[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: jpeg/: Update aged JPG library to version 9d.
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2022-04-27 20:20:52
Message-ID: mailman.10778.1651090862.1553.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 67d7fa96726e in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=67d7fa96726e
summary: jpeg/: Update aged JPG library to version 9d.

diffstat:

 ChangeLog          |      4 +
 jpeg/Makefile.am   |    274 +-
 jpeg/Makefile.in   |   2273 ++-
 jpeg/README        |    752 +-
 jpeg/aclocal.m4    |  20092 ++++++++++++++++---------------
 jpeg/ar-lib        |    540 +-
 jpeg/cderror.h     |    269 +-
 jpeg/cdjpeg.c      |    362 +-
 jpeg/cdjpeg.h      |    376 +-
 jpeg/change.log    |    911 +-
 jpeg/cjpeg.1       |    771 +-
 jpeg/cjpeg.c       |   1328 +-
 jpeg/ckconfig.c    |    804 +-
 jpeg/coderules.txt |    236 +-
 jpeg/compile       |    695 +-
 jpeg/config.guess  |   3044 ++--
 jpeg/config.sub    |   3594 ++--
 jpeg/configure     |  31347 +++++++++++++++++++++++++-------------------------
 jpeg/configure.ac  |    731 +-
 jpeg/depcomp       |   1582 +-
 jpeg/djpeg.1       |    516 +-
 jpeg/djpeg.c       |   1248 +-
 jpeg/example.c     |    866 +-
 jpeg/filelist.txt  |    431 +-
 jpeg/install-sh    |   1045 +-
 jpeg/install.txt   |   2233 +-
 jpeg/jaricom.c     |    306 +-
 jpeg/jcapimin.c    |    576 +-
 jpeg/jcapistd.c    |    324 +-
 jpeg/jcarith.c     |   1889 +-
 jpeg/jccoefct.c    |    908 +-
 jpeg/jccolor.c     |   1205 +-
 jpeg/jcdctmgr.c    |    954 +-
 jpeg/jchuff.c      |   3213 ++--
 jpeg/jcinit.c      |    333 +-
 jpeg/jcmainct.c    |    594 +-
 jpeg/jcmarker.c    |   1436 +-
 jpeg/jcmaster.c    |   1533 +-
 jpeg/jcomapi.c     |    350 +-
 jpeg/jconfig.bcc   |     96 +-
 jpeg/jconfig.cfg   |    118 +-
 jpeg/jconfig.dj    |     76 +-
 jpeg/jconfig.mac   |     86 +-
 jpeg/jconfig.manx  |     86 +-
 jpeg/jconfig.mc6   |    104 +-
 jpeg/jconfig.sas   |     86 +-
 jpeg/jconfig.st    |     84 +-
 jpeg/jconfig.txt   |    342 +-
 jpeg/jconfig.vc    |    103 +-
 jpeg/jconfig.vms   |     74 +-
 jpeg/jconfig.wat   |     76 +-
 jpeg/jcparam.c     |   1261 +-
 jpeg/jcprepct.c    |    716 +-
 jpeg/jcsample.c    |   1090 +-
 jpeg/jctrans.c     |    788 +-
 jpeg/jdapimin.c    |    798 +-
 jpeg/jdapistd.c    |    552 +-
 jpeg/jdarith.c     |   1592 +-
 jpeg/jdatadst.c    |    537 +-
 jpeg/jdatasrc.c    |    549 +-
 jpeg/jdcoefct.c    |   1482 +-
 jpeg/jdcolor.c     |   1467 +-
 jpeg/jdct.h        |    802 +-
 jpeg/jddctmgr.c    |    768 +-
 jpeg/jdhuff.c      |   3113 ++--
 jpeg/jdinput.c     |   1324 +-
 jpeg/jdmainct.c    |   1020 +-
 jpeg/jdmarker.c    |   3016 ++--
 jpeg/jdmaster.c    |   1082 +-
 jpeg/jdmerge.c     |    839 +-
 jpeg/jdpostct.c    |    580 +-
 jpeg/jdsample.c    |    719 +-
 jpeg/jdtrans.c     |    280 +-
 jpeg/jerror.c      |    506 +-
 jpeg/jerror.h      |    608 +-
 jpeg/jfdctflt.c    |    350 +-
 jpeg/jfdctfst.c    |    462 +-
 jpeg/jfdctint.c    |   8821 +++++++-------
 jpeg/jidctflt.c    |    473 +-
 jpeg/jidctfst.c    |    719 +-
 jpeg/jidctint.c    |  10419 ++++++++--------
 jpeg/jinclude.h    |    188 +-
 jpeg/jmemansi.c    |    334 +-
 jpeg/jmemdos.c     |   1276 +-
 jpeg/jmemdosa.asm  |    758 +-
 jpeg/jmemmac.c     |    578 +-
 jpeg/jmemmgr.c     |   2234 +-
 jpeg/jmemname.c    |    552 +-
 jpeg/jmemnobs.c    |    222 +-
 jpeg/jmemsys.h     |    396 +-
 jpeg/jmorecfg.h    |    935 +-
 jpeg/jpegint.h     |    872 +-
 jpeg/jpeglib.h     |   2363 +-
 jpeg/jpegtran.1    |    621 +-
 jpeg/jpegtran.c    |   1231 +-
 jpeg/jquant1.c     |   1714 +-
 jpeg/jquant2.c     |   2622 ++--
 jpeg/jutils.c      |    454 +-
 jpeg/jversion.h    |     28 +-
 jpeg/libjpeg.map   |      8 +-
 jpeg/libjpeg.pc.in |     10 +
 jpeg/libjpeg.txt   |   6221 +++++-----
 jpeg/ltmain.sh     |  20802 ++++++++++++++++++---------------
 jpeg/makcjpeg.st   |     72 +-
 jpeg/makdjpeg.st   |     72 +-
 jpeg/makeadsw.vc6  |    154 +-
 jpeg/makeasln.v16  |     49 +
 jpeg/makecdep.vc6  |    164 +-
 jpeg/makecdsp.vc6  |    260 +-
 jpeg/makecfil.v16  |     69 +
 jpeg/makecmak.vc6  |    318 +-
 jpeg/makecvcx.v16  |    117 +
 jpeg/makeddep.vc6  |    164 +-
 jpeg/makeddsp.vc6  |    260 +-
 jpeg/makedfil.v16  |     69 +
 jpeg/makedmak.vc6  |    318 +-
 jpeg/makedvcx.v16  |    117 +
 jpeg/makefile.ansi |    444 +-
 jpeg/makefile.b32  |    245 +
 jpeg/makefile.bcc  |    587 +-
 jpeg/makefile.dj   |    456 +-
 jpeg/makefile.manx |    444 +-
 jpeg/makefile.mc6  |    514 +-
 jpeg/makefile.mms  |    452 +-
 jpeg/makefile.sas  |    520 +-
 jpeg/makefile.unix |    472 +-
 jpeg/makefile.vc   |    624 +-
 jpeg/makefile.vms  |    284 +-
 jpeg/makefile.vs   |    351 +
 jpeg/makefile.wat  |    483 +-
 jpeg/makejdep.vc6  |    846 +-
 jpeg/makejdsp.vc6  |    570 +-
 jpeg/makejdsw.vc6  |     58 +-
 jpeg/makejfil.v16  |    186 +
 jpeg/makejmak.vc6  |    850 +-
 jpeg/makejsln.v16  |     25 +
 jpeg/makejvcx.v16  |    150 +
 jpeg/makeproj.mac  |    426 +-
 jpeg/makerdep.vc6  |     12 +-
 jpeg/makerdsp.vc6  |    156 +-
 jpeg/makerfil.v16  |     30 +
 jpeg/makermak.vc6  |    220 +-
 jpeg/makervcx.v16  |    102 +
 jpeg/maketdep.vc6  |     86 +-
 jpeg/maketdsp.vc6  |    244 +-
 jpeg/maketfil.v16  |     63 +
 jpeg/maketmak.vc6  |    262 +-
 jpeg/maketvcx.v16  |    115 +
 jpeg/makewdep.vc6  |     12 +-
 jpeg/makewdsp.vc6  |    156 +-
 jpeg/makewfil.v16  |     30 +
 jpeg/makewmak.vc6  |    220 +-
 jpeg/makewvcx.v16  |    102 +
 jpeg/makljpeg.st   |    136 +-
 jpeg/maktjpeg.st   |     60 +-
 jpeg/makvms.opt    |      8 +-
 jpeg/missing       |    430 +-
 jpeg/rdbmp.c       |    949 +-
 jpeg/rdcolmap.c    |    506 +-
 jpeg/rdgif.c       |    715 +-
 jpeg/rdjpgcom.1    |    126 +-
 jpeg/rdjpgcom.c    |   1030 +-
 jpeg/rdppm.c       |    959 +-
 jpeg/rdrle.c       |    767 +-
 jpeg/rdswitch.c    |    731 +-
 jpeg/rdtarga.c     |   1000 +-
 jpeg/structure.txt |   1884 +-
 jpeg/testimgp.jpg  |    Bin 
 jpeg/transupp.c    |   4197 +++--
 jpeg/transupp.h    |    449 +-
 jpeg/usage.txt     |   1386 +-
 jpeg/wizard.txt    |    422 +-
 jpeg/wrbmp.c       |    879 +-
 jpeg/wrgif.c       |    965 +-
 jpeg/wrjpgcom.1    |    206 +-
 jpeg/wrjpgcom.c    |   1182 +-
 jpeg/wrppm.c       |    534 +-
 jpeg/wrrle.c       |    611 +-
 jpeg/wrtarga.c     |    507 +-
 179 files changed, 111218 insertions(+), 104849 deletions(-)

diffs (truncated from 216796 to 500 lines):

diff -r 221dfeade120 -r 67d7fa96726e ChangeLog
--- a/ChangeLog	Sat Apr 23 18:28:10 2022 -0500
+++ b/ChangeLog	Wed Apr 27 22:20:00 2022 +0200
@@ -1,3 +1,7 @@
+2021-04-27  Fojtik Jaroslav  <JaFojtik@yandex.com>
+
+        * jpeg/: Update aged JPG library.
+
 2022-04-23  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
         * coders/ps.c (ReadPSImage): Assure that 'bounds' structure is
diff -r 221dfeade120 -r 67d7fa96726e jpeg/Makefile.am
--- a/jpeg/Makefile.am	Sat Apr 23 18:28:10 2022 -0500
+++ b/jpeg/Makefile.am	Wed Apr 27 22:20:00 2022 +0200
@@ -1,134 +1,140 @@
-## Process this file with automake to produce Makefile.in
-#
-#  Automake Makefile for the JPEG library
-#
-#  This file is written by Bob Friesenhahn, Guido Vollbeding
-#
-
-# Sources to build library
-LIBSOURCES = jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \
-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \
-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \
-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \
-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \
-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \
-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \
-        jquant2.c jutils.c jmemmgr.c @MEMORYMGR@.c
-
-# System dependent sources
-SYSDEPSOURCES = jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c
-
-# Headers which are installed to support the library
-INSTINCLUDES  = jerror.h jmorecfg.h jpeglib.h
-
-# Headers which are not installed
-OTHERINCLUDES = cderror.h cdjpeg.h jdct.h jinclude.h jmemsys.h jpegint.h \
-        jversion.h transupp.h
-
-# Manual pages (Automake uses 'MANS' for itself)
-DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
-
-# Other documentation files
-DOCS= README install.txt usage.txt wizard.txt example.c libjpeg.txt \
-        structure.txt coderules.txt filelist.txt change.log
-
-# Makefiles for various systems
-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \
-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \
-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \
-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \
-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \
-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.v10 \
-        makeasln.v10 makejvcx.v10 makejfil.v10 makecvcx.v10 makecfil.v10 \
-        makedvcx.v10 makedfil.v10 maketvcx.v10 maketfil.v10 makervcx.v10 \
-        makerfil.v10 makewvcx.v10 makewfil.v10 makeproj.mac makcjpeg.st \
-        makdjpeg.st makljpeg.st maktjpeg.st makefile.manx makefile.sas \
-        makefile.mms makefile.vms makvms.opt
-
-# Configuration files
-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \
-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \
-        jconfig.vms
-
-# Support scripts for configure
-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp \
-        missing ar-lib
-
-# Miscellaneous support files
-OTHERFILES= jconfig.txt ckconfig.c jmemdosa.asm libjpeg.map
-
-# Test support files
-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
-        testimgp.jpg
-
-# libtool libraries to build
-lib_LTLIBRARIES = libjpeg.la
-
-# Library sources for libjpeg.la
-libjpeg_la_SOURCES = $(LIBSOURCES)
-
-# LDFLAGS for libjpeg.la
-libjpeg_la_LDFLAGS = -no-undefined \
-        -version-info $(JPEG_LIB_VERSION)
-
-if HAVE_LD_VERSION_SCRIPT
-  libjpeg_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libjpeg.map
-endif
-
-# Executables to build
-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-
-# Executable sources & libs
-cjpeg_SOURCES    = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \
-        rdswitch.c cdjpeg.c
-cjpeg_LDADD      = libjpeg.la
-djpeg_SOURCES    = djpeg.c wrppm.c wrgif.c wrtarga.c wrrle.c wrbmp.c \
-        rdcolmap.c cdjpeg.c
-djpeg_LDADD      = libjpeg.la
-jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c
-jpegtran_LDADD   = libjpeg.la
-rdjpgcom_SOURCES = rdjpgcom.c
-wrjpgcom_SOURCES = wrjpgcom.c
-
-# Manual pages to install
-man_MANS = $(DISTMANS)
-
-# Headers to install
-include_HEADERS = $(INSTINCLUDES)
-
-# Other distributed headers
-noinst_HEADERS = $(OTHERINCLUDES)
-
-# Other distributed files
-EXTRA_DIST =  $(DOCS) $(DISTMANS) $(MKFILES) $(CONFIGFILES) $(SYSDEPSOURCES) \
-        $(OTHERFILES) $(TESTFILES)
-
-# Files to be cleaned
-CLEANFILES = testout.ppm testout.bmp testout.jpg testoutp.ppm testoutp.jpg \
-        testoutt.jpg
-
-# Install jconfig.h
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-	$(INSTALL_HEADER) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
-
-# Uninstall jconfig.h
-uninstall-local:
-	rm -f $(DESTDIR)$(includedir)/jconfig.h
-
-# Run tests
-test: check-local
-check-local:
-	rm -f testout*
-	./djpeg -dct int -ppm -outfile testout.ppm  $(srcdir)/testorig.jpg
-	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  $(srcdir)/testorig.jpg
-	./cjpeg -dct int -outfile testout.jpg  $(srcdir)/testimg.ppm
-	./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg
-	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm
-	./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg
-	cmp $(srcdir)/testimg.ppm testout.ppm
-	cmp $(srcdir)/testimg.bmp testout.bmp
-	cmp $(srcdir)/testimg.jpg testout.jpg
-	cmp $(srcdir)/testimg.ppm testoutp.ppm
-	cmp $(srcdir)/testimgp.jpg testoutp.jpg
-	cmp $(srcdir)/testorig.jpg testoutt.jpg
+## Process this file with automake to produce Makefile.in
+#
+#  Automake Makefile for the JPEG library
+#
+#  This file is written by Bob Friesenhahn, Guido Vollbeding
+#
+
+# Sources to build library
+LIBSOURCES = jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \
+        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \
+        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \
+        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \
+        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \
+        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \
+        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \
+        jquant2.c jutils.c jmemmgr.c @MEMORYMGR@.c
+
+# System dependent sources
+SYSDEPSOURCES = jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c
+
+# Headers which are installed to support the library
+INSTINCLUDES  = jerror.h jmorecfg.h jpeglib.h
+
+# Headers which are not installed
+OTHERINCLUDES = cderror.h cdjpeg.h jdct.h jinclude.h jmemsys.h jpegint.h \
+        jversion.h transupp.h
+
+# Manual pages (Automake uses 'MANS' for itself)
+DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
+
+# Other documentation files
+DOCS= README install.txt usage.txt wizard.txt example.c libjpeg.txt \
+        structure.txt coderules.txt filelist.txt change.log
+
+# Makefiles for various systems
+MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.b32 \
+        makefile.bcc makefile.mc6 makefile.dj makefile.wat makefile.vc \
+        makefile.vs makejdsw.vc6 makeadsw.vc6 makejdep.vc6 makejdsp.vc6 \
+        makejmak.vc6 makecdep.vc6 makecdsp.vc6 makecmak.vc6 makeddep.vc6 \
+        makeddsp.vc6 makedmak.vc6 maketdep.vc6 maketdsp.vc6 maketmak.vc6 \
+        makerdep.vc6 makerdsp.vc6 makermak.vc6 makewdep.vc6 makewdsp.vc6 \
+        makewmak.vc6 makejsln.v16 makeasln.v16 makejvcx.v16 makejfil.v16 \
+        makecvcx.v16 makecfil.v16 makedvcx.v16 makedfil.v16 maketvcx.v16 \
+        maketfil.v16 makervcx.v16 makerfil.v16 makewvcx.v16 makewfil.v16 \
+        makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st maktjpeg.st \
+        makefile.manx makefile.sas makefile.mms makefile.vms makvms.opt
+
+# Configuration files
+CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \
+        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \
+        jconfig.vms
+
+# Support scripts for configure
+CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp \
+        missing ar-lib
+
+# Miscellaneous support files
+OTHERFILES= jconfig.txt ckconfig.c jmemdosa.asm libjpeg.map libjpeg.pc.in
+
+# Test support files
+TESTFILES= testorig.jpg testimg.ppm testimg.gif testimg.bmp testimg.jpg \
+        testprog.jpg testimgp.jpg
+
+# libtool libraries to build
+lib_LTLIBRARIES = libjpeg.la
+
+# Library sources for libjpeg.la
+libjpeg_la_SOURCES = $(LIBSOURCES)
+
+# LDFLAGS for libjpeg.la
+libjpeg_la_LDFLAGS = -no-undefined \
+        -version-info $(JPEG_LIB_VERSION)
+
+if HAVE_LD_VERSION_SCRIPT
+  libjpeg_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libjpeg.map
+endif
+
+# Executables to build
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+
+# Executable sources & libs
+cjpeg_SOURCES    = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \
+        rdswitch.c cdjpeg.c
+cjpeg_LDADD      = libjpeg.la
+djpeg_SOURCES    = djpeg.c wrppm.c wrgif.c wrtarga.c wrrle.c wrbmp.c \
+        rdcolmap.c cdjpeg.c
+djpeg_LDADD      = libjpeg.la
+jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c
+jpegtran_LDADD   = libjpeg.la
+rdjpgcom_SOURCES = rdjpgcom.c
+wrjpgcom_SOURCES = wrjpgcom.c
+
+# Manual pages to install
+man_MANS = $(DISTMANS)
+
+# Headers to install
+include_HEADERS = $(INSTINCLUDES)
+
+# Other distributed headers
+noinst_HEADERS = $(OTHERINCLUDES)
+
+# Other distributed files
+EXTRA_DIST =  $(DOCS) $(DISTMANS) $(MKFILES) $(CONFIGFILES) $(SYSDEPSOURCES) \
+        $(OTHERFILES) $(TESTFILES)
+
+# pkg-config file
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = libjpeg.pc
+
+# Files to be cleaned
+CLEANFILES = testout.ppm testout.gif testout.bmp testout.jpg testoutp.ppm \
+        testoutp.jpg testoutt.jpg
+
+# Install jconfig.h
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	$(INSTALL_HEADER) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
+
+# Uninstall jconfig.h
+uninstall-local:
+	rm -f $(DESTDIR)$(includedir)/jconfig.h
+
+# Run tests
+test: check-local
+check-local:
+	rm -f testout*
+	./djpeg -dct int -ppm -outfile testout.ppm $(srcdir)/testorig.jpg
+	./djpeg -dct int -gif -outfile testout.gif $(srcdir)/testorig.jpg
+	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(srcdir)/testorig.jpg
+	./cjpeg -dct int -outfile testout.jpg $(srcdir)/testimg.ppm
+	./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg
+	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm
+	./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg
+	cmp $(srcdir)/testimg.ppm testout.ppm
+	cmp $(srcdir)/testimg.gif testout.gif
+	cmp $(srcdir)/testimg.bmp testout.bmp
+	cmp $(srcdir)/testimg.jpg testout.jpg
+	cmp $(srcdir)/testimg.ppm testoutp.ppm
+	cmp $(srcdir)/testimgp.jpg testoutp.jpg
+	cmp $(srcdir)/testorig.jpg testoutt.jpg
diff -r 221dfeade120 -r 67d7fa96726e jpeg/Makefile.in
--- a/jpeg/Makefile.in	Sat Apr 23 18:28:10 2022 -0500
+++ b/jpeg/Makefile.in	Wed Apr 27 22:20:00 2022 +0200
@@ -1,1029 +1,1244 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# 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,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-#  Automake Makefile for the JPEG library
-#
-#  This file is written by Bob Friesenhahn, Guido Vollbeding
-#
-
-
-
-VPATH = @srcdir@
-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 \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map
-bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \
-	rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/jconfig.cfg depcomp $(include_HEADERS) \
-	$(noinst_HEADERS)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = jconfig.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libjpeg_la_LIBADD =
-am__objects_1 = jaricom.lo jcapimin.lo jcapistd.lo jcarith.lo \
-	jccoefct.lo jccolor.lo jcdctmgr.lo jchuff.lo jcinit.lo \
-	jcmainct.lo jcmarker.lo jcmaster.lo jcomapi.lo jcparam.lo \
-	jcprepct.lo jcsample.lo jctrans.lo jdapimin.lo jdapistd.lo \
-	jdarith.lo jdatadst.lo jdatasrc.lo jdcoefct.lo jdcolor.lo \
-	jddctmgr.lo jdhuff.lo jdinput.lo jdmainct.lo jdmarker.lo \
-	jdmaster.lo jdmerge.lo jdpostct.lo jdsample.lo jdtrans.lo \
-	jerror.lo jfdctflt.lo jfdctfst.lo jfdctint.lo jidctflt.lo \
-	jidctfst.lo jidctint.lo jquant1.lo jquant2.lo jutils.lo \
-	jmemmgr.lo @MEMORYMGR@.lo
-am_libjpeg_la_OBJECTS = $(am__objects_1)
-libjpeg_la_OBJECTS = $(am_libjpeg_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libjpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libjpeg_la_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(bin_PROGRAMS)
-am_cjpeg_OBJECTS = cjpeg.$(OBJEXT) rdppm.$(OBJEXT) rdgif.$(OBJEXT) \
-	rdtarga.$(OBJEXT) rdrle.$(OBJEXT) rdbmp.$(OBJEXT) \
-	rdswitch.$(OBJEXT) cdjpeg.$(OBJEXT)
-cjpeg_OBJECTS = $(am_cjpeg_OBJECTS)
-cjpeg_DEPENDENCIES = libjpeg.la
-am_djpeg_OBJECTS = djpeg.$(OBJEXT) wrppm.$(OBJEXT) wrgif.$(OBJEXT) \
-	wrtarga.$(OBJEXT) wrrle.$(OBJEXT) wrbmp.$(OBJEXT) \
-	rdcolmap.$(OBJEXT) cdjpeg.$(OBJEXT)
-djpeg_OBJECTS = $(am_djpeg_OBJECTS)
-djpeg_DEPENDENCIES = libjpeg.la
-am_jpegtran_OBJECTS = jpegtran.$(OBJEXT) rdswitch.$(OBJEXT) \
-	cdjpeg.$(OBJEXT) transupp.$(OBJEXT)
-jpegtran_OBJECTS = $(am_jpegtran_OBJECTS)
-jpegtran_DEPENDENCIES = libjpeg.la
-am_rdjpgcom_OBJECTS = rdjpgcom.$(OBJEXT)
-rdjpgcom_OBJECTS = $(am_rdjpgcom_OBJECTS)
-rdjpgcom_LDADD = $(LDADD)
-am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT)
-wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS)
-wrjpgcom_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \


_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic