diff --git a/ChangeLog b/ChangeLog
index 6eddc3e..f24fee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-11 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/cairo/CairoContext.m (-GSDrawImage::): Correct test
+	whether image conversion is needed.
+
 2008-12-10  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* 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