Changeset 439 for pkpgcounter/trunk/pkpgpdls

Timestamp:

12/10/06 19:15:07 (18 years ago)

Author:

jerome

Message:

Now recognizes the GC pseudo colorspace to differentiate
between grayscale and coloured pages.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (1 diff)
• inkcoverage.py (modified) (3 diffs)
• version.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -211 +211 @@
                             dest="colorspace",
                             type="cichoice",
-                            cichoices=["bw", "rgb", "cmyk", "cmy"],
-                            help="Activate the computation of ink usage, and defines the colorspace to use. Supported values are 'BW', 'RGB', 'CMYK', and 'CMY'.")
+                            cichoices=["bw", "rgb", "cmyk", "cmy", "gc"],
+                            help="Activate the computation of ink usage, and defines the colorspace to use. Supported values are 'BW', 'RGB', 'CMYK', 'CMY', and 'GC'.")
     parser.add_option("-r", "--resolution", 
                             type="int", 

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -64 +64 @@
            }
         
+def getPercentGC(img, nbpix) :        
+    """Determines if a page is in grayscale or colour mode."""
+    result = getPercentCMYK(img, nbpix)
+    if result["C"] == result["M"] == result["Y"] == 0.0 :
+        return { "G" : 100.0, "C" : 0.0 }
+    else :    
+        return { "G" : 0.0, "C" : 100.0 }
+    
 def getPercentBW(img, nbpix) :
     """Extracts the percents of Black from a picture, once converted to gray levels."""
@@ -92 +100 @@
     colorspace = colorspace.upper()
     computation = globals()["getPercent%s" % colorspace]
-    if colorspace == "CMYK" : # faster with psyco on my machine
+    if colorspace in ("CMYK", "GC") : # faster with psyco on my machine
         try :
             import psyco
@@ -98 +106 @@
             pass
         else :    
-            psyco.bind(computation)
+            psyco.bind(getPercentCMYK)
     
     index = 0

pkpgcounter/trunk/pkpgpdls/version.py

@@ -23 +23 @@
 
 
-__version__ = "2.12"
+__version__ = "2.13"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""