Index: NSBitmapImageRep.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSBitmapImageRep.m,v
retrieving revision 1.46
diff -u -r1.46 NSBitmapImageRep.m
--- NSBitmapImageRep.m	10 Oct 2004 22:36:02 -0000	1.46
+++ NSBitmapImageRep.m	17 Jan 2005 23:52:56 -0000
@@ -744,14 +744,20 @@
   else
     info.planarConfig = PLANARCONFIG_CONTIG;
 
-  if (_colorSpace == NSDeviceRGBColorSpace)
+  if ([_colorSpace isEqual: NSDeviceRGBColorSpace]
+      || [_colorSpace isEqual: NSCalibratedRGBColorSpace])
     info.photoInterp = PHOTOMETRIC_RGB;
-  else if (_colorSpace == NSDeviceWhiteColorSpace)
+  else if ([_colorSpace isEqual: NSDeviceWhiteColorSpace]
+	   || [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
     info.photoInterp = PHOTOMETRIC_MINISBLACK;
-  else if (_colorSpace == NSDeviceBlackColorSpace)
+  else if ([_colorSpace isEqual: NSDeviceBlackColorSpace]
+	   || [_colorSpace isEqual: NSCalibratedBlackColorSpace])
     info.photoInterp = PHOTOMETRIC_MINISWHITE;
   else
-    info.photoInterp = PHOTOMETRIC_RGB;
+    {
+      NSWarnMLog(@"Unknown colorspace %@.", _colorSpace);
+      info.photoInterp = PHOTOMETRIC_RGB;
+    }
 
   info.extraSamples = (_hasAlpha) ? 1 : 0;
   info.compression = [self _localFromCompressionType: type];