Skip to content
This repository was archived by the owner on Nov 20, 2020. It is now read-only.

Commit f55f8aa

Browse files
author
ijd.org
committed
Imported from jpegsrc.v8b.tar.gz.
1 parent 3c9a3b6 commit f55f8aa

43 files changed

Lines changed: 1169 additions & 1307 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile.am

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \
3838
makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \
3939
makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \
4040
maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \
41-
makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \
42-
makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \
43-
makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \
44-
makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \
45-
makefile.vms makvms.opt
41+
makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.v10 \
42+
makeasln.v10 makejvcx.v10 makejfil.v10 makecvcx.v10 makecfil.v10 \
43+
makedvcx.v10 makedfil.v10 maketvcx.v10 maketfil.v10 makervcx.v10 \
44+
makerfil.v10 makewvcx.v10 makewfil.v10 makeproj.mac makcjpeg.st \
45+
makdjpeg.st makljpeg.st maktjpeg.st makefile.manx makefile.sas \
46+
makefile.mms makefile.vms makvms.opt
4647

4748
# Configuration files
4849
CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \
@@ -118,7 +119,7 @@ uninstall-local:
118119
# Run tests
119120
test: check-local
120121
check-local:
121-
$(RM) testout*
122+
rm -f testout*
122123
./djpeg -dct int -ppm -outfile testout.ppm $(srcdir)/testorig.jpg
123124
./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(srcdir)/testorig.jpg
124125
./cjpeg -dct int -outfile testout.jpg $(srcdir)/testimg.ppm

Makefile.in

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,12 @@ MKFILES = configure Makefile.in makefile.ansi makefile.unix makefile.bcc \
321321
makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \
322322
makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \
323323
maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \
324-
makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \
325-
makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \
326-
makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \
327-
makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \
328-
makefile.vms makvms.opt
324+
makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.v10 \
325+
makeasln.v10 makejvcx.v10 makejfil.v10 makecvcx.v10 makecfil.v10 \
326+
makedvcx.v10 makedfil.v10 maketvcx.v10 maketfil.v10 makervcx.v10 \
327+
makerfil.v10 makewvcx.v10 makewfil.v10 makeproj.mac makcjpeg.st \
328+
makdjpeg.st makljpeg.st maktjpeg.st makefile.manx makefile.sas \
329+
makefile.mms makefile.vms makvms.opt
329330

330331

331332
# Configuration files
@@ -1071,7 +1072,7 @@ uninstall-local:
10711072
# Run tests
10721073
test: check-local
10731074
check-local:
1074-
$(RM) testout*
1075+
rm -f testout*
10751076
./djpeg -dct int -ppm -outfile testout.ppm $(srcdir)/testorig.jpg
10761077
./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(srcdir)/testorig.jpg
10771078
./cjpeg -dct int -outfile testout.jpg $(srcdir)/testimg.ppm

README

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The Independent JPEG Group's JPEG software
22
==========================================
33

4-
README for release 8a of 28-Feb-2010
4+
README for release 8b of 16-May-2010
55
====================================
66

77
This distribution contains the eighth public release of the Independent JPEG
@@ -254,8 +254,8 @@ ARCHIVE LOCATIONS
254254
The "official" archive site for this software is www.ijg.org.
255255
The most recent released version can always be found there in
256256
directory "files". This particular version will be archived as
257-
http://www.ijg.org/files/jpegsrc.v8a.tar.gz, and in Windows-compatible
258-
"zip" archive format as http://www.ijg.org/files/jpegsr8a.zip.
257+
http://www.ijg.org/files/jpegsrc.v8b.tar.gz, and in Windows-compatible
258+
"zip" archive format as http://www.ijg.org/files/jpegsr8b.zip.
259259

260260
The JPEG FAQ (Frequently Asked Questions) article is a source of some
261261
general information about JPEG.
@@ -285,7 +285,8 @@ Thank to John Korejwa and Massimo Ballerini for inviting me to
285285
fruitful consultations in Boston, MA and Milan, Italy.
286286

287287
Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther
288-
Maier-Gerber, and Walter Stoeber for corresponding business development.
288+
Maier-Gerber, Walter Stoeber, and Fred Schmitz for corresponding
289+
business development.
289290

290291
Thank to Nico Zschach and Dirk Stelling of the technical support team
291292
at the Digital Images company in Halle for providing me with extra

change.log

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
CHANGE LOG for Independent JPEG Group's JPEG software
22

33

4+
Version 8b 16-May-2010
5+
-----------------------
6+
7+
Repair problem in new memory source manager with corrupt JPEG data.
8+
Thank to Ted Campbell and Samuel Chun for the report.
9+
10+
Repair problem in Makefile.am test target.
11+
Thank to anonymous user for the report.
12+
13+
Support MinGW installation with automatic configure.
14+
Thank to Volker Grabsch for the suggestion.
15+
16+
417
Version 8a 28-Feb-2010
518
-----------------------
619

configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.65 for libjpeg 8.0.1.
3+
# Generated by GNU Autoconf 2.65 for libjpeg 8.0.2.
44
#
55
#
66
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
698698
# Identity of this package.
699699
PACKAGE_NAME='libjpeg'
700700
PACKAGE_TARNAME='libjpeg'
701-
PACKAGE_VERSION='8.0.1'
702-
PACKAGE_STRING='libjpeg 8.0.1'
701+
PACKAGE_VERSION='8.0.2'
702+
PACKAGE_STRING='libjpeg 8.0.2'
703703
PACKAGE_BUGREPORT=''
704704
PACKAGE_URL=''
705705

@@ -1430,7 +1430,7 @@ if test "$ac_init_help" = "long"; then
14301430
# Omit some internal or obsolete options to make the list less imposing.
14311431
# This message is too long to be a string in the A/UX 3.1 sh.
14321432
cat <<_ACEOF
1433-
\`configure' configures libjpeg 8.0.1 to adapt to many kinds of systems.
1433+
\`configure' configures libjpeg 8.0.2 to adapt to many kinds of systems.
14341434
14351435
Usage: $0 [OPTION]... [VAR=VALUE]...
14361436
@@ -1501,7 +1501,7 @@ fi
15011501

15021502
if test -n "$ac_init_help"; then
15031503
case $ac_init_help in
1504-
short | recursive ) echo "Configuration of libjpeg 8.0.1:";;
1504+
short | recursive ) echo "Configuration of libjpeg 8.0.2:";;
15051505
esac
15061506
cat <<\_ACEOF
15071507
@@ -1608,7 +1608,7 @@ fi
16081608
test -n "$ac_init_help" && exit $ac_status
16091609
if $ac_init_version; then
16101610
cat <<\_ACEOF
1611-
libjpeg configure 8.0.1
1611+
libjpeg configure 8.0.2
16121612
generated by GNU Autoconf 2.65
16131613
16141614
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1973,7 +1973,7 @@ cat >config.log <<_ACEOF
19731973
This file contains any messages produced by compilers while
19741974
running configure, to aid debugging if configure makes a mistake.
19751975
1976-
It was created by libjpeg $as_me 8.0.1, which was
1976+
It was created by libjpeg $as_me 8.0.2, which was
19771977
generated by GNU Autoconf 2.65. Invocation command line was
19781978
19791979
$ $0 $@
@@ -2905,7 +2905,7 @@ fi
29052905
29062906
# Define the identity of the package.
29072907
PACKAGE='libjpeg'
2908-
VERSION='8.0.1'
2908+
VERSION='8.0.2'
29092909
29102910
29112911
cat >>confdefs.h <<_ACEOF
@@ -12675,7 +12675,7 @@ fi
1267512675
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libjpeg version number" >&5
1267612676
$as_echo_n "checking libjpeg version number... " >&6; }
1267712677
JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`
12678-
JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:1"
12678+
JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:2"
1267912679
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JPEG_LIB_VERSION" >&5
1268012680
$as_echo "$JPEG_LIB_VERSION" >&6; }
1268112681
@@ -13215,7 +13215,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1321513215
# report actual input values of CONFIG_FILES etc. instead of their
1321613216
# values after options handling.
1321713217
ac_log="
13218-
This file was extended by libjpeg $as_me 8.0.1, which was
13218+
This file was extended by libjpeg $as_me 8.0.2, which was
1321913219
generated by GNU Autoconf 2.65. Invocation command line was
1322013220
1322113221
CONFIG_FILES = $CONFIG_FILES
@@ -13281,7 +13281,7 @@ _ACEOF
1328113281
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1328213282
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1328313283
ac_cs_version="\\
13284-
libjpeg config.status 8.0.1
13284+
libjpeg config.status 8.0.2
1328513285
configured by $0, generated by GNU Autoconf 2.65,
1328613286
with options \\"\$ac_cs_config\\"
1328713287

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Configure script for IJG libjpeg
66
#
77

8-
AC_INIT([libjpeg], [8.0.1])
8+
AC_INIT([libjpeg], [8.0.2])
99

1010
# Directory where autotools helper scripts lives.
1111
AC_CONFIG_AUX_DIR([.])
@@ -309,7 +309,7 @@ AC_SUBST(MEMORYMGR)
309309
# Extract the library version ID from jpeglib.h.
310310
AC_MSG_CHECKING([libjpeg version number])
311311
[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
312-
[JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:1"]
312+
[JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:2"]
313313
AC_MSG_RESULT([$JPEG_LIB_VERSION])
314314
AC_SUBST([JPEG_LIB_VERSION])
315315

install.txt

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
INSTALLATION INSTRUCTIONS for the Independent JPEG Group's JPEG software
22

3-
Copyright (C) 1991-2009, Thomas G. Lane, Guido Vollbeding.
3+
Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
44
This file is part of the Independent JPEG Group's software.
55
For conditions of distribution and use, see the accompanying README file.
66

@@ -149,7 +149,7 @@ makefile.mc6 jconfig.mc6 MS-DOS, Microsoft C (16-bit only)
149149
makefile.wat jconfig.wat MS-DOS, OS/2, or Windows NT, Watcom C
150150
makefile.vc jconfig.vc Windows NT/95, MS Visual C++
151151
make*.vc6 jconfig.vc Windows NT/95, MS Visual C++ 6
152-
make*.vc9 jconfig.vc Windows NT/95, MS Visual C++ 2008 (v9)
152+
make*.v10 jconfig.vc Windows NT/95, MS Visual C++ 2010 (v10)
153153
makefile.mms jconfig.vms Digital VMS, with MMS software
154154
makefile.vms jconfig.vms Digital VMS, without MMS software
155155

@@ -534,17 +534,17 @@ In general, it's worth trying the maximum optimization level of your compiler,
534534
and experimenting with any optional optimizations such as loop unrolling.
535535
(Unfortunately, far too many compilers have optimizer bugs ... be prepared to
536536
back off if the code fails self-test.) If you do any experimentation along
537-
these lines, please report the optimal settings to jpeg-info@jpegclub.org so
538-
we can mention them in future releases. Be sure to specify your machine and
539-
compiler version.
537+
these lines, please report the optimal settings to jpeg-info@uc.ag so we
538+
can mention them in future releases. Be sure to specify your machine
539+
and compiler version.
540540

541541

542542
HINTS FOR SPECIFIC SYSTEMS
543543
==========================
544544

545545
We welcome reports on changes needed for systems not mentioned here. Submit
546-
'em to jpeg-info@jpegclub.org. Also, if configure or ckconfig.c is wrong
547-
about how to configure the JPEG software for your system, please let us know.
546+
'em to jpeg-info@uc.ag. Also, if configure or ckconfig.c is wrong about how
547+
to configure the JPEG software for your system, please let us know.
548548

549549

550550
Acorn RISC OS:
@@ -998,8 +998,8 @@ model. makefile.vc is intended for command-line use. (If you are using
998998
the Developer Studio environment, you may prefer the DevStudio project
999999
files; see below.)
10001000

1001-
v7 adds extern "C" to jpeglib.h. This avoids the need to put extern "C"
1002-
{ ... } around #include "jpeglib.h" in your C++ application.
1001+
IJG JPEG 7 adds extern "C" to jpeglib.h. This avoids the need to put
1002+
extern "C" { ... } around #include "jpeglib.h" in your C++ application.
10031003
You can also force VC++ to treat the library as C++ code by renaming
10041004
all the *.c files to *.cpp (and adjusting the makefile to match).
10051005
In this case you also need to define the symbol DONT_USE_EXTERN_C in
@@ -1015,51 +1015,50 @@ as Win32 console applications. (Even if you only want the library, we
10151015
recommend building the applications so that you can run the self-test.)
10161016

10171017
To use:
1018-
1. Copy jconfig.vc to jconfig.h, makejdsw.vc6 to jpeg.dsw,
1019-
makeadsw.vc6 to apps.dsw, makejmak.vc6 to jpeg.mak,
1020-
makejdep.vc6 to jpeg.dep, makejdsp.vc6 to jpeg.dsp,
1021-
makecmak.vc6 to cjpeg.mak, makecdep.vc6 to cjpeg.dep,
1022-
makecdsp.vc6 to cjpeg.dsp, makedmak.vc6 to djpeg.mak,
1023-
makeddep.vc6 to djpeg.dep, makeddsp.vc6 to djpeg.dsp,
1024-
maketmak.vc6 to jpegtran.mak, maketdep.vc6 to jpegtran.dep,
1025-
maketdsp.vc6 to jpegtran.dsp, makermak.vc6 to rdjpgcom.mak,
1026-
makerdep.vc6 to rdjpgcom.dep, makerdsp.vc6 to rdjpgcom.dsp,
1027-
makewmak.vc6 to wrjpgcom.mak, makewdep.vc6 to wrjpgcom.dep, and
1028-
makewdsp.vc6 to wrjpgcom.dsp. (Note that the renaming is critical!)
1029-
2. Click on jpeg.dsw and apps.dsw to load the project workspaces.
1018+
1. Open the command prompt, change to the main directory and execute the
1019+
command line
1020+
NMAKE /f makefile.vc setup-vc6
1021+
This will move jconfig.vc to jconfig.h and makefiles to project files.
1022+
(Note that the renaming is critical!)
1023+
2. Open the workspace file jpeg.dsw, build the library project.
10301024
(If you are using DevStudio more recent than 6.0, you'll probably
10311025
get a message saying that the project files are being updated.)
1032-
3. Build the library project, then the applications project.
1033-
4. Move the application .exe files from `app`\Release to an
1026+
3. Open the workspace file apps.dsw, build the application projects.
1027+
4. To perform the self-test, execute the command line
1028+
NMAKE /f makefile.vc test-build
1029+
5. Move the application .exe files from `app`\Release to an
10341030
appropriate location on your path.
1035-
5. To perform the self-test, execute the command line
1036-
NMAKE /f makefile.vc test
10371031

10381032

1039-
Microsoft Windows, Microsoft Visual C++ 2008 Developer Studio (v9):
1033+
Microsoft Windows, Microsoft Visual C++ 2010 Developer Studio (v10):
10401034

10411035
We include makefiles that should work as project files in Visual Studio
1042-
2008 or later. There is a library makefile that builds the IJG library
1036+
2010 or later. There is a library makefile that builds the IJG library
10431037
as a static Win32 library, and application makefiles that build the sample
10441038
applications as Win32 console applications. (Even if you only want the
10451039
library, we recommend building the applications so that you can run the
10461040
self-test.)
10471041

10481042
To use:
1049-
1. Copy jconfig.vc to jconfig.h, makejsln.vc9 to jpeg.sln,
1050-
makeasln.vc9 to apps.sln, makejvcp.vc9 to jpeg.vcproj,
1051-
makecvcp.vc9 to cjpeg.vcproj, makedvcp.vc9 to djpeg.vcproj,
1052-
maketvcp.vc9 to jpegtran.vcproj, makervcp.vc9 to rdjpgcom.vcproj, and
1053-
makewvcp.vc9 to wrjpgcom.vcproj. (Note that the renaming is critical!)
1054-
2. Click on jpeg.sln and apps.sln to load the project solutions.
1055-
(If you are using Visual Studio more recent than 2008 (v9), you'll
1056-
probably get a message saying that the project files are being
1057-
updated.)
1058-
3. Build the library project, then the applications project.
1059-
4. Move the application .exe files from `app`\Release to an
1043+
1. Open the command prompt, change to the main directory and execute the
1044+
command line
1045+
NMAKE /f makefile.vc setup-v10
1046+
This will move jconfig.vc to jconfig.h and makefiles to project files.
1047+
(Note that the renaming is critical!)
1048+
2. Open the solution file jpeg.sln, build the library project.
1049+
(If you are using Visual Studio more recent than 2010 (v10), you'll
1050+
probably get a message saying that the project files are being updated.)
1051+
3. Open the solution file apps.sln, build the application projects.
1052+
4. To perform the self-test, execute the command line
1053+
NMAKE /f makefile.vc test-build
1054+
5. Move the application .exe files from `app`\Release to an
10601055
appropriate location on your path.
1061-
5. To perform the self-test, execute the command line
1062-
NMAKE /f makefile.vc test
1056+
1057+
Note:
1058+
There seems to be an optimization bug in the compiler which causes the
1059+
self-test to fail with the color quantization option.
1060+
We have disabled optimization for the file jquant2.c in the library
1061+
project file which causes the self-test to pass properly.
10631062

10641063

10651064
OS/2, Borland C++:

jconfig.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@
1717
/* Define this if you get warnings about undefined structures. */
1818
#undef INCOMPLETE_TYPES_BROKEN
1919

20+
/* Define "boolean" as unsigned char, not int, on Windows systems. */
21+
#ifdef _WIN32
22+
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
23+
typedef unsigned char boolean;
24+
#endif
25+
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
26+
#endif
27+
2028
#ifdef JPEG_INTERNALS
2129

2230
#undef RIGHT_SHIFT_IS_UNSIGNED

jconfig.mc6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define SHORTxLCONST_32 /* enable compiler-specific DCT optimization */
3131
/* Note: the above define is known to improve the code with Microsoft C 6.00A.
3232
* I do not know whether it is good for later compiler versions.
33-
* Please report any info on this point to jpeg-info@uunet.uu.net.
33+
* Please report any info on this point to jpeg-info@uc.ag.
3434
*/
3535

3636
#endif /* JPEG_INTERNALS */

jconfig.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@
9191
*/
9292
#undef INCOMPLETE_TYPES_BROKEN
9393

94+
/* Define "boolean" as unsigned char, not int, on Windows systems.
95+
*/
96+
#ifdef _WIN32
97+
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
98+
typedef unsigned char boolean;
99+
#endif
100+
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
101+
#endif
102+
94103

95104
/*
96105
* The following options affect code selection within the JPEG library,

0 commit comments

Comments
 (0)