[GM-commit] GraphicsMagick: 2 new changesets
Swiss army knife of image processing
Brought to you by:
bfriesen
From: GraphicsMagick C. <gra...@li...> - 2014-03-09 20:31:08
|
changeset 8ae3a91406af in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=8ae3a91406af summary: Update libjpeg to v9a release. changeset 19e45461b651 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=19e45461b651 summary: Update to libjpeg 9a of 19-Jan-2014 diffstat: ChangeLog | 2 + jpeg/Makefile.in | 74 ++++- jpeg/README | 81 ++++-- jpeg/aclocal.m4 | 299 ++++++++++++++++++------ jpeg/change.log | 27 ++ jpeg/cjpeg.1 | 25 +- jpeg/cjpeg.c | 12 + jpeg/compile | 347 +++++++++++++++++++++++++++++ jpeg/config.guess | 161 ++++++++----- jpeg/config.sub | 45 ++- jpeg/configure | 142 ++++++++++- jpeg/configure.ac | 2 +- jpeg/depcomp | 3 +- jpeg/djpeg.1 | 4 +- jpeg/filelist.txt | 3 +- jpeg/install.txt | 68 +++-- jpeg/jcapistd.c | 3 +- jpeg/jcarith.c | 19 +- jpeg/jccolor.c | 133 ++++++++-- jpeg/jcdctmgr.c | 79 +++--- jpeg/jchuff.c | 119 ++++----- jpeg/jcinit.c | 19 + jpeg/jcmarker.c | 6 +- jpeg/jcmaster.c | 36 +- jpeg/jconfig.cfg | 8 +- jpeg/jconfig.h | 6 + jpeg/jconfig.txt | 9 +- jpeg/jconfig.vc | 6 + jpeg/jcparam.c | 110 ++++++--- jpeg/jctrans.c | 6 +- jpeg/jdapimin.c | 43 +- jpeg/jdapistd.c | 1 + jpeg/jdarith.c | 16 +- jpeg/jdcolor.c | 226 ++++++++++++++---- jpeg/jddctmgr.c | 4 +- jpeg/jdhuff.c | 38 ++- jpeg/jdinput.c | 11 +- jpeg/jdmarker.c | 16 +- jpeg/jdmaster.c | 18 +- jpeg/jdmerge.c | 17 +- jpeg/jfdctint.c | 630 ++++++++++++++++++++++++++++------------------------ jpeg/jidctint.c | 356 ++++++++++++++++------------- jpeg/jmorecfg.h | 80 +++++- jpeg/jpegint.h | 6 +- jpeg/jpeglib.h | 31 +- jpeg/jpegtran.1 | 16 +- jpeg/jpegtran.c | 23 +- jpeg/jversion.h | 6 +- jpeg/libjpeg.txt | 129 +++++---- jpeg/missing | 4 +- jpeg/rdjpgcom.1 | 2 +- jpeg/structure.txt | 33 +- jpeg/testimg.bmp | Bin jpeg/testimg.ppm | 2 +- jpeg/transupp.c | 230 ++++++++++++++++-- jpeg/transupp.h | 22 +- jpeg/usage.txt | 47 +++- www/Changelog.html | 1 + 58 files changed, 2684 insertions(+), 1178 deletions(-) diffs (truncated from 7295 to 300 lines): diff -r c9f8bbe5276b -r 19e45461b651 ChangeLog --- a/ChangeLog Sun Mar 09 15:00:46 2014 -0500 +++ b/ChangeLog Sun Mar 09 15:30:55 2014 -0500 @@ -1,5 +1,7 @@ 2014-03-09 Bob Friesenhahn <bfr...@si...> + * jpeg: Update to libjpeg 9a of 19-Jan-2014. + * png: Update to Libpng 1.6.10 - March 6, 2014. 2014-03-06 Bob Friesenhahn <bfr...@si...> diff -r c9f8bbe5276b -r 19e45461b651 jpeg/Makefile.in --- a/jpeg/Makefile.in Sun Mar 09 15:00:46 2014 -0500 +++ b/jpeg/Makefile.in Sun Mar 09 15:30:55 2014 -0500 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,23 +23,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -484,8 +512,8 @@ $(am__aclocal_m4_deps): jconfig.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/jconfig.cfg $(top_builddir)/config.status @rm -f stamp-h1 @@ -532,6 +560,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libjpeg.la: $(libjpeg_la_OBJECTS) $(libjpeg_la_DEPENDENCIES) $(EXTRA_libjpeg_la_DEPENDENCIES) $(AM_V_CCLD)$(libjpeg_la_LINK) -rpath $(libdir) $(libjpeg_la_OBJECTS) $(libjpeg_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -583,18 +612,23 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + cjpeg$(EXEEXT): $(cjpeg_OBJECTS) $(cjpeg_DEPENDENCIES) $(EXTRA_cjpeg_DEPENDENCIES) @rm -f cjpeg$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cjpeg_OBJECTS) $(cjpeg_LDADD) $(LIBS) + djpeg$(EXEEXT): $(djpeg_OBJECTS) $(djpeg_DEPENDENCIES) $(EXTRA_djpeg_DEPENDENCIES) @rm -f djpeg$(EXEEXT) $(AM_V_CCLD)$(LINK) $(djpeg_OBJECTS) $(djpeg_LDADD) $(LIBS) + jpegtran$(EXEEXT): $(jpegtran_OBJECTS) $(jpegtran_DEPENDENCIES) $(EXTRA_jpegtran_DEPENDENCIES) @rm -f jpegtran$(EXEEXT) $(AM_V_CCLD)$(LINK) $(jpegtran_OBJECTS) $(jpegtran_LDADD) $(LIBS) + rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $(rdjpgcom_DEPENDENCIES) $(EXTRA_rdjpgcom_DEPENDENCIES) @rm -f rdjpgcom$(EXEEXT) $(AM_V_CCLD)$(LINK) $(rdjpgcom_OBJECTS) $(rdjpgcom_LDADD) $(LIBS) + wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES) @rm -f wrjpgcom$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS) @@ -676,14 +710,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -r c9f8bbe5276b -r 19e45461b651 jpeg/README --- a/jpeg/README Sun Mar 09 15:00:46 2014 -0500 +++ b/jpeg/README Sun Mar 09 15:30:55 2014 -0500 @@ -1,8 +1,8 @@ The Independent JPEG Group's JPEG software ========================================== -README for release 9 of 13-Jan-2013 -=================================== +README for release 9a of 19-Jan-2014 +==================================== This distribution contains the ninth public release of the Independent JPEG Group's free JPEG software. You are welcome to redistribute this software and @@ -14,7 +14,7 @@ and other members of the Independent JPEG Group. IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee -(also known as JPEG, together with ITU-T SG16). +(previously known as JPEG, together with ITU-T SG16). DOCUMENTATION ROADMAP @@ -115,7 +115,7 @@ fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. -This software is copyright (C) 1991-2013, Thomas G. Lane, Guido Vollbeding. +This software is copyright (C) 1991-2014, Thomas G. Lane, Guido Vollbeding. All Rights Reserved except as specified below. Permission is hereby granted to use, copy, modify, and distribute this @@ -153,11 +153,11 @@ but is also freely distributable. The IJG distribution formerly included code to read and write GIF files. -To avoid entanglement with the Unisys LZW patent, GIF reading support has -been removed altogether, and the GIF writer has been simplified to produce -"uncompressed GIFs". This technique does not use the LZW algorithm; the -resulting GIF files are larger than usual, but are readable by all standard -GIF decoders. +To avoid entanglement with the Unisys LZW patent (now expired), GIF reading +support has been removed altogether, and the GIF writer has been simplified +to produce "uncompressed GIFs". This technique does not use the LZW +algorithm; the resulting GIF files are larger than usual, but are readable +by all standard GIF decoders. We are required to state that "The Graphics Interchange Format(c) is the Copyright property of @@ -252,8 +252,8 @@ The "official" archive site for this software is www.ijg.org. The most recent released version can always be found there in directory "files". This particular version will be archived as -http://www.ijg.org/files/jpegsrc.v9.tar.gz, and in Windows-compatible -"zip" archive format as http://www.ijg.org/files/jpegsr9.zip. +http://www.ijg.org/files/jpegsrc.v9a.tar.gz, and in Windows-compatible +"zip" archive format as http://www.ijg.org/files/jpegsr9a.zip. The JPEG FAQ (Frequently Asked Questions) article is a source of some general information about JPEG. @@ -280,7 +280,7 @@ Joint Video Team (MPEG & ITU) meeting in Geneva, Switzerland. Thank to Thomas Richter and Daniel Lee for inviting me to the -ISO/IEC JTC1/SC29/WG1 (also known as JPEG, together with ITU-T SG16) +ISO/IEC JTC1/SC29/WG1 (previously known as JPEG, together with ITU-T SG16) meeting in Berlin, Germany. Thank to John Korejwa and Massimo Ballerini for inviting me to @@ -306,10 +306,10 @@ FILE FORMAT WARS ================ -The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together -with ITU-T SG16) currently promotes different formats containing the name -"JPEG" which is misleading because these formats are incompatible with -original DCT-based JPEG and are based on faulty technologies. +The ISO/IEC JTC1/SC29/WG1 standards committee (previously known as JPEG, +together with ITU-T SG16) currently promotes different formats containing +the name "JPEG" which is misleading because these formats are incompatible +with original DCT-based JPEG and are based on faulty technologies. IJG therefore does not and will not support such momentary mistakes (see REFERENCES). There exist also distributions under the name "OpenJPEG" promoting such @@ -322,9 +322,13 @@ (In any case, our decoder will remain capable of reading existing JPEG image files indefinitely.) -Furthermore, the ISO committee pretends to be "responsible for the popular -JPEG" in their public reports which is not true because they don't respond to -actual requirements for the maintenance of the original JPEG specification. +The ISO committee pretends to be "responsible for the popular JPEG" in their +public reports which is not true because they don't respond to actual +requirements for the maintenance of the original JPEG specification. +Furthermore, the ISO committee pretends to "ensure interoperability" with +their standards which is not true because their "standards" support only +application-specific and proprietary use cases and contain mathematically +incorrect code. There are currently different distributions in circulation containing the name "libjpeg" which is misleading because they don't have the features and @@ -332,19 +336,46 @@ One of those fakes is released by members of the ISO committee and just uses the name of libjpeg for misdirection of people, similar to the abuse of the name JPEG as described above, while having nothing in common with actual IJG -libjpeg distributions. -The other one claims to be a "derivative" or "fork" of the original libjpeg -and violates the license conditions as described under LEGAL ISSUES above. -We have no sympathy for the release of misleading and illegal distributions -derived from obsolete code bases. +libjpeg distributions and containing mathematically incorrect code. +The other one claims to be a "derivative" or "fork" of the original libjpeg, +but violates the license conditions as described under LEGAL ISSUES above +and violates basic C programming properties. +We have no sympathy for the release of misleading, incorrect and illegal +distributions derived from obsolete code bases. Don't use an obsolete code base! +According to the UCC (Uniform Commercial Code) law, IJG has the lawful and +legal right to foreclose on certain standardization bodies and other +institutions or corporations that knowingly perform substantial and +systematic deceptive acts and practices, fraud, theft, and damaging of the +value of the people of this planet without their knowing, willing and +intentional consent. +The titles, ownership, and rights of these institutions and all their assets +are now duly secured and held in trust for the free people of this planet. +People of the planet, on every country, may have a financial interest in +the assets of these former principals, agents, and beneficiaries of the +foreclosed institutions and corporations. +IJG asserts what is: that each man, woman, and child has unalienable value +and rights granted and deposited in them by the Creator and not any one of +the people is subordinate to any artificial principality, corporate fiction +or the special interest of another without their appropriate knowing, +willing and intentional consent made by contract or accommodation agreement. +IJG expresses that which already was. +The people have already determined and demanded that public administration +entities, national governments, and their supporting judicial systems must +be fully transparent, accountable, and liable. +IJG has secured the value for all concerned free people of the planet. + +A partial list of foreclosed institutions and corporations ("Hall of Shame") +is currently prepared and will be published later. + TO DO ===== Version 9 is the second release of a new generation JPEG standard -to overcome the limitations of the original JPEG specification. +to overcome the limitations of the original JPEG specification, |