From 70ede5cb904043766f46dfeaef6a1ed0dc72911f Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Thu, 11 Dec 2008 21:03:51 +0000 Subject: [PATCH] Correct test for the need of an image conversion. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@27279 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/cairo/CairoContext.m | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eddc3e..f24fee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-11 Fred Kiefer + + * Source/cairo/CairoContext.m (-GSDrawImage::): Correct test + whether image conversion is needed. + 2008-12-10 Wolfgang Lux * Source/x11/XGServerEvent.m (-runLoopShouldBlock:): Add method to diff --git a/Source/cairo/CairoContext.m b/Source/cairo/CairoContext.m index 2fe651b..f47fadf 100644 --- a/Source/cairo/CairoContext.m +++ b/Source/cairo/CairoContext.m @@ -140,7 +140,7 @@ bitmap = (NSBitmapImageRep*)imageref; colorSpaceName = [bitmap colorSpaceName]; if ([bitmap isPlanar] || ([bitmap bitmapFormat] != 0) - || ([bitmap bitsPerPixel] != 8) || + || ([bitmap bitsPerSample] != 8) || (![colorSpaceName isEqualToString: NSDeviceRGBColorSpace] && ![colorSpaceName isEqualToString: NSCalibratedRGBColorSpace])) { @@ -150,7 +150,7 @@ NSString *colorSpaceName = NSCalibratedRGBColorSpace; NSBitmapImageRep *new; - new = [bitmap _convertToFormatBitsPerSample: bitsPerSample + new = [bitmap _convertToFormatBitsPerSample: bitsPerSample samplesPerPixel: samplesPerPixel hasAlpha: [bitmap hasAlpha] isPlanar: isPlanar