gimp-plugin-fix-ca 4.1 (July 19, 2024)

Discovered scripting didn't work with fix-ca, therefore fixed it.
Discovered that sometime after Feb29 there was an update made which
broke the MSYS2 build, this also turned-out to be a fix-ca.c issue.
Tried to build a working make check, and also found some problems,
such as scripting and exporting tga files. Issue reported upstream.

- Fixed bug in fix-ca.c to run in non-interactive script mode.
- Added make check due to testing non-interactive scripting mode.
- Modify github workflow to work with no available display.
- Updated rmp spec to run make check. Useful self-test.

Author: JoesCat

.github/workflows/main.yml

@@ -6,13 +6,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        choiceL: [--disable-silent-rules, --enable-silent-rules --enable-debugtime]
+        choiceL: [--disable-silent-rules, --enable-silent-rules, --enable-debugtime]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Create configure
         run: |
           sudo apt-get update -y
-          sudo apt-get install autoconf automake libtool gcc libgimp2.0-dev
+          sudo apt-get install autoconf automake libtool gcc gimp libgimp2.0-dev
           autoreconf -i
           automake
       - name: Choose configure
@@ -22,6 +22,9 @@ jobs:
       - name: Test make strip
         if: matrix.choiceL == '--disable-silent-rules'
         run: make strip
+      - name: Do a make check
+        if: matrix.choiceL == '--enable-silent-rules'
+        run: make check
       - name: Test user-level install/uninstall
         if: matrix.choiceL == '--disable-silent-rules'
         run: |
@@ -50,7 +53,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{ matrix.msystem }}
@@ -67,7 +70,7 @@ jobs:
   local:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Create configure
         run: |
           sudo apt-get update -y

Makefile.am

@@ -1,6 +1,6 @@
 # Makefile.am - Top level automakefile for fix-ca
 
-SUBDIRS = . po
+SUBDIRS = . po tests
 
 # The braces around ACLOCAL_FLAGS below instead of parentheses are intentional!
 # Otherwise autoreconf misparses the line.

README.md

@@ -227,6 +227,7 @@ make install
 
 ## Version History
 
+- 4.1 (July 19, 2024) Upgraded code to work with 2.10.34 (broke in MSYS2). Fixed non-interactive scripting, added make check and updated other files for self-tests.
 - 4.0 (February 29, 2024) Upgraded code to use GIMP-2.10 API. Now Gimp-Fix-CA works with RGB/RGBA with precisions of 8bit, 16bit, 32bit, or double for each color of R,G,B,A. Also added Lens X/Y center and a lens centerline in the preview window. Local Language support now included for the installable Gimp-Fix-CA. This version is bumped to 4.0 since it requires GIMP-2.10.xx, and also because non-interactive scripting also requires Lateral Lens X/Y positions (default=-1,-1)
 - 3.0.4 (December 2, 2023) mostly edits around make system. Minimal mods to fix-ca.c code (which needs updating).
 - 3.0.3 (October 8, 2022) autoconf/automake/configure/make added for building fix.ca

configure.ac

@@ -21,7 +21,7 @@ AC_PREREQ([2.68])
 #
 m4_define([fix_ca_name], [gimp-fix-ca])
 m4_define([fix_ca_major_version], [4])
-m4_define([fix_ca_minor_version], [0])
+m4_define([fix_ca_minor_version], [1])
 m4_define([fix_ca_version],[fix_ca_major_version.fix_ca_minor_version])
 m4_define([fix_ca_package_name], [gimp-fix-ca])
 m4_define([fix_ca_package_home], [https://github.com/JoesCat/gimp-fix-ca])
@@ -51,8 +51,10 @@ AC_PROG_CC
 AC_PROG_SED
 AC_PROG_LN_S
 AC_PROG_MKDIR_P
+AC_PATH_PROG([CHMOD],[chmod],[:])
 AC_PATH_PROG([STRIP],[strip],[:])
 AC_PATH_PROG([GIMPTOOL],[gimptool-2.0],[:])
+AC_PATH_PROG([MD5SUM],[md5sum],[:])
 AC_PATH_PROG([MSGFMT],[msgfmt],[:])
 AC_PATH_PROG([MSGINIT],[msginit],[:])
 AC_PATH_PROG([MSGMERGE],[msgmerge],[:])
@@ -240,6 +242,7 @@ AH_BOTTOM([
 AC_CONFIG_FILES([
 Makefile
 po/Makefile
+tests/Makefile
 rpm/gimp-fix-ca.spec
 ])
 AC_OUTPUT

fix-ca.c

@@ -49,7 +49,11 @@
 #define N_(x)	x
 #endif
 
+#ifdef TEST_FIX_CA
+#define PROCEDURE_NAME	"Test-Fix-CA"
+#else
 #define PROCEDURE_NAME	"Fix-CA"
+#endif
 #define DATA_KEY_VALS	"fix_ca"
 
 /* Size controls in Fix CA dialog box */
@@ -104,7 +108,8 @@ static void	fix_ca_region (guchar *srcPTR, guchar *dstPTR,
 			       gint x1, gint x2, gint y1, gint y2,
 			       gboolean show_progress);
 static gboolean	fix_ca_dialog (gint32 drawable_ID, FixCaParams *params);
-static void	preview_update (GimpPreview *preview, FixCaParams *params);
+//static void	preview_update (GimpPreview *preview, FixCaParams *params);
+static void	preview_update (GimpDrawablePreview *preview, FixCaParams *params);
 static int	color_size (const Babl *format);
 static gdouble	get_pixel (guchar *ptr, gint bpc);
 static void	set_pixel (guchar *dest, gdouble d, gint bpc);
@@ -238,6 +243,8 @@ static void run (const gchar *name, gint nparams,
 #endif
 	textdomain( GETTEXT_PACKAGE );
 #endif
+	gegl_init (NULL, NULL);
+
 	switch (run_mode) {
 		case GIMP_RUN_NONINTERACTIVE:
 			fix_ca_params.blue = param[3].data.d_float;
@@ -317,6 +324,8 @@ static void run (const gchar *name, gint nparams,
 		}
 	}
 
+	gegl_exit ();
+
 	values[0].data.d_status = status;
 }
 
@@ -348,8 +357,6 @@ static int fix_ca (gint32 drawable_ID, FixCaParams *params)
 		return -1;
 	}
 
-	//gegl_init (NULL, NULL);
-
 	/* fetch pixel regions and setup shadow buffer */
 	srcBuf  = gimp_drawable_get_buffer (drawable_ID);
 	destBuf = gimp_drawable_get_shadow_buffer (drawable_ID);
@@ -377,8 +384,6 @@ static int fix_ca (gint32 drawable_ID, FixCaParams *params)
 	gimp_drawable_merge_shadow (drawable_ID, TRUE);
 	gimp_drawable_update (drawable_ID, x, y, width, height);
 
-	//gegl_exit ();
-
 #ifdef DEBUG_TIME
 	gettimeofday(&tv2, NULL);
 
@@ -393,7 +398,7 @@ static gboolean fix_ca_dialog (gint32 drawable_ID, FixCaParams *params)
 	GtkWidget *dialog;
 	GtkWidget *main_vbox;
 	GtkWidget *combo;
-	GtkWidget *preview;
+	GtkWidget *preview; /* GimpDrawablePreview widget */
 	GtkWidget *table;
 	GtkWidget *frame;
 	GtkObject *adj;
@@ -609,19 +614,23 @@ static gboolean fix_ca_dialog (gint32 drawable_ID, FixCaParams *params)
 	return run;
 }
 
-static void preview_update (GimpPreview *preview, FixCaParams *params)
+//static void preview_update (GtkWidget *widget, FixCaParams *params)
+static void preview_update (GimpDrawablePreview *preview, FixCaParams *params)
 {
+	GimpPreview *ptr;
 	gint32	preview_ID;
 	gint	b, i, j, x, y, width, height, xImg, yImg, bppImg, bpcImg, size;
 	GeglBuffer *srcBuf;
 	guchar	*srcImg, *destImg, *prevImg;
 	const Babl *format;
 	gdouble d;
 
-	preview_ID = gimp_drawable_preview_get_drawable_id (preview);
+	/* GimpPreview is a subset of GimpScrolledPreview */
+	ptr = (GimpPreview *)(preview);
+	gimp_preview_get_position (ptr, &x, &y);
+	gimp_preview_get_size (ptr, &width, &height);
 
-	gimp_preview_get_position (preview, &x, &y);
-	gimp_preview_get_size (preview, &width, &height);
+	preview_ID = gimp_drawable_preview_get_drawable_id (preview);
 
 	format = gimp_drawable_get_format (preview_ID);
 	bppImg = babl_format_get_bytes_per_pixel(format);
@@ -661,7 +670,7 @@ static void preview_update (GimpPreview *preview, FixCaParams *params)
 		}
 	}
 
-	gimp_preview_draw_buffer (preview, prevImg, width * bppImg/b);
+	gimp_preview_draw_buffer (ptr, prevImg, width * bppImg/b);
 
 	g_object_unref (srcBuf);
 	g_free(prevImg);

org.gimp.extension.fix-ca.metainfo.xml

@@ -38,7 +38,8 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <releases>
-   <release version="4.0"   date="2024-02-24" />
+   <release version="4.1"   date="2024-07-19" />
+   <release version="4.0"   date="2024-02-29" />
    <release version="3.0.4" date="2023-12-02" />
    <release version="3.0.3" date="2022-10-09" />
   </releases>

rpm/gimp-fix-ca.spec.in

@@ -4,14 +4,14 @@
 %define         moname    gimp20-fix-ca
 %define         plugindir %{_libdir}/gimp/2.0/plug-ins/fix-ca
 
-Name:		@FIX_CA_PACKAGE_NAME@
+Name:		gimp-fix-ca
 Version:	@FIX_CA_VERSION@
 Release:	0
 Summary:	A Gimp2 plugin for correcting Chromatic Aberration (CA)
 License:	GPLv3+
 Group:		Graphics/Editors and Converters
 URL:		https://github.com/JoesCat/gimp-fix-ca
-Source0:	https://github.com/JoesCat/gimp-fix-ca/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/JoesCat/gimp-fix-ca/archive/%{version}/gimp-fix-ca-%{version}.tar.gz
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -22,14 +22,12 @@ BuildRequires:  gtk+2-devel
 BuildRequires:  pkgconfig(gimp-2.0)
 Requires:       gimp >= 2.10.0
 
-
 %description
 A Gimp2 plug-in to correct Chromatic Aberration (CA).
 Fix-CA can fix Lateral CA caused due to light travelling through lenses,
 and fix Directional CA due to light travelling through dense material
 such as glass or water.
 
-
 %prep
 %setup -q
 
@@ -39,13 +37,14 @@ automake --add-missing
 %configure
 %make_build
 
+%check
+make check
 
 %install
 %make_install INSTALLDIR="%{buildroot}/%{plugindir}" \
       LOCALEDIR="%{buildroot}/%{_datadir}/locale"
 %find_lang %{moname}
 
-
 %files -f %{moname}.lang
 %license COPYING
 %{plugindir}/fix-ca

tests/Makefile.am

@@ -0,0 +1,32 @@
+AM_CFLAGS = ${CFLAGS} ${CPPFLAGS} ${GIMP_CFLAGS} ${GTK_CFLAGS} ${WCFLAGS} ${FCA_CFLAGS} -I${top_srcdir} -I${top_builddir}
+
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} ${GIMP_CFLAGS} -I${includedir}
+
+EXTRA_DIST = test-fix-ca.c test-fix-ca.scm test1.md5
+
+noinst_PROGRAMS     = test-fix-ca
+test_fix_ca_name    = test-fix-ca
+test_fix_ca_SOURCES = test-fix-ca.c
+test_fix_ca.$(OBJEXT): fix-ca-config.h
+test_fix_ca_LDADD   = ${LIBS} ${GIMP_LIBS} ${GTK_LIBS} ${WSLIB} ${FCA_LIB}
+
+update-tests:
+	echo "#!/bin/sh" > ${builddir}/test1.sh; \
+	echo "rm -f ${builddir}/test1.tga" >> ${builddir}/test1.sh; \
+	echo "${GIMPTOOL} --install-script ${srcdir}/test-fix-ca.scm" >> ${builddir}/test1.sh; \
+	echo "${GIMPTOOL} --install-bin ${builddir}/test-fix-ca" >> ${builddir}/test1.sh; \
+	echo "gimp --verbose --console-messages -i -b '(test \"${top_srcdir}/img-fix-ca/full-branches.jpg\" \"${builddir}/test1.bmp\" 6.0 -2.4 658 1280 1 0.0 0.0 0.0 0.0)' -b '(gimp-quit 0)'" >> ${builddir}/test1.sh; \
+	echo "${GIMPTOOL} --uninstall-bin test-fix-ca" >> ${builddir}/test1.sh; \
+	echo "${GIMPTOOL} --uninstall-script test-fix-ca.scm" >> ${builddir}/test1.sh; \
+	echo "${MD5SUM} -c ${top_srcdir}/tests/test1.md5" >> ${builddir}/test1.sh; \
+	${CHMOD} +x ${builddir}/test1.sh
+
+TESTS = ${builddir}/test1.sh
+
+test1.sh:
+	make update-tests
+
+clean-local:
+	rm -f ${builddir}/test?.sh ${builddir}/test?.bmp
+
+.PHONY: update-tests

tests/test-fix-ca.c

@@ -0,0 +1,2 @@
+#define TEST_FIX_CA 1
+#include "../fix-ca.c"

tests/test-fix-ca.scm

@@ -0,0 +1,6 @@
+(define (test filename result bluel redl lensx lensy interpolation bluex redx bluey redy)
+  (define image (car (gimp-file-load RUN-NONINTERACTIVE filename filename)))
+  (define drawable (car (gimp-image-get-active-layer image)))
+  (Test-Fix-CA RUN-NONINTERACTIVE image drawable bluel redl lensx lensy interpolation bluex redx bluey redy)
+  (gimp-file-save RUN-NONINTERACTIVE image drawable result result)
+  (gimp-image-delete image))

tests/test1.md5

@@ -0,0 +1 @@
+c472550cda23c8cb717853ac0dd93e2b  test1.bmp