Alexandre Julliard : winemenubuilder: Load only low bit count icons if we are going to save to XPM format.
Alexandre Julliard
julliard at winehq.org
Mon Jun 28 11:01:21 CDT 2010
Module: wine
Branch: master
Commit: 67bdd633b2b85cf24b67d9b2dc2581964a85f7d6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bdd633b2b85cf24b67d9b2dc2581964a85f7d6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 28 16:39:12 2010 +0200
winemenubuilder: Load only low bit count icons if we are going to save to XPM format.
---
programs/winemenubuilder/winemenubuilder.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index c027dad..620d705 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -684,8 +684,13 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName)
{
if ((pIconDir = LockResource(hResData)))
{
+ lpName = MAKEINTRESOURCEW(pIconDir->idEntries[0].nID); /* default to first entry */
for (i = 0; i < pIconDir->idCount; i++)
{
+#ifndef SONAME_LIBPNG
+ if (pIconDir->idEntries[i].wBitCount != 4 && pIconDir->idEntries[i].wBitCount != 8)
+ continue;
+#endif
if (pIconDir->idEntries[i].wBitCount >= nMaxBits)
{
if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax)
@@ -694,7 +699,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName)
nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
nMaxBits = pIconDir->idEntries[i].wBitCount;
}
- }
+ }
}
}
More information about the wine-cvs
mailing list