0.20230428: despeckle: add hatch

zvezdochiot · zvezdochiot · commit 9082d6efac10 · 2023-04-28T01:50:20.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          = 20230416
+VERB          = 20230428
 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.20230428
+
+    Despeckle: add hatch
+
 0.20230416
 
     Threshold: reorganize Edge threshold
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230416
+0.20230428
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"
 
 .SH NAME
 imthreshold-fdespeckle
@@ -26,6 +26,7 @@ learnen number (int, optional, default = 1)
 .TP
 -m str
 name method:
+    'hatch'
     'hist'
     'invert'
     'mag2'
diff --git a/man/man1/imthreshold-filter.1 b/man/man1/imthreshold-filter.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"
 
 .SH NAME
 imthreshold-tglobal
diff --git a/man/man1/imthreshold-tlayer.1 b/man/man1/imthreshold-tlayer.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 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.20230408 "08 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/fdespeckle.cpp b/src/fdespeckle.cpp
@@ -28,6 +28,7 @@ void ImthresholdFilterDespeckleUsage()
     printf("          -k N.N  lambda neuro learnen (float, optional, default = 0.1)\n");
     printf("          -l N    learnen number (int, optional, default = 1)\n");
     printf("          -m str  name method:\n");
+    printf("                    'hatch'\n");
     printf("                    'hist'\n");
     printf("                    'invert'\n");
     printf("                    'mag2'\n");
@@ -126,6 +127,11 @@ int main(int argc, char *argv[])
                     kdp = IMTFilterDphist(p_im, height, width, Ksize);
                     printf("Despeckle= %f\n", kdp);
                 }
+                else if (strcmp(namefilter, "hatch") == 0)
+                {
+                    printf("Method= %s\n", namefilter);
+                    IMTFilterDHatch(p_im, height, width, Ksize);
+                }
                 else if (strcmp(namefilter, "invert") == 0)
                 {
                     printf("Method= %s\n", namefilter);
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -127,6 +127,7 @@ IMTpixel IMTmaxIc (IMTpixel**, unsigned, unsigned, unsigned, unsigned);
 IMTpixel IMTminIc (IMTpixel**, unsigned, unsigned, unsigned, unsigned);
 IMTpixel IMTaverageIc (IMTpixel**, IMTpixel, unsigned, unsigned, unsigned, unsigned, float);
 void IMTFilterDespeck2 (BYTE**, unsigned, unsigned, unsigned);
+void IMTFilterDHatch (BYTE**, unsigned, unsigned, unsigned);
 unsigned IMTFilterDMag2 (BYTE**, unsigned, unsigned, unsigned);
 void IMTFilterDNeuro2 (BYTE**, unsigned, unsigned, unsigned, float, unsigned);
 float IMTFilterDphist (BYTE**, unsigned, unsigned, unsigned);
diff --git a/src/lib/despeckle.c b/src/lib/despeckle.c
@@ -23,6 +23,8 @@ void IMTFilterInvertBW (BYTE** p_im, unsigned height, unsigned width)
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 void IMTFilterDespeck2 (BYTE** p_im, unsigned height, unsigned width, unsigned Ksize)
 {
     unsigned k2 = Ksize/2;
@@ -33,11 +35,11 @@ void IMTFilterDespeck2 (BYTE** p_im, unsigned height, unsigned width, unsigned K
 
     for (y = 0; y < height; y++)
     {
-        y0 = ((y > k2) ? (y - k2) : 0);
+        y0 = ((y < k2) ? 0 : (y - k2));
         y2 = (((y + kmax) < height) ? (y + kmax) : height);
         for (x = 0; x < width; x++)
         {
-            x0 = ((x > k2) ? (x - k2) : 0);
+            x0 = ((x < k2) ? 0 : (x - k2));
             x2 = (((x + kmax) < width) ? (x + kmax) : width);
             val = 0;
             n = 0;
@@ -81,6 +83,54 @@ void IMTFilterDespeck2 (BYTE** p_im, unsigned height, unsigned width, unsigned K
 
 ////////////////////////////////////////////////////////////////////////////////
 
+void IMTFilterDHatch (BYTE** p_im, unsigned height, unsigned width, unsigned Ksize)
+{
+    unsigned k2 = Ksize/2;
+    unsigned kmax = Ksize - k2;
+    unsigned y, x, y0, x0, y1, x1, y2, x2;
+    unsigned n, val;
+    BYTE** d_im = BWalloc(height, width);
+
+    for (y = 0; y < height; y++)
+    {
+        y0 = ((y < k2) ? 0 : (y - k2));
+        y2 = (((y + kmax) < height) ? (y + kmax) : height);
+        for (x = 0; x < width; x++)
+        {
+            x0 = ((x < k2) ? 0 : (x - k2));
+            x2 = (((x + kmax) < width) ? (x + kmax) : width);
+            val = p_im[y][x];
+            n = 0;
+            if (val == 0)
+            {
+                for(y1 = y0; y1 < y2; y1++)
+                {
+                    for(x1 = x0; x1 < x2; x1++)
+                    {
+                        if (p_im[y1][x1] > 0)
+                        {
+                            n++;
+                        }
+                    }
+                }
+                val = (n > 0) ? val : 255;
+            }
+            d_im[y][x] = (BYTE)val;
+        }
+    }
+    for (y = 0; y < height; y++)
+    {
+        for (x = 0; x < width; x++)
+        {
+            p_im[y][x] = d_im[y][x];
+        }
+    }
+
+    BWfree(d_im, height);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 unsigned IMTFilterDMag2 (BYTE** p_im, unsigned height, unsigned width, unsigned Ksize)
 {
     unsigned height2 = height * 2, width2 = width * 2, y, threshold;
diff --git a/src/lib/threshold.c b/src/lib/threshold.c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "ImThreshold" 1 0.20230408 "08 Apr 2023" "User Manual"`
	`1`	`+.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"`
`2`	`2`
`3`	`3`	`.SH NAME`
`4`	`4`	`imthreshold-a4`