[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r9787 - trunk/filter
From:       cups-dev () easysw ! com
Date:       2011-05-19 2:48:36
Message-ID: 10558-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2011-05-18 19:48:35 -0700 (Wed, 18 May 2011)
New Revision: 9787
Log:
Fix newer colorspaces.


Modified:
   trunk/filter/interpret.c

Modified: trunk/filter/interpret.c
===================================================================
--- trunk/filter/interpret.c	2011-05-18 22:50:35 UTC (rev 9786)
+++ trunk/filter/interpret.c	2011-05-19 02:48:35 UTC (rev 9787)
@@ -364,6 +364,7 @@
     case CUPS_CSPACE_WHITE :
     case CUPS_CSPACE_GOLD :
     case CUPS_CSPACE_SILVER :
+    case CUPS_CSPACE_SW :
         h->cupsNumColors    = 1;
         h->cupsBitsPerPixel = h->cupsBitsPerColor;
 	break;
@@ -425,6 +426,29 @@
 
         h->cupsNumColors = 4;
 	break;
+
+    case CUPS_CSPACE_DEVICE1 :
+    case CUPS_CSPACE_DEVICE2 :
+    case CUPS_CSPACE_DEVICE3 :
+    case CUPS_CSPACE_DEVICE4 :
+    case CUPS_CSPACE_DEVICE5 :
+    case CUPS_CSPACE_DEVICE6 :
+    case CUPS_CSPACE_DEVICE7 :
+    case CUPS_CSPACE_DEVICE8 :
+    case CUPS_CSPACE_DEVICE9 :
+    case CUPS_CSPACE_DEVICEA :
+    case CUPS_CSPACE_DEVICEB :
+    case CUPS_CSPACE_DEVICEC :
+    case CUPS_CSPACE_DEVICED :
+    case CUPS_CSPACE_DEVICEE :
+    case CUPS_CSPACE_DEVICEF :
+        h->cupsNumColors = h->cupsColorSpace - CUPS_CSPACE_DEVICE1 + 1;
+
+        if (h->cupsColorOrder == CUPS_ORDER_CHUNKED)
+          h->cupsBitrsPerPixel = h->cupsBitsPerColor * h->cupsNumColors;
+	else
+	  h->cupsBitsPerPixel = h->cupsBitsPerColor;
+	break;
   }
 
   h->cupsBytesPerLine = (h->cupsBitsPerPixel * h->cupsWidth + 7) / 8;

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]