gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSBitmapImageRep+ICNS.m (_imageRepsWithICNSData:): Try to

Browse source 
put the best suited image first.
This commit is contained in:
fredkiefer 2019-02-26 21:31:11 +01:00
parent d9c033d464
commit a7d572f744
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2019-02-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBitmapImageRep+ICNS.m (_imageRepsWithICNSData:): Try to
put the best suited image first.
2019-02-10 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSHorizontalTypesetter.h: Add

24
Source/NSBitmapImageRep+ICNS.m
View file

@ -615,6 +615,7 @@ typedef struct pixel_t
icns_family_t *iconFamily = NULL;
unsigned long dataOffset = 0;
icns_byte_t *data = NULL;
int best = 0;
error = icns_import_family_data(size, bytes, &iconFamily);
if (error != ICNS_STATUS_OK)
@ -644,6 +645,7 @@ typedef struct pixel_t
typeStr,
&iconImage);
//NSLog(@"Read image %c %c %c %c result %d size %d", typeStr.c[0], typeStr.c[1], typeStr.c[2], typeStr.c[3], error, element.elementSize);
if (!error)
{
NSBitmapImageRep* imageRep;
@ -651,7 +653,27 @@ typedef struct pixel_t
imageRep = [[self alloc] _initBitmapFromICNSImage: &iconImage];
if (imageRep)
{
[array addObject: imageRep];
// If it exists, put the 48 icon as the first element in the array
if (icns_types_equal(typeStr, ICNS_48x48_32BIT_DATA))
{
[array insertObject: imageRep atIndex: 0];
best = 48;
}
else if (icns_types_equal(typeStr, ICNS_32x32_32BIT_DATA) && best != 48)
{
[array insertObject: imageRep atIndex: 0];
best = 32;
}
else if ((icns_types_equal(typeStr, ICNS_16x16_32BIT_DATA) ||
icns_types_equal(typeStr, ICNS_128X128_32BIT_DATA)) &&
best != 48 && best != 32)
{
[array insertObject: imageRep atIndex: 0];
}
else
{
[array addObject: imageRep];
}
RELEASE(imageRep);
}