Changeset 3447 for pkpgcounter/trunk

Timestamp:

11/17/08 23:22:27 (16 years ago)

Author:

jerome

Message:

Fixes #33 by implementing Martin Schreiber's patch.

Location:

pkpgcounter/trunk

Files:

• CREDITS (modified) (1 diff)
• pkpgpdls/inkcoverage.py (modified) (1 diff)

pkpgcounter/trunk/CREDITS

@@ -45 +45 @@
                      Description Language.
 
+  - Martin Schreiber : Fixed the computation in the CMYK colorspace.
+
 ==============================================================
 

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -53 +53 @@
     cyan = magenta = yellow = black = 0
     for (r, g, b) in img.getdata() :
-        if r == g == b :
-            black += 255 - r
-        else :
-            cyan += 255 - r
-            magenta += 255 - g
-            yellow += 255 - b
-    return { "C" : 100.0 * (cyan / 255.0) / nbpix,
-             "M" : 100.0 * (magenta / 255.0) / nbpix,
-             "Y" : 100.0 * (yellow / 255.0) / nbpix,
-             "K" : 100.0 * (black / 255.0) / nbpix,
+        pixblack = 255 - max(r, g, b)
+        black += pixblack
+        cyan += 255 - r - pixblack
+        magenta += 255 - g - pixblack
+        yellow += 255 - b - pixblack
+
+    frac = 100.0 / nbpix
+    return { "C" : frac * (cyan / 255.0),
+             "M" : frac * (magenta / 255.0),
+             "Y" : frac * (yellow / 255.0),
+             "K" : frac * (black / 255.0),
            }