Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [435] tiki
|
From: <at...@us...> - 2007-08-09 22:49:07
|
Revision: 435
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=435&view=rev
Author: atani
Date: 2007-08-09 15:48:59 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
astyle --style=kr -t -P -K -a
Modified Paths:
--------------
tiki/3rdparty/libjpeg/README
tiki/3rdparty/libjpeg/jcapimin.c
tiki/3rdparty/libjpeg/jcapistd.c
tiki/3rdparty/libjpeg/jccoefct.c
tiki/3rdparty/libjpeg/jccolor.c
tiki/3rdparty/libjpeg/jcdctmgr.c
tiki/3rdparty/libjpeg/jchuff.c
tiki/3rdparty/libjpeg/jchuff.h
tiki/3rdparty/libjpeg/jcinit.c
tiki/3rdparty/libjpeg/jcmainct.c
tiki/3rdparty/libjpeg/jcmarker.c
tiki/3rdparty/libjpeg/jcmaster.c
tiki/3rdparty/libjpeg/jcomapi.c
tiki/3rdparty/libjpeg/jconfig.h
tiki/3rdparty/libjpeg/jcparam.c
tiki/3rdparty/libjpeg/jcphuff.c
tiki/3rdparty/libjpeg/jcprepct.c
tiki/3rdparty/libjpeg/jcsample.c
tiki/3rdparty/libjpeg/jctrans.c
tiki/3rdparty/libjpeg/jdapimin.c
tiki/3rdparty/libjpeg/jdapistd.c
tiki/3rdparty/libjpeg/jdatadst.c
tiki/3rdparty/libjpeg/jdatasrc.c
tiki/3rdparty/libjpeg/jdcoefct.c
tiki/3rdparty/libjpeg/jdcolor.c
tiki/3rdparty/libjpeg/jdct.h
tiki/3rdparty/libjpeg/jddctmgr.c
tiki/3rdparty/libjpeg/jdhuff.c
tiki/3rdparty/libjpeg/jdhuff.h
tiki/3rdparty/libjpeg/jdinput.c
tiki/3rdparty/libjpeg/jdmainct.c
tiki/3rdparty/libjpeg/jdmarker.c
tiki/3rdparty/libjpeg/jdmaster.c
tiki/3rdparty/libjpeg/jdmerge.c
tiki/3rdparty/libjpeg/jdphuff.c
tiki/3rdparty/libjpeg/jdpostct.c
tiki/3rdparty/libjpeg/jdsample.c
tiki/3rdparty/libjpeg/jdtrans.c
tiki/3rdparty/libjpeg/jerror.c
tiki/3rdparty/libjpeg/jerror.h
tiki/3rdparty/libjpeg/jfdctflt.c
tiki/3rdparty/libjpeg/jfdctfst.c
tiki/3rdparty/libjpeg/jfdctint.c
tiki/3rdparty/libjpeg/jidctflt.c
tiki/3rdparty/libjpeg/jidctfst.c
tiki/3rdparty/libjpeg/jidctint.c
tiki/3rdparty/libjpeg/jidctred.c
tiki/3rdparty/libjpeg/jinclude.h
tiki/3rdparty/libjpeg/jmemmgr.c
tiki/3rdparty/libjpeg/jmemnobs.c
tiki/3rdparty/libjpeg/jmemsys.h
tiki/3rdparty/libjpeg/jmorecfg.h
tiki/3rdparty/libjpeg/jpegint.h
tiki/3rdparty/libjpeg/jpeglib.h
tiki/3rdparty/libjpeg/jquant1.c
tiki/3rdparty/libjpeg/jquant2.c
tiki/3rdparty/libjpeg/jversion.h
tiki/3rdparty/libpng/png.h
tiki/3rdparty/libpng/pngconf.h
tiki/3rdparty/libvorbis/lib/backends.h
tiki/3rdparty/libvorbis/lib/bitrate.h
tiki/3rdparty/libvorbis/lib/codebook.h
tiki/3rdparty/libvorbis/lib/codec_internal.h
tiki/3rdparty/libvorbis/lib/envelope.h
tiki/3rdparty/libvorbis/lib/highlevel.h
tiki/3rdparty/libvorbis/lib/lookup.h
tiki/3rdparty/libvorbis/lib/lookup_data.h
tiki/3rdparty/libvorbis/lib/lpc.h
tiki/3rdparty/libvorbis/lib/lsp.h
tiki/3rdparty/libvorbis/lib/masking.h
tiki/3rdparty/libvorbis/lib/mdct.h
tiki/3rdparty/libvorbis/lib/misc.h
tiki/3rdparty/libvorbis/lib/os.h
tiki/3rdparty/libvorbis/lib/psy.h
tiki/3rdparty/libvorbis/lib/registry.h
tiki/3rdparty/libvorbis/lib/scales.h
tiki/3rdparty/libvorbis/lib/smallft.h
tiki/3rdparty/libvorbis/lib/window.h
tiki/3rdparty/zlib/crc32.h
tiki/3rdparty/zlib/deflate.h
tiki/3rdparty/zlib/inffast.h
tiki/3rdparty/zlib/inffixed.h
tiki/3rdparty/zlib/inflate.h
tiki/3rdparty/zlib/inftrees.h
tiki/3rdparty/zlib/trees.h
tiki/3rdparty/zlib/zconf.h
tiki/3rdparty/zlib/zlib.h
tiki/3rdparty/zlib/zutil.h
tiki/dc/include/Tiki/glhdrs.h
tiki/dc/include/Tiki/platthread.h
tiki/dc/include/Tiki/tikitypes.h
tiki/dc/include/pch.h
tiki/dc/include/sys/queue.h
tiki/dc/src/audio/sound.cpp
tiki/dc/src/audio/stream.cpp
tiki/dc/src/init_shutdown.cpp
tiki/dc/src/platgl.cpp
tiki/dc/src/plathid.cpp
tiki/dc/src/platthread.cpp
tiki/dc/src/tikitime.cpp
tiki/gp2x/include/GLES/egl.h
tiki/gp2x/include/GLES/egltypes.h
tiki/gp2x/include/GLES/gl.h
tiki/gp2x/include/GLES/glext.h
tiki/gp2x/include/Tiki/glhdrs.h
tiki/gp2x/include/Tiki/platthread.h
tiki/gp2x/include/Tiki/tikitypes.h
tiki/gp2x/include/minimal.h
tiki/gp2x/include/minimal_940t.h
tiki/gp2x/include/pch.h
tiki/gp2x/include/sys/queue.h
tiki/gp2x/src/init_shutdown.cpp
tiki/gp2x/src/platgl.cpp
tiki/gp2x/src/plathid.cpp
tiki/gp2x/src/platthread.cpp
tiki/gp2x/src/rlyeh-minimal.cpp
tiki/gp2x/src/tikitime.cpp
tiki/include/Tiki/animation.h
tiki/include/Tiki/bspline.h
tiki/include/Tiki/color.h
tiki/include/Tiki/color3.h
tiki/include/Tiki/debug.h
tiki/include/Tiki/drawable.h
tiki/include/Tiki/endian.h
tiki/include/Tiki/eventcollector.h
tiki/include/Tiki/file.h
tiki/include/Tiki/font.h
tiki/include/Tiki/genmenu.h
tiki/include/Tiki/gl.h
tiki/include/Tiki/hid.h
tiki/include/Tiki/image.h
tiki/include/Tiki/imgjpg.h
tiki/include/Tiki/imgpng.h
tiki/include/Tiki/list.h
tiki/include/Tiki/matrix.h
tiki/include/Tiki/object.h
tiki/include/Tiki/oggvorbis.h
tiki/include/Tiki/plxcompat.h
tiki/include/Tiki/refcnt.h
tiki/include/Tiki/scene.h
tiki/include/Tiki/sound.h
tiki/include/Tiki/stream.h
tiki/include/Tiki/tee.h
tiki/include/Tiki/texture.h
tiki/include/Tiki/thread.h
tiki/include/Tiki/tiki.h
tiki/include/Tiki/tikimath.h
tiki/include/Tiki/tikitime.h
tiki/include/Tiki/timeline.h
tiki/include/Tiki/timepoint.h
tiki/include/Tiki/trigger.h
tiki/include/Tiki/vector.h
tiki/include/Tiki/vector3.h
tiki/nds/arm7_template/source/dssoundstream.h
tiki/nds/include/Tiki/glhdrs.h
tiki/nds/include/Tiki/platthread.h
tiki/nds/include/Tiki/tikitypes.h
tiki/nds/include/dssoundstream.h
tiki/nds/include/pch.h
tiki/nds/src/audio/sound.cpp
tiki/nds/src/audio/stream.cpp
tiki/nds/src/init_shutdown.cpp
tiki/nds/src/platgl.cpp
tiki/nds/src/plathid.cpp
tiki/nds/src/platthread.cpp
tiki/nds/src/tikitime.cpp
tiki/osx/include/Tiki/TikiMain.h
tiki/osx/include/Tiki/glhdrs.h
tiki/osx/include/Tiki/platthread.h
tiki/osx/include/Tiki/tikitypes.h
tiki/osx/include/pch.h
tiki/osx/src/init_shutdown.cpp
tiki/osx/src/platgl.cpp
tiki/osx/src/platthread.cpp
tiki/osx/src/tikitime.cpp
tiki/sdl/include/Tiki/glhdrs.h
tiki/sdl/include/Tiki/platthread.h
tiki/sdl/include/Tiki/tikitypes.h
tiki/sdl/include/pch.h
tiki/sdl/include/sys/queue.h
tiki/sdl/src/init_shutdown.cpp
tiki/sdl/src/platgl.cpp
tiki/sdl/src/plathid.cpp
tiki/sdl/src/platthread.cpp
tiki/sdl/src/tikitime.cpp
tiki/src/audio/oggvorbis/misc.h
tiki/src/audio/oggvorbis/sndoggvorbis.cpp
tiki/src/audio/sound.cpp
tiki/src/audio/stream.cpp
tiki/src/base/debug.cpp
tiki/src/base/endian.cpp
tiki/src/base/file.cpp
tiki/src/base/object.cpp
tiki/src/base/timeline.cpp
tiki/src/base/timepoint.cpp
tiki/src/gl/animation.cpp
tiki/src/gl/drawable.cpp
tiki/src/gl/font.cpp
tiki/src/gl/genmenu.cpp
tiki/src/gl/gl.cpp
tiki/src/gl/plxcompat.cpp
tiki/src/gl/texture.cpp
tiki/src/gl/trigger.cpp
tiki/src/hid/eventcollector.cpp
tiki/src/hid/hid.cpp
tiki/src/image/image.cpp
tiki/src/image/loadjpg.cpp
tiki/src/image/loadpng.cpp
tiki/src/math/bspline.cpp
tiki/src/math/math.cpp
tiki/src/math/matrix.cpp
tiki/src/math/vector.cpp
tiki/src/math/vector3.cpp
tiki/src/thread/thread.cpp
tiki/win32/include/Tiki/glhdrs.h
tiki/win32/include/Tiki/tikitypes.h
tiki/win32/include/pch.h
tiki/win32/include/sys/cdefs.h
tiki/win32/include/sys/queue.h
tiki/win32/src/init_shutdown.cpp
tiki/win32/src/platgl.cpp
tiki/win32/src/plathid.cpp
tiki/win32/src/platthread.cpp
tiki/win32/src/tikitime.cpp
Modified: tiki/3rdparty/libjpeg/README
===================================================================
--- tiki/3rdparty/libjpeg/README 2007-08-09 21:57:40 UTC (rev 434)
+++ tiki/3rdparty/libjpeg/README 2007-08-09 22:48:59 UTC (rev 435)
@@ -5,381 +5,392 @@
====================================
This distribution contains the sixth public release of the Independent JPEG
-Group's free JPEG software. You are welcome to redistribute this software and
+Group's free JPEG software. You are welcome to redistribute this software and
to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
-Serious users of this software (particularly those incorporating it into
-larger programs) should contact IJG at jpe...@uu... to be added to
-our electronic mailing list. Mailing list members are notified of updates
-and have a chance to participate in technical discussions, etc.
+Serious users of this software ( particularly those incorporating it into
+ larger programs )
+ should contact IJG at jpeg - in...@uu... to be added to
+ our electronic mailing list. Mailing list members are notified of updates
+ and have a chance to participate in technical discussions, etc.
-This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
-Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
-Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
-Group.
+ This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
+ Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
+ Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
+ Group.
-IJG is not affiliated with the official ISO JPEG standards committee.
+ IJG is not affiliated with the official ISO JPEG standards committee.
-DOCUMENTATION ROADMAP
-=====================
+ DOCUMENTATION ROADMAP
+ =====================
-This file contains the following sections:
+ This file contains the following sections:
-OVERVIEW General description of JPEG and the IJG software.
-LEGAL ISSUES Copyright, lack of warranty, terms of distribution.
-REFERENCES Where to learn more about JPEG.
-ARCHIVE LOCATIONS Where to find newer versions of this software.
-RELATED SOFTWARE Other stuff you should get.
-FILE FORMAT WARS Software *not* to get.
-TO DO Plans for future IJG releases.
+ OVERVIEW General description of JPEG and the IJG software.
+ LEGAL ISSUES Copyright, lack of warranty, terms of distribution.
+ REFERENCES Where to learn more about JPEG.
+ ARCHIVE LOCATIONS Where to find newer versions of this software.
+ RELATED SOFTWARE Other stuff you should get.
+ FILE FORMAT WARS Software *not* to get.
+ TO DO Plans for future IJG releases.
-Other documentation files in the distribution are:
+ Other documentation files in the distribution are:
-User documentation:
- install.doc How to configure and install the IJG software.
- usage.doc Usage instructions for cjpeg, djpeg, jpegtran,
- rdjpgcom, and wrjpgcom.
- *.1 Unix-style man pages for programs (same info as usage.doc).
- wizard.doc Advanced usage instructions for JPEG wizards only.
- change.log Version-to-version change highlights.
-Programmer and internal documentation:
- libjpeg.doc How to use the JPEG library in your own programs.
- example.c Sample code for calling the JPEG library.
- structure.doc Overview of the JPEG library's internal structure.
- filelist.doc Road map of IJG files.
- coderules.doc Coding style rules --- please read if you contribute code.
+ User documentation:
+ install.doc How to configure and install the IJG software.
+ usage.doc Usage instructions for cjpeg, djpeg, jpegtran,
+ rdjpgcom, and wrjpgcom.
+ *.1 Unix-style man pages for programs (same info as usage.doc).
+ wizard.doc Advanced usage instructions for JPEG wizards only.
+ change.log Version-to-version change highlights.
+ Programmer and internal documentation:
+ libjpeg.doc How to use the JPEG library in your own programs.
+ example.c Sample code for calling the JPEG library.
+ structure.doc Overview of the JPEG library's internal structure.
+ filelist.doc Road map of IJG files.
+ coderules.doc Coding style rules -- - please read if you contribute code.
-Please read at least the files install.doc and usage.doc. Useful information
-can also be found in the JPEG FAQ (Frequently Asked Questions) article. See
-ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
+ Please read at least the files install.doc and usage.doc. Useful information
+ can also be found in the JPEG FAQ ( Frequently Asked Questions )
+ article. See
+ ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
-If you want to understand how the JPEG code works, we suggest reading one or
-more of the REFERENCES, then looking at the documentation files (in roughly
-the order listed) before diving into the code.
+ If you want to understand how the JPEG code works, we suggest reading one or
+ more of the REFERENCES, then looking at the documentation files ( in roughly
+ the order listed ) before diving into the code.
-OVERVIEW
-========
+ OVERVIEW
+ == == == ==
-This package contains C software to implement JPEG image compression and
-decompression. JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and gray-scale images. JPEG is intended for compressing
-"real-world" scenes; line drawings, cartoons and other non-realistic images
-are not its strong suit. JPEG is lossy, meaning that the output image is not
-exactly identical to the input image. Hence you must not use JPEG if you
-have to have identical output bits. However, on typical photographic images,
+ This package contains C software to implement JPEG image compression and
+ decompression. JPEG ( pronounced "jay-peg" ) is a standardized compression
+ method for full - color and gray - scale images. JPEG is intended for compressing
+ "real-world" scenes;
+line drawings, cartoons and other non - realistic images
+are not its strong suit. JPEG is lossy, meaning that the output image is not
+exactly identical to the input image. Hence you must not use JPEG if you
+have to have identical output bits. However, on typical photographic images,
very good compression levels can be obtained with no visible change, and
remarkably high compression levels are possible if you can tolerate a
-low-quality image. For more details, see the references, or just experiment
-with various compression settings.
+ low - quality image. For more details, see the references, or just experiment
+ with various compression settings.
-This software implements JPEG baseline, extended-sequential, and progressive
-compression processes. Provision is made for supporting all variants of these
-processes, although some uncommon parameter settings aren't implemented yet.
-For legal reasons, we are not distributing code for the arithmetic-coding
-variants of JPEG; see LEGAL ISSUES. We have made no provision for supporting
-the hierarchical or lossless processes defined in the standard.
+ This software implements JPEG baseline, extended - sequential, and progressive
+ compression processes. Provision is made for supporting all variants of these
+ processes, although some uncommon parameter settings aren't implemented yet.
+ For legal reasons, we are not distributing code for the arithmetic-coding
+ variants of JPEG; see LEGAL ISSUES. We have made no provision for supporting
+ the hierarchical or lossless processes defined in the standard.
-We provide a set of library routines for reading and writing JPEG image files,
-plus two sample applications "cjpeg" and "djpeg", which use the library to
-perform conversion between JPEG and some other popular image file formats.
-The library is intended to be reused in other applications.
+ We provide a set of library routines for reading and writing JPEG image files,
+ plus two sample applications "cjpeg" and "djpeg", which use the library to
+ perform conversion between JPEG and some other popular image file formats.
+ The library is intended to be reused in other applications.
-In order to support file conversion and viewing software, we have included
-considerable functionality beyond the bare JPEG coding/decoding capability;
-for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
-colormapped displays. These extra functions can be compiled out of the
-library if not required for a particular application. We have also included
-"jpegtran", a utility for lossless transcoding between different JPEG
-processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
-inserting and extracting textual comments in JFIF files.
+ In order to support file conversion and viewing software, we have included
+ considerable functionality beyond the bare JPEG coding/decoding capability;
+ for example, the color quantization modules are not strictly part of JPEG
+ decoding, but they are essential for output to colormapped file formats or
+ colormapped displays. These extra functions can be compiled out of the
+ library if not required for a particular application. We have also included
+ "jpegtran", a utility for lossless transcoding between different JPEG
+ processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
+ inserting and extracting textual comments in JFIF files.
-The emphasis in designing this software has been on achieving portability and
-flexibility, while also making it fast enough to be useful. In particular,
-the software is not intended to be read as a tutorial on JPEG. (See the
-REFERENCES section for introductory material.) Rather, it is intended to
-be reliable, portable, industrial-strength code. We do not claim to have
-achieved that goal in every aspect of the software, but we strive for it.
+ The emphasis in designing this software has been on achieving portability and
+ flexibility, while also making it fast enough to be useful. In particular,
+ the software is not intended to be read as a tutorial on JPEG. (See the
+ REFERENCES section for introductory material.) Rather, it is intended to
+ be reliable, portable, industrial-strength code. We do not claim to have
+ achieved that goal in every aspect of the software, but we strive for it.
-We welcome the use of this software as a component of commercial products.
-No royalty is required, but we do ask for an acknowledgement in product
-documentation, as described under LEGAL ISSUES.
+ We welcome the use of this software as a component of commercial products.
+ No royalty is required, but we do ask for an acknowledgement in product
+ documentation, as described under LEGAL ISSUES.
-LEGAL ISSUES
-============
+ LEGAL ISSUES
+ ============
-In plain English:
+ In plain English:
-1. We don't promise that this software works. (But if you find any bugs,
- please let us know!)
-2. You can use this software for whatever you want. You don't have to pay us.
-3. You may not pretend that you wrote this software. If you use it in a
- program, you must acknowledge somewhere in your documentation that
- you've used the IJG code.
+ 1. We don't promise that this software works. ( But if you find any bugs,
+ please let us know! )
+ 2. You can use this software for whatever you want. You don't have to pay us.
+ 3. You may not pretend that you wrote this software. If you use it in a
+ program, you must acknowledge somewhere in your documentation that
+ you've used the IJG code.
In legalese:
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-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.
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ 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-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
+ This software is copyright ( C )
+ 1991 - 1998, Thomas G. Lane.
+ All Rights Reserved except as specified below.
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software ( or portions thereof ) for any purpose, without fee, subject to these
conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
+ ( 1 )
+ If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no - warranty notice
+ unaltered;
+and any additions, deletions, or changes to the original files
must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
+( 2 )
+If only executable code is distributed, then the accompanying
documentation must state that "this software is based in part on the work of
the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
+( 3 ) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences;
+the authors accept
NO LIABILITY for damages of any kind.
These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library. If you use our work, you ought to
+not just to the unmodified library. If you use our work, you ought to
acknowledge us.
Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it. This software may be referred to only as "the Independent JPEG Group's
-software".
+ in advertising or publicity relating to this software or products derived from
+ it. This software may be referred to only as "the Independent JPEG Group's
+ software".
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-by the usual distribution terms of the Free Software Foundation; principally,
-that you must include source code if you redistribute it. (See the file
-ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part
-of any program generated from the IJG code, this does not limit you more than
-the foregoing paragraphs do.
+ ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+ sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+ by the usual distribution terms of the Free Software Foundation; principally,
+ that you must include source code if you redistribute it. (See the file
+ ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part
+ of any program generated from the IJG code, this does not limit you more than
+ the foregoing paragraphs do.
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh). Another support script, install-sh, is copyright
-by M.I.T. but is also freely distributable.
+ The Unix configuration script "configure" was produced with GNU Autoconf.
+ It is copyright by the Free Software Foundation but is freely distributable.
+ The same holds for its supporting scripts (config.guess, config.sub,
+ ltconfig, ltmain.sh). Another support script, install-sh, is copyright
+ by M.I.T. but is also freely distributable.
-It appears that the arithmetic coding option of the JPEG spec is covered by
-patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot
-legally be used without obtaining one or more licenses. For this reason,
-support for arithmetic coding has been removed from the free JPEG software.
-(Since arithmetic coding provides only a marginal gain over the unpatented
-Huffman mode, it is unlikely that very many implementations will support it.)
-So far as we are aware, there are no patent restrictions on the remaining
-code.
+ It appears that the arithmetic coding option of the JPEG spec is covered by
+ patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot
+ legally be used without obtaining one or more licenses. For this reason,
+ support for arithmetic coding has been removed from the free JPEG software.
+ (Since arithmetic coding provides only a marginal gain over the unpatented
+ Huffman mode, it is unlikely that very many implementations will support it.)
+ So far as we are aware, there are no patent restrictions on the remaining
+ code.
-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.
+ 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.
-We are required to state that
- "The Graphics Interchange Format(c) is the Copyright property of
- CompuServe Incorporated. GIF(sm) is a Service Mark property of
- CompuServe Incorporated."
+ We are required to state that
+ "The Graphics Interchange Format( c )
+ is the Copyright property of
+ CompuServe Incorporated. GIF( sm ) is a Service Mark property of
+ CompuServe Incorporated."
-REFERENCES
-==========
+ REFERENCES
+ ==========
-We highly recommend reading one or more of these references before trying to
-understand the innards of the JPEG software.
+ We highly recommend reading one or more of these references before trying to
+ understand the innards of the JPEG software.
-The best short technical introduction to the JPEG compression algorithm is
- Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
- Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
-(Adjacent articles in that issue discuss MPEG motion picture compression,
-applications of JPEG, and related topics.) If you don't have the CACM issue
-handy, a PostScript file containing a revised version of Wallace's article is
-available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz. The file (actually
-a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
-omits the sample images that appeared in CACM, but it includes corrections
-and some added material. Note: the Wallace article is copyright ACM and IEEE,
-and it may not be used for commercial purposes.
+ The best short technical introduction to the JPEG compression algorithm is
+ Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
+ Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+ (Adjacent articles in that issue discuss MPEG motion picture compression,
+ applications of JPEG, and related topics.) If you don't have the CACM issue
+ handy, a PostScript file containing a revised version of Wallace's article is
+ available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz. The file (actually
+ a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+ omits the sample images that appeared in CACM, but it includes corrections
+ and some added material. Note: the Wallace article is copyright ACM and IEEE,
+ and it may not be used for commercial purposes.
-A somewhat less technical, more leisurely introduction to JPEG can be found in
-"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
-M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1. This book provides
-good explanations and example C code for a multitude of compression methods
-including JPEG. It is an excellent source if you are comfortable reading C
-code but don't know much about data compression in general. The book's JPEG
-sample code is far from industrial-strength, but when you are ready to look
-at a full implementation, you've got one here...
+ A somewhat less technical, more leisurely introduction to JPEG can be found in
+ "The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+ M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1. This book provides
+ good explanations and example C code for a multitude of compression methods
+ including JPEG. It is an excellent source if you are comfortable reading C
+ code but don't know much about data compression in general. The book's JPEG
+ sample code is far from industrial-strength, but when you are ready to look
+ at a full implementation, you've got one here...
-The best full description of JPEG is the textbook "JPEG Still Image Data
-Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
-by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1. Price US$59.95, 638 pp.
-The book includes the complete text of the ISO JPEG standards (DIS 10918-1
-and draft DIS 10918-2). This is by far the most complete exposition of JPEG
-in existence, and we highly recommend it.
+ The best full description of JPEG is the textbook "JPEG Still Image Data
+ Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
+ by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1. Price US$59.95, 638 pp.
+ The book includes the complete text of the ISO JPEG standards (DIS 10918-1
+ and draft DIS 10918-2). This is by far the most complete exposition of JPEG
+ in existence, and we highly recommend it.
-The JPEG standard itself is not available electronically; you must order a
-paper copy through ISO or ITU. (Unless you feel a need to own a certified
-official copy, we recommend buying the Pennebaker and Mitchell book instead;
-it's much cheaper and includes a great deal of useful explanatory material.)
-In the USA, copies of the standard may be ordered from ANSI Sales at (212)
-642-4900, or from Global Engineering Documents at (800) 854-7179. (ANSI
-doesn't take credit card orders, but Global does.) It's not cheap: as of
-1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
-shipping/handling. The standard is divided into two parts, Part 1 being the
-actual specification, while Part 2 covers compliance testing methods. Part 1
-is titled "Digital Compression and Coding of Continuous-tone Still Images,
-Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
-10918-1, ITU-T T.81. Part 2 is titled "Digital Compression and Coding of
-Continuous-tone Still Images, Part 2: Compliance testing" and has document
-numbers ISO/IEC IS 10918-2, ITU-T T.83.
+ The JPEG standard itself is not available electronically; you must order a
+ paper copy through ISO or ITU. (Unless you feel a need to own a certified
+ official copy, we recommend buying the Pennebaker and Mitchell book instead;
+ it's much cheaper and includes a great deal of useful explanatory material.)
+ In the USA, copies of the standard may be ordered from ANSI Sales at (212)
+ 642-4900, or from Global Engineering Documents at (800) 854-7179. (ANSI
+ doesn't take credit card orders, but Global does.) It's not cheap: as of
+ 1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
+ shipping/handling. The standard is divided into two parts, Part 1 being the
+ actual specification, while Part 2 covers compliance testing methods. Part 1
+ is titled "Digital Compression and Coding of Continuous - tone Still Images,
+Part 1:
+ Requirements and guidelines" and has document numbers ISO/IEC IS
+ 10918-1, ITU-T T.81. Part 2 is titled "Digital Compression and Coding of
+Continuous - tone Still Images, Part 2:
+ Compliance testing" and has document
+ numbers ISO/IEC IS 10918-2, ITU-T T.83.
-Some extensions to the original JPEG standard are defined in JPEG Part 3,
-a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84. IJG
-currently does not support any Part 3 extensions.
+ Some extensions to the original JPEG standard are defined in JPEG Part 3,
+ a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84. IJG
+ currently does not support any Part 3 extensions.
-The JPEG standard does not specify all details of an interchangeable file
-format. For the omitted details we follow the "JFIF" conventions, revision
-1.02. A copy of the JFIF spec is available from:
- Literature Department
- C-Cube Microsystems, Inc.
- 1778 McCarthy Blvd.
- Milpitas, CA 95035
- phone (408) 944-6300, fax (408) 944-6314
-A PostScript version of this document is available by FTP at
-ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz. There is also a plain text
-version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
-the figures.
+ The JPEG standard does not specify all details of an interchangeable file
+ format. For the omitted details we follow the "JFIF" conventions, revision
+ 1.02. A copy of the JFIF spec is available from:
+ Literature Department
+ C-Cube Microsystems, Inc.
+ 1778 McCarthy Blvd.
+ Milpitas, CA 95035
+ phone (408) 944-6300, fax (408) 944-6314
+ A PostScript version of this document is available by FTP at
+ ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz. There is also a plain text
+ version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
+ the figures.
-The TIFF 6.0 file format specification can be obtained by FTP from
-ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz. The JPEG incorporation scheme
-found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
-IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
-Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7). Copies of this Note can be obtained from ftp.sgi.com or
-from ftp://ftp.uu.net/graphics/jpeg/. It is expected that the next revision
-of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
-Although IJG's own code does not support TIFF/JPEG, the free libtiff library
-uses our library to implement TIFF/JPEG per the Note. libtiff is available
-from ftp://ftp.sgi.com/graphics/tiff/.
+ The TIFF 6.0 file format specification can be obtained by FTP from
+ ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz. The JPEG incorporation scheme
+ found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
+ IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
+ Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
+ (Compression tag 7). Copies of this Note can be obtained from ftp.sgi.com or
+ from ftp://ftp.uu.net/graphics/jpeg/. It is expected that the next revision
+ of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+ Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+ uses our library to implement TIFF/JPEG per the Note. libtiff is available
+ from ftp://ftp.sgi.com/graphics/tiff/.
-ARCHIVE LOCATIONS
-=================
+ ARCHIVE LOCATIONS
+ =================
-The "official" archive site for this software is ftp.uu.net (Internet
-address 192.48.96.9). The most recent released version can always be found
-there in directory graphics/jpeg. This particular version will be archived
-as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz. If you don't have
-direct Internet access, UUNET's archives are also available via UUCP; contact
-he...@uu... for information on retrieving files that way.
+ The "official" archive site for this software is ftp.uu.net (Internet
+ address 192.48.96.9). The most recent released version can always be found
+ there in directory graphics/jpeg. This particular version will be archived
+ as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz. If you don't have
+ direct Internet access, UUNET's archives are also available via UUCP; contact
+ he...@uu... for information on retrieving files that way.
-Numerous Internet sites maintain copies of the UUNET files. However, only
-ftp.uu.net is guaranteed to have the latest official version.
+ Numerous Internet sites maintain copies of the UUNET files. However, only
+ ftp.uu.net is guaranteed to have the latest official version.
-You can also obtain this software in DOS-compatible "zip" archive format from
-the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
-on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
-"JPEG Tools". Again, these versions may sometimes lag behind the ftp.uu.net
-release.
+ You can also obtain this software in DOS-compatible "zip" archive format from
+ the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
+ on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
+ "JPEG Tools". Again, these versions may sometimes lag behind the ftp.uu.net
+ release.
-The JPEG FAQ (Frequently Asked Questions) article is a useful source of
-general information about JPEG. It is updated constantly and therefore is
-not included in this distribution. The FAQ is posted every two weeks to
-Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
-and other news.answers archive sites, including the official news.answers
-archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
-If you don't have Web or FTP access, send e-mail to mai...@rt...
-with body
- send usenet/news.answers/jpeg-faq/part1
- send usenet/news.answers/jpeg-faq/part2
+ The JPEG FAQ (Frequently Asked Questions) article is a useful source of
+ general information about JPEG. It is updated constantly and therefore is
+ not included in this distribution. The FAQ is posted every two weeks to
+ Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
+ It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
+ and other news.answers archive sites, including the official news.answers
+ archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
+ If you don't have Web or FTP access, send e-mail to mai...@rt...
+ with body
+ send usenet/news.answers/jpeg-faq/part1
+ send usenet/news.answers/jpeg-faq/part2
-RELATED SOFTWARE
-================
+ RELATED SOFTWARE
+ ================
-Numerous viewing and image manipulation programs now support JPEG. (Quite a
-few of them use this library to do so.) The JPEG FAQ described above lists
-some of the more popular free and shareware viewers, and tells where to
-obtain them on Internet.
+ Numerous viewing and image manipulation programs now support JPEG. (Quite a
+ few of them use this library to do so.) The JPEG FAQ described above lists
+ some of the more popular free and shareware viewers, and tells where to
+ obtain them on Internet.
-If you are on a Unix machine, we highly recommend Jef Poskanzer's free
-PBMPLUS software, which provides many useful operations on PPM-format image
-files. In particular, it can convert PPM images to and from a wide range of
-other formats, thus making cjpeg/djpeg considerably more useful. The latest
-version is distributed by the NetPBM group, and is available from numerous
-sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
-Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
-you are likely to have difficulty making it work on any non-Unix machine.
+ If you are on a Unix machine, we highly recommend Jef Poskanzer's free
+ PBMPLUS software, which provides many useful operations on PPM-format image
+ files. In particular, it can convert PPM images to and from a wide range of
+ other formats, thus making cjpeg/djpeg considerably more useful. The latest
+ version is distributed by the NetPBM group, and is available from numerous
+ sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
+ Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
+ you are likely to have difficulty making it work on any non-Unix machine.
-A different free JPEG implementation, written by the PVRG group at Stanford,
-is available from ftp://havefun.stanford.edu/pub/jpeg/. This program
-is designed for research and experimentation rather than production use;
-it is slower, harder to use, and less portable than the IJG code, but it
-is easier to read and modify. Also, the PVRG code supports lossless JPEG,
-which we do not. (On the other hand, it doesn't do progressive JPEG.)
+ A different free JPEG implementation, written by the PVRG group at Stanford,
+ is available from ftp://havefun.stanford.edu/pub/jpeg/. This program
+ is designed for research and experimentation rather than production use;
+ it is slower, harder to use, and less portable than the IJG code, but it
+ is easier to read and modify. Also, the PVRG code supports lossless JPEG,
+ which we do not. (On the other hand, it doesn't do progressive JPEG.)
-FILE FORMAT WARS
-================
+ FILE FORMAT WARS
+ ================
-Some JPEG programs produce files that are not compatible with our library.
-The root of the problem is that the ISO JPEG committee failed to specify a
-concrete file format. Some vendors "filled in the blanks" on their own,
-creating proprietary formats that no one else could read. (For example, none
-of the early commercial JPEG implementations for the Macintosh were able to
-exchange compressed files.)
+ Some JPEG programs produce files that are not compatible with our library.
+ The root of the problem is that the ISO JPEG committee failed to specify a
+ concrete file format. Some vendors "filled in the blanks" on their own,
+ creating proprietary formats that no one else could read. (For example, none
+ of the early commercial JPEG implementations for the Macintosh were able to
+ exchange compressed files.)
-The file format we have adopted is called JFIF (see REFERENCES). This format
-has been agreed to by a number of major commercial JPEG vendors, and it has
-become the de facto standard. JFIF is a minimal or "low end" representation.
-We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
-Technical Note #2) for "high end" applications that need to record a lot of
-additional data about an image. TIFF/JPEG is fairly new and not yet widely
-supported, unfortunately.
+ The file format we have adopted is called JFIF (see REFERENCES). This format
+ has been agreed to by a number of major commercial JPEG vendors, and it has
+ become the de facto standard. JFIF is a minimal or "low end" representation.
+ We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
+ Technical Note #2) for "high end" applications that need to record a lot of
+ additional data about an image. TIFF/JPEG is fairly new and not yet widely
+ supported, unfortunately.
-The upcoming JPEG Part 3 standard defines a file format called SPIFF.
-SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
-be able to read the most common variant of SPIFF. SPIFF has some technical
-advantages over JFIF, but its major claim to fame is simply that it is an
-official standard rather than an informal one. At this point it is unclear
-whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
-standard. IJG intends to support SPIFF once the standard is frozen, but we
-have not decided whether it should become our default output format or not.
-(In any case, our decoder will remain capable of reading JFIF indefinitely.)
+ The upcoming JPEG Part 3 standard defines a file format called SPIFF.
+ SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
+ be able to read the most common variant of SPIFF. SPIFF has some technical
+ advantages over JFIF, but its major claim to fame is simply that it is an
+ official standard rather than an informal one. At this point it is unclear
+ whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
+ standard. IJG intends to support SPIFF once the standard is frozen, but we
+ have not decided whether it should become our default output format or not.
+ (In any case, our decoder will remain capable of reading JFIF indefinitely.)
-Various proprietary file formats incorporating JPEG compression also exist.
-We have little or no sympathy for the existence of these formats. Indeed,
-one of the original reasons for developing this free software was to help
-force convergence on common, open format standards for JPEG files. Don't
-use a proprietary file format!
+ Various proprietary file formats incorporating JPEG compression also exist.
+ We have little or no sympathy for the existence of these formats. Indeed,
+ one of the original reasons for developing this free software was to help
+ force convergence on common, open format standards for JPEG files. Don't
+ use a proprietary file format!
-TO DO
-=====
+ TO DO
+ =====
-The major thrust for v7 will probably be improvement of visual quality.
-The current method for scaling the quantization tables is known not to be
-very good at low Q values. We also intend to investigate block boundary
-smoothing, "poor man's variable quantization", and other means of improving
-quality-vs-file-size performance without sacrificing compatibility.
+ The major thrust for v7 will probably be improvement of visual quality.
+ The current method for scaling the quantization tables is known not to be
+ very good at low Q values. We also intend to investigate block boundary
+ smoothing, "poor man's variable quantization", and other means of improving
+ quality-vs-file-size performance without sacrificing compatibility.
-In future versions, we are considering supporting some of the upcoming JPEG
-Part 3 extensions --- principally, variable quantization and the SPIFF file
-format.
+ In future versions, we are considering supporting some of the upcoming JPEG
+ Part 3 extensions --- principally, variable quantization and the SPIFF file
+ format.
-As always, speeding things up is of great interest.
+ As always, speeding things up is of great interest.
-Please send bug reports, offers of help, etc. to jpe...@uu....
+ Please send bug reports, offers of help, etc. to jpe...@uu....
Modified: tiki/3rdparty/libjpeg/jcapimin.c
===================================================================
--- tiki/3rdparty/libjpeg/jcapimin.c 2007-08-09 21:57:40 UTC (rev 434)
+++ tiki/3rdparty/libjpeg/jcapimin.c 2007-08-09 22:48:59 UTC (rev 435)
@@ -1,20 +1,20 @@
/*
- * jcapimin.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the compression half
- * of the JPEG library. These are the "minimum" API routines that may be
- * needed in either the normal full-compression case or the transcoding-only
- * case.
- *
- * Most of the routines intended to be called directly by an application
- * are in this file or in jcapistd.c. But also see jcparam.c for
- * parameter-setup helper routines, jcomapi.c for routines shared by
- * compression and decompression, and jctrans.c for the transcoding case.
- */
+* jcapimin.c
+*
+* Copyright (C) 1994-1998, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains application interface code for the compression half
+* of the JPEG library. These are the "minimum" API routines that may be
+* needed in either the normal full-compression case or the transcoding-only
+* case.
+*
+* Most of the routines intended to be called directly by an application
+* are in this file or in jcapistd.c. But also see jcparam.c for
+* parameter-setup helper routines, jcomapi.c for routines shared by
+* compression and decompression, and jctrans.c for the transcoding case.
+*/
#define JPEG_INTERNALS
#include "jinclude.h"
@@ -26,57 +26,56 @@
* The error manager must already be set up (in case memory manager fails).
*/
-GLOBAL(void)
-jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
-{
- int i;
+GLOBAL( void )
+jpeg_CreateCompress ( j_compress_ptr cinfo, int version, size_t structsize ) {
+ int i;
- /* Guard against version mismatches between library and caller. */
- cinfo->mem = NULL; /* so jpeg_destroy knows mem mgr not called */
- if (version != JPEG_LIB_VERSION)
- ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
- if (structsize != SIZEOF(struct jpeg_compress_struct))
- ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE,
- (int) SIZEOF(struct jpeg_compress_struct), (int) structsize);
+ /* Guard against version mismatches between library and caller. */
+ cinfo->mem = NULL; /* so jpeg_destroy knows mem mgr not called */
+ if ( version != JPEG_LIB_VERSION )
+ ERREXIT2( cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version );
+ if ( structsize != SIZEOF( struct jpeg_compress_struct ) )
+ ERREXIT2( cinfo, JERR_BAD_STRUCT_SIZE,
+ ( int ) SIZEOF( struct jpeg_compress_struct ), ( int ) structsize );
- /* For debugging purposes, we zero the whole master structure.
- * But the application has already set the err pointer, and may have set
- * client_data, so we have to save and restore those fields.
- * Note: if application hasn't set client_data, tools like Purify may
- * complain here.
- */
- {
- struct jpeg_error_mgr * err = cinfo->err;
- void * client_data = cinfo->client_data; /* ignore Purify complaint here */
- MEMZERO(cinfo, SIZEOF(struct jpeg_compress_struct));
- cinfo->err = err;
- cinfo->client_data = client_data;
- }
- cinfo->is_decompressor = FALSE;
+ /* For debugging purposes, we zero the whole master structure.
+ * But the application has already set the err pointer, and may have set
+ * client_data, so we have to save and restore those fields.
+ * Note: if application hasn't set client_data, tools like Purify may
+ * complain here.
+ */
+ {
+ struct jpeg_error_mgr * err = cinfo->err;
+ void * client_data = cinfo->client_data; /* ignore Purify complaint here */
+ MEMZERO( cinfo, SIZEOF( struct jpeg_compress_struct ) );
+ cinfo->err = err;
+ cinfo->client_data = client_data;
+ }
+ cinfo->is_decompressor = FALSE;
- /* Initialize a memory manager instance for this object */
- jinit_memory_mgr((j_common_ptr) cinfo);
+ /* Initialize a memory manager instance for this object */
+ jinit_memory_mgr( ( j_common_ptr ) cinfo );
- /* Zero out pointers to permanent structures. */
- cinfo->progress = NULL;
- cinfo->dest = NULL;
+ /* Zero out pointers to permanent structures. */
+ cinfo->progress = NULL;
+ cinfo->dest = NULL;
- cinfo->comp_info = NULL;
+ cinfo->comp_info = NULL;
- for (i = 0; i < NUM_QUANT_TBLS; i++)
- cinfo->quant_tbl_ptrs[i] = NULL;
+ for ( i = 0; i < NUM_QUANT_TBLS; i++ )
+ cinfo->quant_tbl_ptrs[ i ] = NULL;
- for (i = 0; i < NUM_HUFF_TBLS; i++) {
- cinfo->dc_huff_tbl_ptrs[i] = NULL;
- cinfo->ac_huff_tbl_ptrs[i] = NULL;
- }
+ for ( i = 0; i < NUM_HUFF_TBLS; i++ ) {
+ cinfo->dc_huff_tbl_ptrs[ i ] = NULL;
+ cinfo->ac_huff_tbl_ptrs[ i ] = NULL;
+ }
- cinfo->script_space = NULL;
+ cinfo->script_space = NULL;
- cinfo->input_gamma = 1.0; /* in case application forgets */
+ cinfo->input_gamma = 1.0; /* in case application forgets */
- /* OK, I'm ready */
- cinfo->global_state = CSTATE_START;
+ /* OK, I'm ready */
+ cinfo->global_state = CSTATE_START;
}
@@ -84,10 +83,9 @@
* Destruction of a JPEG compression object
*/
-GLOBAL(void)
-jpeg_destroy_compress (j_compress_ptr cinfo)
-{
- jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
+GLOBAL( void )
+jpeg_destroy_compress ( j_compress_ptr cinfo ) {
+ jpeg_destroy( ( j_common_ptr ) cinfo ); /* use common routine */
}
@@ -96,10 +94,9 @@
* but don't destroy the object itself.
*/
-GLOBAL(void)
-jpeg_abort_compress (j_compress_ptr cinfo)
-{
- jpeg_abort((j_common_ptr) cinfo); /* use common routine */
+GLOBAL( void )
+jpeg_abort_compress ( j_compress_ptr cinfo ) {
+ jpeg_abort( ( j_common_ptr ) cinfo ); /* use common routine */
}
@@ -115,24 +112,23 @@
* jcparam.o would be linked whether the application used it or not.
*/
-GLOBAL(void)
-jpeg_suppress_tables (j_compress_ptr cinfo, boolean suppress)
-{
- int i;
- JQUANT_TBL * qtbl;
- JHUFF_TBL * htbl;
+GLOBAL( void )
+jpeg_suppress_tables ( j_compress_ptr cinfo, boolean suppress ) {
+ int i;
+ JQUANT_TBL * qtbl;
+ JHUFF_TBL * htbl;
- for (i = 0; i < NUM_QUANT_TBLS; i++) {
- if ((qtbl = cinfo->quant_tbl_ptrs[i]) != NULL)
- qtbl->sent_table = suppress;
- }
+ for ( i = 0; i < NUM_QUANT_TBLS; i++ ) {
+ if ( ( qtbl = cinfo->quant_tbl_ptrs[ i ] ) != NULL )
+ qtbl->sent_table = suppress;
+ }
- for (i = 0; i < NUM_HUFF_TBLS; i++) {
- if ((htbl = cinfo->dc_huff_tbl_ptrs[i]) != NULL)
- htbl->sent_table = suppress;
- if ((htbl = cinfo->ac_huff_tbl_ptrs[i]) != NULL)
- htbl->sent_table = suppress;
- }
+ for ( i = 0; i < NUM_HUFF_TBLS; i++ ) {
+ if ( ( htbl = cinfo->dc_huff_tbl_ptrs[ i ] ) != NULL )
+ htbl->sent_table = suppress;
+ if ( ( htbl = cinfo->ac_huff_tbl_ptrs[ i ] ) != NULL )
+ htbl->sent_table = suppress;
+ }
}
@@ -143,41 +139,40 @@
* work including most of the actual output.
*/
-GLOBAL(void)
-jpeg_finish_compress (j_compress_ptr cinfo)
-{
- JDIMENSION iMCU_row;
+GLOBAL( void )
+jpeg_finish_compress ( j_compress_ptr cinfo ) {
+ JDIMENSION iMCU_row;
- if (cinfo->global_state == CSTATE_SCANNING ||
- cinfo->global_state == CSTATE_RAW_OK) {
- /* Terminate first pass */
- if (cinfo->next_scanline < cinfo->image_height)
- ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
- (*cinfo->master->finish_pass) (cinfo);
- } else if (cinfo->global_state != CSTATE_WRCOEFS)
- ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
- /* Perform any remaining passes */
- while (! cinfo->master->is_last_pass) {
- (*cinfo->master->prepare_for_pass) (cinfo);
- for (iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++) {
- if (cinfo->progress != NULL) {
- cinfo->progress->pass_counter = (long) iMCU_row;
- cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows;
- (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
- }
- /* We bypass the main controller and invoke coef controller directly;
- * all work is being done from the coefficient buffer.
- */
- if (! (*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE) NULL))
- ERREXIT(cinfo, JERR_CANT_SUSPEND);
- }
- (*cinfo->master->finish_pass) (cinfo);
- }
- /* Write EOI, do final cleanup */
- (*cinfo->marker->write_file_trailer) (cinfo);
- (*cinfo->dest->term_destination) (cinfo);
- /* We can use jpeg_abort to release memory and reset global_state */
- jpeg_abort((j_common_ptr) cinfo);
+ if ( cinfo->global_state == CSTATE_SCANNING ||
+ cinfo->global_state == CSTATE_RAW_OK ) {
+ /* Terminate first pass */
+ if ( cinfo->next_scanline < cinfo->image_height )
+ ERREXIT( cinfo, JERR_TOO_LITTLE_DATA );
+ ( *cinfo->master->finish_pass ) ( cinfo );
+ } else if ( cinfo->global_state != CSTATE_WRCOEFS )
+ ERREXIT1( cinfo, JERR_BAD_STATE, cinfo->global_state );
+ /* Perform any remaining passes */
+ while ( ! cinfo->master->is_last_pass ) {
+ ( *cinfo->master->prepare_for_pass ) ( cinfo );
+ for ( iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++ ) {
+ if ( cinfo->progress != NULL ) {
+ cinfo->progress->pass_counter = ( long ) iMCU_row;
+ cinfo->progress->pass_limit = ( long ) cinfo->total_iMCU_rows;
+ ( *cinfo->progress->progress_monitor ) ( ( j_common_ptr ) cinfo );
+ }
+ /* We bypass the main controller and invoke coef controller directly;
+ * all work is being done from the coefficient buffer.
+ */
+ if ( ! ( *cinfo->coef->compress_data ) ( cinfo, ( JSAMPIMAGE ) NULL ) )
+ ERREXIT( cinfo, JERR_CANT_SUSPEND );
+ }
+ ( *cinfo->master->finish_pass ) ( cinfo );
+ }
+ /* Write EOI, do final cleanup */
+ ( *cinfo->marker->write_file_trailer ) ( cinfo );
+ ( *cinfo->dest->term_destination ) ( cinfo );
+ /* We can use jpeg_abort to release memory and reset global_state */
+ jpeg_abort( ( j_common_ptr ) cinfo );
}
@@ -188,44 +183,41 @@
* first call to jpeg_write_scanlines() or jpeg_write_raw_data().
*/
-GLOBAL(void)
-jpeg_write_marker (j_compress_ptr cinfo, int marker,
- const JOCTET *dataptr, unsigned int datalen)
-{
- JMETHOD(void, write_marker_byte, (j_compress_ptr info, int val));
+GLOBAL( void )
+jpeg_write_marker ( j_compress_ptr cinfo, int marker,
+ const JOCTET *dataptr, unsigned int datalen ) {
+ JMETHOD( void, write_marker_byte, ( j_compress_ptr info, int val ) );
- if (cinfo->next_scanline != 0 ||
- (cinfo->global_state != CSTATE_SCANNING &&
- cinfo->global_state != CSTATE_RAW_OK &&
- cinfo->global_state != CSTATE_WRCOEFS))
- ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+ if ( cinfo->next_scanline != 0 ||
+ ( cinfo->global_state != CSTATE_SCANNING &&
+ cinfo->global_state != CSTATE_RAW_OK &&
+ cinfo->global_state != CSTATE_WRCOEFS ) )
+ ERREXIT1( cinfo, JERR_BAD_STATE, cinfo->global_state );
- (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
- write_marker_byte = cinfo->marker->write_marker_byte; /* copy for speed */
- while (datalen--) {
- (*write_marker_byte) (cinfo, *dataptr);
- dataptr++;
- }
+ ( *cinfo->marker->write_marker_header ) ( cinfo, marker, datalen );
+ write_marker_byte = cinfo->marker->write_marker_byte; /* copy for speed */
+ while ( datalen-- ) {
+ ( *write_marker_byte ) ( cinfo, *dataptr );
+ dataptr++;
+ }
}
/* Same, but piecemeal. */
-GLOBAL(void)
-jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
-{
- if (cinfo->next_scanline != 0 ||
- (cinfo->global_state != CSTATE_SCANNING &&
- cinfo->global_state != CSTATE_RAW_OK &&
- cinfo->global_state != CSTATE_WRCOEFS))
- ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+GLOBAL( void )
+jpeg_write_m_header ( j_compress_ptr cinfo, int marker, unsigned int datalen ) {
+ if ( cinfo->next_scanline != 0 ||
+ ( cinfo->global_state != CSTATE_SCANNING &&
+ cinfo->global_state != CSTATE_RAW_OK &&
+ cinfo->global_state != CSTATE_WRCOEFS ) )
+ ERREXIT1( cinfo, JERR_BAD_STATE, cinfo->global_state );
- (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
+ ( *cinfo->marker->write_marker_header ) ( cinfo, marker, datalen );
}
-GLOBAL(void)
-jpeg_write_m_byte (j_co...
[truncated message content] |
