gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lets try to fix the last fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@37855 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2014-05-07 21:05:38 +00:00
parent 0e941b80a5
commit 6fe6cb74cc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/x11/XGServerWindow.m
View file

@ -112,7 +112,7 @@ static int last_win_num = 0;
bitsPerPixel: (NSInteger)pixelBits;
@end
static NSBitmapImageRep *getStandardBitmap(NSImage *image)
static NSBitmapImageRep *getStandardBitmapForBitmapFormat(NSImage *image, NSBitmapFormat bitmapFormat)
{
NSBitmapImageRep *rep;
@ -149,12 +149,16 @@ static NSBitmapImageRep *getStandardBitmap(NSImage *image)
hasAlpha: [rep hasAlpha]
isPlanar: NO
colorSpaceName: NSCalibratedRGBColorSpace
bitmapFormat: NSAlphaNonpremultipliedBitmapFormat
bitmapFormat: bitmapFormat
bytesPerRow: 0
bitsPerPixel: 0];
}
}
static NSBitmapImageRep *getStandardBitmap(NSImage *image)
{
return getStandardBitmapForBitmapFormat(image, 0);
}
void __objc_xgcontextwindow_linking (void)
{
@ -1872,7 +1876,7 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
long *iconPropertyData;
int iconSize;
rep = getStandardBitmap(image);
rep = getStandardBitmapForBitmapFormat(image, NSAlphaNonpremultipliedBitmapFormat);
if (rep == nil)
{
NSLog(@"Wrong image type for WM icon");