Ken Thomases : winemenubuilder: On Mac, size is implicit in ICNS slot; don' t search for best.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e72a37e9604ae1a14d4928abbe7551aac8c38cdf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e72a37e9604ae1a14d4928abbe...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Wed Jan 12 00:17:30 2011 -0600

winemenubuilder: On Mac, size is implicit in ICNS slot; don't search for best.

---

 programs/winemenubuilder/winemenubuilder.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 8cafce0..56ff158 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -839,7 +839,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico
     int numEntries;
     struct {
         int index;
-        int maxPixels;
         int maxBits;
     } best[ICNS_SLOTS];
     int indexes[ICNS_SLOTS];
@@ -857,7 +856,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico
     for (i = 0; i < ICNS_SLOTS; i++)
     {
         best[i].index = -1;
-        best[i].maxPixels = 0;
         best[i].maxBits = 0;
     }
     for (i = 0; i < numEntries; i++)
@@ -872,11 +870,9 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico
         slot = size_to_slot(width);
         if (slot < 0)
             continue;
-        if (iconDirEntries[i].wBitCount >= best[slot].maxBits &&
-            (height * width) >= best[slot].maxPixels)
+        if (iconDirEntries[i].wBitCount >= best[slot].maxBits)
         {
             best[slot].index = i;
-            best[slot].maxPixels = height * width;
             best[slot].maxBits = iconDirEntries[i].wBitCount;
         }
     }