Author: mlytwyn
Date: Wed May 7 23:05:38 2014
New Revision: 37855
URL: http://svn.gna.org/viewcvs/gnustep?rev=37855&view=rev
Log:
Lets try to fix the last fix
Modified:
libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
Modified:
libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m?rev=37855&r1=37854&r2=37855&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
Wed May 7 23:05:38 2014
@@ -112,7 +112,7 @@
bitsPerPixel: (NSInteger)pixelBits;
@end
-static NSBitmapImageRep *getStandardBitmap(NSImage *image)
+static NSBitmapImageRep *getStandardBitmapForBitmapFormat(NSImage *image,
NSBitmapFormat bitmapFormat)
{
NSBitmapImageRep *rep;
@@ -149,12 +149,16 @@
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 @@
long *iconPropertyData;
int iconSize;
- rep = getStandardBitmap(image);
+ rep = getStandardBitmapForBitmapFormat(image,
NSAlphaNonpremultipliedBitmapFormat);
if (rep == nil)
{
NSLog(@"Wrong image type for WM icon");
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
