0.20230330: Math: Overlay

zvezdochiot · zvezdochiot · commit 4e2a6b774801 · 2023-03-30T18:34:40.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          = 20230320
+VERB          = 20230330
 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.20230330
+
+    Math: Overlay
+
 0.20230320
 
     Filter: Postprocess: Reverse
diff --git a/doc/imthreshold/VERSION b/doc/imthreshold/VERSION
@@ -1 +1 @@
-0.20230320
+0.20230330
diff --git a/man/man1/imthreshold-a4.1 b/man/man1/imthreshold-a4.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 2023" "User Manual"
 
 .SH NAME
  imthreshold-math
@@ -29,6 +29,7 @@ name method
     'mirror'
     'multiply'
     'norm'
+    'overlay'
     'plus'
     'sbmetric'
     'diff'
diff --git a/man/man1/imthreshold-rotate.1 b/man/man1/imthreshold-rotate.1
@@ -1,4 +1,4 @@
-.TH "ImThreshold" 1 0.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 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.20230320 "20 Mar 2023" "User Manual"
+.TH "ImThreshold" 1 0.20230330 "30 Mar 2023" "User Manual"
 
 .SH NAME
 imthreshold
diff --git a/src/imthreshold.h b/src/imthreshold.h
@@ -165,6 +165,7 @@ void IMTFilterMathMinus (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
 void IMTFilterMathMirror (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
 void IMTFilterMathMultiply (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
 void IMTFilterMathNorm (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
+void IMTFilterMathOverlay (IMTpixel**, IMTpixel**, unsigned int, unsigned int, int);
 void IMTFilterMathPlus (IMTpixel**, IMTpixel**, unsigned, unsigned, int);
 float IMTFilterMathSharpenBadMetric (IMTpixel**, IMTpixel**, unsigned, unsigned);
 void IMTFilterMathThreshold (IMTpixel**, IMTpixel**, BYTE**, unsigned, unsigned, int);
diff --git a/src/lib/math.c b/src/lib/math.c
@@ -378,6 +378,42 @@ void IMTFilterMathNorm (IMTpixel** p_im, IMTpixel** m_im, unsigned height, unsig
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void IMTFilterMathOverlay (IMTpixel** p_im, IMTpixel** m_im, unsigned int height, unsigned int width, int delta)
+{
+    unsigned int y, x, d;
+    int im, imm, imo;
+
+    for ( y = 0; y < height; y++ )
+    {
+        for ( x = 0; x < width; x++ )
+        {
+            for (d = 0; d < 3; d++)
+            {
+                im = (int)p_im[y][x].c[d];
+                imm = (int)m_im[y][x].c[d];
+                imo = im;
+                if (imo > 127)
+                {
+                    im = 255 - im;
+                    imm = 255 - imm;
+                }
+                im *= imm;
+                im *= 2;
+                im /= 255;
+                if (imo > 127)
+                {
+                    im = 255 - im;
+                }
+                im += delta;
+                p_im[y][x].c[d] = ByteClamp(im);
+            }
+            p_im[y][x] = IMTcalcS (p_im[y][x]);
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 void IMTFilterMathPlus (IMTpixel** p_im, IMTpixel** m_im, unsigned height, unsigned width, int delta)
 {
     unsigned y, x, d;
diff --git a/src/math.cpp b/src/math.cpp
@@ -38,6 +38,7 @@ void ImthresholdFilterMathUsage()
     printf("                    'mirror'\n");
     printf("                    'multiply'\n");
     printf("                    'norm'\n");
+    printf("                    'overlay'\n");
     printf("                    'plus'\n");
     printf("                    'diff'\n");
     printf("                    'patch'\n");
@@ -119,8 +120,8 @@ int main(int argc, char *argv[])
             {
                 if (FreeImage_GetImageType(dib) == FIT_BITMAP)
                 {
-                    unsigned widthm = FreeImage_GetWidth (dib);
-                    unsigned heightm = FreeImage_GetHeight (dib);
+                    unsigned int widthm = FreeImage_GetWidth (dib);
+                    unsigned int heightm = FreeImage_GetHeight (dib);
 
                     if ((height == heightm) && (width == widthm))
                     {
@@ -244,6 +245,15 @@ int main(int argc, char *argv[])
                             dst_dib = FreeImage_Allocate (width, height, 24);
                             ImthresholdSetData (dst_dib, p_im);
                         }
+                        else if (strcmp(namefilter, "overlay") == 0)
+                        {
+                            printf("Filter= %s\n", namefilter);
+                            printf("Delta= %d\n", delta);
+
+                            IMTFilterMathOverlay (p_im, m_im, height, width, delta);
+                            dst_dib = FreeImage_Allocate (width, height, 24);
+                            ImthresholdSetData (dst_dib, p_im);
+                        }
                         else if (strcmp(namefilter, "plus") == 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.20230320 "20 Mar 2023" "User Manual"`
	`1`	`+.TH "ImThreshold" 1 0.20230330 "30 Mar 2023" "User Manual"`
`2`	`2`
`3`	`3`	`.SH NAME`
`4`	`4`	`imthreshold-a4`