From: glennrp <glennrp@git.imagemagick.org>
Date: Fri, 5 Nov 2010 15:15:40 +0000 (+0000)
Subject: Changed 5x5, 6x6, 7x7 to make black circles, and added o5x5wc, o6x6wc, o7x7wc
X-Git-Tag: 7.0.1-0~8571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67f2e0c21a26e310ff3c81fe757355fbc789e67c;p=imagemagick

Changed 5x5, 6x6, 7x7 to make black circles, and added o5x5wc, o6x6wc, o7x7wc
---

diff --git a/config/thresholds.xml b/config/thresholds.xml
index 421251365..0be117d4b 100644
--- a/config/thresholds.xml
+++ b/config/thresholds.xml
@@ -69,10 +69,10 @@
   </threshold>
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  Dispersion Ordered Dither Patterns
+  Dispersed Pixel Ordered Dither Patterns
 -->
   <threshold map="o2x2" alias="2x2">
-    <description>Ordered 2x2 Dispersion</description>
+    <description>Ordered 2x2 Dispersed Pixel</description>
     <levels width="2" height="2" divisor="5">
        1  3
        4  2
@@ -80,7 +80,7 @@
   </threshold>
 
   <threshold map="o3x3" alias="3x3">
-    <description>Ordered 3x3 Dispersion</description>
+    <description>Ordered 3x3 Dispersed Pixel</description>
     <levels width="3" height="3" divisor="10">
         3  7  4
         6  1  9
@@ -93,7 +93,7 @@
        From "Dithering Algorithms"
        http://www.efg2.com/Lab/Library/ImageProcessing/DHALF.TXT
      -->
-    <description>Ordered 4x4 Dispersion</description>
+    <description>Ordered 4x4 Dispersed Pixel</description>
     <levels width="4" height="4" divisor="17">
        1   9   3  11
       13   5  15   7
@@ -102,11 +102,26 @@
     </levels>
   </threshold>
 
-  <threshold map="o5x5c" alias="5x5">
+  <threshold map="o5x5bc" alias="5x5">
     <!--
        Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
      -->
-    <description>Ordered 5x5 Circular</description>
+    <description>Ordered 5x5 Black Circles</description>
+    <levels width="5" height="5" divisor="26">
+         1 21 16 15  4
+         5 17 20 19 14
+         6 21 25 24 12
+         7 18 22 23 11
+         2  8  9 10  3
+    </levels>
+  </threshold>
+
+
+  <threshold map="o5x5wc" alias="o5x5wc">
+    <!--
+       Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
+     -->
+    <description>Ordered 5x5 White Circles</description>
     <levels width="5" height="5" divisor="26">
         25 21 10 11 22
         20  9  6  7 12
@@ -116,11 +131,26 @@
     </levels>
   </threshold>
 
-  <threshold map="o6x6c" alias="6x6">
+  <threshold map="o6x6bc" alias="6x6">
+    <!--
+       Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
+     -->
+    <description>Ordered 6x6 Black Circles</description>
+    <levels width="6" height="6" divisor="37">
+        36 32 23 24 25 33
+        31 15  9 10 16 26
+        22  8  2  3 11 17
+        21  7  1  4 12 18
+        30 14  6  5 13 27
+        35 29 20 19 28 34
+    </levels>
+  </threshold>
+
+  <threshold map="o6x6wc" alias="6x6wc">
     <!--
        Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
      -->
-    <description>Ordered 6x6 Circular</description>
+    <description>Ordered 6x6 White Circles</description>
     <levels width="6" height="6" divisor="37">
         36 32 23 24 25 33
         31 15  9 10 16 26
@@ -131,11 +161,28 @@
     </levels>
   </threshold>
 
-  <threshold map="o7x7c" alias="7x7">
+  <threshold map="o7x7bc" alias="7x7">
     <!--
        Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
      -->
-    <description>Ordered 7x7 Circular</description>
+    <description>Ordered 7x7 Black Circles</description>
+    <levels width="7" height="7" divisor="50">
+        2  7 16 26 15  6  1
+        8 17 33 39 32 14  5
+       18 34 44 48 43 31 13
+       27 40 45 49 47 38 25
+       19 35 41 46 42 30 24
+        9 20 36 37 29 23 12
+        3 10 21 28 22 11  4
+    </levels>
+  </threshold>
+
+
+  <threshold map="o7x7wc" alias="o7x7wc">
+    <!--
+       Added by Glenn Randers-Pehrson, 4 Nov 2010, ImageMagick 6.6.5-6
+     -->
+    <description>Ordered 7x7 White Circles</description>
     <levels width="7" height="7" divisor="50">
        49 42 32 18 19 33 48
        41 31 17 10 11 20 34
@@ -147,9 +194,10 @@
     </levels>
   </threshold>
 
+
   <threshold map="o8x8" alias="8x8">
     <!-- Extracted from original 'OrderedDither()' Function -->
-    <description>Ordered 8x8 Dispersion</description>
+    <description>Ordered 8x8 Dispersed Pixel</description>
     <levels width="8" height="8" divisor="65">
          1  49  13  61   4  52  16  64
         33  17  45  29  36  20  48  32