0.20230226: threshold: bayer and dots

zvezdochiot · zvezdochiot · commit 833de4c3a199 · 2023-02-26T17:34:54.000+03:00
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ CC            = gcc
 CPP           = g++
 CFLAGS        = -DUNIX -I$(SRCS) -Wall -s
 VER           = 0
-VERB          = 20230221
+VERB          = 20230226
 ifeq ($(OS),Windows_NT)
 LIBS          = FreeImage.lib
 PLIBF         = $(PNAME).$(VER).dll
diff --git a/doc/imthreshold/CHANGELOG b/doc/imthreshold/CHANGELOG
@@ -1,3 +1,7 @@
+0.20230226
+
+    Threshold: added bayer and dots
+
 0.20230221
 
     Filter: autowhite
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230221
+0.20230226
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-a4
diff --git a/man/man1/imthreshold-anytodjvu.1 b/man/man1/imthreshold-anytodjvu.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-anytodjvu
diff --git a/man/man1/imthreshold-anytominidjvu.1 b/man/man1/imthreshold-anytominidjvu.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-anytodjvu
diff --git a/man/man1/imthreshold-bash-scripts.1 b/man/man1/imthreshold-bash-scripts.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-bash-scripts
diff --git a/man/man1/imthreshold-deskew.1 b/man/man1/imthreshold-deskew.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-deskew
diff --git a/man/man1/imthreshold-fautoinv.1 b/man/man1/imthreshold-fautoinv.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
  imthreshold-fautoinv
diff --git a/man/man1/imthreshold-fdespeckle.1 b/man/man1/imthreshold-fdespeckle.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-fdespeckle
diff --git a/man/man1/imthreshold-filter.1 b/man/man1/imthreshold-filter.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-filter
diff --git a/man/man1/imthreshold-finfo.1 b/man/man1/imthreshold-finfo.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
  imthreshold-finfo
diff --git a/man/man1/imthreshold-fpmean.1 b/man/man1/imthreshold-fpmean.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
  imthreshold-fpmean
diff --git a/man/man1/imthreshold-math.1 b/man/man1/imthreshold-math.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
  imthreshold-math
diff --git a/man/man1/imthreshold-rotate.1 b/man/man1/imthreshold-rotate.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-rotate
diff --git a/man/man1/imthreshold-sbwmag2.1 b/man/man1/imthreshold-sbwmag2.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-sbwmag2
diff --git a/man/man1/imthreshold-separate.1 b/man/man1/imthreshold-separate.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-separate
diff --git a/man/man1/imthreshold-shris.1 b/man/man1/imthreshold-shris.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-shris
diff --git a/man/man1/imthreshold-size.1 b/man/man1/imthreshold-size.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-size
diff --git a/man/man1/imthreshold-tdjvul.1 b/man/man1/imthreshold-tdjvul.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-tdjvul
diff --git a/man/man1/imthreshold-tgatos.1 b/man/man1/imthreshold-tgatos.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-tgatos
diff --git a/man/man1/imthreshold-tglobal.1 b/man/man1/imthreshold-tglobal.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-tglobal
@@ -19,15 +19,14 @@ delta (int, optional, default = 0)
 .TP
 -f str
 name filter:
+    'bayer'
     'bht'
     'bimod' (default)
     'bimodc'
     'color'
     'dither'
-    'dithh' (Knuth D.E.)
-    'ditho' (Knuth D.E.)
-    'dithq'
-    'ditht'
+    'dithk' (Knuth D.E.)
+    'dots'
     'entropy'
     'eqbright'
     'grad'
@@ -51,6 +50,9 @@ max iteration (int, optional, default = 10)
 -n
 norm (bool, optional, default = false)
 .TP
+-p N
+pattern (int, optional, default = 4)
+.TP
 -q str
 colorspace:
     'rgb' (default)
diff --git a/man/man1/imthreshold-tlayer.1 b/man/man1/imthreshold-tlayer.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-tlayer
diff --git a/man/man1/imthreshold-tlocal.1 b/man/man1/imthreshold-tlocal.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-tlocal
diff --git a/man/man1/imthreshold-ttext.1 b/man/man1/imthreshold-ttext.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-ttext
diff --git a/man/man1/imthreshold-twhiterohrer.1 b/man/man1/imthreshold-twhiterohrer.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold-twhiterohrer
diff --git a/man/man1/imthreshold.1 b/man/man1/imthreshold.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -242,6 +242,8 @@ int IMTFilterTDalg (IMTpixel**, BYTE**, unsigned, unsigned, int, int, int, int);
 int IMTFilterTDither (IMTpixel**, BYTE**, unsigned, unsigned);
 int IMTFilterTDithH (IMTpixel**, BYTE**, unsigned, unsigned, int, int, unsigned);
 int IMTFilterTDithO (IMTpixel**, BYTE**, unsigned, unsigned, int, int);
+int IMTFilterTDithBayer (IMTpixel**, BYTE**, unsigned, unsigned, int);
+int IMTFilterTDithDots (IMTpixel**, BYTE**, unsigned, unsigned, int);
 int IMTFilterTDjVuL (IMTpixel**, BYTE**, IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned, unsigned, int, float, float, unsigned);
 int IMTFilterTEntValue (IMTpixel**, unsigned, unsigned);
 int IMTFilterTEnt (IMTpixel**, BYTE**, unsigned, unsigned);
diff --git a/src/lib/threshold.c b/src/lib/threshold.c
@@ -1384,8 +1384,6 @@ int IMTFilterTDithH (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned wid
         { 0, 0, 0, 0 },
         { 0, 0, 0, 0 }
     };
-    char dith1s = "A";
-    char dith2s = "a";
     int dith[4][4];
     int hdithy[2][17], hdithx[2][17], herr, herrp, herrg;
     wwidth = (wwidth < 2) ? 2 : wwidth;
@@ -1537,7 +1535,6 @@ int IMTFilterTDithO (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned wid
         { 13,  0,  2, 18, 50, 63, 61, 45 },
         { 24, 16,  8, 26, 39, 47, 55, 37 }
     };
-    char odiths = "0";
     int odithy[65], odithx[65], herr, herrp, herrg;
     for (y = 0; y < wwidth; y++)
     {
@@ -1632,6 +1629,94 @@ int IMTFilterTDithO (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned wid
 
 ////////////////////////////////////////////////////////////////////////////////
 
+int IMTFilterTDithBayer (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned width, int delta)
+{
+    unsigned int y, x, yb, xb;
+    unsigned int wwidth = 8;
+    int thres, pix;
+    int threshold = 383;
+    // Bayer dither matrix
+    int bdith[8][8] =
+    {
+        { 0, 32,  8, 40,  2, 34, 10, 42},
+        {48, 16, 56, 24, 50, 18, 58, 26},
+        {12, 44,  4, 36, 14, 46,  6, 38},
+        {60, 28, 52, 20, 62, 30, 54, 22},
+        { 3, 35, 11, 43,  1, 33,  9, 41},
+        {51, 19, 59, 27, 49, 17, 57, 25},
+        {15, 47,  7, 39, 13, 45,  5, 37},
+        {63, 31, 55, 23, 61, 29, 53, 21}
+    };
+
+    for (y = 0; y < wwidth; y++)
+    {
+        for (x = 0; x < wwidth; x++)
+        {
+            bdith[y][x] *= 12;
+        }
+    }
+    for (y = 0; y < height; y++)
+    {
+        yb = y % wwidth;
+        for (x = 0; x < width; x++)
+        {
+            xb = x % wwidth;
+            thres = bdith[yb][xb];
+            pix = p_im[y][x].s;
+            pix += delta;
+            d_im[y][x] = (BYTE)((pix < thres) ? 0 : 255);
+        }
+    }
+
+    return threshold;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+int IMTFilterTDithDots (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned width, int delta)
+{
+    unsigned int y, x, yb, xb;
+    unsigned int wwidth = 8;
+    int thres, pix;
+    int threshold = 383;
+    // Dots dither matrix
+    int ddith[8][8] =
+    {
+        {13,  9,  5, 12, 18, 22, 26, 19},
+        { 6,  1,  0,  8, 25, 30, 31, 23},
+        {10,  2,  3,  4, 21, 29, 28, 27},
+        {14,  7, 11, 15, 17, 24, 20, 16},
+        {18, 22, 26, 19, 13,  9,  5, 12},
+        {25, 30, 31, 23,  6,  1,  0,  8},
+        {21, 29, 28, 27, 10,  2,  3,  4},
+        {17, 24, 20, 16, 14,  7, 11, 15}
+    };
+
+    for (y = 0; y < wwidth; y++)
+    {
+        for (x = 0; x < wwidth; x++)
+        {
+            ddith[y][x] *= 24;
+        }
+    }
+    for (y = 0; y < height; y++)
+    {
+        yb = y % wwidth;
+        for (x = 0; x < width; x++)
+        {
+            xb = x % wwidth;
+            thres = ddith[yb][xb];
+            pix = p_im[y][x].s;
+            pix += delta;
+            d_im[y][x] = (BYTE)((pix < thres) ? 0 : 255);
+        }
+    }
+
+    return threshold;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 int IMTFilterTDjVuL (IMTpixel** p_im, BYTE** m_im, IMTpixel** fg_im, IMTpixel** bg_im, unsigned height, unsigned width, unsigned bgs, unsigned fgs, unsigned level, int wbmode, float anisotropic, float doverlay, unsigned fposter)
 {
     unsigned widthbg = (width + bgs - 1) / bgs;
diff --git a/src/tglobal.cpp b/src/tglobal.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "ImThreshold" 1 0.20230221 "21 Feb 2023" "User Manual"`
	`1`	`+.TH "ImThreshold" 1 0.20230226 "26 Feb 2023" "User Manual"`
`2`	`2`
`3`	`3`	`.SH NAME`
`4`	`4`	`imthreshold-a4`