Changeset 442 for pkpgcounter/trunk/pkpgpdls

Timestamp:

12/16/06 21:44:34 (18 years ago)

Author:

jerome

Message:

Severely optimized color detection code in GC colorspace with
absolutely NO visible change : so probably the whole time is not
passed in my code, or I'm stupid :-)

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• inkcoverage.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -49 +49 @@
     if img.mode != "RGB" :
         img = img.convert("RGB")
-    data = img.getdata()    
     cyan = magenta = yellow = black = 0    
-    for (r, g, b) in data :
+    for (r, g, b) in img.getdata() :
         if r == g == b :
             black += 255 - r
@@ -66 +65 @@
 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 }
+    if img.mode != "RGB" :
+        img = img.convert("RGB")
+    gray = 0
+    for (r, g, b) in img.getdata() :
+        if not (r == g == b) :
+            # optimize : if a single pixel is no gray the whole page is colored.
+            return { "G" : 0.0, "C" : 100.0 }
+    return { "G" : 100.0, "C" : 0.0 }
     
 def getPercentBW(img, nbpix) :

pkpgcounter/trunk/pkpgpdls/version.py

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