0.20230704: despeckle: wgrid

zvezdochiot · zvezdochiot · commit ebb5f870dc48 · 2023-07-04T02:57:05.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          = 20230505
+VERB          = 20230704
 ifeq ($(OS),Windows_NT)
 LIBS          = FreeImage.lib
 PLIBF         = $(PNAME).$(VER).dll
diff --git a/bash/pdf/mfbpdf-jbig2jpge.sh b/bash/pdf/mfbpdf-jbig2jpge.sh
@@ -272,3 +272,6 @@ printf ">>\n" >> $fout
 printf "startxref\n" >> $fout
 printf "%d\n" "$xrefC" >> $fout
 printf "%%%%EOF\n" >> $fout
+
+xrefZ=$(cat $fout | wc -c)
+printf "%s: %s\n" $fout $xrefZ
diff --git a/doc/imthreshold/CHANGELOG b/doc/imthreshold/CHANGELOG
@@ -1,3 +1,8 @@
+0.20230704
+
+    Despeackle: WGrid
+    Bash: MFB PDF generator
+
 0.20230505
 
     Threshold: EdgePlus - accurate memory used
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230505
+0.20230704
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold-fdespeckle
@@ -34,6 +34,7 @@ name method:
     'neuro'
     'smearing'
     'simple' (default)
+    'wgrid'
 .TP
 -h
 help
diff --git a/man/man1/imthreshold-filter.1 b/man/man1/imthreshold-filter.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 Jul 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 Jul 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 Jul 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 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.20230428 "28 Apr 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230704 "04 Jul 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/fdespeckle.cpp b/src/fdespeckle.cpp
@@ -36,6 +36,7 @@ void ImthresholdFilterDespeckleUsage()
     printf("                    'neuro'\n");
     printf("                    'smearing'\n");
     printf("                    'simple' (default)\n");
+    printf("                    'wgrid'\n");
     printf("          -h      this help\n");
 }
 
@@ -137,6 +138,12 @@ int main(int argc, char *argv[])
                     printf("Method= %s\n", namefilter);
                     IMTFilterInvertBW(p_im, height, width);
                 }
+                else if (strcmp(namefilter, "wgrid") == 0)
+                {
+                    printf("Method= %s\n", namefilter);
+                    unsigned threshold = 0;
+                    IMTFilterDWGrid(p_im, height, width, Ksize);
+                }
                 else if (strcmp(namefilter, "mag2") == 0)
                 {
                     printf("Method= %s\n", namefilter);
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -133,6 +133,7 @@ void IMTFilterDNeuro2 (BYTE**, unsigned, unsigned, unsigned, float, unsigned);
 float IMTFilterDphist (BYTE**, unsigned, unsigned, unsigned);
 void IMTFilterDMinMax (BYTE**, unsigned, unsigned, unsigned);
 void IMTFilterDSmearing (BYTE**, unsigned, unsigned, unsigned);
+void IMTFilterDWGrid (BYTE**, unsigned int, unsigned int, unsigned int);
 float IMTFilterDeNoiseDiff1p (IMTpixel**, unsigned, unsigned, float);
 float IMTFilterDeNoiseDiff (IMTpixel**, unsigned, unsigned, unsigned, float);
 void IMTBlurMask (IMTpixel**, BYTE**, unsigned, unsigned, int);
diff --git a/src/lib/despeckle.c b/src/lib/despeckle.c
@@ -598,3 +598,40 @@ void IMTFilterDSmearing (BYTE** p_im, unsigned height, unsigned width, unsigned
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+
+void IMTFilterDWGrid (BYTE** p_im, unsigned int height, unsigned int width, unsigned int Ksize)
+{
+    unsigned int y, x, yg, xg, hg, wg;
+    BYTE** d_im;;
+
+    hg = (height + Ksize - 1) / Ksize;
+    wg = (width + Ksize - 1) / Ksize;
+    d_im = BWalloc(hg, wg);
+    for (yg = 0; yg < hg; yg++)
+    {
+        for (xg = 0; xg < wg; xg++)
+        {
+			d_im[yg][xg] = 255;
+		}
+	}
+    for (y = 0; y < height; y++)
+    {
+        yg = y / Ksize;
+        for (x = 0; x < width; x++)
+        {
+            xg = x / Ksize;
+            d_im[yg][xg] &= (255 - p_im[y][x]);
+        }
+    }
+    for (y = 0; y < height; y++)
+    {
+        yg = y / Ksize;
+        for (x = 0; x < width; x++)
+        {
+            xg = x / Ksize;
+            p_im[y][x] = (255 - d_im[yg][xg]);
+        }
+    }
+
+    BWfree(d_im, hg);
+}

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