GraphicsMagick: Added test for old JPEG. Use signature test meth...
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.18670.1668701976.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset 30e49fab25ad in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=30e49fab25ad summary: Added test for old JPEG. Use signature test method for some tests. diffstat: ChangeLog | 14 +++++++- PerlMagick/t/read.t | 16 ++++---- PerlMagick/t/reference/read/input1_4_wpg.miff | Bin PerlMagick/t/reference/read/input1_8_1_wpg.miff | Bin PerlMagick/t/reference/read/input_3chars_xpm.miff | Bin PerlMagick/t/reference/read/input_hrz.miff | Bin PerlMagick/t/reference/read/input_xpm.miff | Bin PerlMagick/t/reference/read/input_xpm_bilevel.miff | Bin PerlMagick/t/reference/read/input_xpm_pal16.miff | Bin PerlMagick/t/reference/tiff/input_JPG_old_tif.jpg | Bin PerlMagick/t/tiff/input_JPG_old.tif | Bin PerlMagick/t/tiff/read.t | 39 ++++++++++++-------- VisualMagick/installer/inc/version.isx | 4 +- magick/version.h | 4 +- www/Changelog.html | 13 ++++++- 15 files changed, 60 insertions(+), 30 deletions(-) diffs (299 lines): diff -r c44b85963ede -r 30e49fab25ad ChangeLog --- a/ChangeLog Wed Nov 16 11:32:24 2022 -0600 +++ b/ChangeLog Thu Nov 17 10:19:24 2022 -0600 @@ -1,4 +1,16 @@ -2022-11-16 Fojtik Jaroslav <[email protected]> +2022-11-17 Bob Friesenhahn <[email protected]> + + * PerlMagick/t/read.t: Reduced distribution size by using + signature test method for some tests. + + * PerlMagick/t/tiff/read.t: Added test for old JPEG. + +2022-11-17 Fojtik Jaroslav <[email protected]> + + PerlMagick/t/input_JPG_old.tif Added JPG embedded into TIFF using + old Adobe's embedding style. + + 2022-11-17 Fojtik Jaroslav <[email protected]> tiff/libtiff/tif_ojpeg.c Backported from 4.4.0 to 4.1.0 diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/read.t --- a/PerlMagick/t/read.t Wed Nov 16 11:32:24 2022 -0600 +++ b/PerlMagick/t/read.t Thu Nov 17 10:19:24 2022 -0600 @@ -104,7 +104,7 @@ print("HRZ Slow scan TV ...\n"); ++$test; -testReadCompare('input.hrz', 'reference/read/input_hrz.miff', q//, 0, 0); +testRead('input.hrz', 'cf3aed87b1364c93509e15b2519c26dd0302dcef024ac92d0c870aeacf472524'); print("MacPaint ...\n"); ++$test; @@ -313,15 +313,15 @@ print("WPG (Word Perfect Graphics image, bilevel WPG level 1) ...\n"); ++$test; -testReadCompare('input1_1.wpg', 'reference/read/input1_1_wpg.miff', q//, 0, 0); +testRead('input1_1.wpg', '24f136b95afc7c11b9d5e1a22c4b53030b7aced49bf83eebaa5985128e0600f3'); print("WPG (Word Perfect Graphics image, 4 bit depth WPG level 1) ...\n"); ++$test; -testReadCompare('input1_4.wpg', 'reference/read/input1_4_wpg.miff', q//, 0, 0); +testRead('input1_4.wpg', '27b4d537ef0fac232f1f9cb8bc1b3e1378d6804a43d4b813770119cd6146e225'); print("WPG (Word Perfect Graphics image, 8 bit depth WPG level 1) ...\n"); ++$test; -testReadCompare('input1_8_1.wpg', 'reference/read/input1_8_1_wpg.miff', q//, 0, 0); +testRead('input1_8_1.wpg', '6c8a6e6e237e03a636e976b3a04fcab56470854d6051b8959bd968b526843c48'); print("WPG (Word Perfect Graphics image, 1 bit depth + 24 bit depth WPG level 2) ...\n"); ++$test; @@ -341,20 +341,20 @@ print("X Windows system pixmap file (bilevel) ...\n"); ++$test; -testReadCompare('input_bilevel.xpm', 'reference/read/input_xpm_bilevel.miff', q//, 0, 0); +testRead('input_bilevel.xpm', 'c100134c37f7d48c2908747f40f4f18e63a00ebf2b6124cdbe63f078bc74cc5f'); print("X Windows system pixmap file (color) ...\n"); ++$test; -testReadCompare('input.xpm', 'reference/read/input_xpm.miff', q//, 0, 0); +testRead('input.xpm', 'f84cb6b5817ea2f6f313c2bdd90c94af0d0e7fb144528994050b355f8d5e6a94'); # Q:32 mean-error=0.23551931713272, maximum-error=0.989543041912839 print("X Windows system pixmap file (color, 16bit palette) ...\n"); ++$test; -testReadCompare('input_pal16.xpm', 'reference/read/input_xpm_pal16.miff', q//, 0, 0); +testRead('input_pal16.xpm', '45f0083676dcd95255f24b897df490a310a28f8f180c86ba2450e1624656f1f8'); print("X Windows system pixmap file (color, 3 chars per pixel) ...\n"); ++$test; -testReadCompare('input_3chars.xpm', 'reference/read/input_3chars_xpm.miff', q//, 0, 0); +testRead('input_3chars.xpm', '3716883efcd24e9ea3500febb299b77a86484574a6b81e11707e6b06d3c208f7'); #print("X Windows system window dump file (color) ...\n"); #++$test; diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input1_4_wpg.miff Binary file PerlMagick/t/reference/read/input1_4_wpg.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input1_8_1_wpg.miff Binary file PerlMagick/t/reference/read/input1_8_1_wpg.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input_3chars_xpm.miff Binary file PerlMagick/t/reference/read/input_3chars_xpm.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input_hrz.miff Binary file PerlMagick/t/reference/read/input_hrz.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input_xpm.miff Binary file PerlMagick/t/reference/read/input_xpm.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input_xpm_bilevel.miff Binary file PerlMagick/t/reference/read/input_xpm_bilevel.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/read/input_xpm_pal16.miff Binary file PerlMagick/t/reference/read/input_xpm_pal16.miff has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/reference/tiff/input_JPG_old_tif.jpg Binary file PerlMagick/t/reference/tiff/input_JPG_old_tif.jpg has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/tiff/input_JPG_old.tif Binary file PerlMagick/t/tiff/input_JPG_old.tif has changed diff -r c44b85963ede -r 30e49fab25ad PerlMagick/t/tiff/read.t --- a/PerlMagick/t/tiff/read.t Wed Nov 16 11:32:24 2022 -0600 +++ b/PerlMagick/t/tiff/read.t Thu Nov 17 10:19:24 2022 -0600 @@ -12,7 +12,7 @@ # # Written by Bob Friesenhahn <[email protected]> # -BEGIN { $| = 1; $test=1; print "1..27\n"; } +BEGIN { $| = 1; $test=1; print "1..28\n"; } END {print "not ok $test\n" unless $loaded;} use Graphics::Magick; @@ -24,7 +24,7 @@ # # 1) Test Reading Monochrome -# +# print("Monochrome (min-is-white) ...\n"); testRead ( 'input_gray_01bit_minwhite.tiff', '2b48bcf7d93cc31a8deb3026d872f1bb0a300b0f4e177423e5301adc638179e4' ); @@ -79,7 +79,7 @@ # # 8) Test Reading TrueColor (8-bit) -# +# ++$test; print("TrueColor (8-bit) image ...\n"); testRead( 'input_truecolor_08.tiff', @@ -87,7 +87,7 @@ # # 9) Test Reading TrueColor (8-bit + matte channel) -# +# ++$test; print("TrueColor (8-bit) image with alpha channel ...\n"); testRead( 'input_truecolor_08_matte.tiff', @@ -95,7 +95,7 @@ # # 10) Test Reading TrueColor (10-bit) -# +# ++$test; print("TrueColor (10-bit) image ...\n"); testRead( 'input_truecolor_10.tiff', @@ -105,7 +105,7 @@ # # 11) Test Reading TrueColor (12-bit) -# +# ++$test; print("TrueColor (12-bit) image ...\n"); testRead( 'input_truecolor_12.tiff', @@ -115,7 +115,7 @@ # # 12) Test Reading TrueColor (14-bit) -# +# ++$test; print("TrueColor (14-bit) image ...\n"); testRead( 'input_truecolor_14.tiff', @@ -160,7 +160,7 @@ # # 17) Test Reading 8-bit TrueColor Stripped (8 rows per strip) -# +# ++$test; print("TrueColor (8-bit) stripped image, 8 rows per strip ...\n"); testRead( 'input_truecolor_08_stripped.tiff', @@ -184,7 +184,7 @@ # # 20) Test Reading Grayscale 8-bit -# +# ++$test; print("Grayscale (8-bit) ...\n"); testRead( 'input_gray_08bit.tiff', @@ -192,7 +192,7 @@ # # 21) Test Reading Grayscale 8-bit + matte -# +# ++$test; print("Grayscale (8-bit + matte) ...\n"); testRead( 'input_gray_08bit_matte.tiff', @@ -200,7 +200,7 @@ # # 22) Test Reading Grayscale 10-bit -# +# ++$test; print("Grayscale (10-bit) ...\n"); testRead( 'input_gray_10bit.tiff', @@ -210,7 +210,7 @@ # # 23) Test Reading Grayscale 12-bit -# +# ++$test; print("Grayscale (12-bit) ...\n"); testRead( 'input_gray_12bit.tiff', @@ -220,7 +220,7 @@ # # 24) Test Reading Grayscale 14-bit -# +# ++$test; print("Grayscale (14-bit) ...\n"); testRead( 'input_gray_14bit.tiff', @@ -230,7 +230,7 @@ # # 25) Test Reading Grayscale 16-bit -# +# ++$test; print("Grayscale (16-bit) ...\n"); testRead( 'input_gray_16bit.tiff', @@ -239,7 +239,7 @@ # # 26) Test Reading Grayscale 32-bit -# +# ++$test; print("Grayscale (32-bit) ...\n"); testRead( 'input_gray_32bit.tiff', @@ -249,8 +249,15 @@ # # 27) Test Reading CALS Type 1 (Group4-based) -# +# ++$test; print("CALS Type 1...\n"); testRead ( 'input_gray_01bit_minwhite.cals', '2b48bcf7d93cc31a8deb3026d872f1bb0a300b0f4e177423e5301adc638179e4' ); + +# +# 28) Test Reading Old JPEG format +# ++print("Old JPG ...\n"); ++++$test; ++testReadCompare('input_JPG_old.tif', '../reference/tiff/input_JPG_old_tif.jpg', q//, 0.003, 0.1); diff -r c44b85963ede -r 30e49fab25ad VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Wed Nov 16 11:32:24 2022 -0600 +++ b/VisualMagick/installer/inc/version.isx Thu Nov 17 10:19:24 2022 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020221116" -#define public MagickPackageReleaseDate "snapshot-20221116" +#define public MagickPackageVersionAddendum ".020221117" +#define public MagickPackageReleaseDate "snapshot-20221117" diff -r c44b85963ede -r 30e49fab25ad magick/version.h --- a/magick/version.h Wed Nov 16 11:32:24 2022 -0600 +++ b/magick/version.h Thu Nov 17 10:19:24 2022 -0600 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x272400 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 27,24,0 -#define MagickChangeDate "20221116" -#define MagickReleaseDate "snapshot-20221116" +#define MagickChangeDate "20221117" +#define MagickReleaseDate "snapshot-20221117" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r c44b85963ede -r 30e49fab25ad www/Changelog.html --- a/www/Changelog.html Wed Nov 16 11:32:24 2022 -0600 +++ b/www/Changelog.html Thu Nov 17 10:19:24 2022 -0600 @@ -37,8 +37,19 @@ </div> <div class="document"> -<p>2022-11-16 Fojtik Jaroslav <<a class="reference external" href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p> +<p>2022-11-17 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> +<ul class="simple"> +<li><p>PerlMagick/t/read.t: Reduced distribution size by using +signature test method for some tests.</p></li> +<li><p>PerlMagick/t/tiff/read.t: Added test for old JPEG.</p></li> +</ul> +</blockquote> +<p>2022-11-17 Fojtik Jaroslav <<a class="reference external" href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p> +<blockquote> +<p>PerlMagick/t/input_JPG_old.tif Added JPG embedded into TIFF using +old Adobe's embedding style.</p> +<p>2022-11-17 Fojtik Jaroslav <<a class="reference external" href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p> <p>tiff/libtiff/tif_ojpeg.c Backported from 4.4.0 to 4.1.0</p> </blockquote> <p>2022-11-13 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>