0.20230809: size: crop

zvezdochiot · zvezdochiot · commit 27c4463c4080 · 2023-08-09T14:39:44.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          = 20230714
+VERB          = 20230809
 ifeq ($(OS),Windows_NT)
 LIBS          = FreeImage.lib
 PLIBF         = $(PNAME).$(VER).dll
diff --git a/doc/imthreshold/CHANGELOG b/doc/imthreshold/CHANGELOG
@@ -1,3 +1,8 @@
+0.20230809
+
+    Size: Crop/Extent
+    Filter: Equalize, despeckle (based: blur+equalize+screen)
+
 0.20230714
 
     Threshold: EdgeDiv (combine EdgePlus & BlurDiv)
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230714
+0.20230809
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 2023" "User Manual"
 
 .SH NAME
 imthreshold-filter
@@ -30,6 +30,8 @@ name filter:
     'bwc'
     'cluster'
     'denoise'
+    'despeckle'
+    'eqialize'
     'greynorm'
     'greyworld'
     'illumc'
diff --git a/man/man1/imthreshold-finfo.1 b/man/man1/imthreshold-finfo.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 2023" "User Manual"
 
 .SH NAME
 imthreshold-size
@@ -17,6 +17,7 @@ name filter:
                     'bicont'
                     'bicubic'
                     'biline'
+                    'crop'
                     'gsample' (default)
                     'nearest'
 .TP
diff --git a/man/man1/imthreshold-tdjvul.1 b/man/man1/imthreshold-tdjvul.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 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.20230714 "14 Jul 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230809 "09 Aug 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/filter.cpp b/src/filter.cpp
@@ -37,6 +37,8 @@ void ImthresholdFilterUsage()
     printf("                    'bwc'\n");
     printf("                    'cluster'\n");
     printf("                    'denoise'\n");
+    printf("                    'despeckle'\n");
+    printf("                    'equalize'\n");
     printf("                    'greynorm'\n");
     printf("                    'greyworld'\n");
     printf("                    'illumc'\n");
@@ -258,6 +260,22 @@ int main(int argc, char *argv[])
                 kdenoises = IMTFilterDeNoiseDiff (d_im, height, width, radiusint, threshold);
                 printf("KDeNoise= %f\n", kdenoises);
             }
+            else if (strcmp(namefilter, "despeckle") == 0)
+            {
+                printf("Filter= %s\n", namefilter);
+                radius = (radius > 0.0f) ? radius : 1.0f;
+                printf("Radius= %f\n", radius);
+                IMTFilterGaussBlur(p_im, d_im, height, width, radius);
+                IMTFilterEqualize(d_im, height, width);
+                IMTFilterMathScreen (p_im, d_im, height, width, 0);
+                IMTFilterCopy (p_im, d_im, height, width);
+            }
+            else if (strcmp(namefilter, "equalize") == 0)
+            {
+                printf("Filter= %s\n", namefilter);
+                IMTFilterCopy (p_im, d_im, height, width);
+                IMTFilterEqualize(d_im, height, width);
+            }
             else if (strcmp(namefilter, "greyworld") == 0)
             {
                 printf("Filter= %s\n", namefilter);
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -77,6 +77,7 @@ enum Scaler
     SCALER_BICUBIC,
     SCALER_BILINE,
     SCALER_BIAKIMA,
+    SCALER_CROP,
     SCALER_GSAMPLE
 };
 
@@ -155,6 +156,7 @@ void IMTFilterSeparate (IMTpixel**, BYTE**, IMTpixel**, unsigned, unsigned, unsi
 void IMTFilterSeparateBGFGL (IMTpixel**, BYTE**, IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned, unsigned, float);
 void IMTFilterSeparateBGFGC (IMTpixel**, BYTE**, IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned, unsigned, float);
 void IMTFilterSeparateDelta (IMTpixel**, BYTE**, IMTpixel**, unsigned, unsigned, int, float);
+void IMTFilterEqualize (IMTpixel**, unsigned, unsigned);
 IMTpixel IMTFilterGreyWorld (IMTpixel**, unsigned, unsigned);
 IMTpixel IMTFilterGreyNorm (IMTpixel**, unsigned, unsigned);
 float IMTFilterLevelMean (IMTpixel**, IMTpixel**, unsigned, unsigned, int, float, float, int, int);
@@ -220,6 +222,7 @@ void IMTFilterSBicub (IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsi
 void IMTFilterSBicont (IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned);
 void IMTFilterSBilin (IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned);
 void IMTFilterSBiakima (IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned);
+void IMTFilterSCrop (IMTpixel**, IMTpixel**, unsigned, unsigned, unsigned, unsigned);
 void IMTFilterSize (IMTpixel**, IMTpixel**, int, unsigned, unsigned, unsigned, unsigned);
 int IMTFilterSBWMag2 (BYTE**, BYTE**, unsigned, unsigned, unsigned, unsigned);
 int IMTFilterSBWReduce2 (BYTE**, BYTE**, unsigned, unsigned, unsigned, unsigned);
diff --git a/src/lib/color.c b/src/lib/color.c
@@ -423,6 +423,58 @@ void IMTFilterCopy (IMTpixel** p_im, IMTpixel** d_im, unsigned height, unsigned
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
+void IMTFilterEqualize (IMTpixel** p_im, unsigned height, unsigned width)
+{
+    unsigned int y, x, d, i, val;
+    unsigned long int histogram[256] = {0}, szi;
+
+    szi = (height * width) >> 8;
+    for (d = 0; d < 3; d++)
+    {
+        for (i = 0; i < 256; i++)
+        {
+            histogram[i] = 0;
+        }
+        for (y = 0; y < height; y++)
+        {
+            for (x = 0; x < width; x++)
+            {
+                val = p_im[y][x].c[d];
+                histogram[val]++;
+            }
+        }
+        for (i = 1; i < 256; i++)
+        {
+            histogram[i] += histogram[i - 1];
+        }
+        for (i = 0; i < 256; i++)
+        {
+            histogram[i] += (szi >> 1);
+            histogram[i] /= szi;
+            histogram[i] = (histogram[i] < 255) ? histogram[i] : 255;
+        }
+        for (y = 0; y < height; y++)
+        {
+            for (x = 0; x < width; x++)
+            {
+                val = p_im[y][x].c[d];
+                val = histogram[val];
+                p_im[y][x].c[d] = val;
+            }
+        }
+    }
+    for ( y = 0; y < height; y++ )
+    {
+        for ( x = 0; x < width; x++ )
+        {
+            p_im[y][x] = IMTcalcS (p_im[y][x]);
+        }
+    }
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
 IMTpixel IMTFilterGreyNorm (IMTpixel** p_im, unsigned height, unsigned width)
 {
     unsigned y, x, d, n;
diff --git a/src/lib/size.c b/src/lib/size.c
@@ -317,6 +317,28 @@ void IMTFilterSBiakima (IMTpixel** p_im, IMTpixel** d_im, unsigned height, unsig
 
 ////////////////////////////////////////////////////////////////////////////////
 
+void IMTFilterSCrop (IMTpixel** p_im, IMTpixel** d_im, unsigned height, unsigned width, unsigned new_height, unsigned new_width)
+{
+    unsigned int y, x;
+    int yo, xo, dy, dx;
+
+    dy = ((int) height - (int) new_height) >> 1;
+    dx = ((int) width - (int) new_width) >> 1;
+    for (y = 0; y < new_height; y++)
+    {
+        yo  = (int) y + dy;
+        yo = (yo < 0) ? 0 : ((yo < (int) height) ? yo : (height -1));
+        for (x = 0; x < new_width; x++ )
+        {
+            xo  = (int) x + dx;
+            xo = (xo < 0) ? 0 : ((xo < (int) width) ? xo : (width -1));
+            d_im[y][x] = p_im[yo][xo];
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 void IMTFilterSize (IMTpixel** p_im, IMTpixel** d_im, int scaler, unsigned height, unsigned width, unsigned new_height, unsigned new_width)
 {
     switch(scaler)
@@ -336,6 +358,9 @@ void IMTFilterSize (IMTpixel** p_im, IMTpixel** d_im, int scaler, unsigned heigh
     case SCALER_BIAKIMA:
         IMTFilterSBiakima(p_im, d_im, height, width, new_height, new_width);
         break;
+    case SCALER_CROP:
+        IMTFilterSCrop(p_im, d_im, height, width, new_height, new_width);
+        break;
     case SCALER_GSAMPLE:
         IMTFilterSGsample(p_im, d_im, height, width, new_height, new_width);
         break;
diff --git a/src/size.cpp b/src/size.cpp
@@ -28,6 +28,7 @@ void ImthresholdFilterSizeUsage()
     printf("                    'biline'\n");
     printf("                    'bicont'\n");
     printf("                    'biakima'\n");
+    printf("                    'crop'\n");
     printf("                    'gsample' (default)\n");
     printf("                    'nearest'\n");
     printf("          -p N.N  part prefilter RIS (float, optional, default = 1.0)\n");
@@ -171,6 +172,11 @@ int main(int argc, char *argv[])
                 printf("Filter= %s\n", namefilter);
                 imscaler = SCALER_BIAKIMA;
             }
+            else if (strcmp(namefilter, "crop") == 0)
+            {
+                printf("Filter= %s\n", namefilter);
+                imscaler = SCALER_CROP;
+            }
             else if (strcmp(namefilter, "nearest") == 0)
             {
                 printf("Filter= %s\n", namefilter);

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