0.20230714: Threshold: EdgeDiv (combine EdgePlus & BlurDiv)

zvezdochiot · zvezdochiot · commit c5d3fef4d0a3 · 2023-07-14T08:27:23.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          = 20230707
+VERB          = 20230714
 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.20230714
+
+    Threshold: EdgeDiv (combine EdgePlus & BlurDiv)
+
 0.20230707
 
     Threshold: DjVuC
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230707
+0.20230714
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold-tglobal
@@ -11,6 +11,9 @@ imthreshold-tglobal [options] <input_image> <output_image>(BW)
 
 .SH OPTIONS
 .TP
+-2
+color sqr (bool, optional, default = false)
+.TP
 -b
 color correct (bool, optional, default = false)
 .TP
diff --git a/man/man1/imthreshold-tlayer.1 b/man/man1/imthreshold-tlayer.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold-tlayer
@@ -11,6 +11,12 @@ imthreshold-tlayer [options] <input_image> <output_image>
 
 .SH OPTIONS
 .TP
+-2
+color sqr (bool, optional, default = false)
+.TP
+-b
+color correct (bool, optional, default = false)
+.TP
 -c N
 contrast limit (int, optional, default = 128)
 .TP
diff --git a/man/man1/imthreshold-tlocal.1 b/man/man1/imthreshold-tlocal.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold-tlocal
@@ -11,6 +11,9 @@ imthreshold-tlocal [options] <input_image> <output_image>(BW)
 
 .SH OPTIONS
 .TP
+-2
+color sqr (bool, optional, default = false)
+.TP
 -b
 color correct (bool, optional, default = false)
 .TP
@@ -29,6 +32,7 @@ name filter:
     'chistian'
     'dalg'
     'edge'
+    'edgediv'
     'edgeplus'
     'gravure'
     'mscale'
diff --git a/man/man1/imthreshold-ttext.1 b/man/man1/imthreshold-ttext.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 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.20230707 "07 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -176,6 +176,7 @@ void IMTFilterMathOverlay (IMTpixel**, IMTpixel**, unsigned int, unsigned int, i
 void IMTFilterMathPlus (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
 void IMTFilterMathScreen (IMTpixel**, IMTpixel**, unsigned int, unsigned int, int);
 float IMTFilterMathSharpenBadMetric (IMTpixel**, IMTpixel**, unsigned, unsigned);
+void IMTFilterMathSqr (IMTpixel**, unsigned, unsigned);
 void IMTFilterMathThreshold (IMTpixel**, IMTpixel**, BYTE**, unsigned, unsigned, int);
 float IMTFilterMirror (IMTpixel**, IMTpixel**, unsigned, unsigned);
 float IMTFilterMirrorPart (IMTpixel**, IMTpixel**, unsigned, unsigned, float);
@@ -258,6 +259,7 @@ 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 IMTFilterTEdge (IMTpixel**, BYTE**, unsigned int, unsigned int, int, float);
+int IMTFilterTEdgeDiv (IMTpixel**, BYTE**, unsigned int, unsigned int, int, float, float, float);
 int IMTFilterTEdgePlus (IMTpixel**, BYTE**, unsigned int, unsigned int, int, float, float);
 int IMTFilterTEntValue (IMTpixel**, unsigned, unsigned);
 int IMTFilterTEnt (IMTpixel**, BYTE**, unsigned, unsigned);
diff --git a/src/lib/math.c b/src/lib/math.c
@@ -570,6 +570,31 @@ float IMTFilterMathSharpenBadMetric (IMTpixel** p_im, IMTpixel** m_im, unsigned
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void IMTFilterMathSqr (IMTpixel** p_im, unsigned height, unsigned width)
+{
+    unsigned y, x, d;
+    float im;
+
+    for ( y = 0; y < height; y++ )
+    {
+        for ( x = 0; x < width; x++ )
+        {
+            for (d = 0; d < 3; d++)
+            {
+                im = (float)p_im[y][x].c[d];
+                im++;
+                im *= im;
+                im /= 256.0;
+                im -= 0.5;
+                p_im[y][x].c[d] = ByteClamp((int)im);
+            }
+            p_im[y][x] = IMTcalcS (p_im[y][x]);
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 void IMTFilterMathThreshold (IMTpixel** p_im, IMTpixel** m_im, BYTE** d_im, unsigned height, unsigned width, int delta)
 {
     unsigned y, x;
diff --git a/src/lib/threshold.c b/src/lib/threshold.c
@@ -817,29 +817,8 @@ int IMTFilterTBiModC (IMTpixel** p_im, BYTE** d_im, unsigned height, unsigned wi
 
 int IMTFilterTBlurDiv (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsigned int width, int radius, float sensitivity, float delta)
 {
-    unsigned int y, x;
-    float origin, blur, edge, edgenorm, retval;
-    int threshold = 0;
-    IMTpixel** b_im = IMTalloc(height, width);
-
-    IMTFilterGaussBlur (p_im, b_im, height, width, radius);
-    for (y = 0; y < height; y++)
-    {
-        for (x = 0; x < width; x++)
-        {
-            origin = p_im[y][x].s;
-            blur = b_im[y][x].s;
-            edge = (blur + 1.0f) / (origin + 1.0f) - 0.5f;
-            edgenorm = sensitivity * edge + (1.0f - sensitivity);
-            retval = (edgenorm > 0.0f) ? (origin / edgenorm) : origin;
-            retval = (retval < 0.0f) ? 0.0f : (retval < 765.0f) ? retval : 765.0f;
-            b_im[y][x].s = (WORD)(retval + 0.5f);
-        }
-    }
-    threshold = IMTFilterTBiMod (b_im, d_im, height, width, delta);
-    IMTfree(b_im, height);
-
-    return threshold;
+    /* DEPRECATED */
+    return IMTFilterTEdgeDiv (p_im, d_im, height, width, radius, 0.0f, sensitivity, delta);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1915,10 +1894,10 @@ int IMTFilterTEdge (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsigned
 
 ////////////////////////////////////////////////////////////////////////////////
 
-int IMTFilterTEdgePlus (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsigned int width, int radius, float sensitivity, float delta)
+int IMTFilterTEdgeDiv (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsigned int width, int radius, float sensitivity, float sensitivityblur, float delta)
 {
     unsigned int y, x;
-    float origin, blur, edge, edgeplus, retval;
+    float origin, blur, edge, edgeplus, edgenorm, retval;
     int threshold = 0;
     IMTpixel** b_im = IMTalloc(height, width);
 
@@ -1929,9 +1908,19 @@ int IMTFilterTEdgePlus (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsig
         {
             origin = p_im[y][x].s;
             blur = b_im[y][x].s;
-            edge = (origin + 1.0f) / (blur + 1.0f) - 0.5f;
-            edgeplus = origin * edge;
-            retval = sensitivity * edgeplus + (1.0f - sensitivity) * origin;
+            retval = origin;
+            if (sensitivity > 0.0f)
+            {
+                edge = (origin + 1.0f) / (blur + 1.0f) - 0.5f;
+                edgeplus = origin * edge;
+                retval = sensitivity * edgeplus + (1.0f - sensitivity) * origin;
+            }
+            if (sensitivityblur > 0.0f)
+            {
+                edge = (blur + 1.0f) / (retval + 1.0f) - 0.5f;
+                edgenorm = sensitivityblur * edge + (1.0f - sensitivityblur);
+                retval = (edgenorm > 0.0f) ? (origin / edgenorm) : origin;
+            }
             retval = (retval < 0.0f) ? 0.0f : (retval < 765.0f) ? retval : 765.0f;
             b_im[y][x].s = (WORD)(retval + 0.5f);
         }
@@ -1944,6 +1933,14 @@ int IMTFilterTEdgePlus (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsig
 
 ///////////////////////////////////////////////////////////////////////////////
 
+int IMTFilterTEdgePlus (IMTpixel** p_im, BYTE** d_im, unsigned int height, unsigned int width, int radius, float sensitivity, float delta)
+{
+    /* DEPRECATED */
+    return IMTFilterTEdgeDiv (p_im, d_im, height, width, radius, sensitivity, 0.0f, delta);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 int IMTFilterTEntValue (IMTpixel** p_im, unsigned height, unsigned width)
 {
     unsigned i, t, cn = 768;
diff --git a/src/tglobal.cpp b/src/tglobal.cpp
@@ -23,6 +23,7 @@ void ImthresholdFilterTGlobalUsage()
 {
     printf("Usage : imthreshold-tglobal [options] <input_image> <output_image>(BW)\n\n");
     printf("options:\n");
+    printf("          -2      color sqr (bool, optional, default = false)\n");
     printf("          -b      color correct (bool, optional, default = false)\n");
     printf("          -d N    delta (int, optional, default = 0)\n");
     printf("          -f str  name filter:\n");
@@ -78,17 +79,21 @@ int main(int argc, char *argv[])
     bool weight = false;
     bool fnorm = false;
     bool fmirror = false;
+    bool fcsqr = false;
     bool fccor = false;
     bool finv = false;
     bool fhelp = false;
     int threshold;
     char *namefilter, *csp, *cspn;
     namefilter = (char*)"bimod";
     csp = (char*)"rgb";
-    while ((opt = getopt(argc, argv, ":bd:f:ik:m:np:q:s:wzh")) != -1)
+    while ((opt = getopt(argc, argv, ":2bd:f:ik:m:np:q:s:wzh")) != -1)
     {
         switch(opt)
         {
+        case '2':
+            fcsqr = true;
+            break;
         case 'b':
             fccor = true;
             break;
@@ -168,6 +173,11 @@ int main(int argc, char *argv[])
             cspn = IMTFilterRGBtoCSP(p_im, height, width, csp, 1);
             printf("ColorSpace= %s\n", cspn);
 
+            if (fcsqr)
+            {
+                IMTFilterMathSqr(p_im, height, width);
+                printf("ColorSqr= true\n");
+            }
             if (fccor)
             {
                 IMTFilterSCCor(p_im, height, width);
diff --git a/src/tlayer.cpp b/src/tlayer.cpp
diff --git a/src/tlocal.cpp b/src/tlocal.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "ImThreshold" 1 0.20230707 "07 Jul 2023" "User Manual"`
	`1`	`+.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"`
`2`	`2`
`3`	`3`	`.SH NAME`
`4`	`4`	`imthreshold-a4`