OSDN > Find Software > graphicsmagick > SCM > hg > GM > Commit

graphicsmagick
Fork

GM: Commit

Main GraphicsMagick source repository

Revision	a45a3d5e77aefbbbd184ba9d93dceaceb4885a18 (tree)
Time	2022-01-17 05:46:19
Author	Bob Friesenhahn <bfriesen@Grap...>
Commiter	Bob Friesenhahn

ReadMIFFImage(): Do not proceed to next image in sequence unless the character read is the expected 'i' character.

diff -r 743f1bcf3052 -r a45a3d5e77ae ChangeLog

--- a/ChangeLog Sun Jan 16 11:57:59 2022 -0600

+++ b/ChangeLog Sun Jan 16 14:46:19 2022 -0600

		@@ -1,5 +1,10 @@
1	1	2022-01-16 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2	2
	3	+ * coders/miff.c (ReadMIFFImage): Do not proceed to next image in
	4	+ sequence unless the character read is the expected 'i' character.
	5	+ Inspired by GraphicsMagick bug #659 "Can not escape $0 in a batch
	6	+ command".
	7	+
3	8	* coders/heif.c (ReadHEIFImage): Take row stride into account when
4	9	reading pixel rows. Add support for 'ping' mode. Add header magic
5	10	detection. Add module aliases. Add useful traces.

diff -r 743f1bcf3052 -r a45a3d5e77ae coders/miff.c

--- a/coders/miff.c Sun Jan 16 11:57:59 2022 -0600

+++ b/coders/miff.c Sun Jan 16 14:46:19 2022 -0600

		@@ -2007,7 +2007,7 @@
2007	2007	{
2008	2008	c=ReadBlobByte(image);
2009	2009	} while (!isgraph(c) && (c != EOF));
2010		- if (c != EOF)
	2010	+ if (c != EOF && ((c == 'i') \|\| (c == 'I')))
2011	2011	{
2012	2012	/*
2013	2013	Allocate next image structure.

		@@ -2025,7 +2025,7 @@
2025	2025	if (status == MagickFail)
2026	2026	break;
2027	2027	}
2028		- } while (c != EOF);
	2028	+ } while (c != EOF && ((c == 'i') \|\| (c == 'I')));
2029	2029	while (image->previous != (Image *) NULL)
2030	2030	image=image->previous;
2031	2031	CloseBlob(image);

diff -r 743f1bcf3052 -r a45a3d5e77ae www/Changelog.html

--- a/www/Changelog.html Sun Jan 16 11:57:59 2022 -0600

+++ b/www/Changelog.html Sun Jan 16 14:46:19 2022 -0600

		@@ -37,9 +37,14 @@
37	37
38	38	<p>2022-01-16 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>
39	39	<blockquote>
40		-* coders/heif.c (ReadHEIFImage): Take row stride into account when
	40	+<p>* coders/miff.c (ReadMIFFImage): Do not proceed to next image in
	41	+sequence unless the character read is the expected 'i' character.
	42	+Inspired by GraphicsMagick bug #659 "Can not escape $0 in a batch
	43	+command".</p>
	44	+<p>* coders/heif.c (ReadHEIFImage): Take row stride into account when
41	45	reading pixel rows. Add support for 'ping' mode. Add header magic
42		-detection. Add module aliases. Add useful traces.</blockquote>
	46	+detection. Add module aliases. Add useful traces.</p>
	47	+</blockquote>
43	48	<p>2022-01-15 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>
44	49	<blockquote>
45	50	<p>* coders/jxl.c: Added preliminary JPEG XL support written by