1 files changed, 39 insertions, 29 deletions

diff --git a/plugins/AdvaImg/src/LibJPEG/install.txt b/plugins/AdvaImg/src/LibJPEG/install.txt
index d73a05761f..8e6b721ba5 100644
--- a/plugins/AdvaImg/src/LibJPEG/install.txt
+++ b/plugins/AdvaImg/src/LibJPEG/install.txt
@@ -1,6 +1,6 @@
 INSTALLATION INSTRUCTIONS for the Independent JPEG Group's JPEG software

 

-Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.

+Copyright (C) 1991-2013, Thomas G. Lane, Guido Vollbeding.

 This file is part of the Independent JPEG Group's software.

 For conditions of distribution and use, see the accompanying README file.

 

@@ -418,54 +418,58 @@ support as follows:
 	    the directory containing the URT "librle.a" file (typically the

 	    "lib" subdirectory of the URT distribution).

 

-Support for 12-bit-deep pixel data:

+Support for 9-bit to 12-bit deep pixel data:

 

-The JPEG standard allows either 8-bit or 12-bit data precision.  (For color,

-this means 8 or 12 bits per channel, of course.)  If you need to work with

-deeper than 8-bit data, you can compile the IJG code for 12-bit operation.

+The IJG code currently allows 8, 9, 10, 11, or 12 bits sample data precision.

+(For color, this means 8 to 12 bits per channel, of course.)  If you need to

+work with deeper than 8-bit data, you can compile the IJG code for 9-bit to

+12-bit operation.

 To do so:

-  1. In jmorecfg.h, define BITS_IN_JSAMPLE as 12 rather than 8.

+  1. In jmorecfg.h, define BITS_IN_JSAMPLE as 9, 10, 11, or 12 rather than 8.

   2. In jconfig.h, undefine BMP_SUPPORTED, RLE_SUPPORTED, and TARGA_SUPPORTED,

-     because the code for those formats doesn't handle 12-bit data and won't

-     even compile.  (The PPM code does work, as explained below.  The GIF

-     code works too; it scales 8-bit GIF data to and from 12-bit depth

-     automatically.)

+     because the code for those formats doesn't handle deeper than 8-bit data

+     and won't even compile.  (The PPM code does work, as explained below.

+     The GIF code works too; it scales 8-bit GIF data to and from 12-bit

+     depth automatically.)

   3. Compile.  Don't expect "make test" to pass, since the supplied test

      files are for 8-bit data.

 

-Currently, 12-bit support does not work on 16-bit-int machines.

+Currently, 9-bit to 12-bit support does not work on 16-bit-int machines.

 

-Note that a 12-bit version will not read 8-bit JPEG files, nor vice versa;

-so you'll want to keep around a regular 8-bit compilation as well.

-(Run-time selection of data depth, to allow a single copy that does both,

-is possible but would probably slow things down considerably; it's very low

-on our to-do list.)

+Run-time selection and conversion of data precision are currently not

+supported and may be added later.

+Exception:  The transcoding part (jpegtran) supports all settings in a

+single instance, since it operates on the level of DCT coefficients and

+not sample values.

 

-The PPM reader (rdppm.c) can read 12-bit data from either text-format or

-binary-format PPM and PGM files.  Binary-format PPM/PGM files which have a

-maxval greater than 255 are assumed to use 2 bytes per sample, MSB first

-(big-endian order).  As of early 1995, 2-byte binary format is not

+The PPM reader (rdppm.c) can read deeper than 8-bit data from either

+text-format or binary-format PPM and PGM files.  Binary-format PPM/PGM files

+which have a maxval greater than 255 are assumed to use 2 bytes per sample,

+MSB first (big-endian order).  As of early 1995, 2-byte binary format is not

 officially supported by the PBMPLUS library, but it is expected that a

 future release of PBMPLUS will support it.  Note that the PPM reader will

 read files of any maxval regardless of the BITS_IN_JSAMPLE setting; incoming

-data is automatically rescaled to either maxval=255 or maxval=4095 as

-appropriate for the cjpeg bit depth.

+data is automatically rescaled to maxval=MAXJSAMPLE as appropriate for the

+cjpeg bit depth.

 

 The PPM writer (wrppm.c) will normally write 2-byte binary PPM or PGM

-format, maxval 4095, when compiled with BITS_IN_JSAMPLE=12.  Since this

+format, maxval=MAXJSAMPLE, when compiled with BITS_IN_JSAMPLE>8.  Since this

 format is not yet widely supported, you can disable it by compiling wrppm.c

 with PPM_NORAWWORD defined; then the data is scaled down to 8 bits to make a

 standard 1-byte/sample PPM or PGM file.  (Yes, this means still another copy

 of djpeg to keep around.  But hopefully you won't need it for very long.

 Poskanzer's supposed to get that new PBMPLUS release out Real Soon Now.)

 

-Of course, if you are working with 12-bit data, you probably have it stored

-in some other, nonstandard format.  In that case you'll probably want to

-write your own I/O modules to read and write your format.

+Of course, if you are working with 9-bit to 12-bit data, you probably have

+it stored in some other, nonstandard format.  In that case you'll probably

+want to write your own I/O modules to read and write your format.

 

-Note that a 12-bit version of cjpeg always runs in "-optimize" mode, in

-order to generate valid Huffman tables.  This is necessary because our

-default Huffman tables only cover 8-bit data.

+Note:

+The standard Huffman tables are only valid for 8-bit data precision.  If

+you selected more than 8-bit data precision, cjpeg uses arithmetic coding

+by default.  The Huffman encoder normally uses entropy optimization to

+compute usable tables for higher precision.  Otherwise, you'll have to

+supply different default Huffman tables.

 

 Removing code:

 

@@ -859,6 +863,12 @@ add something like this to your jconfig.h file:
 	#ifndef __RPCNDR_H__	/* don't conflict if rpcndr.h already read */

 	typedef unsigned char boolean;

 	#endif

+	#ifndef FALSE		/* in case these macros already exist */

+	#define FALSE	0	/* values of boolean */

+	#endif

+	#ifndef TRUE

+	#define TRUE	1

+	#endif

 	#define HAVE_BOOLEAN	/* prevent jmorecfg.h from redefining it */

 (This is already in jconfig.vc, by the way.)