Merge branch 'master' into sdl2.0

.gitignore

@@ -17,3 +17,4 @@ TuxPaint.dmg
 src/po/POTFILES.in
 src/tuxpaint.desktop
 src/org.tuxpaint.Tuxpaint.appdata.xml
+test-png

Makefile

@@ -4,7 +4,7 @@
 # Various contributors (see AUTHORS.txt)
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - June 29, 2022
+# June 14, 2002 - July 3, 2022
 
 
 # The version number, for release:
@@ -316,6 +316,9 @@ NOSVGFLAG:=$(if $(SVG_LIB),,-DNOSVG$(warning No SVG for you!))
 OLDSVGFLAG:=$(if $(filter -lsvg-cairo,$(SVG_LIB)),-DOLD_SVG,)
 
 
+PNG_CFLAGS:=$(shell $(PKG_CONFIG) libpng --cflags)
+
+
 ifeq ($(hack),1)
 hack:
 	@echo 'SDL2_PANGO_LIB is' $(SDL2_PANGO_LIB)
@@ -717,6 +720,7 @@ clean:
 	@-rm -f TuxPaint.dmg temp.dmg; rm -rf magic/*.dSYM Resources
 	@-rm -f dlllist a.exe
 	@-rm -f win32/Preprocessed.iss win32/tuxpaint-*.zip win32/tuxpaint-*.exe
+	@-rm -f test-png
 	@echo
 
 # "make uninstall" should remove the various parts from their
@@ -1402,3 +1406,7 @@ $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
 
 .PHONY: magic-plugins
 magic-plugins:	src/tp_magic_api.h $(MAGIC_SO)
+
+test-png:	src/test-png.c
+	$(CC) $(PNG_CFLAGS) src/test-png.c -o test-png $(PNG)
+

docs/CHANGES.txt

@@ -7,13 +7,33 @@ Various contributors (see below, and AUTHORS.txt)
 http://www.tuxpaint.org/
 
 
-2022.July.02 (0.9.29)
+2022.July.3 (0.9.29)
   * Bug Fixes:
     ----------
     * Opening and immediately dismissing Color Mixer could cause
       an unexpected color to be chosen.
       h/t @kentonyanamin on Twitter for reporting.
       Closes https://sourceforge.net/p/tuxpaint/bugs/251/
+      Bill Kendrick <bill@newbreedsoftware.com>
+
+    * Line shape could report "360 degrees", which should be "0 degrees".
+      h/t Karl Ove Hufthammer <karl@huftis.org> for the report
+      Closes https://sourceforge.net/p/tuxpaint/bugs/255/
+      Bill Kendrick <bill@newbreedsoftware.com>
+
+    * Some Magic tools did not change descriptions when switching
+      from paint to full-canvas mode.
+      + Emboss
+      + Drip
+      h/t Karl Ove Hufthammer <karl@huftis.org> for the reports
+      (https://sourceforge.net/p/tuxpaint/bugs/256/
+      https://sourceforge.net/p/tuxpaint/bugs/257/)
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+      & Bill Kendrick <bill@newbreedsoftware.com>
+
+    * Full-screen Drip magic effect didn't work well
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+      Closes https://sourceforge.net/p/tuxpaint/bugs/256/
 
   * Other Improvements:
     -------------------
@@ -31,6 +51,10 @@ http://www.tuxpaint.org/
       the file permanently.
       Mark Kim <markuskimius@gmail.com>
 
+    * Processed PNG images through `pngout` to increase some compression
+      (also corrects some warnings being reported by libpng (via SDL_image);
+      h/t Tim Dickson, closes https://sourceforge.net/p/tuxpaint/bugs/252/)
+
   * Ports & Building:
     -----------------
     * Change name of Tux Paint config. files from ".conf" to ".cfg"
@@ -71,9 +95,15 @@ http://www.tuxpaint.org/
       Terrence Sheflin <terrence.sheflin@gmail.com>
       Pere Pujal i Carabantes <perepujal@gmail.com>
 
-    * Compatibility with SDL2_Pango 0.1.3.
+    * SDL2.0 version: Compatibility with SDL2_Pango 0.1.3.
       Mark Kim <markuskimius@gmail.com>
 
+    * New tool, "test-png", which exercises libpng library on
+      a set of PNG image files, allowing us to find those which
+      cause Tux Paint (via SDL_image, in turn via libpng) to
+      report back warnings to STDERR.
+      h/t Tim Dickson, per https://sourceforge.net/p/tuxpaint/bugs/252/
+
   * Documentation updates:
     ---------------------
     * Update macOS build instructions for SDL2.0.
@@ -84,6 +114,9 @@ http://www.tuxpaint.org/
     * Catalan translation
       Pere Pujal i Carabantes <perepujal@gmail.com>
 
+    * Norwegian Nynorsk translation
+      Karl Ove Hufthammer <karl@huftis.org>
+
 2022.June.4 (0.9.28)
   * Improvements to "Paint" and "Lines" tools:
     ------------------------------------------