204 files changed, 15 insertions, 149626 deletions

diff --git a/plugins/AdvaImg/src/CacheFile.h b/plugins/AdvaImg/src/CacheFile.h
deleted file mode 100644
index a1e5e782c9..0000000000
--- a/plugins/AdvaImg/src/CacheFile.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// ==========================================================
-// Multi-Page functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef CACHEFILE_H
-#define CACHEFILE_H
-
-// ----------------------------------------------------------
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-
-static const int CACHE_SIZE = 32;
-static const int BLOCK_SIZE = (64 * 1024) - 8;
-
-// ----------------------------------------------------------
-
-#ifdef _WIN32
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif // _WIN32
-
-struct Block {
-     unsigned nr;
-     unsigned next;
-     BYTE *data;
-};
-
-#ifdef _WIN32
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif // _WIN32
-
-// ----------------------------------------------------------
-
-class CacheFile {
-	typedef std::list<Block *> PageCache;
-	typedef std::list<Block *>::iterator PageCacheIt;
-	typedef std::map<int, PageCacheIt> PageMap;
-	typedef std::map<int, PageCacheIt>::iterator PageMapIt;
-
-public :
-	CacheFile(const std::string filename, BOOL keep_in_memory);
-	~CacheFile();
-
-	BOOL open();
-	void close();
-	BOOL readFile(BYTE *data, int nr, int size);
-	int writeFile(BYTE *data, int size);
-	void deleteFile(int nr);
-
-private :
-	void cleanupMemCache();
-	int allocateBlock();
-	Block *lockBlock(int nr);
-	BOOL unlockBlock(int nr);
-	BOOL deleteBlock(int nr);
-
-private :
-	FILE *m_file;
-	std::string m_filename;
-	std::list<int> m_free_pages;
-	PageCache m_page_cache_mem;
-	PageCache m_page_cache_disk;
-	PageMap m_page_map;
-	int m_page_count;
-	Block *m_current_block;
-	BOOL m_keep_in_memory;
-};
-
-#endif // CACHEFILE_H
diff --git a/plugins/AdvaImg/src/FreeImage.h b/plugins/AdvaImg/src/FreeImage.h
deleted file mode 100644
index 78060629a2..0000000000
--- a/plugins/AdvaImg/src/FreeImage.h
+++ /dev/null
@@ -1,1154 +0,0 @@
-// ==========================================================
-// FreeImage 3
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// Contributors:
-// - see changes log named 'Whatsnew.txt', see header of each .h and .cpp file
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef FREEIMAGE_H
-#define FREEIMAGE_H
-
-// Version information ------------------------------------------------------
-
-#define FREEIMAGE_MAJOR_VERSION   3
-#define FREEIMAGE_MINOR_VERSION   17
-#define FREEIMAGE_RELEASE_SERIAL  0
-
-// Compiler options ---------------------------------------------------------
-
-#include <wchar.h>	// needed for UNICODE functions
-
-#if defined(FREEIMAGE_LIB)
-	#define DLL_API
-	#define DLL_CALLCONV
-#else
-	#if defined(_WIN32) || defined(__WIN32__)
-		#define DLL_CALLCONV __stdcall
-		// The following ifdef block is the standard way of creating macros which make exporting 
-		// from a DLL simpler. All files within this DLL are compiled with the FREEIMAGE_EXPORTS
-		// symbol defined on the command line. this symbol should not be defined on any project
-		// that uses this DLL. This way any other project whose source files include this file see 
-		// DLL_API functions as being imported from a DLL, wheras this DLL sees symbols
-		// defined with this macro as being exported.
-		#ifdef FREEIMAGE_EXPORTS
-			#define DLL_API __declspec(dllexport)
-		#else
-			#define DLL_API __declspec(dllimport)
-		#endif // FREEIMAGE_EXPORTS
-	#else 
-		// try the gcc visibility support (see http://gcc.gnu.org/wiki/Visibility)
-		#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-			#ifndef GCC_HASCLASSVISIBILITY
-				#define GCC_HASCLASSVISIBILITY
-			#endif
-		#endif // __GNUC__
-		#define DLL_CALLCONV
-		#if defined(GCC_HASCLASSVISIBILITY)
-			#define DLL_API __attribute__ ((visibility("default")))
-		#else
-			#define DLL_API
-		#endif		
-	#endif // WIN32 / !WIN32
-#endif // FREEIMAGE_LIB
-
-// Endianness:
-// Some versions of gcc may have BYTE_ORDER or __BYTE_ORDER defined.
-// If your big endian system isn't being detected, add an OS specific check
-// or define any of FREEIMAGE_BIGENDIAN and FREEIMAGE_LITTLEENDIAN directly
-// to specify the desired endianness.
-#if (!defined(FREEIMAGE_BIGENDIAN) && !defined(FREEIMAGE_LITTLEENDIAN))
-	#if (defined(BYTE_ORDER) && BYTE_ORDER==BIG_ENDIAN) || (defined(__BYTE_ORDER) && __BYTE_ORDER==__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
-		#define FREEIMAGE_BIGENDIAN
-	#endif // BYTE_ORDER
-#endif // !FREEIMAGE_[BIG|LITTLE]ENDIAN
-
-// Color-Order:
-// The specified order of color components red, green and blue affects 24-
-// and 32-bit images of type FIT_BITMAP as well as the colors that are part
-// of a color palette. All other images always use RGB order. By default,
-// color order is coupled to endianness:
-// little-endian -> BGR
-// big-endian    -> RGB
-// However, you can always define FREEIMAGE_COLORORDER to any of the known
-// orders FREEIMAGE_COLORORDER_BGR (0) and FREEIMAGE_COLORORDER_RGB (1) to
-// specify your preferred color order.
-#define FREEIMAGE_COLORORDER_BGR    0
-#define FREEIMAGE_COLORORDER_RGB    1
-#if (!defined(FREEIMAGE_COLORORDER)) || ((FREEIMAGE_COLORORDER != FREEIMAGE_COLORORDER_BGR) && (FREEIMAGE_COLORORDER != FREEIMAGE_COLORORDER_RGB))
-	#if defined(FREEIMAGE_BIGENDIAN)
-		#define FREEIMAGE_COLORORDER FREEIMAGE_COLORORDER_RGB
-	#else
-		#define FREEIMAGE_COLORORDER FREEIMAGE_COLORORDER_BGR
-	#endif // FREEIMAGE_BIGENDIAN
-#endif // FREEIMAGE_COLORORDER
-
-// Ensure 4-byte enums if we're using Borland C++ compilers
-#if defined(__BORLANDC__)
-#pragma option push -b
-#endif
-
-// For C compatibility --------------------------------------------------------
-
-#ifdef __cplusplus
-#define FI_DEFAULT(x)	= x
-#define FI_ENUM(x)      enum x
-#define FI_STRUCT(x)	struct x
-#else
-#define FI_DEFAULT(x)
-#define FI_ENUM(x)      typedef int x; enum x
-#define FI_STRUCT(x)	typedef struct x x; struct x
-#endif
-
-// Bitmap types -------------------------------------------------------------
-
-FI_STRUCT (FIBITMAP) { void *data; };
-FI_STRUCT (FIMULTIBITMAP) { void *data; };
-
-// Types used in the library (directly copied from Windows) -----------------
-
-#if defined(__MINGW32__) && defined(_WINDOWS_H)
-#define _WINDOWS_	// prevent a bug in MinGW32
-#endif // __MINGW32__
-
-#ifndef _WINDOWS_
-#define _WINDOWS_
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET  0
-#define SEEK_CUR  1
-#define SEEK_END  2
-#endif
-
-#ifndef _MSC_VER
-// define portable types for 32-bit / 64-bit OS
-#include <inttypes.h>
-typedef int32_t BOOL;
-typedef uint8_t BYTE;
-typedef uint16_t WORD;
-typedef uint32_t DWORD;
-typedef int32_t LONG;
-typedef int64_t INT64;
-typedef uint64_t UINT64;
-#else
-// MS is not C99 ISO compliant
-typedef long BOOL;
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-typedef long LONG;
-typedef signed __int64 INT64;
-typedef unsigned __int64 UINT64;
-#endif // _MSC_VER
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif // WIN32
-
-typedef struct tagRGBQUAD {
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-  BYTE rgbBlue;
-  BYTE rgbGreen;
-  BYTE rgbRed;
-#else
-  BYTE rgbRed;
-  BYTE rgbGreen;
-  BYTE rgbBlue;
-#endif // FREEIMAGE_COLORORDER
-  BYTE rgbReserved;
-} RGBQUAD;
-
-typedef struct tagRGBTRIPLE {
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-  BYTE rgbtBlue;
-  BYTE rgbtGreen;
-  BYTE rgbtRed;
-#else
-  BYTE rgbtRed;
-  BYTE rgbtGreen;
-  BYTE rgbtBlue;
-#endif // FREEIMAGE_COLORORDER
-} RGBTRIPLE;
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif // WIN32
-
-typedef struct tagBITMAPINFOHEADER{
-  DWORD biSize;
-  LONG  biWidth; 
-  LONG  biHeight; 
-  WORD  biPlanes; 
-  WORD  biBitCount;
-  DWORD biCompression; 
-  DWORD biSizeImage; 
-  LONG  biXPelsPerMeter; 
-  LONG  biYPelsPerMeter; 
-  DWORD biClrUsed; 
-  DWORD biClrImportant;
-} BITMAPINFOHEADER, *PBITMAPINFOHEADER; 
-
-typedef struct tagBITMAPINFO { 
-  BITMAPINFOHEADER bmiHeader; 
-  RGBQUAD          bmiColors[1];
-} BITMAPINFO, *PBITMAPINFO;
-
-#endif // _WINDOWS_
-
-// Types used in the library (specific to FreeImage) ------------------------
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif // WIN32
-
-/** 48-bit RGB 
-*/
-typedef struct tagFIRGB16 {
-	WORD red;
-	WORD green;
-	WORD blue;
-} FIRGB16;
-
-/** 64-bit RGBA
-*/
-typedef struct tagFIRGBA16 {
-	WORD red;
-	WORD green;
-	WORD blue;
-	WORD alpha;
-} FIRGBA16;
-
-/** 96-bit RGB Float
-*/
-typedef struct tagFIRGBF {
-	float red;
-	float green;
-	float blue;
-} FIRGBF;
-
-/** 128-bit RGBA Float
-*/
-typedef struct tagFIRGBAF {
-	float red;
-	float green;
-	float blue;
-	float alpha;
-} FIRGBAF;
-
-/** Data structure for COMPLEX type (complex number)
-*/
-typedef struct tagFICOMPLEX {
-    /// real part
-	double r;
-	/// imaginary part
-    double i;
-} FICOMPLEX;
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif // WIN32
-
-// Indexes for byte arrays, masks and shifts for treating pixels as words ---
-// These coincide with the order of RGBQUAD and RGBTRIPLE -------------------
-
-#ifndef FREEIMAGE_BIGENDIAN
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-// Little Endian (x86 / MS Windows, Linux) : BGR(A) order
-#define FI_RGBA_RED				2
-#define FI_RGBA_GREEN			1
-#define FI_RGBA_BLUE			0
-#define FI_RGBA_ALPHA			3
-#define FI_RGBA_RED_MASK		0x00FF0000
-#define FI_RGBA_GREEN_MASK		0x0000FF00
-#define FI_RGBA_BLUE_MASK		0x000000FF
-#define FI_RGBA_ALPHA_MASK		0xFF000000
-#define FI_RGBA_RED_SHIFT		16
-#define FI_RGBA_GREEN_SHIFT		8
-#define FI_RGBA_BLUE_SHIFT		0
-#define FI_RGBA_ALPHA_SHIFT		24
-#else
-// Little Endian (x86 / MaxOSX) : RGB(A) order
-#define FI_RGBA_RED				0
-#define FI_RGBA_GREEN			1
-#define FI_RGBA_BLUE			2
-#define FI_RGBA_ALPHA			3
-#define FI_RGBA_RED_MASK		0x000000FF
-#define FI_RGBA_GREEN_MASK		0x0000FF00
-#define FI_RGBA_BLUE_MASK		0x00FF0000
-#define FI_RGBA_ALPHA_MASK		0xFF000000
-#define FI_RGBA_RED_SHIFT		0
-#define FI_RGBA_GREEN_SHIFT		8
-#define FI_RGBA_BLUE_SHIFT		16
-#define FI_RGBA_ALPHA_SHIFT		24
-#endif // FREEIMAGE_COLORORDER
-#else
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-// Big Endian (PPC / none) : BGR(A) order
-#define FI_RGBA_RED				2
-#define FI_RGBA_GREEN			1
-#define FI_RGBA_BLUE			0
-#define FI_RGBA_ALPHA			3
-#define FI_RGBA_RED_MASK		0x0000FF00
-#define FI_RGBA_GREEN_MASK		0x00FF0000
-#define FI_RGBA_BLUE_MASK		0xFF000000
-#define FI_RGBA_ALPHA_MASK		0x000000FF
-#define FI_RGBA_RED_SHIFT		8
-#define FI_RGBA_GREEN_SHIFT		16
-#define FI_RGBA_BLUE_SHIFT		24
-#define FI_RGBA_ALPHA_SHIFT		0
-#else
-// Big Endian (PPC / Linux, MaxOSX) : RGB(A) order
-#define FI_RGBA_RED				0
-#define FI_RGBA_GREEN			1
-#define FI_RGBA_BLUE			2
-#define FI_RGBA_ALPHA			3
-#define FI_RGBA_RED_MASK		0xFF000000
-#define FI_RGBA_GREEN_MASK		0x00FF0000
-#define FI_RGBA_BLUE_MASK		0x0000FF00
-#define FI_RGBA_ALPHA_MASK		0x000000FF
-#define FI_RGBA_RED_SHIFT		24
-#define FI_RGBA_GREEN_SHIFT		16
-#define FI_RGBA_BLUE_SHIFT		8
-#define FI_RGBA_ALPHA_SHIFT		0
-#endif // FREEIMAGE_COLORORDER
-#endif // FREEIMAGE_BIGENDIAN
-
-#define FI_RGBA_RGB_MASK		(FI_RGBA_RED_MASK|FI_RGBA_GREEN_MASK|FI_RGBA_BLUE_MASK)
-
-// The 16bit macros only include masks and shifts, since each color element is not byte aligned
-
-#define FI16_555_RED_MASK		0x7C00
-#define FI16_555_GREEN_MASK		0x03E0
-#define FI16_555_BLUE_MASK		0x001F
-#define FI16_555_RED_SHIFT		10
-#define FI16_555_GREEN_SHIFT	5
-#define FI16_555_BLUE_SHIFT		0
-#define FI16_565_RED_MASK		0xF800
-#define FI16_565_GREEN_MASK		0x07E0
-#define FI16_565_BLUE_MASK		0x001F
-#define FI16_565_RED_SHIFT		11
-#define FI16_565_GREEN_SHIFT	5
-#define FI16_565_BLUE_SHIFT		0
-
-// ICC profile support ------------------------------------------------------
-
-#define FIICC_DEFAULT			0x00
-#define FIICC_COLOR_IS_CMYK		0x01
-
-FI_STRUCT (FIICCPROFILE) { 
-	WORD    flags;	//! info flag
-	DWORD	size;	//! profile's size measured in bytes
-	void   *data;	//! points to a block of contiguous memory containing the profile
-};
-
-// Important enums ----------------------------------------------------------
-
-/** I/O image format identifiers.
-*/
-FI_ENUM(FREE_IMAGE_FORMAT) {
-	FIF_UNKNOWN = -1,
-	FIF_BMP		= 0,
-	FIF_ICO		= 1,
-	FIF_JPEG	= 2,
-	FIF_JNG		= 3,
-	FIF_KOALA	= 4,
-	FIF_LBM		= 5,
-	FIF_IFF = FIF_LBM,
-	FIF_MNG		= 6,
-	FIF_PBM		= 7,
-	FIF_PBMRAW	= 8,
-	FIF_PCD		= 9,
-	FIF_PCX		= 10,
-	FIF_PGM		= 11,
-	FIF_PGMRAW	= 12,
-	FIF_PNG		= 13,
-	FIF_PPM		= 14,
-	FIF_PPMRAW	= 15,
-	FIF_RAS		= 16,
-	FIF_TARGA	= 17,
-	FIF_TIFF	= 18,
-	FIF_WBMP	= 19,
-	FIF_PSD		= 20,
-	FIF_CUT		= 21,
-	FIF_XBM		= 22,
-	FIF_XPM		= 23,
-	FIF_DDS		= 24,
-	FIF_GIF     = 25,
-	FIF_HDR		= 26,
-	FIF_FAXG3	= 27,
-	FIF_SGI		= 28,
-	FIF_EXR		= 29,
-	FIF_J2K		= 30,
-	FIF_JP2		= 31,
-	FIF_PFM		= 32,
-	FIF_PICT	= 33,
-	FIF_RAW		= 34,
-	FIF_WEBP	= 35,
-	FIF_JXR		= 36
-};
-
-/** Image type used in FreeImage.
-*/
-FI_ENUM(FREE_IMAGE_TYPE) {
-	FIT_UNKNOWN = 0,	//! unknown type
-	FIT_BITMAP  = 1,	//! standard image			: 1-, 4-, 8-, 16-, 24-, 32-bit
-	FIT_UINT16	= 2,	//! array of unsigned short	: unsigned 16-bit
-	FIT_INT16	= 3,	//! array of short			: signed 16-bit
-	FIT_UINT32	= 4,	//! array of unsigned long	: unsigned 32-bit
-	FIT_INT32	= 5,	//! array of long			: signed 32-bit
-	FIT_FLOAT	= 6,	//! array of float			: 32-bit IEEE floating point
-	FIT_DOUBLE	= 7,	//! array of double			: 64-bit IEEE floating point
-	FIT_COMPLEX	= 8,	//! array of FICOMPLEX		: 2 x 64-bit IEEE floating point
-	FIT_RGB16	= 9,	//! 48-bit RGB image			: 3 x 16-bit
-	FIT_RGBA16	= 10,	//! 64-bit RGBA image		: 4 x 16-bit
-	FIT_RGBF	= 11,	//! 96-bit RGB float image	: 3 x 32-bit IEEE floating point
-	FIT_RGBAF	= 12	//! 128-bit RGBA float image	: 4 x 32-bit IEEE floating point
-};
-
-/** Image color type used in FreeImage.
-*/
-FI_ENUM(FREE_IMAGE_COLOR_TYPE) {
-	FIC_MINISWHITE = 0,		//! min value is white
-    FIC_MINISBLACK = 1,		//! min value is black
-    FIC_RGB        = 2,		//! RGB color model
-    FIC_PALETTE    = 3,		//! color map indexed
-	FIC_RGBALPHA   = 4,		//! RGB color model with alpha channel
-	FIC_CMYK       = 5		//! CMYK color model
-};
-
-/** Color quantization algorithms.
-Constants used in FreeImage_ColorQuantize.
-*/
-FI_ENUM(FREE_IMAGE_QUANTIZE) {
-    FIQ_WUQUANT = 0,		//! Xiaolin Wu color quantization algorithm
-    FIQ_NNQUANT = 1,		//! NeuQuant neural-net quantization algorithm by Anthony Dekker
-	FIQ_LFPQUANT = 2		//! Lossless Fast Pseudo-Quantization Algorithm by Carsten Klein
-};
-
-/** Dithering algorithms.
-Constants used in FreeImage_Dither.
-*/
-FI_ENUM(FREE_IMAGE_DITHER) {
-    FID_FS			= 0,	//! Floyd & Steinberg error diffusion
-	FID_BAYER4x4	= 1,	//! Bayer ordered dispersed dot dithering (order 2 dithering matrix)
-	FID_BAYER8x8	= 2,	//! Bayer ordered dispersed dot dithering (order 3 dithering matrix)
-	FID_CLUSTER6x6	= 3,	//! Ordered clustered dot dithering (order 3 - 6x6 matrix)
-	FID_CLUSTER8x8	= 4,	//! Ordered clustered dot dithering (order 4 - 8x8 matrix)
-	FID_CLUSTER16x16= 5,	//! Ordered clustered dot dithering (order 8 - 16x16 matrix)
-	FID_BAYER16x16	= 6		//! Bayer ordered dispersed dot dithering (order 4 dithering matrix)
-};
-
-/** Lossless JPEG transformations
-Constants used in FreeImage_JPEGTransform
-*/
-FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
-	FIJPEG_OP_NONE			= 0,	//! no transformation
-	FIJPEG_OP_FLIP_H		= 1,	//! horizontal flip
-	FIJPEG_OP_FLIP_V		= 2,	//! vertical flip
-	FIJPEG_OP_TRANSPOSE		= 3,	//! transpose across UL-to-LR axis
-	FIJPEG_OP_TRANSVERSE	= 4,	//! transpose across UR-to-LL axis
-	FIJPEG_OP_ROTATE_90		= 5,	//! 90-degree clockwise rotation
-	FIJPEG_OP_ROTATE_180	= 6,	//! 180-degree rotation
-	FIJPEG_OP_ROTATE_270	= 7		//! 270-degree clockwise (or 90 ccw)
-};
-
-/** Tone mapping operators.
-Constants used in FreeImage_ToneMapping.
-*/
-FI_ENUM(FREE_IMAGE_TMO) {
-    FITMO_DRAGO03	 = 0,	//! Adaptive logarithmic mapping (F. Drago, 2003)
-	FITMO_REINHARD05 = 1,	//! Dynamic range reduction inspired by photoreceptor physiology (E. Reinhard, 2005)
-	FITMO_FATTAL02	 = 2	//! Gradient domain high dynamic range compression (R. Fattal, 2002)
-};
-
-/** Upsampling / downsampling filters. 
-Constants used in FreeImage_Rescale.
-*/
-FI_ENUM(FREE_IMAGE_FILTER) {
-	FILTER_BOX		  = 0,	//! Box, pulse, Fourier window, 1st order (constant) b-spline
-	FILTER_BICUBIC	  = 1,	//! Mitchell & Netravali's two-param cubic filter
-	FILTER_BILINEAR   = 2,	//! Bilinear filter
-	FILTER_BSPLINE	  = 3,	//! 4th order (cubic) b-spline
-	FILTER_CATMULLROM = 4,	//! Catmull-Rom spline, Overhauser spline
-	FILTER_LANCZOS3	  = 5	//! Lanczos3 filter
-};
-
-/** Color channels.
-Constants used in color manipulation routines.
-*/
-FI_ENUM(FREE_IMAGE_COLOR_CHANNEL) {
-	FICC_RGB	= 0,	//! Use red, green and blue channels
-	FICC_RED	= 1,	//! Use red channel
-	FICC_GREEN	= 2,	//! Use green channel
-	FICC_BLUE	= 3,	//! Use blue channel
-	FICC_ALPHA	= 4,	//! Use alpha channel
-	FICC_BLACK	= 5,	//! Use black channel
-	FICC_REAL	= 6,	//! Complex images: use real part
-	FICC_IMAG	= 7,	//! Complex images: use imaginary part
-	FICC_MAG	= 8,	//! Complex images: use magnitude
-	FICC_PHASE	= 9		//! Complex images: use phase
-};
-
-// Metadata support ---------------------------------------------------------
-
-/**
-  Tag data type information (based on TIFF specifications)
-
-  Note: RATIONALs are the ratio of two 32-bit integer values.
-*/
-FI_ENUM(FREE_IMAGE_MDTYPE) {
-	FIDT_NOTYPE		= 0,	//! placeholder 
-	FIDT_BYTE		= 1,	//! 8-bit unsigned integer 
-	FIDT_ASCII		= 2,	//! 8-bit bytes w/ last byte null 
-	FIDT_SHORT		= 3,	//! 16-bit unsigned integer 
-	FIDT_LONG		= 4,	//! 32-bit unsigned integer 
-	FIDT_RATIONAL	= 5,	//! 64-bit unsigned fraction 
-	FIDT_SBYTE		= 6,	//! 8-bit signed integer 
-	FIDT_UNDEFINED	= 7,	//! 8-bit untyped data 
-	FIDT_SSHORT		= 8,	//! 16-bit signed integer 
-	FIDT_SLONG		= 9,	//! 32-bit signed integer 
-	FIDT_SRATIONAL	= 10,	//! 64-bit signed fraction 
-	FIDT_FLOAT		= 11,	//! 32-bit IEEE floating point 
-	FIDT_DOUBLE		= 12,	//! 64-bit IEEE floating point 
-	FIDT_IFD		= 13,	//! 32-bit unsigned integer (offset) 
-	FIDT_PALETTE	= 14,	//! 32-bit RGBQUAD 
-	FIDT_LONG8		= 16,	//! 64-bit unsigned integer 
-	FIDT_SLONG8		= 17,	//! 64-bit signed integer
-	FIDT_IFD8		= 18	//! 64-bit unsigned integer (offset)
-};
-
-/**
-  Metadata models supported by FreeImage
-*/
-FI_ENUM(FREE_IMAGE_MDMODEL) {
-	FIMD_NODATA			= -1,
-	FIMD_COMMENTS		= 0,	//! single comment or keywords
-	FIMD_EXIF_MAIN		= 1,	//! Exif-TIFF metadata
-	FIMD_EXIF_EXIF		= 2,	//! Exif-specific metadata
-	FIMD_EXIF_GPS		= 3,	//! Exif GPS metadata
-	FIMD_EXIF_MAKERNOTE = 4,	//! Exif maker note metadata
-	FIMD_EXIF_INTEROP	= 5,	//! Exif interoperability metadata
-	FIMD_IPTC			= 6,	//! IPTC/NAA metadata
-	FIMD_XMP			= 7,	//! Abobe XMP metadata
-	FIMD_GEOTIFF		= 8,	//! GeoTIFF metadata
-	FIMD_ANIMATION		= 9,	//! Animation metadata
-	FIMD_CUSTOM			= 10,	//! Used to attach other metadata types to a dib
-	FIMD_EXIF_RAW		= 11	//! Exif metadata as a raw buffer
-};
-
-/**
-  Handle to a metadata model
-*/
-FI_STRUCT (FIMETADATA) { void *data; };
-
-/**
-  Handle to a FreeImage tag
-*/
-FI_STRUCT (FITAG) { void *data; };
-
-// File IO routines ---------------------------------------------------------
-
-#ifndef FREEIMAGE_IO
-#define FREEIMAGE_IO
-
-typedef void* fi_handle;
-typedef unsigned (DLL_CALLCONV *FI_ReadProc) (void *buffer, unsigned size, unsigned count, fi_handle handle);
-typedef unsigned (DLL_CALLCONV *FI_WriteProc) (void *buffer, unsigned size, unsigned count, fi_handle handle);
-typedef int (DLL_CALLCONV *FI_SeekProc) (fi_handle handle, long offset, int origin);
-typedef long (DLL_CALLCONV *FI_TellProc) (fi_handle handle);
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif // WIN32
-
-FI_STRUCT(FreeImageIO) {
-	FI_ReadProc  read_proc;     //! pointer to the function used to read data
-    FI_WriteProc write_proc;    //! pointer to the function used to write data
-    FI_SeekProc  seek_proc;     //! pointer to the function used to seek
-    FI_TellProc  tell_proc;     //! pointer to the function used to aquire the current position
-};
-
-#if (defined(_WIN32) || defined(__WIN32__))
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif // WIN32
-
-/**
-Handle to a memory I/O stream
-*/
-FI_STRUCT (FIMEMORY) { void *data; };
-
-#endif // FREEIMAGE_IO
-
-// Plugin routines ----------------------------------------------------------
-
-#ifndef PLUGINS
-#define PLUGINS
-
-typedef const char *(DLL_CALLCONV *FI_FormatProc)(void);
-typedef const char *(DLL_CALLCONV *FI_DescriptionProc)(void);
-typedef const char *(DLL_CALLCONV *FI_ExtensionListProc)(void);
-typedef const char *(DLL_CALLCONV *FI_RegExprProc)(void);
-typedef void *(DLL_CALLCONV *FI_OpenProc)(FreeImageIO *io, fi_handle handle, BOOL read);
-typedef void (DLL_CALLCONV *FI_CloseProc)(FreeImageIO *io, fi_handle handle, void *data);
-typedef int (DLL_CALLCONV *FI_PageCountProc)(FreeImageIO *io, fi_handle handle, void *data);
-typedef int (DLL_CALLCONV *FI_PageCapabilityProc)(FreeImageIO *io, fi_handle handle, void *data);
-typedef FIBITMAP *(DLL_CALLCONV *FI_LoadProc)(FreeImageIO *io, fi_handle handle, int page, int flags, void *data);
-typedef BOOL (DLL_CALLCONV *FI_SaveProc)(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data);
-typedef BOOL (DLL_CALLCONV *FI_ValidateProc)(FreeImageIO *io, fi_handle handle);
-typedef const char *(DLL_CALLCONV *FI_MimeProc)(void);
-typedef BOOL (DLL_CALLCONV *FI_SupportsExportBPPProc)(int bpp);
-typedef BOOL (DLL_CALLCONV *FI_SupportsExportTypeProc)(FREE_IMAGE_TYPE type);
-typedef BOOL (DLL_CALLCONV *FI_SupportsICCProfilesProc)(void);
-typedef BOOL (DLL_CALLCONV *FI_SupportsNoPixelsProc)(void);
-
-FI_STRUCT (Plugin) {
-	FI_FormatProc format_proc;
-	FI_DescriptionProc description_proc;
-	FI_ExtensionListProc extension_proc;
-	FI_RegExprProc regexpr_proc;
-	FI_OpenProc open_proc;
-	FI_CloseProc close_proc;
-	FI_PageCountProc pagecount_proc;
-	FI_PageCapabilityProc pagecapability_proc;
-	FI_LoadProc load_proc;
-	FI_SaveProc save_proc;
-	FI_ValidateProc validate_proc;
-	FI_MimeProc mime_proc;
-	FI_SupportsExportBPPProc supports_export_bpp_proc;
-	FI_SupportsExportTypeProc supports_export_type_proc;
-	FI_SupportsICCProfilesProc supports_icc_profiles_proc;
-	FI_SupportsNoPixelsProc supports_no_pixels_proc;
-};
-
-typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
-
-#endif // PLUGINS
-
-
-// Load / Save flag constants -----------------------------------------------
-
-#define FIF_LOAD_NOPIXELS 0x8000	//! loading: load the image header only (not supported by all plugins, default to full loading)
-
-#define BMP_DEFAULT         0
-#define BMP_SAVE_RLE        1
-#define CUT_DEFAULT         0
-#define DDS_DEFAULT			0
-#define EXR_DEFAULT			0		//! save data as half with piz-based wavelet compression
-#define EXR_FLOAT			0x0001	//! save data as float instead of as half (not recommended)
-#define EXR_NONE			0x0002	//! save with no compression
-#define EXR_ZIP				0x0004	//! save with zlib compression, in blocks of 16 scan lines
-#define EXR_PIZ				0x0008	//! save with piz-based wavelet compression
-#define EXR_PXR24			0x0010	//! save with lossy 24-bit float compression
-#define EXR_B44				0x0020	//! save with lossy 44% float compression - goes to 22% when combined with EXR_LC
-#define EXR_LC				0x0040	//! save images with one luminance and two chroma channels, rather than as RGB (lossy compression)
-#define FAXG3_DEFAULT		0
-#define GIF_DEFAULT			0
-#define GIF_LOAD256			1		//! load the image as a 256 color image with ununsed palette entries, if it's 16 or 2 color
-#define GIF_PLAYBACK		2		//! 'Play' the GIF to generate each frame (as 32bpp) instead of returning raw frame data when loading
-#define HDR_DEFAULT			0
-#define ICO_DEFAULT         0
-#define ICO_MAKEALPHA		1		//! convert to 32bpp and create an alpha channel from the AND-mask when loading
-#define IFF_DEFAULT         0
-#define J2K_DEFAULT			0		//! save with a 16:1 rate
-#define JP2_DEFAULT			0		//! save with a 16:1 rate
-#define JPEG_DEFAULT        0		//! loading (see JPEG_FAST); saving (see JPEG_QUALITYGOOD|JPEG_SUBSAMPLING_420)
-#define JPEG_FAST           0x0001	//! load the file as fast as possible, sacrificing some quality
-#define JPEG_ACCURATE       0x0002	//! load the file with the best quality, sacrificing some speed
-#define JPEG_CMYK			0x0004	//! load separated CMYK "as is" (use | to combine with other load flags)
-#define JPEG_EXIFROTATE		0x0008	//! load and rotate according to Exif 'Orientation' tag if available
-#define JPEG_GREYSCALE		0x0010	//! load and convert to a 8-bit greyscale image
-#define JPEG_QUALITYSUPERB  0x80	//! save with superb quality (100:1)
-#define JPEG_QUALITYGOOD    0x0100	//! save with good quality (75:1)
-#define JPEG_QUALITYNORMAL  0x0200	//! save with normal quality (50:1)
-#define JPEG_QUALITYAVERAGE 0x0400	//! save with average quality (25:1)
-#define JPEG_QUALITYBAD     0x0800	//! save with bad quality (10:1)
-#define JPEG_PROGRESSIVE	0x2000	//! save as a progressive-JPEG (use | to combine with other save flags)
-#define JPEG_SUBSAMPLING_411 0x1000		//! save with high 4x1 chroma subsampling (4:1:1) 
-#define JPEG_SUBSAMPLING_420 0x4000		//! save with medium 2x2 medium chroma subsampling (4:2:0) - default value
-#define JPEG_SUBSAMPLING_422 0x8000		//! save with low 2x1 chroma subsampling (4:2:2) 
-#define JPEG_SUBSAMPLING_444 0x10000	//! save with no chroma subsampling (4:4:4)
-#define JPEG_OPTIMIZE		0x20000		//! on saving, compute optimal Huffman coding tables (can reduce a few percent of file size)
-#define JPEG_BASELINE		0x40000		//! save basic JPEG, without metadata or any markers
-#define KOALA_DEFAULT       0
-#define LBM_DEFAULT         0
-#define MNG_DEFAULT         0
-#define PCD_DEFAULT         0
-#define PCD_BASE            1		//! load the bitmap sized 768 x 512
-#define PCD_BASEDIV4        2		//! load the bitmap sized 384 x 256
-#define PCD_BASEDIV16       3		//! load the bitmap sized 192 x 128
-#define PCX_DEFAULT         0
-#define PFM_DEFAULT         0
-#define PICT_DEFAULT        0
-#define PNG_DEFAULT         0
-#define PNG_IGNOREGAMMA		1		//! loading: avoid gamma correction
-#define PNG_Z_BEST_SPEED			0x0001	//! save using ZLib level 1 compression flag (default value is 6)
-#define PNG_Z_DEFAULT_COMPRESSION	0x0006	//! save using ZLib level 6 compression flag (default recommended value)
-#define PNG_Z_BEST_COMPRESSION		0x0009	//! save using ZLib level 9 compression flag (default value is 6)
-#define PNG_Z_NO_COMPRESSION		0x0100	//! save without ZLib compression
-#define PNG_INTERLACED				0x0200	//! save using Adam7 interlacing (use | to combine with other save flags)
-#define PNM_DEFAULT         0
-#define PNM_SAVE_RAW        0       //! if set the writer saves in RAW format (i.e. P4, P5 or P6)
-#define PNM_SAVE_ASCII      1       //! if set the writer saves in ASCII format (i.e. P1, P2 or P3)
-#define PSD_DEFAULT         0
-#define PSD_CMYK			1		//! reads tags for separated CMYK (default is conversion to RGB)
-#define PSD_LAB				2		//! reads tags for CIELab (default is conversion to RGB)
-#define RAS_DEFAULT         0
-#define RAW_DEFAULT         0		//! load the file as linear RGB 48-bit
-#define RAW_PREVIEW			1		//! try to load the embedded JPEG preview with included Exif Data or default to RGB 24-bit
-#define RAW_DISPLAY			2		//! load the file as RGB 24-bit
-#define RAW_HALFSIZE		4		//! output a half-size color image
-#define RAW_UNPROCESSED		8		//! output a FIT_UINT16 raw Bayer image
-#define SGI_DEFAULT			0
-#define TARGA_DEFAULT       0
-#define TARGA_LOAD_RGB888   1       //! if set the loader converts RGB555 and ARGB8888 -> RGB888.
-#define TARGA_SAVE_RLE		2		//! if set, the writer saves with RLE compression
-#define TIFF_DEFAULT        0
-#define TIFF_CMYK			0x0001	//! reads/stores tags for separated CMYK (use | to combine with compression flags)
-#define TIFF_PACKBITS       0x0100  //! save using PACKBITS compression
-#define TIFF_DEFLATE        0x0200  //! save using DEFLATE compression (a.k.a. ZLIB compression)
-#define TIFF_ADOBE_DEFLATE  0x0400  //! save using ADOBE DEFLATE compression
-#define TIFF_NONE           0x0800  //! save without any compression
-#define TIFF_CCITTFAX3		0x1000  //! save using CCITT Group 3 fax encoding
-#define TIFF_CCITTFAX4		0x2000  //! save using CCITT Group 4 fax encoding
-#define TIFF_LZW			0x4000	//! save using LZW compression
-#define TIFF_JPEG			0x8000	//! save using JPEG compression
-#define TIFF_LOGLUV			0x10000	//! save using LogLuv compression
-#define WBMP_DEFAULT        0
-#define XBM_DEFAULT			0
-#define XPM_DEFAULT			0
-#define WEBP_DEFAULT		0		//! save with good quality (75:1)
-#define WEBP_LOSSLESS		0x100	//! save in lossless mode
-#define JXR_DEFAULT			0		//! save with quality 80 and no chroma subsampling (4:4:4)
-#define JXR_LOSSLESS		0x0064	//! save lossless
-#define JXR_PROGRESSIVE		0x2000	//! save as a progressive-JXR (use | to combine with other save flags)
-
-// Background filling options ---------------------------------------------------------
-// Constants used in FreeImage_FillBackground and FreeImage_EnlargeCanvas
-
-#define FI_COLOR_IS_RGB_COLOR			0x00	//! RGBQUAD color is a RGB color (contains no valid alpha channel)
-#define FI_COLOR_IS_RGBA_COLOR			0x01	//! RGBQUAD color is a RGBA color (contains a valid alpha channel)
-#define FI_COLOR_FIND_EQUAL_COLOR		0x02	//! For palettized images: lookup equal RGB color from palette
-#define FI_COLOR_ALPHA_IS_INDEX			0x04	//! The color's rgbReserved member (alpha) contains the palette index to be used
-#define FI_COLOR_PALETTE_SEARCH_MASK	(FI_COLOR_FIND_EQUAL_COLOR | FI_COLOR_ALPHA_IS_INDEX)	// No color lookup is performed
-
-// RescaleEx options ---------------------------------------------------------
-// Constants used in FreeImage_RescaleEx
-
-#define FI_RESCALE_DEFAULT			0x00    //! default options; none of the following other options apply
-#define FI_RESCALE_TRUE_COLOR		0x01	//! for non-transparent greyscale images, convert to 24-bit if src bitdepth <= 8 (default is a 8-bit greyscale image). 
-#define FI_RESCALE_OMIT_METADATA	0x02	//! do not copy metadata to the rescaled image
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Init / Error routines ----------------------------------------------------
-
-DLL_API void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only FI_DEFAULT(FALSE));
-DLL_API void DLL_CALLCONV FreeImage_DeInitialise(void);
-
-// Version routines ---------------------------------------------------------
-
-DLL_API const char *DLL_CALLCONV FreeImage_GetVersion(void);
-DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void);
-
-// Message output functions -------------------------------------------------
-
-typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg);
-typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg); 
-
-DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf); 
-DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf);
-DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...);
-
-// Allocate / Clone / Unload routines ---------------------------------------
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Allocate(int width, int height, int bpp, unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateT(FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-DLL_API FIBITMAP * DLL_CALLCONV FreeImage_Clone(FIBITMAP *dib);
-DLL_API void DLL_CALLCONV FreeImage_Unload(FIBITMAP *dib);
-
-// Header loading routines
-DLL_API BOOL DLL_CALLCONV FreeImage_HasPixels(FIBITMAP *dib);
-
-// Load / Save routines -----------------------------------------------------
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Load(FREE_IMAGE_FORMAT fif, const char *filename, int flags FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_Save(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const char *filename, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_SaveU(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const wchar_t *filename, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_SaveToHandle(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0));
-
-// Memory I/O stream routines -----------------------------------------------
-
-DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0));
-DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags FI_DEFAULT(0));
-DLL_API long DLL_CALLCONV FreeImage_TellMemory(FIMEMORY *stream);
-DLL_API BOOL DLL_CALLCONV FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin);
-DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, BYTE **data, DWORD *size_in_bytes);
-DLL_API unsigned DLL_CALLCONV FreeImage_ReadMemory(void *buffer, unsigned size, unsigned count, FIMEMORY *stream);
-DLL_API unsigned DLL_CALLCONV FreeImage_WriteMemory(const void *buffer, unsigned size, unsigned count, FIMEMORY *stream);
-
-DLL_API FIMULTIBITMAP *DLL_CALLCONV FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_SaveMultiBitmapToMemory(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FIMEMORY *stream, int flags);
-
-// Plugin Interface ---------------------------------------------------------
-
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterLocalPlugin(FI_InitProc proc_address, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0));
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterExternalPlugin(const char *path, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0));
-DLL_API int DLL_CALLCONV FreeImage_GetFIFCount(void);
-DLL_API int DLL_CALLCONV FreeImage_SetPluginEnabled(FREE_IMAGE_FORMAT fif, BOOL enable);
-DLL_API int DLL_CALLCONV FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif);
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFormat(const char *format);
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromMime(const char *mime);
-DLL_API const char *DLL_CALLCONV FreeImage_GetFormatFromFIF(FREE_IMAGE_FORMAT fif);
-DLL_API const char *DLL_CALLCONV FreeImage_GetFIFExtensionList(FREE_IMAGE_FORMAT fif);
-DLL_API const char *DLL_CALLCONV FreeImage_GetFIFDescription(FREE_IMAGE_FORMAT fif);
-DLL_API const char *DLL_CALLCONV FreeImage_GetFIFRegExpr(FREE_IMAGE_FORMAT fif);
-DLL_API const char *DLL_CALLCONV FreeImage_GetFIFMimeType(FREE_IMAGE_FORMAT fif);
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilename(const char *filename);
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilenameU(const wchar_t *filename);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsReading(FREE_IMAGE_FORMAT fif);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsWriting(FREE_IMAGE_FORMAT fif);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportBPP(FREE_IMAGE_FORMAT fif, int bpp);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportType(FREE_IMAGE_FORMAT fif, FREE_IMAGE_TYPE type);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif);
-DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsNoPixels(FREE_IMAGE_FORMAT fif);
-
-// Multipaging interface ----------------------------------------------------
-
-DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory FI_DEFAULT(FALSE), int flags FI_DEFAULT(0));
-DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmapU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory FI_DEFAULT(FALSE), int flags FI_DEFAULT(0));
-DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_SaveMultiBitmapToHandle(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0));
-DLL_API BOOL DLL_CALLCONV FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags FI_DEFAULT(0));
-DLL_API int DLL_CALLCONV FreeImage_GetPageCount(FIMULTIBITMAP *bitmap);
-DLL_API void DLL_CALLCONV FreeImage_AppendPage(FIMULTIBITMAP *bitmap, FIBITMAP *data);
-DLL_API void DLL_CALLCONV FreeImage_InsertPage(FIMULTIBITMAP *bitmap, int page, FIBITMAP *data);
-DLL_API void DLL_CALLCONV FreeImage_DeletePage(FIMULTIBITMAP *bitmap, int page);
-DLL_API FIBITMAP * DLL_CALLCONV FreeImage_LockPage(FIMULTIBITMAP *bitmap, int page);
-DLL_API void DLL_CALLCONV FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *data, BOOL changed);
-DLL_API BOOL DLL_CALLCONV FreeImage_MovePage(FIMULTIBITMAP *bitmap, int target, int source);
-DLL_API BOOL DLL_CALLCONV FreeImage_GetLockedPageNumbers(FIMULTIBITMAP *bitmap, int *pages, int *count);
-
-// Filetype request routines ------------------------------------------------
-
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileType(const char *filename, int size FI_DEFAULT(0));
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeU(const wchar_t *filename, int size FI_DEFAULT(0));
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size FI_DEFAULT(0));
-DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromMemory(FIMEMORY *stream, int size FI_DEFAULT(0));
-
-// Image type request routine -----------------------------------------------
-
-DLL_API FREE_IMAGE_TYPE DLL_CALLCONV FreeImage_GetImageType(FIBITMAP *dib);
-
-// FreeImage helper routines ------------------------------------------------
-
-DLL_API BOOL DLL_CALLCONV FreeImage_IsLittleEndian(void);
-DLL_API BOOL DLL_CALLCONV FreeImage_LookupX11Color(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue);
-DLL_API BOOL DLL_CALLCONV FreeImage_LookupSVGColor(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue);
-
-// Pixel access routines ----------------------------------------------------
-
-DLL_API BYTE *DLL_CALLCONV FreeImage_GetBits(FIBITMAP *dib);
-DLL_API BYTE *DLL_CALLCONV FreeImage_GetScanLine(FIBITMAP *dib, int scanline);
-
-DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value);
-DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value);
-
-// DIB info routines --------------------------------------------------------
-
-DLL_API unsigned DLL_CALLCONV FreeImage_GetColorsUsed(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetBPP(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetWidth(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetHeight(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetLine(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetPitch(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetDIBSize(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetMemorySize(FIBITMAP *dib);
-DLL_API RGBQUAD *DLL_CALLCONV FreeImage_GetPalette(FIBITMAP *dib);
-
-DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterX(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterY(FIBITMAP *dib);
-DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterX(FIBITMAP *dib, unsigned res);
-DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res);
-
-DLL_API BITMAPINFOHEADER *DLL_CALLCONV FreeImage_GetInfoHeader(FIBITMAP *dib);
-DLL_API BITMAPINFO *DLL_CALLCONV FreeImage_GetInfo(FIBITMAP *dib);
-DLL_API FREE_IMAGE_COLOR_TYPE DLL_CALLCONV FreeImage_GetColorType(FIBITMAP *dib);
-
-DLL_API unsigned DLL_CALLCONV FreeImage_GetRedMask(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetGreenMask(FIBITMAP *dib);
-DLL_API unsigned DLL_CALLCONV FreeImage_GetBlueMask(FIBITMAP *dib);
-
-DLL_API unsigned DLL_CALLCONV FreeImage_GetTransparencyCount(FIBITMAP *dib);
-DLL_API BYTE * DLL_CALLCONV FreeImage_GetTransparencyTable(FIBITMAP *dib);
-DLL_API void DLL_CALLCONV FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled);
-DLL_API void DLL_CALLCONV FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count);
-DLL_API BOOL DLL_CALLCONV FreeImage_IsTransparent(FIBITMAP *dib);
-DLL_API void DLL_CALLCONV FreeImage_SetTransparentIndex(FIBITMAP *dib, int index);
-DLL_API int DLL_CALLCONV FreeImage_GetTransparentIndex(FIBITMAP *dib);
-
-DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib);
-DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor);
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetThumbnail(FIBITMAP *dib);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetThumbnail(FIBITMAP *dib, FIBITMAP *thumbnail);
-
-// ICC profile routines -----------------------------------------------------
-
-DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_GetICCProfile(FIBITMAP *dib);
-DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size);
-DLL_API void DLL_CALLCONV FreeImage_DestroyICCProfile(FIBITMAP *dib);
-
-// Line conversion routines -------------------------------------------------
-
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To4(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_565_To16_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_555_To16_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_555(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_565(BYTE *target, BYTE *source, int width_in_pixels);
-DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels);
-
-// Smart conversion routines ------------------------------------------------
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize FI_DEFAULT(FIQ_WUQUANT), int PaletteSize FI_DEFAULT(256), int ReserveSize FI_DEFAULT(0), RGBQUAD *ReservePalette FI_DEFAULT(NULL));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Threshold(FIBITMAP *dib, BYTE T);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm);
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertFromRawBits(BYTE *bits, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertFromRawBitsEx(BOOL copySource, BYTE *bits, FREE_IMAGE_TYPE type, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE));
-DLL_API void DLL_CALLCONV FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE));
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToFloat(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBAF(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToUINT16(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGB16(FIBITMAP *dib);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBA16(FIBITMAP *dib);
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE));
-
-// Tone mapping operators ---------------------------------------------------
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param FI_DEFAULT(0), double second_param FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoDrago03(FIBITMAP *src, double gamma FI_DEFAULT(2.2), double exposure FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoReinhard05(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoReinhard05Ex(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0), double adaptation FI_DEFAULT(1), double color_correction FI_DEFAULT(0));
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoFattal02(FIBITMAP *src, double color_saturation FI_DEFAULT(0.5), double attenuation FI_DEFAULT(0.85));
-
-// ZLib interface -----------------------------------------------------------
-
-DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size);
-DLL_API DWORD DLL_CALLCONV FreeImage_ZLibUncompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size);
-DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size);
-DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGUnzip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size);
-DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCRC32(DWORD crc, BYTE *source, DWORD source_size);
-
-// --------------------------------------------------------------------------
-// Metadata routines
-// --------------------------------------------------------------------------
-
-// tag creation / destruction
-DLL_API FITAG *DLL_CALLCONV FreeImage_CreateTag(void);
-DLL_API void DLL_CALLCONV FreeImage_DeleteTag(FITAG *tag);
-DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag);
-
-// tag getters and setters
-DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag);
-DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag);
-DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag);
-DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag);
-DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag);
-DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag);
-DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag);
-
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagValue(FITAG *tag, const void *value);
-
-// iterator
-DLL_API FIMETADATA *DLL_CALLCONV FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag);
-DLL_API BOOL DLL_CALLCONV FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag);
-DLL_API void DLL_CALLCONV FreeImage_FindCloseMetadata(FIMETADATA *mdhandle);
-
-// metadata setter and getter
-DLL_API BOOL DLL_CALLCONV FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag);
-DLL_API BOOL DLL_CALLCONV FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetMetadataKeyValue(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, const char *value);
-
-// helpers
-DLL_API unsigned DLL_CALLCONV FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib);
-DLL_API BOOL DLL_CALLCONV FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src);
-
-// tag to C string conversion
-DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, FITAG *tag, char *Make FI_DEFAULT(NULL));
-
-// --------------------------------------------------------------------------
-// JPEG lossless transformation routines
-// --------------------------------------------------------------------------
-
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCropU(const wchar_t *src_file, const wchar_t *dst_file, int left, int top, int right, int bottom);
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
-DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
-
-
-// --------------------------------------------------------------------------
-// Image manipulation toolkit
-// --------------------------------------------------------------------------
-
-// rotation and flipping
-/// @deprecated see FreeImage_Rotate
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor FI_DEFAULT(NULL));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask);
-DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib);
-DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib);
-
-// upsampling / downsampling
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter FI_DEFAULT(FILTER_CATMULLROM));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_MakeThumbnail(FIBITMAP *dib, int max_pixel_size, BOOL convert FI_DEFAULT(TRUE));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RescaleRect(FIBITMAP *dib, int dst_width, int dst_height, int left, int top, int right, int bottom, FREE_IMAGE_FILTER filter FI_DEFAULT(FILTER_CATMULLROM), unsigned flags FI_DEFAULT(0));
-
-// color manipulation routines (point operations)
-DLL_API BOOL DLL_CALLCONV FreeImage_AdjustCurve(FIBITMAP *dib, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel);
-DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma);
-DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage);
-DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage);
-DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib);
-DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK));
-DLL_API int DLL_CALLCONV FreeImage_GetAdjustColorsLookupTable(BYTE *LUT, double brightness, double contrast, double gamma, BOOL invert);
-DLL_API BOOL DLL_CALLCONV FreeImage_AdjustColors(FIBITMAP *dib, double brightness, double contrast, double gamma, BOOL invert FI_DEFAULT(FALSE));
-DLL_API unsigned DLL_CALLCONV FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolors, unsigned count, BOOL ignore_alpha, BOOL swap);
-DLL_API unsigned DLL_CALLCONV FreeImage_SwapColors(FIBITMAP *dib, RGBQUAD *color_a, RGBQUAD *color_b, BOOL ignore_alpha);
-DLL_API unsigned DLL_CALLCONV FreeImage_ApplyPaletteIndexMapping(FIBITMAP *dib, BYTE *srcindices,	BYTE *dstindices, unsigned count, BOOL swap);
-DLL_API unsigned DLL_CALLCONV FreeImage_SwapPaletteIndices(FIBITMAP *dib, BYTE *index_a, BYTE *index_b);
-
-// channel processing routines
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *dib, FREE_IMAGE_COLOR_CHANNEL channel);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel);
-
-// copy / paste / composite routines
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom);
-DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha);
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_CreateView(FIBITMAP *dib, unsigned left, unsigned top, unsigned right, unsigned bottom);
-
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(NULL), FIBITMAP *bg FI_DEFAULT(NULL));
-DLL_API BOOL DLL_CALLCONV FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib);
-
-// background filling routines
-DLL_API BOOL DLL_CALLCONV FreeImage_FillBackground(FIBITMAP *dib, const void *color, int options FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_EnlargeCanvas(FIBITMAP *src, int left, int top, int right, int bottom, const void *color, int options FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateEx(int width, int height, int bpp, const RGBQUAD *color, int options FI_DEFAULT(0), const RGBQUAD *palette FI_DEFAULT(NULL), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateExT(FREE_IMAGE_TYPE type, int width, int height, int bpp, const void *color, int options FI_DEFAULT(0), const RGBQUAD *palette FI_DEFAULT(NULL), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-
-// miscellaneous algorithms
-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle FI_DEFAULT(3));
-
-// restore the borland-specific enum size option
-#if defined(__BORLANDC__)
-#pragma option pop
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // FREEIMAGE_H
diff --git a/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp b/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp
deleted file mode 100644
index 2fbec7ab24..0000000000
--- a/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp
+++ /dev/null
@@ -1,1573 +0,0 @@
-// ==========================================================
-// FreeImage implementation
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-// - Petr Supina (psup@centrum.cz)
-// - Carsten Klein (c.klein@datagis.com)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif 
-
-#include <stdlib.h>
-#if defined(_WIN32) || defined(_WIN64) || defined(__MINGW32__)
-#include <malloc.h>
-#endif // _WIN32 || _WIN64 || __MINGW32__
-
-#include "FreeImage.h"
-#include "FreeImageIO.h"
-#include "Utilities.h"
-#include "MapIntrospector.h"
-
-#include "../Metadata/FreeImageTag.h"
-
-/**
-Constants for the BITMAPINFOHEADER::biCompression field
-BI_RGB:
-The bitmap is in uncompressed red green blue (RGB) format that is not compressed and does not use color masks.
-BI_BITFIELDS:
-The bitmap is not compressed and the color table consists of three DWORD color masks that specify the red, green, and blue components, 
-respectively, of each pixel. This is valid when used with 16 and 32-bits per pixel bitmaps.
-*/
-#ifndef _WINGDI_
-#define BI_RGB       0L
-#define BI_BITFIELDS 3L
-#endif // _WINGDI_
-
-// ----------------------------------------------------------
-//  Metadata definitions
-// ----------------------------------------------------------
-
-/** helper for map<key, value> where value is a pointer to a FreeImage tag */
-typedef std::map<std::string, FITAG*> TAGMAP;
-
-/** helper for map<FREE_IMAGE_MDMODEL, TAGMAP*> */
-typedef std::map<int, TAGMAP*> METADATAMAP;
-
-/** helper for metadata iterator */
-FI_STRUCT (METADATAHEADER) { 
-	long pos;		//! current position when iterating the map
-	TAGMAP *tagmap;	//! pointer to the tag map
-};
-
-// ----------------------------------------------------------
-//  FIBITMAP definition
-// ----------------------------------------------------------
-
-/**
-FreeImage header structure
-*/
-FI_STRUCT (FREEIMAGEHEADER) {
-	/** data type - bitmap, array of long, double, complex, etc */
-	FREE_IMAGE_TYPE type;
-
-	/** background color used for RGB transparency */
-	RGBQUAD bkgnd_color;
-
-	/**@name transparency management */
-	//@{
-	/**
-	why another table ? for easy transparency table retrieval !
-	transparency could be stored in the palette, which is better
-	overall, but it requires quite some changes and it will render
-	FreeImage_GetTransparencyTable obsolete in its current form;
-	*/
-	BYTE transparent_table[256];
-	/** number of transparent colors */
-	int  transparency_count;
-	/** TRUE if the image is transparent */
-	BOOL transparent;
-	//@}
-
-	/** space to hold ICC profile */
-	FIICCPROFILE iccProfile;
-
-	/** contains a list of metadata models attached to the bitmap */
-	METADATAMAP *metadata;
-
-	/** FALSE if the FIBITMAP only contains the header and no pixel data */
-	BOOL has_pixels;
-
-	/** optionally contains a thumbnail attached to the bitmap */
-	FIBITMAP *thumbnail;
-
-	/**@name external pixel buffer management */
-	//@{
-	/** pointer to user provided pixels, NULL otherwise */
-	BYTE *external_bits;
-	/** user provided pitch, 0 otherwise */
-	unsigned external_pitch;
-	//@}
-
-	//BYTE filler[1];			 // fill to 32-bit alignment
-};
-
-// ----------------------------------------------------------
-//  FREEIMAGERGBMASKS definition
-// ----------------------------------------------------------
-
-/**
-RGB mask structure - mainly used for 16-bit RGB555 / RGB 565 FIBITMAP
-*/
-FI_STRUCT (FREEIMAGERGBMASKS) {
-	unsigned red_mask;		//! bit layout of the red components
-	unsigned green_mask;	//! bit layout of the green components
-	unsigned blue_mask;		//! bit layout of the blue components
-};
-
-// ----------------------------------------------------------
-//  Memory allocation on a specified alignment boundary
-// ----------------------------------------------------------
-
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-
-void* FreeImage_Aligned_Malloc(size_t amount, size_t alignment) {
-	assert(alignment == FIBITMAP_ALIGNMENT);
-	return _aligned_malloc(amount, alignment);
-}
-
-void FreeImage_Aligned_Free(void* mem) {
-	_aligned_free(mem);
-}
-
-#elif defined (__MINGW32__)
-
-void* FreeImage_Aligned_Malloc(size_t amount, size_t alignment) {
-	assert(alignment == FIBITMAP_ALIGNMENT);
-	return __mingw_aligned_malloc (amount, alignment);
-}
-
-void FreeImage_Aligned_Free(void* mem) {
-	__mingw_aligned_free (mem);
-}
-
-#else
-
-void* FreeImage_Aligned_Malloc(size_t amount, size_t alignment) {
-	assert(alignment == FIBITMAP_ALIGNMENT);
-	/*
-	In some rare situations, the malloc routines can return misaligned memory. 
-	The routine FreeImage_Aligned_Malloc allocates a bit more memory to do
-	aligned writes.  Normally, it *should* allocate "alignment" extra memory and then writes
-	one dword back the true pointer.  But if the memory manager returns a
-	misaligned block that is less than a dword from the next alignment, 
-	then the writing back one dword will corrupt memory.
-
-	For example, suppose that alignment is 16 and malloc returns the address 0xFFFF.
-
-	16 - 0xFFFF % 16 + 0xFFFF = 16 - 15 + 0xFFFF = 0x10000.
-
-	Now, you subtract one dword from that and write and that will corrupt memory.
-
-	That's why the code below allocates *two* alignments instead of one. 
-	*/
-	void* mem_real = malloc(amount + 2 * alignment);
-	if(!mem_real) return NULL;
-	char* mem_align = (char*)((unsigned long)(2 * alignment - (unsigned long)mem_real % (unsigned long)alignment) + (unsigned long)mem_real);
-	*((long*)mem_align - 1) = (long)mem_real;
-	return mem_align;
-}
-
-void FreeImage_Aligned_Free(void* mem) {
-	free((void*)*((long*)mem - 1));
-}
-
-#endif // _WIN32 || _WIN64
-
-// ----------------------------------------------------------
-//  FIBITMAP memory management
-// ----------------------------------------------------------
-
-/**
-Calculate the size of a FreeImage image. 
-Align the palette and the pixels on a FIBITMAP_ALIGNMENT bytes alignment boundary.
-This function includes a protection against malicious images, based on a KISS integer overflow detection mechanism. 
-
-@param header_only If TRUE, calculate a 'header only' FIBITMAP size, otherwise calculate a full FIBITMAP size
-@param width Image width
-@param height Image height
-@param bpp Number of bits-per-pixel
-@param need_masks We only store the masks (and allocate memory for them) for 16-bit images of type FIT_BITMAP
-@return Returns a size in BYTE units
-@see FreeImage_AllocateBitmap
-*/
-static size_t 
-FreeImage_GetInternalImageSize(BOOL header_only, unsigned width, unsigned height, unsigned bpp, BOOL need_masks) {
-	size_t dib_size = sizeof(FREEIMAGEHEADER);
-	dib_size += (dib_size % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - dib_size % FIBITMAP_ALIGNMENT : 0);
-	dib_size += FIBITMAP_ALIGNMENT - sizeof(BITMAPINFOHEADER) % FIBITMAP_ALIGNMENT;
-	dib_size += sizeof(BITMAPINFOHEADER);
-	// palette is aligned on a 16 bytes boundary
-	dib_size += sizeof(RGBQUAD) * CalculateUsedPaletteEntries(bpp);
-	// we both add palette size and masks size if need_masks is true, since CalculateUsedPaletteEntries
-	// always returns 0 if need_masks is true (which is only true for 16 bit images).
-	dib_size += need_masks ? sizeof(DWORD) * 3 : 0;
-	dib_size += (dib_size % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - dib_size % FIBITMAP_ALIGNMENT : 0);
-
-	if(!header_only) {
-		const size_t header_size = dib_size;
-
-		// pixels are aligned on a 16 bytes boundary
-		dib_size += (size_t)CalculatePitch(CalculateLine(width, bpp)) * (size_t)height;
-
-		// check for possible malloc overflow using a KISS integer overflow detection mechanism
-		{
-			const double dPitch = floor( ((double)bpp * width + 31.0) / 32.0 ) * 4.0;
-			const double dImageSize = (double)header_size + dPitch * height;
-			if(dImageSize != (double)dib_size) {
-				// here, we are sure to encounter a malloc overflow: try to avoid it ...
-				return 0;
-			}
-
-			/*
-			The following constant take into account the additionnal memory used by 
-			aligned malloc functions as well as debug malloc functions. 
-			It is supposed here that using a (8 * FIBITMAP_ALIGNMENT) risk margin will be enough
-			for the target compiler. 
-			*/
-			const double FIBITMAP_MAX_MEMORY = (double)((size_t)-1) - 8 * FIBITMAP_ALIGNMENT;
-
-			if(dImageSize > FIBITMAP_MAX_MEMORY) {
-				// avoid possible overflow inside C allocation functions
-				return 0;
-			}
-		}
-	}
-
-	return dib_size;
-}
-
-/**
-Helper for 16-bit FIT_BITMAP
-Returns a pointer to the bitmap's red-, green- and blue masks.
-@param dib The bitmap to obtain masks from.
-@return Returns a pointer to the bitmap's red-, green- and blue masks
-or NULL, if no masks are present (e.g. for 24 bit images).
-*/
-static FREEIMAGERGBMASKS *
-FreeImage_GetRGBMasks(FIBITMAP *dib) {
-	return FreeImage_HasRGBMasks(dib) ? (FREEIMAGERGBMASKS *)(((BYTE *)FreeImage_GetInfoHeader(dib)) + sizeof(BITMAPINFOHEADER)) : NULL;
-}
-
-/**
-Internal FIBITMAP allocation.
-
-This function accepts (ext_bits, ext_pitch) arguments. If these are provided the FIBITMAP 
-will be allocated as "header only", but bits and pitch will be stored within the FREEIMAGEHEADER 
-and the resulting FIBITMAP will have pixels, i.e. HasPixels() will return TRUE.
-- GetBits() and GetPitch return the correct values - either offsets or the stored values (user-provided bits and pitch).
-- Clone() creates a new FIBITMAP with copy of the user pixel data.
-- Unload's implementation does not need to change - it just release a "header only" dib.
-Note that when using external data, the data does not need to have the same alignment as the default 4-byte alignment. 
-This enables the possibility to access buffers with, for instance, stricter alignment,
-like the ones used in low-level APIs like OpenCL or intrinsics.
-
-@param header_only If TRUE, allocate a 'header only' FIBITMAP, otherwise allocate a full FIBITMAP
-@param ext_bits Pointer to external user's pixel buffer if using wrapped buffer, NULL otherwise
-@param ext_pitch Pointer to external user's pixel buffer pitch if using wrapped buffer, 0 otherwise
-@param type Image type
-@param width Image width
-@param height Image height
-@param bpp Number of bits per pixel
-@param red_mask Image red mask 
-@param green_mask Image green mask
-@param blue_mask Image blue mask
-@return Returns the allocated FIBITMAP if successful, returns NULL otherwise
-*/
-static FIBITMAP * 
-FreeImage_AllocateBitmap(BOOL header_only, BYTE *ext_bits, unsigned ext_pitch, FREE_IMAGE_TYPE type, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-
-	// check input variables
-	width = abs(width);
-	height = abs(height);
-	if(!((width > 0) && (height > 0))) {
-		return NULL;
-	}
-	if(ext_bits) {
-		if(ext_pitch == 0) {
-			return NULL;
-		}
-		assert(header_only == FALSE);
-	}
-
-	// we only store the masks (and allocate memory for them) for 16-bit images of type FIT_BITMAP
-	BOOL need_masks = FALSE;
-
-	// check pixel bit depth
-	switch(type) {
-		case FIT_BITMAP:
-			switch(bpp) {
-				case 1:
-				case 4:
-				case 8:
-					break;
-				case 16:
-					need_masks = TRUE;
-					break;
-				case 24:
-				case 32:
-					break;
-				default:
-					bpp = 8;
-					break;
-			}
-			break;
-		case FIT_UINT16:
-			bpp = 8 * sizeof(unsigned short);
-			break;
-		case FIT_INT16:
-			bpp = 8 * sizeof(short);
-			break;
-		case FIT_UINT32:
-			bpp = 8 * sizeof(DWORD);
-			break;
-		case FIT_INT32:
-			bpp = 8 * sizeof(LONG);
-			break;
-		case FIT_FLOAT:
-			bpp = 8 * sizeof(float);
-			break;
-		case FIT_DOUBLE:
-			bpp = 8 * sizeof(double);
-			break;
-		case FIT_COMPLEX:
-			bpp = 8 * sizeof(FICOMPLEX);
-			break;
-		case FIT_RGB16:
-			bpp = 8 * sizeof(FIRGB16);
-			break;
-		case FIT_RGBA16:
-			bpp = 8 * sizeof(FIRGBA16);
-			break;
-		case FIT_RGBF:
-			bpp = 8 * sizeof(FIRGBF);
-			break;
-		case FIT_RGBAF:
-			bpp = 8 * sizeof(FIRGBAF);
-			break;
-		default:
-			return NULL;
-	}
-
-	FIBITMAP *bitmap = (FIBITMAP *)malloc(sizeof(FIBITMAP));
-
-	if (bitmap != NULL) {
-
-		// calculate the size of a FreeImage image
-		// align the palette and the pixels on a FIBITMAP_ALIGNMENT bytes alignment boundary
-		// palette is aligned on a 16 bytes boundary
-		// pixels are aligned on a 16 bytes boundary
-
-		// when using a user provided pixel buffer, force a 'header only' allocation
-
-		size_t dib_size = FreeImage_GetInternalImageSize(header_only || ext_bits, width, height, bpp, need_masks);
-
-		if(dib_size == 0) {
-			// memory allocation will fail (probably a malloc overflow)
-			free(bitmap);
-			return NULL;
-		}
-
-		bitmap->data = (BYTE *)FreeImage_Aligned_Malloc(dib_size * sizeof(BYTE), FIBITMAP_ALIGNMENT);
-
-		if (bitmap->data != NULL) {
-			memset(bitmap->data, 0, dib_size);
-
-			// write out the FREEIMAGEHEADER
-
-			FREEIMAGEHEADER *fih = (FREEIMAGEHEADER *)bitmap->data;
-
-			fih->type = type;
-
-			memset(&fih->bkgnd_color, 0, sizeof(RGBQUAD));
-
-			fih->transparent = FALSE;
-			fih->transparency_count = 0;
-			memset(fih->transparent_table, 0xff, 256);
-
-			fih->has_pixels = header_only ? FALSE : TRUE;
-
-			// initialize FIICCPROFILE link
-
-			FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(bitmap);
-			iccProfile->size = 0;
-			iccProfile->data = 0;
-			iccProfile->flags = 0;
-
-			// initialize metadata models list
-
-			fih->metadata = new(std::nothrow) METADATAMAP;
-
-			// initialize attached thumbnail
-
-			fih->thumbnail = NULL;
-
-			// store a pointer to user provided pixel buffer (if any)
-
-			fih->external_bits = ext_bits;
-			fih->external_pitch = ext_pitch;
-
-			// write out the BITMAPINFOHEADER
-
-			BITMAPINFOHEADER *bih   = FreeImage_GetInfoHeader(bitmap);
-			bih->biSize             = sizeof(BITMAPINFOHEADER);
-			bih->biWidth            = width;
-			bih->biHeight           = height;
-			bih->biPlanes           = 1;
-			bih->biCompression      = need_masks ? BI_BITFIELDS : BI_RGB;
-			bih->biBitCount         = (WORD)bpp;
-			bih->biClrUsed          = CalculateUsedPaletteEntries(bpp);
-			bih->biClrImportant     = bih->biClrUsed;
-			bih->biXPelsPerMeter	= 2835;	// 72 dpi
-			bih->biYPelsPerMeter	= 2835;	// 72 dpi
-
-			if(bpp == 8) {
-				// build a default greyscale palette (very useful for image processing)
-				RGBQUAD *pal = FreeImage_GetPalette(bitmap);
-				for(int i = 0; i < 256; i++) {
-					pal[i].rgbRed	= (BYTE)i;
-					pal[i].rgbGreen = (BYTE)i;
-					pal[i].rgbBlue	= (BYTE)i;
-				}
-			}
-
-			// just setting the masks (only if needed) just like the palette.
-			if (need_masks) {
-				FREEIMAGERGBMASKS *masks = FreeImage_GetRGBMasks(bitmap);
-				masks->red_mask = red_mask;
-				masks->green_mask = green_mask;
-				masks->blue_mask = blue_mask;
-			}
-
-			return bitmap;
-		}
-
-		free(bitmap);
-	}
-
-	return NULL;
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateHeaderForBits(BYTE *ext_bits, unsigned ext_pitch, FREE_IMAGE_TYPE type, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateBitmap(FALSE, ext_bits, ext_pitch, type, width, height, bpp, red_mask, green_mask, blue_mask);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateHeaderT(BOOL header_only, FREE_IMAGE_TYPE type, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateBitmap(header_only, NULL, 0, type, width, height, bpp, red_mask, green_mask, blue_mask);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateHeader(BOOL header_only, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateBitmap(header_only, NULL, 0, FIT_BITMAP, width, height, bpp, red_mask, green_mask, blue_mask);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_Allocate(int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateBitmap(FALSE, NULL, 0, FIT_BITMAP, width, height, bpp, red_mask, green_mask, blue_mask);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateT(FREE_IMAGE_TYPE type, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateBitmap(FALSE, NULL, 0, type, width, height, bpp, red_mask, green_mask, blue_mask);
-}
-
-void DLL_CALLCONV
-FreeImage_Unload(FIBITMAP *dib) {
-	if (NULL != dib) {	
-		if (NULL != dib->data) {
-			// delete possible icc profile ...
-			if (FreeImage_GetICCProfile(dib)->data) {
-				free(FreeImage_GetICCProfile(dib)->data);
-			}
-
-			// delete metadata models
-			METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-
-			for(METADATAMAP::iterator i = (*metadata).begin(); i != (*metadata).end(); i++) {
-				TAGMAP *tagmap = (*i).second;
-
-				if(tagmap) {
-					for(TAGMAP::iterator j = tagmap->begin(); j != tagmap->end(); j++) {
-						FITAG *tag = (*j).second;
-						FreeImage_DeleteTag(tag);
-					}
-
-					delete tagmap;
-				}
-			}
-
-			delete metadata;
-
-			// delete embedded thumbnail
-			FreeImage_Unload(FreeImage_GetThumbnail(dib));
-
-			// delete bitmap ...
-			FreeImage_Aligned_Free(dib->data);
-		}
-
-		free(dib);		// ... and the wrapper
-	}
-}
-
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_Clone(FIBITMAP *dib) {
-	if(!dib) {
-		return NULL;
-	}
-
-	FREE_IMAGE_TYPE type = FreeImage_GetImageType(dib);
-	unsigned width	= FreeImage_GetWidth(dib);
-	unsigned height	= FreeImage_GetHeight(dib);
-	unsigned bpp	= FreeImage_GetBPP(dib);
-
-	const BYTE *ext_bits = ((FREEIMAGEHEADER *)dib->data)->external_bits;
-	
-	// check for pixel availability ...
-	BOOL header_only = FreeImage_HasPixels(dib) ? FALSE : TRUE;
-
-	// check whether this image has masks defined ...
-	BOOL need_masks = (bpp == 16 && type == FIT_BITMAP) ? TRUE : FALSE;
-
-	// allocate a new dib
-	FIBITMAP *new_dib = FreeImage_AllocateHeaderT(header_only, type, width, height, bpp,
-			FreeImage_GetRedMask(dib), FreeImage_GetGreenMask(dib), FreeImage_GetBlueMask(dib));
-
-	if (new_dib) {
-		// save ICC profile links
-		FIICCPROFILE *src_iccProfile = FreeImage_GetICCProfile(dib);
-		FIICCPROFILE *dst_iccProfile = FreeImage_GetICCProfile(new_dib);
-
-		// save metadata links
-		METADATAMAP *src_metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-		METADATAMAP *dst_metadata = ((FREEIMAGEHEADER *)new_dib->data)->metadata;
-
-		// calculate the size of the src image
-		// align the palette and the pixels on a FIBITMAP_ALIGNMENT bytes alignment boundary
-		// palette is aligned on a 16 bytes boundary
-		// pixels are aligned on a 16 bytes boundary
-		
-		// when using a user provided pixel buffer, force a 'header only' calculation		
-
-		size_t dib_size = FreeImage_GetInternalImageSize(header_only || ext_bits, width, height, bpp, need_masks);
-
-		// copy the bitmap + internal pointers (remember to restore new_dib internal pointers later)
-		memcpy(new_dib->data, dib->data, dib_size);
-
-		// reset ICC profile link for new_dib
-		memset(dst_iccProfile, 0, sizeof(FIICCPROFILE));
-
-		// restore metadata link for new_dib
-		((FREEIMAGEHEADER *)new_dib->data)->metadata = dst_metadata;
-
-		// reset thumbnail link for new_dib
-		((FREEIMAGEHEADER *)new_dib->data)->thumbnail = NULL;
-
-		// copy possible ICC profile
-		FreeImage_CreateICCProfile(new_dib, src_iccProfile->data, src_iccProfile->size);
-		dst_iccProfile->flags = src_iccProfile->flags;
-
-		// copy metadata models
-		for(METADATAMAP::iterator i = (*src_metadata).begin(); i != (*src_metadata).end(); i++) {
-			int model = (*i).first;
-			TAGMAP *src_tagmap = (*i).second;
-
-			if(src_tagmap) {
-				// create a metadata model
-				TAGMAP *dst_tagmap = new(std::nothrow) TAGMAP();
-
-				if(dst_tagmap) {
-					// fill the model
-					for(TAGMAP::iterator j = src_tagmap->begin(); j != src_tagmap->end(); j++) {
-						std::string dst_key = (*j).first;
-						FITAG *dst_tag = FreeImage_CloneTag( (*j).second );
-
-						// assign key and tag value
-						(*dst_tagmap)[dst_key] = dst_tag;
-					}
-
-					// assign model and tagmap
-					(*dst_metadata)[model] = dst_tagmap;
-				}
-			}
-		}
-
-		// copy the thumbnail
-		FreeImage_SetThumbnail(new_dib, FreeImage_GetThumbnail(dib));
-
-		// copy user provided pixel buffer (if any)
-		if(ext_bits) {
-			const unsigned pitch = FreeImage_GetPitch(dib);
-			const unsigned linesize = FreeImage_GetLine(dib);
-			for(unsigned y = 0; y < height; y++) {
-				memcpy(FreeImage_GetScanLine(new_dib, y), ext_bits, linesize);
-				ext_bits += pitch;
-			}
-		}
-
-		return new_dib;
-	}
-
-	return NULL;
-}
-
-// ----------------------------------------------------------
-
-BYTE * DLL_CALLCONV
-FreeImage_GetBits(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib)) {
-		return NULL;
-	}
-
-	if(((FREEIMAGEHEADER *)dib->data)->external_bits) {
-		return ((FREEIMAGEHEADER *)dib->data)->external_bits;
-	}
-
-	// returns the pixels aligned on a FIBITMAP_ALIGNMENT bytes alignment boundary
-	size_t lp = (size_t)FreeImage_GetInfoHeader(dib);
-	lp += sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * FreeImage_GetColorsUsed(dib);
-	lp += FreeImage_HasRGBMasks(dib) ? sizeof(DWORD) * 3 : 0;
-	lp += (lp % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - lp % FIBITMAP_ALIGNMENT : 0);
-	return (BYTE *)lp;
-}
-
-// ----------------------------------------------------------
-//  DIB information functions
-// ----------------------------------------------------------
-
-FIBITMAP* DLL_CALLCONV
-FreeImage_GetThumbnail(FIBITMAP *dib) {
-	return (dib != NULL) ? ((FREEIMAGEHEADER *)dib->data)->thumbnail : NULL;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SetThumbnail(FIBITMAP *dib, FIBITMAP *thumbnail) {
-	if(dib == NULL) {
-		return FALSE;
-	}
-	FIBITMAP *currentThumbnail = ((FREEIMAGEHEADER *)dib->data)->thumbnail;
-	if(currentThumbnail == thumbnail) {
-		return TRUE;
-	}
-	FreeImage_Unload(currentThumbnail);
-
-	((FREEIMAGEHEADER *)dib->data)->thumbnail = FreeImage_HasPixels(thumbnail) ? FreeImage_Clone(thumbnail) : NULL;
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-FREE_IMAGE_COLOR_TYPE DLL_CALLCONV
-FreeImage_GetColorType(FIBITMAP *dib) {
-	RGBQUAD *rgb;
-
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-
-	// special bitmap type
-	if(image_type != FIT_BITMAP) {
-		switch(image_type) {
-			case FIT_UINT16:
-			{
-				// 16-bit greyscale TIF can be either FIC_MINISBLACK (the most common case) or FIC_MINISWHITE
-				// you can check this using EXIF_MAIN metadata
-				FITAG *photometricTag = NULL;
-				if(FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "PhotometricInterpretation", &photometricTag)) {
-					const short *value = (short*)FreeImage_GetTagValue(photometricTag);
-					// PHOTOMETRIC_MINISWHITE = 0 => min value is white
-					// PHOTOMETRIC_MINISBLACK = 1 => min value is black
-					return (*value == 0) ? FIC_MINISWHITE : FIC_MINISBLACK;
-				}
-				return FIC_MINISBLACK;
-			}
-			break;
-			case FIT_RGB16:
-			case FIT_RGBF:
-				return FIC_RGB;
-			case FIT_RGBA16:
-			case FIT_RGBAF:
-				return FIC_RGBALPHA;
-		}
-
-		return FIC_MINISBLACK;
-	}
-
-	// standard image type
-	switch (FreeImage_GetBPP(dib)) {
-		case 1:
-		{
-			rgb = FreeImage_GetPalette(dib);
-
-			if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) && (rgb->rgbBlue == 0)) {
-				rgb++;
-
-				if ((rgb->rgbRed == 255) && (rgb->rgbGreen == 255) && (rgb->rgbBlue == 255)) {
-					return FIC_MINISBLACK;
-				}
-			}
-
-			if ((rgb->rgbRed == 255) && (rgb->rgbGreen == 255) && (rgb->rgbBlue == 255)) {
-				rgb++;
-
-				if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) && (rgb->rgbBlue == 0)) {
-					return FIC_MINISWHITE;
-				}
-			}
-
-			return FIC_PALETTE;
-		}
-
-		case 4:
-		case 8:	// Check if the DIB has a color or a greyscale palette
-		{
-			int ncolors = FreeImage_GetColorsUsed(dib);
-		    int minisblack = 1;
-			rgb = FreeImage_GetPalette(dib);
-
-			for (int i = 0; i < ncolors; i++) {
-				if ((rgb->rgbRed != rgb->rgbGreen) || (rgb->rgbRed != rgb->rgbBlue)) {
-					return FIC_PALETTE;
-				}
-
-				// The DIB has a color palette if the greyscale isn't a linear ramp
-				// Take care of reversed grey images
-				if (rgb->rgbRed != i) {
-					if ((ncolors-i-1) != rgb->rgbRed) {
-						return FIC_PALETTE;
-					} else {
-						minisblack = 0;
-					}
-				}
-
-				rgb++;
-			}
-
-			return minisblack ? FIC_MINISBLACK : FIC_MINISWHITE;
-		}
-
-		case 16:
-		case 24:
-			return FIC_RGB;
-
-		case 32:
-		{
-			if (FreeImage_GetICCProfile(dib)->flags & FIICC_COLOR_IS_CMYK) {
-				return FIC_CMYK;
-			}
-
-			if( FreeImage_HasPixels(dib) ) {
-				// check for fully opaque alpha layer
-				for (unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-					rgb = (RGBQUAD *)FreeImage_GetScanLine(dib, y);
-
-					for (unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-						if (rgb[x].rgbReserved != 0xFF) {
-							return FIC_RGBALPHA;
-						}
-					}
-				}
-				return FIC_RGB;
-			}
-
-			return FIC_RGBALPHA;
-		}
-				
-		default :
-			return FIC_MINISBLACK;
-	}
-}
-
-// ----------------------------------------------------------
-
-FREE_IMAGE_TYPE DLL_CALLCONV 
-FreeImage_GetImageType(FIBITMAP *dib) {
-	return (dib != NULL) ? ((FREEIMAGEHEADER *)dib->data)->type : FIT_UNKNOWN;
-}
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV 
-FreeImage_HasPixels(FIBITMAP *dib) {
-	return (dib != NULL) ? ((FREEIMAGEHEADER *)dib->data)->has_pixels : FALSE;
-}
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_HasRGBMasks(FIBITMAP *dib) {
-	return dib && FreeImage_GetInfoHeader(dib)->biCompression == BI_BITFIELDS;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetRedMask(FIBITMAP *dib) {
-	FREEIMAGERGBMASKS *masks = NULL;
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	switch(image_type) {
-		case FIT_BITMAP:
-			// check for 16-bit RGB (565 or 555)
-			masks = FreeImage_GetRGBMasks(dib);
-			if (masks) {
-				return masks->red_mask;
-			}
-			return FreeImage_GetBPP(dib) >= 24 ? FI_RGBA_RED_MASK : 0;
-		default:
-			return 0;
-	}
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetGreenMask(FIBITMAP *dib) {
-	FREEIMAGERGBMASKS *masks = NULL;
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	switch(image_type) {
-		case FIT_BITMAP:
-			// check for 16-bit RGB (565 or 555)
-			masks = FreeImage_GetRGBMasks(dib);
-			if (masks) {
-				return masks->green_mask;
-			}
-			return FreeImage_GetBPP(dib) >= 24 ? FI_RGBA_GREEN_MASK : 0;
-		default:
-			return 0;
-	}
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetBlueMask(FIBITMAP *dib) {
-	FREEIMAGERGBMASKS *masks = NULL;
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	switch(image_type) {
-		case FIT_BITMAP:
-			// check for 16-bit RGB (565 or 555)
-			masks = FreeImage_GetRGBMasks(dib);
-			if (masks) {
-				return masks->blue_mask;
-			}
-			return FreeImage_GetBPP(dib) >= 24 ? FI_RGBA_BLUE_MASK : 0;
-		default:
-			return 0;
-	}
-}
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_HasBackgroundColor(FIBITMAP *dib) {
-	if(dib) {
-		RGBQUAD *bkgnd_color = &((FREEIMAGEHEADER *)dib->data)->bkgnd_color;
-		return (bkgnd_color->rgbReserved != 0) ? TRUE : FALSE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor) {
-	if(dib && bkcolor) {
-		if(FreeImage_HasBackgroundColor(dib)) {
-			// get the background color
-			RGBQUAD *bkgnd_color = &((FREEIMAGEHEADER *)dib->data)->bkgnd_color;
-			memcpy(bkcolor, bkgnd_color, sizeof(RGBQUAD));
-			// get the background index
-			if(FreeImage_GetBPP(dib) == 8) {
-				RGBQUAD *pal = FreeImage_GetPalette(dib);
-				for(unsigned i = 0; i < FreeImage_GetColorsUsed(dib); i++) {
-					if(bkgnd_color->rgbRed == pal[i].rgbRed) {
-						if(bkgnd_color->rgbGreen == pal[i].rgbGreen) {
-							if(bkgnd_color->rgbBlue == pal[i].rgbBlue) {
-								bkcolor->rgbReserved = (BYTE)i;
-								return TRUE;
-							}
-						}
-					}
-				}
-			}
-
-			bkcolor->rgbReserved = 0;
-
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor) {
-	if(dib) {
-		RGBQUAD *bkgnd_color = &((FREEIMAGEHEADER *)dib->data)->bkgnd_color;
-		if(bkcolor) {
-			// set the background color
-			memcpy(bkgnd_color, bkcolor, sizeof(RGBQUAD));
-			// enable the file background color
-			bkgnd_color->rgbReserved = 1;
-		} else {
-			// clear and disable the file background color
-			memset(bkgnd_color, 0, sizeof(RGBQUAD));
-		}
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_IsTransparent(FIBITMAP *dib) {
-	if(dib) {
-		FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-		switch(image_type) {
-			case FIT_BITMAP:
-				if(FreeImage_GetBPP(dib) == 32) {
-					if(FreeImage_GetColorType(dib) == FIC_RGBALPHA) {
-						return TRUE;
-					}
-				} else {
-					return ((FREEIMAGEHEADER *)dib->data)->transparent ? TRUE : FALSE;
-				}
-				break;
-			case FIT_RGBA16:
-			case FIT_RGBAF:
-				return TRUE;
-			default:
-				break;
-		}
-	}
-	return FALSE;
-}
-
-BYTE * DLL_CALLCONV
-FreeImage_GetTransparencyTable(FIBITMAP *dib) {
-	return dib ? ((FREEIMAGEHEADER *)dib->data)->transparent_table : NULL;
-}
-
-void DLL_CALLCONV
-FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled) {
-	if (dib) {
-		if ((FreeImage_GetBPP(dib) <= 8) || (FreeImage_GetBPP(dib) == 32)) {
-			((FREEIMAGEHEADER *)dib->data)->transparent = enabled;
-		} else {
-			((FREEIMAGEHEADER *)dib->data)->transparent = FALSE;
-		}
-	}
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetTransparencyCount(FIBITMAP *dib) {
-	return dib ? ((FREEIMAGEHEADER *)dib->data)->transparency_count : 0;
-}
-
-void DLL_CALLCONV
-FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count) {
-	if (dib) {
-		count = MAX(0, MIN(count, 256));
-		if (FreeImage_GetBPP(dib) <= 8) {
-			((FREEIMAGEHEADER *)dib->data)->transparent = (count > 0) ? TRUE : FALSE;
-			((FREEIMAGEHEADER *)dib->data)->transparency_count = count;
-
-			if (table) {
-				memcpy(((FREEIMAGEHEADER *)dib->data)->transparent_table, table, count);
-			} else {
-				memset(((FREEIMAGEHEADER *)dib->data)->transparent_table, 0xff, count);
-			}
-		} 
-	}
-}
-
-/** @brief Sets the index of the palette entry to be used as transparent color
- for the image specified. Does nothing on high color images. 
- 
- This method sets the index of the palette entry to be used as single transparent
- color for the image specified. This works on palletised images only and does
- nothing for high color images.
- 
- Although it is possible for palletised images to have more than one transparent
- color, this method sets the palette entry specified as the single transparent
- color for the image. All other colors will be set to be non-transparent by this
- method.
- 
- As with FreeImage_SetTransparencyTable(), this method also sets the image's
- transparency property to TRUE (as it is set and obtained by
- FreeImage_SetTransparent() and FreeImage_IsTransparent() respectively) for
- palletised images.
- 
- @param dib Input image, whose transparent color is to be set.
- @param index The index of the palette entry to be set as transparent color.
- */
-void DLL_CALLCONV
-FreeImage_SetTransparentIndex(FIBITMAP *dib, int index) {
-	if (dib) {
-		int count = FreeImage_GetColorsUsed(dib);
-		if (count) {
-			BYTE *new_tt = (BYTE *)malloc(count * sizeof(BYTE));
-			memset(new_tt, 0xFF, count);
-			if ((index >= 0) && (index < count)) {
-				new_tt[index] = 0x00;
-			}
-			FreeImage_SetTransparencyTable(dib, new_tt, count);
-			free(new_tt);
-		}
-	}
-}
-
-/** @brief Returns the palette entry used as transparent color for the image
- specified. Works for palletised images only and returns -1 for high color
- images or if the image has no color set to be transparent. 
- 
- Although it is possible for palletised images to have more than one transparent
- color, this function always returns the index of the first palette entry, set
- to be transparent. 
- 
- @param dib Input image, whose transparent color is to be returned.
- @return Returns the index of the palette entry used as transparent color for
- the image specified or -1 if there is no transparent color found (e.g. the image
- is a high color image).
- */
-int DLL_CALLCONV
-FreeImage_GetTransparentIndex(FIBITMAP *dib) {
-	int count = FreeImage_GetTransparencyCount(dib);
-	BYTE *tt = FreeImage_GetTransparencyTable(dib);
-	for (int i = 0; i < count; i++) {
-		if (tt[i] == 0) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-// ----------------------------------------------------------
-
-FIICCPROFILE * DLL_CALLCONV
-FreeImage_GetICCProfile(FIBITMAP *dib) {
-	FIICCPROFILE *profile = (dib) ? (FIICCPROFILE *)&((FREEIMAGEHEADER *)dib->data)->iccProfile : NULL;
-	return profile;
-}
-
-FIICCPROFILE * DLL_CALLCONV
-FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size) {
-	// clear the profile but preserve profile->flags
-	FreeImage_DestroyICCProfile(dib);
-	// create the new profile
-	FIICCPROFILE *profile = FreeImage_GetICCProfile(dib);
-	if(size && profile) {
-		profile->data = malloc(size);
-		if(profile->data) {
-			memcpy(profile->data, data, profile->size = size);
-		}
-	}
-	return profile;
-}
-
-void DLL_CALLCONV
-FreeImage_DestroyICCProfile(FIBITMAP *dib) {
-	FIICCPROFILE *profile = FreeImage_GetICCProfile(dib);
-	if(profile) {
-		if (profile->data) {
-			free (profile->data);
-		}
-		// clear the profile but preserve profile->flags
-		profile->data = NULL;
-		profile->size = 0;
-	}
-}
-
-// ----------------------------------------------------------
-
-unsigned DLL_CALLCONV
-FreeImage_GetWidth(FIBITMAP *dib) {
-	return dib ? FreeImage_GetInfoHeader(dib)->biWidth : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetHeight(FIBITMAP *dib) {
-	return (dib) ? FreeImage_GetInfoHeader(dib)->biHeight : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetBPP(FIBITMAP *dib) {
-	return dib ? FreeImage_GetInfoHeader(dib)->biBitCount : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetLine(FIBITMAP *dib) {
-	return dib ? ((FreeImage_GetWidth(dib) * FreeImage_GetBPP(dib)) + 7) / 8 : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetPitch(FIBITMAP *dib) {
-	if(dib) {
-		FREEIMAGEHEADER *fih = (FREEIMAGEHEADER *)dib->data;
-		return fih->external_bits ? fih->external_pitch : (FreeImage_GetLine(dib) + 3 & ~3);
-	}
-	return 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetColorsUsed(FIBITMAP *dib) {
-	return dib ? FreeImage_GetInfoHeader(dib)->biClrUsed : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetDIBSize(FIBITMAP *dib) {
-	return (dib) ? sizeof(BITMAPINFOHEADER) + (FreeImage_GetColorsUsed(dib) * sizeof(RGBQUAD)) + (FreeImage_GetPitch(dib) * FreeImage_GetHeight(dib)) : 0;
-}
-
-RGBQUAD * DLL_CALLCONV
-FreeImage_GetPalette(FIBITMAP *dib) {
-	return (dib && FreeImage_GetBPP(dib) < 16) ? (RGBQUAD *)(((BYTE *)FreeImage_GetInfoHeader(dib)) + sizeof(BITMAPINFOHEADER)) : NULL;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetDotsPerMeterX(FIBITMAP *dib) {
-	return (dib) ? FreeImage_GetInfoHeader(dib)->biXPelsPerMeter : 0;
-}
-
-unsigned DLL_CALLCONV
-FreeImage_GetDotsPerMeterY(FIBITMAP *dib) {
-	return (dib) ? FreeImage_GetInfoHeader(dib)->biYPelsPerMeter : 0;
-}
-
-void DLL_CALLCONV
-FreeImage_SetDotsPerMeterX(FIBITMAP *dib, unsigned res) {
-	if(dib) {
-		FreeImage_GetInfoHeader(dib)->biXPelsPerMeter = res;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res) {
-	if(dib) {
-		FreeImage_GetInfoHeader(dib)->biYPelsPerMeter = res;
-	}
-}
-
-BITMAPINFOHEADER * DLL_CALLCONV
-FreeImage_GetInfoHeader(FIBITMAP *dib) {
-	if(!dib) {
-		return NULL;
-	}
-	size_t lp = (size_t)dib->data + sizeof(FREEIMAGEHEADER);
-	lp += (lp % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - lp % FIBITMAP_ALIGNMENT : 0);
-	lp += FIBITMAP_ALIGNMENT - sizeof(BITMAPINFOHEADER) % FIBITMAP_ALIGNMENT;
-	return (BITMAPINFOHEADER *)lp;
-}
-
-BITMAPINFO * DLL_CALLCONV
-FreeImage_GetInfo(FIBITMAP *dib) {
-	return (BITMAPINFO *)FreeImage_GetInfoHeader(dib);
-}
-
-// ----------------------------------------------------------
-//  Metadata routines
-// ----------------------------------------------------------
-
-FIMETADATA * DLL_CALLCONV 
-FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag) {
-	if(!dib) {
-		return NULL;
-	}
-
-	// get the metadata model
-	METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-	TAGMAP *tagmap = NULL;
-	if( (*metadata).find(model) != (*metadata).end() ) {
-		tagmap = (*metadata)[model];
-	}
-	if(tagmap) {
-		// allocate a handle
-		FIMETADATA 	*handle = (FIMETADATA *)malloc(sizeof(FIMETADATA));
-		if(handle) {
-			// calculate the size of a METADATAHEADER
-			int header_size = sizeof(METADATAHEADER);
-
-			handle->data = (BYTE *)malloc(header_size * sizeof(BYTE));
-			
-			if(handle->data) {
-				memset(handle->data, 0, header_size * sizeof(BYTE));
-
-				// write out the METADATAHEADER
-				METADATAHEADER *mdh = (METADATAHEADER *)handle->data;
-
-				mdh->pos = 1;
-				mdh->tagmap = tagmap;
-
-				// get the first element
-				TAGMAP::iterator i = tagmap->begin();
-				*tag = (*i).second;
-
-				return handle;
-			}
-
-			free(handle);
-		}
-	}
-
-	return NULL;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag) {
-	if(!mdhandle) {
-		return FALSE;
-	}
-
-	METADATAHEADER *mdh = (METADATAHEADER *)mdhandle->data;
-	TAGMAP *tagmap = mdh->tagmap;
-
-	int current_pos = mdh->pos;
-	int mapsize     = (int)tagmap->size();
-
-	if(current_pos < mapsize) {
-		// get the tag element at position pos
-		int count = 0;
-
-		for(TAGMAP::iterator i = tagmap->begin(); i != tagmap->end(); i++) {
-			if(count == current_pos) {
-				*tag = (*i).second;
-				mdh->pos++;
-				break;
-			}
-			count++;
-		}
-		
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void DLL_CALLCONV 
-FreeImage_FindCloseMetadata(FIMETADATA *mdhandle) {
-	if (NULL != mdhandle) {	// delete the handle
-		if (NULL != mdhandle->data) {
-			free(mdhandle->data);
-		}
-		free(mdhandle);		// ... and the wrapper
-	}
-}
-
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src) {
-	if(!src || !dst) {
-		return FALSE;
-	}
-
-	// get metadata links
-	METADATAMAP *src_metadata = ((FREEIMAGEHEADER *)src->data)->metadata;
-	METADATAMAP *dst_metadata = ((FREEIMAGEHEADER *)dst->data)->metadata;
-
-	// copy metadata models, *except* the FIMD_ANIMATION model
-	for(METADATAMAP::iterator i = (*src_metadata).begin(); i != (*src_metadata).end(); i++) {
-		int model = (*i).first;
-		if(model == (int)FIMD_ANIMATION) {
-			continue;
-		}
-		TAGMAP *src_tagmap = (*i).second;
-
-		if(src_tagmap) {
-			if( dst_metadata->find(model) != dst_metadata->end() ) {
-				// destroy dst model
-				FreeImage_SetMetadata((FREE_IMAGE_MDMODEL)model, dst, NULL, NULL);
-			}
-
-			// create a metadata model
-			TAGMAP *dst_tagmap = new(std::nothrow) TAGMAP();
-
-			if(dst_tagmap) {
-				// fill the model
-				for(TAGMAP::iterator j = src_tagmap->begin(); j != src_tagmap->end(); j++) {
-					std::string dst_key = (*j).first;
-					FITAG *dst_tag = FreeImage_CloneTag( (*j).second );
-
-					// assign key and tag value
-					(*dst_tagmap)[dst_key] = dst_tag;
-				}
-
-				// assign model and tagmap
-				(*dst_metadata)[model] = dst_tagmap;
-			}
-		}
-	}
-
-	// clone resolution 
-	FreeImage_SetDotsPerMeterX(dst, FreeImage_GetDotsPerMeterX(src)); 
-	FreeImage_SetDotsPerMeterY(dst, FreeImage_GetDotsPerMeterY(src)); 
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV 
-FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag) {
-	if(!dib) {
-		return FALSE;
-	}
-
-	TAGMAP *tagmap = NULL;
-
-	// get the metadata model
-	METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-	METADATAMAP::iterator model_iterator = metadata->find(model);
-	if (model_iterator != metadata->end()) {
-		tagmap = model_iterator->second;
-	}
-
-	if(key != NULL) {
-
-		if(!tagmap) {
-			// this model, doesn't exist: create it 
-			tagmap = new(std::nothrow) TAGMAP();
-			(*metadata)[model] = tagmap;
-		}
-		
-		if(tag) {
-			// first check the tag
-			if(FreeImage_GetTagKey(tag) == NULL) {
-				FreeImage_SetTagKey(tag, key);
-			} else if(strcmp(key, FreeImage_GetTagKey(tag)) != 0) {
-				// set the tag key
-				FreeImage_SetTagKey(tag, key);
-			}
-			if(FreeImage_GetTagCount(tag) * FreeImage_TagDataWidth(FreeImage_GetTagType(tag)) != FreeImage_GetTagLength(tag)) {
-				FreeImage_OutputMessageProc(FIF_UNKNOWN, "Invalid data count for tag '%s'", key);
-				return FALSE;
-			}
-
-			// fill the tag ID if possible and if it's needed
-			TagLib& tag_lib = TagLib::instance();
-			switch(model) {
-				case FIMD_IPTC:
-				{
-					int id = tag_lib.getTagID(TagLib::IPTC, key);
-					/*
-					if(id == -1) {
-						FreeImage_OutputMessageProc(FIF_UNKNOWN, "IPTC: Invalid key '%s'", key);
-					}
-					*/
-					FreeImage_SetTagID(tag, (WORD)id);
-				}
-				break;
-
-				default:
-					break;
-			}
-
-			// delete existing tag
-			FITAG *old_tag = (*tagmap)[key];
-			if(old_tag) {
-				FreeImage_DeleteTag(old_tag);
-			}
-
-			// create a new tag
-			(*tagmap)[key] = FreeImage_CloneTag(tag);
-		}
-		else {
-			// delete existing tag
-			TAGMAP::iterator i = tagmap->find(key);
-			if(i != tagmap->end()) {
-				FITAG *old_tag = (*i).second;
-				FreeImage_DeleteTag(old_tag);
-				tagmap->erase(key);
-			}
-		}
-	}
-	else {
-		// destroy the metadata model
-		if(tagmap) {
-			for(TAGMAP::iterator i = tagmap->begin(); i != tagmap->end(); i++) {
-				FITAG *tag = (*i).second;
-				FreeImage_DeleteTag(tag);
-			}
-
-			delete tagmap;
-			metadata->erase(model_iterator);
-		}
-	}
-
-	return TRUE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag) {
-	if(!dib || !key || !tag) {
-		return FALSE;
-	}
-
-	TAGMAP *tagmap = NULL;
-	*tag = NULL;
-
-	// get the metadata model
-	METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-	if(!(*metadata).empty()) {
-		METADATAMAP::iterator model_iterator = metadata->find(model);
-		if (model_iterator != metadata->end() ) {
-			// this model exists : try to get the requested tag
-			tagmap = model_iterator->second;
-			TAGMAP::iterator tag_iterator = tagmap->find(key);
-			if (tag_iterator != tagmap->end() ) {
-				// get the requested tag
-				*tag = tag_iterator->second;
-			} 
-		}
-	}
-
-	return (*tag != NULL) ? TRUE : FALSE;
-}
-
-/**
-Build and set a FITAG whose type is FIDT_ASCII. 
-@param model Metadata model to be filled
-@param dib Image to be filled
-@param key Tag key
-@param value Tag value as a ASCII string
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL DLL_CALLCONV 
-FreeImage_SetMetadataKeyValue(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, const char *value) {
-	if(!dib || !key || !value) {
-		return FALSE;
-	}
-	// create a tag
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		BOOL bSuccess = TRUE;
-		// fill the tag
-		DWORD tag_length = (DWORD)(strlen(value) + 1);
-		bSuccess &= FreeImage_SetTagKey(tag, key);
-		bSuccess &= FreeImage_SetTagLength(tag, tag_length);
-		bSuccess &= FreeImage_SetTagCount(tag, tag_length);
-		bSuccess &= FreeImage_SetTagType(tag, FIDT_ASCII);
-		bSuccess &= FreeImage_SetTagValue(tag, value);
-		if(bSuccess) {
-			// set the tag
-			bSuccess &= FreeImage_SetMetadata(model, dib, FreeImage_GetTagKey(tag), tag);
-		}
-		// delete the tag
-		FreeImage_DeleteTag(tag);
-
-		return bSuccess;
-	}
-
-	return FALSE;
-}
-
-// ----------------------------------------------------------
-
-unsigned DLL_CALLCONV 
-FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib) {
-	if(!dib) {
-		return FALSE;
-	}
-
-	TAGMAP *tagmap = NULL;
-
-	// get the metadata model
-	METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata;
-	if( (*metadata).find(model) != (*metadata).end() ) {
-		tagmap = (*metadata)[model];
-	}
-	if(!tagmap) {
-		// this model, doesn't exist: return
-		return 0;
-	}
-
-	// get the tag count
-	return (unsigned)tagmap->size();
-}
-
-// ----------------------------------------------------------
-
-unsigned DLL_CALLCONV
-FreeImage_GetMemorySize(FIBITMAP *dib) {
-	if (!dib) {
-		return 0;
-	}
-	FREEIMAGEHEADER *header = (FREEIMAGEHEADER *)dib->data;
-	BITMAPINFOHEADER *bih = FreeImage_GetInfoHeader(dib);
-
-	BOOL header_only = !header->has_pixels || header->external_bits != NULL;
-	BOOL need_masks = bih->biCompression == BI_BITFIELDS;
-	unsigned width = bih->biWidth;
-	unsigned height = bih->biHeight;
-	unsigned bpp = bih->biBitCount;
-	
-	// start off with the size of the FIBITMAP structure
-	size_t size = sizeof(FIBITMAP);
-	
-	// add sizes of FREEIMAGEHEADER, BITMAPINFOHEADER, palette and DIB data
-	size += FreeImage_GetInternalImageSize(header_only, width, height, bpp, need_masks);
-
-	// add ICC profile size
-	size += header->iccProfile.size;
-
-	// add thumbnail image size
-	if (header->thumbnail) {
-		// we assume a thumbnail not having a thumbnail as well, 
-		// so this recursive call should not create an infinite loop
-		size += FreeImage_GetMemorySize(header->thumbnail);
-	}
-
-	// add metadata size
-	METADATAMAP *md = header->metadata;
-	if (!md) {
-		return (unsigned)size;
-	}
-
-	// add size of METADATAMAP
-	size += sizeof(METADATAMAP);
-
-	const size_t models = md->size();
-	if (models == 0) {
-		return (unsigned)size;
-	}
-
-	unsigned tags = 0;
-
-	for (METADATAMAP::iterator i = md->begin(); i != md->end(); i++) {
-		TAGMAP *tm = i->second;
-		if (tm) {
-			for (TAGMAP::iterator j = tm->begin(); j != tm->end(); j++) {
-				++tags;
-				const std::string & key = j->first;
-				size += key.capacity();
-				size += FreeImage_GetTagMemorySize(j->second);
-			}
-		}
-	}
-
-	// add size of all TAGMAP instances
-	size += models * sizeof(TAGMAP);
-	// add size of tree nodes in METADATAMAP
-	size += MapIntrospector<METADATAMAP>::GetNodesMemorySize(models);
-	// add size of tree nodes in TAGMAP
-	size += MapIntrospector<TAGMAP>::GetNodesMemorySize(tags);
-
-	return (unsigned)size;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/CacheFile.cpp b/plugins/AdvaImg/src/FreeImage/CacheFile.cpp
deleted file mode 100644
index 309faf8faf..0000000000
--- a/plugins/AdvaImg/src/FreeImage/CacheFile.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// ==========================================================
-// Multi-Page functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - checkered (checkered@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif 
-
-#include "CacheFile.h"
-
-// ----------------------------------------------------------
-
-CacheFile::CacheFile(const std::string filename, BOOL keep_in_memory) :
-m_file(NULL),
-m_filename(filename),
-m_free_pages(),
-m_page_cache_mem(),
-m_page_cache_disk(),
-m_page_map(),
-m_page_count(0),
-m_current_block(NULL),
-m_keep_in_memory(keep_in_memory) {
-}
-
-CacheFile::~CacheFile() {
-}
-
-BOOL
-CacheFile::open() {
-	if ((!m_filename.empty()) && (!m_keep_in_memory)) {
-		m_file = fopen(m_filename.c_str(), "w+b");
-		return (m_file != NULL);
-	}
-
-	return (m_keep_in_memory == TRUE);
-}
-
-void
-CacheFile::close() {
-	// dispose the cache entries
-
-	while (!m_page_cache_disk.empty()) {
-		Block *block = *m_page_cache_disk.begin();
-		m_page_cache_disk.pop_front();
-		delete [] block->data;
-		delete block;
-	}
-	while (!m_page_cache_mem.empty()) { 
-		Block *block = *m_page_cache_mem.begin(); 
-		m_page_cache_mem.pop_front(); 
-		delete [] block->data; 
-		delete block; 
-	} 
-
-	if (m_file) {
-		// close the file
-
-		fclose(m_file);
-
-		// delete the file
-
-		remove(m_filename.c_str());
-	}
-}
-
-void
-CacheFile::cleanupMemCache() {
-	if (!m_keep_in_memory) {
-		if (m_page_cache_mem.size() > CACHE_SIZE) {
-			// flush the least used block to file
-
-			Block *old_block = m_page_cache_mem.back();
-			fseek(m_file, old_block->nr * BLOCK_SIZE, SEEK_SET);
-			fwrite(old_block->data, BLOCK_SIZE, 1, m_file);
-
-			// remove the data
-
-			delete [] old_block->data;
-			old_block->data = NULL;
-
-			// move the block to another list
-
-			m_page_cache_disk.splice(m_page_cache_disk.begin(), m_page_cache_mem, --m_page_cache_mem.end());
-			m_page_map[old_block->nr] = m_page_cache_disk.begin();
-		}
-	}
-}
-
-int
-CacheFile::allocateBlock() {
-	Block *block = new Block;
-	block->data = new BYTE[BLOCK_SIZE];
-	block->next = 0;
-
-	if (!m_free_pages.empty()) {
-		block->nr = *m_free_pages.begin();
-		m_free_pages.pop_front();
-	} else {
-		block->nr = m_page_count++;
-	}
-
-	m_page_cache_mem.push_front(block);
-	m_page_map[block->nr] = m_page_cache_mem.begin();
-
-	cleanupMemCache();
-
-	return block->nr;
-}
-
-Block *
-CacheFile::lockBlock(int nr) {
-	if (m_current_block == NULL) {
-		PageMapIt it = m_page_map.find(nr);
-
-		if (it != m_page_map.end()) {
-			m_current_block = *(it->second);
-
-			// the block is swapped out to disc. load it back
-			// and remove the block from the cache. it might get cached
-			// again as soon as the memory buffer fills up
-
-			if (m_current_block->data == NULL) {
-				m_current_block->data = new BYTE[BLOCK_SIZE];
-
-				fseek(m_file, m_current_block->nr * BLOCK_SIZE, SEEK_SET);
-				fread(m_current_block->data, BLOCK_SIZE, 1, m_file);
-
-				m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second);
-				m_page_map[nr] = m_page_cache_mem.begin();
-			}
-
-			// if the memory cache size is too large, swap an item to disc
-
-			cleanupMemCache();
-
-			// return the current block
-
-			return m_current_block;
-		}
-	}
-
-	return NULL;
-}
-
-BOOL
-CacheFile::unlockBlock(int nr) {
-	if (m_current_block) {
-		m_current_block = NULL;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-BOOL
-CacheFile::deleteBlock(int nr) {
-	if (!m_current_block) {
-		PageMapIt it = m_page_map.find(nr);
-
-		// remove block from cache
-
-		if (it != m_page_map.end())
-			m_page_map.erase(nr);
-
-		// add block to free page list
-
-		m_free_pages.push_back(nr);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-BOOL
-CacheFile::readFile(BYTE *data, int nr, int size) {
-	if ((data) && (size > 0)) {
-		int s = 0;
-		int block_nr = nr;
-
-		do {
-			int copy_nr = block_nr;
-
-			Block *block = lockBlock(copy_nr);
-
-			block_nr = block->next;
-
-			memcpy(data + s, block->data, (s + BLOCK_SIZE > size) ? size - s : BLOCK_SIZE);
-
-			unlockBlock(copy_nr);
-
-			s += BLOCK_SIZE;
-		} while (block_nr != 0);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-int
-CacheFile::writeFile(BYTE *data, int size) {
-	if ((data) && (size > 0)) {
-		int nr_blocks_required = 1 + (size / BLOCK_SIZE);
-		int count = 0;
-		int s = 0;
-		int stored_alloc;
-		int alloc;
-		
-		stored_alloc = alloc = allocateBlock();
-
-		do {
-			int copy_alloc = alloc;
-
-			Block *block = lockBlock(copy_alloc);
-
-			block->next = 0;
-
-			memcpy(block->data, data + s, (s + BLOCK_SIZE > size) ? size - s : BLOCK_SIZE);
-
-			if (count + 1 < nr_blocks_required)
-				alloc = block->next = allocateBlock();
-
-			unlockBlock(copy_alloc);
-
-			s += BLOCK_SIZE;			
-		} while (++count < nr_blocks_required);
-
-		return stored_alloc;
-	}
-
-	return 0;
-}
-
-void
-CacheFile::deleteFile(int nr) {
-	do {
-		Block *block = lockBlock(nr);
-
-		if (block == NULL)
-			break;
-
-		int next = block->next;
-
-		unlockBlock(nr);
-
-		deleteBlock(nr);
-
-		nr = next;
-	} while (nr != 0);
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ColorLookup.cpp b/plugins/AdvaImg/src/FreeImage/ColorLookup.cpp
deleted file mode 100644
index 0f4435a725..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ColorLookup.cpp
+++ /dev/null
@@ -1,785 +0,0 @@
-// ==========================================================
-// X11 and SVG Color name lookup
-//
-// Design and implementation by
-// - Karl-Heinz Bussian (khbussian@moss.de)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-//
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// RGB color names  ---------------------------------------------------------
-
-typedef struct tagNamedColor {
-	const char *name;	//! color name
-	BYTE  r;			//! red value
-	BYTE  g;			//! green value
-	BYTE  b;			//! blue value
-} NamedColor;
-
-// --------------------------------------------------------------------------
-
-/**
-Helper function : perform a binary search on a color array
-@param name Color name
-@param color_array Color array
-@param n Length of the color array
-@return Returns the color index in the array if successful, returns -1 otherwise
-*/
-static int
-binsearch(const char *name, const NamedColor *color_array, int n) {
-	int cond, low, mid, high;
-
-    low = 0;
-    high = n - 1;
-    while (low <= high) {
-		mid = (low + high) / 2;
-		if ((cond = strcmp(name, color_array[mid].name)) < 0) {
-			high = mid - 1;
-		} else if (cond > 0) {
-			low = mid + 1;
-		} else {
-			return mid;
-		}
-	}
-	return -1;
-}
-
-/**
-Perform a binary search on a color array
-@param szColor Color name
-@param color_array Color array
-@param ncolors Length of the color array
-@return Returns the color index in the array if successful, returns -1 otherwise
-*/
-static int
-FreeImage_LookupNamedColor(const char *szColor, const NamedColor *color_array, int ncolors) {
-	int i;
-    char color[64];
-
-    // make lower case name, squezze white space
-
-    for (i = 0; szColor[i] && i < sizeof(color) - 1; i++) {
-		if (isspace(szColor[i])) {
-            continue;
-		}
-		if (isupper(szColor[i])) {
-			color[i] = (char)tolower(szColor[i]);
-		} else {
-            color[i] = szColor[i];
-		}
-    }
-    color[i] = 0;
-
-    return binsearch(color, color_array, ncolors);
-}
-
-// ==========================================================
-// X11 Color name lookup
-
-/**
- This big list of color names was formed from the file: /usr/X11R6/lib/X11/rgb.txt
- found on a standard Linux installation.
-*/
-
-static NamedColor X11ColorMap[] = {
-    { "aliceblue",            240, 248, 255 },
-    { "antiquewhite",         250, 235, 215 },
-    { "antiquewhite1",        255, 239, 219 },
-    { "antiquewhite2",        238, 223, 204 },
-    { "antiquewhite3",        205, 192, 176 },
-    { "antiquewhite4",        139, 131, 120 },
-    { "aquamarine",           127, 255, 212 },
-    { "aquamarine1",          127, 255, 212 },
-    { "aquamarine2",          118, 238, 198 },
-    { "aquamarine3",          102, 205, 170 },
-    { "aquamarine4",           69, 139, 116 },
-    { "azure",                240, 255, 255 },
-    { "azure1",               240, 255, 255 },
-    { "azure2",               224, 238, 238 },
-    { "azure3",               193, 205, 205 },
-    { "azure4",               131, 139, 139 },
-    { "beige",                245, 245, 220 },
-    { "bisque",               255, 228, 196 },
-    { "bisque1",              255, 228, 196 },
-    { "bisque2",              238, 213, 183 },
-    { "bisque3",              205, 183, 158 },
-    { "bisque4",              139, 125, 107 },
-    { "black",                  0,   0,   0 },
-    { "blanchedalmond",       255, 235, 205 },
-    { "blue",                   0,   0, 255 },
-    { "blue1",                  0,   0, 255 },
-    { "blue2",                  0,   0, 238 },
-    { "blue3",                  0,   0, 205 },
-    { "blue4",                  0,   0, 139 },
-    { "blueviolet",           138,  43, 226 },
-    { "brown",                165,  42,  42 },
-    { "brown1",               255,  64,  64 },
-    { "brown2",               238,  59,  59 },
-    { "brown3",               205,  51,  51 },
-    { "brown4",               139,  35,  35 },
-    { "burlywood",            222, 184, 135 },
-    { "burlywood1",           255, 211, 155 },
-    { "burlywood2",           238, 197, 145 },
-    { "burlywood3",           205, 170, 125 },
-    { "burlywood4",           139, 115,  85 },
-    { "cadetblue",             95, 158, 160 },
-    { "cadetblue1",           152, 245, 255 },
-    { "cadetblue2",           142, 229, 238 },
-    { "cadetblue3",           122, 197, 205 },
-    { "cadetblue4",            83, 134, 139 },
-    { "chartreuse",           127, 255,   0 },
-    { "chartreuse1",          127, 255,   0 },
-    { "chartreuse2",          118, 238,   0 },
-    { "chartreuse3",          102, 205,   0 },
-    { "chartreuse4",           69, 139,   0 },
-    { "chocolate",            210, 105,  30 },
-    { "chocolate1",           255, 127,  36 },
-    { "chocolate2",           238, 118,  33 },
-    { "chocolate3",           205, 102,  29 },
-    { "chocolate4",           139,  69,  19 },
-    { "coral",                255, 127,  80 },
-    { "coral1",               255, 114,  86 },
-    { "coral2",               238, 106,  80 },
-    { "coral3",               205,  91,  69 },
-    { "coral4",               139,  62,  47 },
-    { "cornflowerblue",       100, 149, 237 },
-    { "cornsilk",             255, 248, 220 },
-    { "cornsilk1",            255, 248, 220 },
-    { "cornsilk2",            238, 232, 205 },
-    { "cornsilk3",            205, 200, 177 },
-    { "cornsilk4",            139, 136, 120 },
-    { "cyan",                   0, 255, 255 },
-    { "cyan1",                  0, 255, 255 },
-    { "cyan2",                  0, 238, 238 },
-    { "cyan3",                  0, 205, 205 },
-    { "cyan4",                  0, 139, 139 },
-    { "darkblue",               0,   0, 139 },
-    { "darkcyan",               0, 139, 139 },
-    { "darkgoldenrod",        184, 134,  11 },
-    { "darkgoldenrod1",       255, 185,  15 },
-    { "darkgoldenrod2",       238, 173,  14 },
-    { "darkgoldenrod3",       205, 149,  12 },
-    { "darkgoldenrod4",       139, 101,   8 },
-    { "darkgreen",              0, 100,   0 },
-    { "darkkhaki",            189, 183, 107 },
-    { "darkmagenta",          139,   0, 139 },
-    { "darkolivegreen",        85, 107,  47 },
-    { "darkolivegreen1",      202, 255, 112 },
-    { "darkolivegreen2",      188, 238, 104 },
-    { "darkolivegreen3",      162, 205,  90 },
-    { "darkolivegreen4",      110, 139,  61 },
-    { "darkorange",           255, 140,   0 },
-    { "darkorange1",          255, 127,   0 },
-    { "darkorange2",          238, 118,   0 },
-    { "darkorange3",          205, 102,   0 },
-    { "darkorange4",          139,  69,   0 },
-    { "darkorchid",           153,  50, 204 },
-    { "darkorchid1",          191,  62, 255 },
-    { "darkorchid2",          178,  58, 238 },
-    { "darkorchid3",          154,  50, 205 },
-    { "darkorchid4",          104,  34, 139 },
-    { "darkred",              139,   0,   0 },
-    { "darksalmon",           233, 150, 122 },
-    { "darkseagreen",         143, 188, 143 },
-    { "darkseagreen1",        193, 255, 193 },
-    { "darkseagreen2",        180, 238, 180 },
-    { "darkseagreen3",        155, 205, 155 },
-    { "darkseagreen4",        105, 139, 105 },
-    { "darkslateblue",         72,  61, 139 },
-    { "darkslategray",         47,  79,  79 },
-    { "darkslategray1",       151, 255, 255 },
-    { "darkslategray2",       141, 238, 238 },
-    { "darkslategray3",       121, 205, 205 },
-    { "darkslategray4",        82, 139, 139 },
-    { "darkslategrey",         47,  79,  79 },
-    { "darkturquoise",          0, 206, 209 },
-    { "darkviolet",           148,   0, 211 },
-    { "deeppink",             255,  20, 147 },
-    { "deeppink1",            255,  20, 147 },
-    { "deeppink2",            238,  18, 137 },
-    { "deeppink3",            205,  16, 118 },
-    { "deeppink4",            139,  10,  80 },
-    { "deepskyblue",            0, 191, 255 },
-    { "deepskyblue1",           0, 191, 255 },
-    { "deepskyblue2",           0, 178, 238 },
-    { "deepskyblue3",           0, 154, 205 },
-    { "deepskyblue4",           0, 104, 139 },
-    { "dimgray",              105, 105, 105 },
-    { "dimgrey",              105, 105, 105 },
-    { "dodgerblue",            30, 144, 255 },
-    { "dodgerblue1",           30, 144, 255 },
-    { "dodgerblue2",           28, 134, 238 },
-    { "dodgerblue3",           24, 116, 205 },
-    { "dodgerblue4",           16,  78, 139 },
-    { "firebrick",            178,  34,  34 },
-    { "firebrick1",           255,  48,  48 },
-    { "firebrick2",           238,  44,  44 },
-    { "firebrick3",           205,  38,  38 },
-    { "firebrick4",           139,  26,  26 },
-    { "floralwhite",          255, 250, 240 },
-    { "forestgreen",          176,  48,  96 },
-    { "gainsboro",            220, 220, 220 },
-    { "ghostwhite",           248, 248, 255 },
-    { "gold",                 255, 215,   0 },
-    { "gold1",                255, 215,   0 },
-    { "gold2",                238, 201,   0 },
-    { "gold3",                205, 173,   0 },
-    { "gold4",                139, 117,   0 },
-    { "goldenrod",            218, 165,  32 },
-    { "goldenrod1",           255, 193,  37 },
-    { "goldenrod2",           238, 180,  34 },
-    { "goldenrod3",           205, 155,  29 },
-    { "goldenrod4",           139, 105,  20 },
-    { "gray",                 190, 190, 190 },
-    { "green",                  0, 255,   0 },
-    { "green1",                 0, 255,   0 },
-    { "green2",                 0, 238,   0 },
-    { "green3",                 0, 205,   0 },
-    { "green4",                 0, 139,   0 },
-    { "greenyellow",          173, 255,  47 },
-    { "grey",                 190, 190, 190 },
-    { "honeydew",             240, 255, 240 },
-    { "honeydew1",            240, 255, 240 },
-    { "honeydew2",            224, 238, 224 },
-    { "honeydew3",            193, 205, 193 },
-    { "honeydew4",            131, 139, 131 },
-    { "hotpink",              255, 105, 180 },
-    { "hotpink1",             255, 110, 180 },
-    { "hotpink2",             238, 106, 167 },
-    { "hotpink3",             205,  96, 144 },
-    { "hotpink4",             139,  58,  98 },
-    { "indianred",            205,  92,  92 },
-    { "indianred1",           255, 106, 106 },
-    { "indianred2",           238,  99,  99 },
-    { "indianred3",           205,  85,  85 },
-    { "indianred4",           139,  58,  58 },
-    { "ivory",                255, 255, 240 },
-    { "ivory1",               255, 255, 240 },
-    { "ivory2",               238, 238, 224 },
-    { "ivory3",               205, 205, 193 },
-    { "ivory4",               139, 139, 131 },
-    { "khaki",                240, 230, 140 },
-    { "khaki1",               255, 246, 143 },
-    { "khaki2",               238, 230, 133 },
-    { "khaki3",               205, 198, 115 },
-    { "khaki4",               139, 134,  78 },
-    { "lavender",             230, 230, 250 },
-    { "lavenderblush",        255, 240, 245 },
-    { "lavenderblush1",       255, 240, 245 },
-    { "lavenderblush2",       238, 224, 229 },
-    { "lavenderblush3",       205, 193, 197 },
-    { "lavenderblush4",       139, 131, 134 },
-    { "lawngreen",            124, 252,   0 },
-    { "lemonchiffon",         255, 250, 205 },
-    { "lemonchiffon1",        255, 250, 205 },
-    { "lemonchiffon2",        238, 233, 191 },
-    { "lemonchiffon3",        205, 201, 165 },
-    { "lemonchiffon4",        139, 137, 112 },
-    { "lightblue",            173, 216, 230 },
-    { "lightblue1",           191, 239, 255 },
-    { "lightblue2",           178, 223, 238 },
-    { "lightblue3",           154, 192, 205 },
-    { "lightblue4",           104, 131, 139 },
-    { "lightcoral",           240, 128, 128 },
-    { "lightcyan",            224, 255, 255 },
-    { "lightcyan1",           224, 255, 255 },
-    { "lightcyan2",           209, 238, 238 },
-    { "lightcyan3",           180, 205, 205 },
-    { "lightcyan4",           122, 139, 139 },
-    { "lightgoldenrod",       238, 221, 130 },
-    { "lightgoldenrod1",      255, 236, 139 },
-    { "lightgoldenrod2",      238, 220, 130 },
-    { "lightgoldenrod3",      205, 190, 112 },
-    { "lightgoldenrod4",      139, 129,  76 },
-    { "lightgoldenrodyellow", 250, 250, 210 },
-    { "lightgray",            211, 211, 211 },
-    { "lightgreen",           144, 238, 144 },
-    { "lightgrey",            211, 211, 211 },
-    { "lightpink",            255, 182, 193 },
-    { "lightpink1",           255, 174, 185 },
-    { "lightpink2",           238, 162, 173 },
-    { "lightpink3",           205, 140, 149 },
-    { "lightpink4",           139,  95, 101 },
-    { "lightsalmon",          255, 160, 122 },
-    { "lightsalmon1",         255, 160, 122 },
-    { "lightsalmon2",         238, 149, 114 },
-    { "lightsalmon3",         205, 129,  98 },
-    { "lightsalmon4",         139,  87,  66 },
-    { "lightseagreen",         32, 178, 170 },
-    { "lightskyblue",         135, 206, 250 },
-    { "lightskyblue1",        176, 226, 255 },
-    { "lightskyblue2",        164, 211, 238 },
-    { "lightskyblue3",        141, 182, 205 },
-    { "lightskyblue4",         96, 123, 139 },
-    { "lightslateblue",       132, 112, 255 },
-    { "lightslategray",       119, 136, 153 },
-    { "lightslategrey",       119, 136, 153 },
-    { "lightsteelblue",       176, 196, 222 },
-    { "lightsteelblue1",      202, 225, 255 },
-    { "lightsteelblue2",      188, 210, 238 },
-    { "lightsteelblue3",      162, 181, 205 },
-    { "lightsteelblue4",      110, 123, 139 },
-    { "lightyellow",          255, 255, 224 },
-    { "lightyellow1",         255, 255, 224 },
-    { "lightyellow2",         238, 238, 209 },
-    { "lightyellow3",         205, 205, 180 },
-    { "lightyellow4",         139, 139, 122 },
-    { "limegreen",             50, 205,  50 },
-    { "linen",                250, 240, 230 },
-    { "magenta",              255,   0, 255 },
-    { "magenta1",             255,   0, 255 },
-    { "magenta2",             238,   0, 238 },
-    { "magenta3",             205,   0, 205 },
-    { "magenta4",             139,   0, 139 },
-    { "maroon",                 0, 255, 255 },
-    { "maroon1",              255,  52, 179 },
-    { "maroon2",              238,  48, 167 },
-    { "maroon3",              205,  41, 144 },
-    { "maroon4",              139,  28,  98 },
-    { "mediumaquamarine",     102, 205, 170 },
-    { "mediumblue",             0,   0, 205 },
-    { "mediumorchid",         186,  85, 211 },
-    { "mediumorchid1",        224, 102, 255 },
-    { "mediumorchid2",        209,  95, 238 },
-    { "mediumorchid3",        180,  82, 205 },
-    { "mediumorchid4",        122,  55, 139 },
-    { "mediumpurple",         147, 112, 219 },
-    { "mediumpurple1",        171, 130, 255 },
-    { "mediumpurple2",        159, 121, 238 },
-    { "mediumpurple3",        137, 104, 205 },
-    { "mediumpurple4",         93,  71, 139 },
-    { "mediumseagreen",        60, 179, 113 },
-    { "mediumslateblue",      123, 104, 238 },
-    { "mediumspringgreen",      0, 250, 154 },
-    { "mediumturquoise",       72, 209, 204 },
-    { "mediumvioletred",      199,  21, 133 },
-    { "midnightblue",          25,  25, 112 },
-    { "mintcream",            245, 255, 250 },
-    { "mistyrose",            255, 228, 225 },
-    { "mistyrose1",           255, 228, 225 },
-    { "mistyrose2",           238, 213, 210 },
-    { "mistyrose3",           205, 183, 181 },
-    { "mistyrose4",           139, 125, 123 },
-    { "moccasin",             255, 228, 181 },
-    { "navajowhite",          255, 222, 173 },
-    { "navajowhite1",         255, 222, 173 },
-    { "navajowhite2",         238, 207, 161 },
-    { "navajowhite3",         205, 179, 139 },
-    { "navajowhite4",         139, 121,  94 },
-    { "navy",                   0,   0, 128 },
-    { "navyblue",               0,   0, 128 },
-    { "oldlace",              253, 245, 230 },
-    { "olivedrab",            107, 142,  35 },
-    { "olivedrab1",           192, 255,  62 },
-    { "olivedrab2",           179, 238,  58 },
-    { "olivedrab3",           154, 205,  50 },
-    { "olivedrab4",           105, 139,  34 },
-    { "orange",               255, 165,   0 },
-    { "orange1",              255, 165,   0 },
-    { "orange2",              238, 154,   0 },
-    { "orange3",              205, 133,   0 },
-    { "orange4",              139,  90,   0 },
-    { "orangered",            255,  69,   0 },
-    { "orangered1",           255,  69,   0 },
-    { "orangered2",           238,  64,   0 },
-    { "orangered3",           205,  55,   0 },
-    { "orangered4",           139,  37,   0 },
-    { "orchid",               218, 112, 214 },
-    { "orchid1",              255, 131, 250 },
-    { "orchid2",              238, 122, 233 },
-    { "orchid3",              205, 105, 201 },
-    { "orchid4",              139,  71, 137 },
-    { "palegoldenrod",        238, 232, 170 },
-    { "palegreen",            152, 251, 152 },
-    { "palegreen1",           154, 255, 154 },
-    { "palegreen2",           144, 238, 144 },
-    { "palegreen3",           124, 205, 124 },
-    { "palegreen4",            84, 139,  84 },
-    { "paleturquoise",        175, 238, 238 },
-    { "paleturquoise1",       187, 255, 255 },
-    { "paleturquoise2",       174, 238, 238 },
-    { "paleturquoise3",       150, 205, 205 },
-    { "paleturquoise4",       102, 139, 139 },
-    { "palevioletred",        219, 112, 147 },
-    { "palevioletred1",       255, 130, 171 },
-    { "palevioletred2",       238, 121, 159 },
-    { "palevioletred3",       205, 104, 137 },
-    { "palevioletred4",       139,  71,  93 },
-    { "papayawhip",           255, 239, 213 },
-    { "peachpuff",            255, 218, 185 },
-    { "peachpuff1",           255, 218, 185 },
-    { "peachpuff2",           238, 203, 173 },
-    { "peachpuff3",           205, 175, 149 },
-    { "peachpuff4",           139, 119, 101 },
-    { "peru",                 205, 133,  63 },
-    { "pink",                 255, 192, 203 },
-    { "pink1",                255, 181, 197 },
-    { "pink2",                238, 169, 184 },
-    { "pink3",                205, 145, 158 },
-    { "pink4",                139,  99, 108 },
-    { "plum",                 221, 160, 221 },
-    { "plum1",                255, 187, 255 },
-    { "plum2",                238, 174, 238 },
-    { "plum3",                205, 150, 205 },
-    { "plum4",                139, 102, 139 },
-    { "powderblue",           176, 224, 230 },
-    { "purple",               160,  32, 240 },
-    { "purple1",              155,  48, 255 },
-    { "purple2",              145,  44, 238 },
-    { "purple3",              125,  38, 205 },
-    { "purple4",               85,  26, 139 },
-    { "red",                  255,   0,   0 },
-    { "red1",                 255,   0,   0 },
-    { "red2",                 238,   0,   0 },
-    { "red3",                 205,   0,   0 },
-    { "red4",                 139,   0,   0 },
-    { "rosybrown",            188, 143, 143 },
-    { "rosybrown1",           255, 193, 193 },
-    { "rosybrown2",           238, 180, 180 },
-    { "rosybrown3",           205, 155, 155 },
-    { "rosybrown4",           139, 105, 105 },
-    { "royalblue",             65, 105, 225 },
-    { "royalblue1",            72, 118, 255 },
-    { "royalblue2",            67, 110, 238 },
-    { "royalblue3",            58,  95, 205 },
-    { "royalblue4",            39,  64, 139 },
-    { "saddlebrown",          139,  69,  19 },
-    { "salmon",               250, 128, 114 },
-    { "salmon1",              255, 140, 105 },
-    { "salmon2",              238, 130,  98 },
-    { "salmon3",              205, 112,  84 },
-    { "salmon4",              139,  76,  57 },
-    { "sandybrown",           244, 164,  96 },
-    { "seagreen",              46, 139,  87 },
-    { "seagreen1",             84, 255, 159 },
-    { "seagreen2",             78, 238, 148 },
-    { "seagreen3",             67, 205, 128 },
-    { "seagreen4",             46, 139,  87 },
-    { "seashell",             255, 245, 238 },
-    { "seashell1",            255, 245, 238 },
-    { "seashell2",            238, 229, 222 },
-    { "seashell3",            205, 197, 191 },
-    { "seashell4",            139, 134, 130 },
-    { "sienna",               160,  82,  45 },
-    { "sienna1",              255, 130,  71 },
-    { "sienna2",              238, 121,  66 },
-    { "sienna3",              205, 104,  57 },
-    { "sienna4",              139,  71,  38 },
-    { "skyblue",              135, 206, 235 },
-    { "skyblue1",             135, 206, 255 },
-    { "skyblue2",             126, 192, 238 },
-    { "skyblue3",             108, 166, 205 },
-    { "skyblue4",              74, 112, 139 },
-    { "slateblue",            106,  90, 205 },
-    { "slateblue1",           131, 111, 255 },
-    { "slateblue2",           122, 103, 238 },
-    { "slateblue3",           105,  89, 205 },
-    { "slateblue4",            71,  60, 139 },
-    { "slategray",            112, 128, 144 },
-    { "slategray1",           198, 226, 255 },
-    { "slategray2",           185, 211, 238 },
-    { "slategray3",           159, 182, 205 },
-    { "slategray4",           108, 123, 139 },
-    { "slategrey",            112, 128, 144 },
-    { "snow",                 255, 250, 250 },
-    { "snow1",                255, 250, 250 },
-    { "snow2",                238, 233, 233 },
-    { "snow3",                205, 201, 201 },
-    { "snow4",                139, 137, 137 },
-    { "springgreen",            0, 255, 127 },
-    { "springgreen1",           0, 255, 127 },
-    { "springgreen2",           0, 238, 118 },
-    { "springgreen3",           0, 205, 102 },
-    { "springgreen4",           0, 139,  69 },
-    { "steelblue",             70, 130, 180 },
-    { "steelblue1",            99, 184, 255 },
-    { "steelblue2",            92, 172, 238 },
-    { "steelblue3",            79, 148, 205 },
-    { "steelblue4",            54, 100, 139 },
-    { "tan",                  210, 180, 140 },
-    { "tan1",                 255, 165,  79 },
-    { "tan2",                 238, 154,  73 },
-    { "tan3",                 205, 133,  63 },
-    { "tan4",                 139,  90,  43 },
-    { "thistle",              216, 191, 216 },
-    { "thistle1",             255, 225, 255 },
-    { "thistle2",             238, 210, 238 },
-    { "thistle3",             205, 181, 205 },
-    { "thistle4",             139, 123, 139 },
-    { "tomato",               255,  99,  71 },
-    { "tomato1",              255,  99,  71 },
-    { "tomato2",              238,  92,  66 },
-    { "tomato3",              205,  79,  57 },
-    { "tomato4",              139,  54,  38 },
-    { "turquoise",             64, 224, 208 },
-    { "turquoise1",             0, 245, 255 },
-    { "turquoise2",             0, 229, 238 },
-    { "turquoise3",             0, 197, 205 },
-    { "turquoise4",             0, 134, 139 },
-    { "violet",               238, 130, 238 },
-    { "violetred",            208,  32, 144 },
-    { "violetred1",           255,  62, 150 },
-    { "violetred2",           238,  58, 140 },
-    { "violetred3",           205,  50, 120 },
-    { "violetred4",           139,  34,  82 },
-    { "wheat",                245, 222, 179 },
-    { "wheat1",               255, 231, 186 },
-    { "wheat2",               238, 216, 174 },
-    { "wheat3",               205, 186, 150 },
-    { "wheat4",               139, 126, 102 },
-    { "white",                255, 255, 255 },
-    { "whitesmoke",           245, 245, 245 },
-    { "yellow",               255, 255,   0 },
-    { "yellow1",              255, 255,   0 },
-    { "yellow2",              238, 238,   0 },
-    { "yellow3",              205, 205,   0 },
-    { "yellow4",              139, 139,   0 },
-    { "yellowgreen",          154, 205,  50 }
-};
-
-
-BOOL DLL_CALLCONV
-FreeImage_LookupX11Color(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue) {
-    int i;
-
-    // lookup color
-    i = FreeImage_LookupNamedColor(szColor, X11ColorMap, sizeof(X11ColorMap)/sizeof(X11ColorMap[0]));
-    if (i >= 0) {
-        *nRed   = X11ColorMap[i].r;
-        *nGreen = X11ColorMap[i].g;
-        *nBlue  = X11ColorMap[i].b;
-        return TRUE;
-    }
-
-    // not found, try for grey color with attached percent value
-    if ( (szColor[0] == 'g' || szColor[0] == 'G') &&
-         (szColor[1] == 'r' || szColor[1] == 'R') &&
-         (szColor[2] == 'e' || szColor[2] == 'E' || szColor[2] == 'a' || szColor[2] == 'A' ) &&
-         (szColor[3] == 'y' || szColor[3] == 'Y' ) )  {
-
-        // grey<num>, or gray<num>, num 1...100
-        i = strtol(szColor+4, NULL, 10);
-        *nRed   = (BYTE)(255.0/100.0 * i);
-        *nGreen = *nRed;
-        *nBlue  = *nRed;
-
-        return TRUE;
-    }
-
-    // not found at all
-    *nRed   = 0;
-    *nGreen = 0;
-    *nBlue  = 0;
-
-    return FALSE;
-}
-
-// ==========================================================
-// SVG Color name lookup
-
-/**
- These are the colors defined in the SVG standard (I haven't checked
- the final recommendation for changes)
-*/
-static NamedColor SVGColorMap[] = {
-	{ "aliceblue",                  240, 248, 255 },
-	{ "antiquewhite",               250, 235, 215 },
-	{ "aqua",                         0, 255, 255 },
-	{ "aquamarine",                 127, 255, 212 },
-	{ "azure",                      240, 255, 255 },
-	{ "beige",                      245, 245, 220 },
-	{ "bisque",                     255, 228, 196 },
-	{ "black",                        0,   0,   0 },
-	{ "blanchedalmond",             255, 235, 205 },
-	{ "blue",                         0,   0, 255 },
-	{ "blueviolet",                 138,  43, 226 },
-	{ "brown",                      165,  42,  42 },
-	{ "burlywood",                  222, 184, 135 },
-	{ "cadetblue",                   95, 158, 160 },
-	{ "chartreuse",                 127, 255,   0 },
-	{ "chocolate",                  210, 105,  30 },
-	{ "coral",                      255, 127,  80 },
-	{ "cornflowerblue",             100, 149, 237 },
-	{ "cornsilk",                   255, 248, 220 },
-	{ "crimson",                    220,  20,  60 },
-	{ "cyan",                         0, 255, 255 },
-	{ "darkblue",                     0,   0, 139 },
-	{ "darkcyan",                     0, 139, 139 },
-	{ "darkgoldenrod",              184, 134,  11 },
-	{ "darkgray",                   169, 169, 169 },
-	{ "darkgreen",                    0, 100,   0 },
-	{ "darkgrey",                   169, 169, 169 },
-	{ "darkkhaki",                  189, 183, 107 },
-	{ "darkmagenta",                139,   0, 139 },
-	{ "darkolivegreen",              85, 107,  47 },
-	{ "darkorange",                 255, 140,   0 },
-	{ "darkorchid",                 153,  50, 204 },
-	{ "darkred",                    139,   0,   0 },
-	{ "darksalmon",                 233, 150, 122 },
-	{ "darkseagreen",               143, 188, 143 },
-	{ "darkslateblue",               72,  61, 139 },
-	{ "darkslategray",               47,  79,  79 },
-	{ "darkslategrey",               47,  79,  79 },
-	{ "darkturquoise",                0, 206, 209 },
-	{ "darkviolet",                 148,   0, 211 },
-	{ "deeppink",                   255,  20, 147 },
-	{ "deepskyblue",                  0, 191, 255 },
-	{ "dimgray",                    105, 105, 105 },
-	{ "dimgrey",                    105, 105, 105 },
-	{ "dodgerblue",                  30, 144, 255 },
-	{ "firebrick",                  178,  34,  34 },
-	{ "floralwhite",                255, 250, 240 },
-	{ "forestgreen",                 34, 139,  34 },
-	{ "fuchsia",                    255,   0, 255 },
-	{ "gainsboro",                  220, 220, 220 },
-	{ "ghostwhite",                 248, 248, 255 },
-	{ "gold",                       255, 215,   0 },
-	{ "goldenrod",                  218, 165,  32 },
-	{ "gray",                       128, 128, 128 },
-	{ "green",                        0, 128,   0 },
-	{ "greenyellow",                173, 255,  47 },
-	{ "grey",                       128, 128, 128 },
-	{ "honeydew",                   240, 255, 240 },
-	{ "hotpink",                    255, 105, 180 },
-	{ "indianred",                  205,  92,  92 },
-	{ "indigo",                      75,   0, 130 },
-	{ "ivory",                      255, 255, 240 },
-	{ "khaki",                      240, 230, 140 },
-	{ "lavender",                   230, 230, 250 },
-	{ "lavenderblush",              255, 240, 245 },
-	{ "lawngreen",                  124, 252,   0 },
-	{ "lemonchiffon",               255, 250, 205 },
-	{ "lightblue",                  173, 216, 230 },
-	{ "lightcoral",                 240, 128, 128 },
-	{ "lightcyan",                  224, 255, 255 },
-	{ "lightgoldenrodyellow",       250, 250, 210 },
-	{ "lightgray",                  211, 211, 211 },
-	{ "lightgreen",                 144, 238, 144 },
-	{ "lightgrey",                  211, 211, 211 },
-	{ "lightpink",                  255, 182, 193 },
-	{ "lightsalmon",                255, 160, 122 },
-	{ "lightseagreen",               32, 178, 170 },
-	{ "lightskyblue",               135, 206, 250 },
-	{ "lightslategray",             119, 136, 153 },
-	{ "lightslategrey",             119, 136, 153 },
-	{ "lightsteelblue",             176, 196, 222 },
-	{ "lightyellow",                255, 255, 224 },
-	{ "lime",                         0, 255,   0 },
-	{ "limegreen",                   50, 205,  50 },
-	{ "linen",                      250, 240, 230 },
-	{ "magenta",                    255,   0, 255 },
-	{ "maroon",                     128,   0,   0 },
-	{ "mediumaquamarine",           102, 205, 170 },
-	{ "mediumblue",                   0,   0, 205 },
-	{ "mediumorchid",               186,  85, 211 },
-	{ "mediumpurple",               147, 112, 219 },
-	{ "mediumseagreen",              60, 179, 113 },
-	{ "mediumslateblue",            123, 104, 238 },
-	{ "mediumspringgreen",            0, 250, 154 },
-	{ "mediumturquoise",             72, 209, 204 },
-	{ "mediumvioletred",            199,  21, 133 },
-	{ "midnightblue",                25,  25, 112 },
-	{ "mintcream",                  245, 255, 250 },
-	{ "mistyrose",                  255, 228, 225 },
-	{ "moccasin",                   255, 228, 181 },
-	{ "navajowhite",                255, 222, 173 },
-	{ "navy",                         0,   0, 128 },
-	{ "oldlace",                    253, 245, 230 },
-	{ "olive",                      128, 128,   0 },
-	{ "olivedrab",                  107, 142,  35 },
-	{ "orange",                     255, 165,   0 },
-	{ "orangered",                  255,  69,   0 },
-	{ "orchid",                     218, 112, 214 },
-	{ "palegoldenrod",              238, 232, 170 },
-	{ "palegreen",                  152, 251, 152 },
-	{ "paleturquoise",              175, 238, 238 },
-	{ "palevioletred",              219, 112, 147 },
-	{ "papayawhip",                 255, 239, 213 },
-	{ "peachpuff",                  255, 218, 185 },
-	{ "peru",                       205, 133,  63 },
-	{ "pink",                       255, 192, 203 },
-	{ "plum",                       221, 160, 221 },
-	{ "powderblue",                 176, 224, 230 },
-	{ "purple",                     128,   0, 128 },
-	{ "red",                        255,   0,   0 },
-	{ "rosybrown",                  188, 143, 143 },
-	{ "royalblue",                   65, 105, 225 },
-	{ "saddlebrown",                139,  69,  19 },
-	{ "salmon",                     250, 128, 114 },
-	{ "sandybrown",                 244, 164,  96 },
-	{ "seagreen",                    46, 139,  87 },
-	{ "seashell",                   255, 245, 238 },
-	{ "sienna",                     160,  82,  45 },
-	{ "silver",                     192, 192, 192 },
-	{ "skyblue",                    135, 206, 235 },
-	{ "slateblue",                  106,  90, 205 },
-	{ "slategray",                  112, 128, 144 },
-	{ "slategrey",                  112, 128, 144 },
-	{ "snow",                       255, 250, 250 },
-	{ "springgreen",                  0, 255, 127 },
-	{ "steelblue",                   70, 130, 180 },
-	{ "tan",                        210, 180, 140 },
-	{ "teal",                         0, 128, 128 },
-	{ "thistle",                    216, 191, 216 },
-	{ "tomato",                     255,  99,  71 },
-	{ "turquoise",                   64, 224, 208 },
-	{ "violet",                     238, 130, 238 },
-	{ "wheat",                      245, 222, 179 },
-	{ "white",                      255, 255, 255 },
-	{ "whitesmoke",                 245, 245, 245 },
-	{ "yellow",                     255, 255,   0 },
-	{ "yellowgreen",                154, 205,  50 }
-};
-
-
-BOOL DLL_CALLCONV
-FreeImage_LookupSVGColor(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue) {
-    int i;
-
-    // lookup color
-    i = FreeImage_LookupNamedColor(szColor, SVGColorMap, sizeof(SVGColorMap)/sizeof(SVGColorMap[0]));
-    if (i >= 0) {
-        *nRed   = SVGColorMap[i].r;
-        *nGreen = SVGColorMap[i].g;
-        *nBlue  = SVGColorMap[i].b;
-        return TRUE;
-    }
-
-    // not found, try for grey color with attached percent value
-    if ( (szColor[0] == 'g' || szColor[0] == 'G') &&
-         (szColor[1] == 'r' || szColor[1] == 'R') &&
-         (szColor[2] == 'e' || szColor[2] == 'E' || szColor[2] == 'a' || szColor[2] == 'A' ) &&
-         (szColor[3] == 'y' || szColor[3] == 'Y' ) )  {
-
-        // grey<num>, or gray<num>, num 1...100
-        i = strtol(szColor+4, NULL, 10);
-        *nRed   = (BYTE)(255.0/100.0 * i);
-        *nGreen = *nRed;
-        *nBlue  = *nRed;
-        return TRUE;
-    }
-
-    // not found at all
-    *nRed   = 0;
-    *nGreen = 0;
-    *nBlue  = 0;
-
-    return FALSE;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion.cpp b/plugins/AdvaImg/src/FreeImage/Conversion.cpp
deleted file mode 100644
index 815057ad08..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion.cpp
+++ /dev/null
@@ -1,551 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "Quantizers.h"
-
-// ----------------------------------------------------------
-
-#define CONVERT(from, to) case to : FreeImage_ConvertLine##from##To##to(bits, scanline, FreeImage_GetWidth(dib)); break;
-#define CONVERTWITHPALETTE(from, to) case to : FreeImage_ConvertLine##from##To##to(bits, scanline, FreeImage_GetWidth(dib), FreeImage_GetPalette(dib)); break;
-
-#define CONVERTTO16(from) \
-	case 16 : \
-		if ((red_mask == FI16_555_RED_MASK) && (green_mask == FI16_555_GREEN_MASK) && (blue_mask == FI16_555_BLUE_MASK)) { \
-			FreeImage_ConvertLine##from##To16_555(bits, scanline, FreeImage_GetWidth(dib)); \
-		} else { \
-			FreeImage_ConvertLine##from##To16_565(bits, scanline, FreeImage_GetWidth(dib)); \
-		} \
-		break;
-
-#define CONVERTTO16WITHPALETTE(from) \
-	case 16 : \
-		if ((red_mask == FI16_555_RED_MASK) && (green_mask == FI16_555_GREEN_MASK) && (blue_mask == FI16_555_BLUE_MASK)) { \
-			FreeImage_ConvertLine##from##To16_555(bits, scanline, FreeImage_GetWidth(dib), FreeImage_GetPalette(dib)); \
-		} else { \
-			FreeImage_ConvertLine##from##To16_565(bits, scanline, FreeImage_GetWidth(dib), FreeImage_GetPalette(dib)); \
-		} \
-		break;
-
-// ==========================================================
-// Utility functions declared in Utilities.h
-
-BOOL SwapRedBlue32(FIBITMAP* dib) {
-	if(FreeImage_GetImageType(dib) != FIT_BITMAP) {
-		return FALSE;
-	}
-		
-	const unsigned bytesperpixel = FreeImage_GetBPP(dib) / 8;
-	if(bytesperpixel > 4 || bytesperpixel < 3) {
-		return FALSE;
-	}
-		
-	const unsigned height = FreeImage_GetHeight(dib);
-	const unsigned pitch = FreeImage_GetPitch(dib);
-	const unsigned lineSize = FreeImage_GetLine(dib);
-	
-	BYTE* line = FreeImage_GetBits(dib);
-	for(unsigned y = 0; y < height; ++y, line += pitch) {
-		for(BYTE* pixel = line; pixel < line + lineSize ; pixel += bytesperpixel) {
-			INPLACESWAP(pixel[0], pixel[2]);
-		}
-	}
-	
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-static inline void 
-assignRGB(WORD r, WORD g, WORD b, WORD* out) {
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-}
-
-static inline void 
-assignRGB(BYTE r, BYTE g, BYTE b, BYTE* out) {
-	out[FI_RGBA_RED]	= r;
-	out[FI_RGBA_GREEN]	= g;
-	out[FI_RGBA_BLUE]	= b;
-}
-
-/**
-CMYK -> CMY -> RGB conversion from http://www.easyrgb.com/
-
-CMYK to CMY [0-1]: C,M,Y * (1 - K) + K
-CMY to RGB [0-1]: (1 - C,M,Y)
-
-=> R,G,B = (1 - C,M,Y) * (1 - K)
-mapped to [0-MAX_VAL]: 
-(MAX_VAL - C,M,Y) * (MAX_VAL - K) / MAX_VAL
-*/
-template <class T>
-static inline void 
-CMYKToRGB(T C, T M, T Y, T K, T* out) {
-	unsigned max_val = std::numeric_limits<T>::max();
-	
-	unsigned r = (max_val - C) * (max_val - K) / max_val;
-	unsigned g = (max_val - M) * (max_val - K) / max_val;
-	unsigned b = (max_val - Y) * (max_val - K) / max_val;
-
-	// clamp values to [0..max_val]
-	T red	= (T)CLAMP(r, (unsigned)0, max_val);
-	T green	= (T)CLAMP(g, (unsigned)0, max_val);
-	T blue	= (T)CLAMP(b, (unsigned)0, max_val);
-
-	assignRGB(red, green, blue, out);
-}
-
-template <class T>
-static void 
-_convertCMYKtoRGBA(unsigned width, unsigned height, BYTE* line_start, unsigned pitch, unsigned samplesperpixel) {
-	const BOOL hasBlack = (samplesperpixel > 3) ? TRUE : FALSE;
-	const T MAX_VAL = std::numeric_limits<T>::max();
-		
-	T K = 0;
-	for(unsigned y = 0; y < height; y++) {
-		T *line = (T*)line_start;
-
-		for(unsigned x = 0; x < width; x++) {
-			if(hasBlack) {
-				K = line[FI_RGBA_ALPHA];			
-				line[FI_RGBA_ALPHA] = MAX_VAL; // TODO write the first extra channel as alpha!
-			}			
-			
-			CMYKToRGB<T>(line[0], line[1], line[2], K, line);
-			
-			line += samplesperpixel;
-		}
-		line_start += pitch;
-	}
-}
-
-BOOL 
-ConvertCMYKtoRGBA(FIBITMAP* dib) {
-	if(!FreeImage_HasPixels(dib)) {
-		return FALSE;
-	}
-		
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	const unsigned bytesperpixel = FreeImage_GetBPP(dib)/8;
-	
-	unsigned channelSize = 1;
-	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
-	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
-		return FALSE;
-	}
-				
-	const unsigned width = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	BYTE *line_start = FreeImage_GetScanLine(dib, 0);
-	const unsigned pitch = FreeImage_GetPitch(dib);
-	
-	unsigned samplesperpixel = FreeImage_GetLine(dib) / width / channelSize;
-
-	if(channelSize == sizeof(WORD)) {
-		_convertCMYKtoRGBA<WORD>(width, height, line_start, pitch, samplesperpixel);
-	} else {
-		_convertCMYKtoRGBA<BYTE>(width, height, line_start, pitch, samplesperpixel);
-	}
-
-	return TRUE;	
-}
-
-// ----------------------------------------------------------
-
-/**
-CIELab -> XYZ conversion from http://www.easyrgb.com/
-*/
-static void 
-CIELabToXYZ(float L, float a, float b, float *X, float *Y, float *Z) {
-	float pow_3;
-	
-	// CIELab -> XYZ conversion 
-	// ------------------------
-	float var_Y = (L + 16.F ) / 116.F;
-	float var_X = a / 500.F + var_Y;
-	float var_Z = var_Y - b / 200.F;
-
-	pow_3 = powf(var_Y, 3);
-	if(pow_3 > 0.008856F) {
-		var_Y = pow_3;
-	} else {
-		var_Y = ( var_Y - 16.F / 116.F ) / 7.787F;
-	}
-	pow_3 = powf(var_X, 3);
-	if(pow_3 > 0.008856F) {
-		var_X = pow_3;
-	} else {
-		var_X = ( var_X - 16.F / 116.F ) / 7.787F;
-	}
-	pow_3 = powf(var_Z, 3);
-	if(pow_3 > 0.008856F) {
-		var_Z = pow_3;
-	} else {
-		var_Z = ( var_Z - 16.F / 116.F ) / 7.787F;
-	}
-
-	static const float ref_X =  95.047F;
-	static const float ref_Y = 100.000F;
-	static const float ref_Z = 108.883F;
-
-	*X = ref_X * var_X;	// ref_X = 95.047 (Observer= 2°, Illuminant= D65)
-	*Y = ref_Y * var_Y;	// ref_Y = 100.000
-	*Z = ref_Z * var_Z;	// ref_Z = 108.883
-}
-
-/**
-XYZ -> RGB conversion from http://www.easyrgb.com/
-*/
-static void 
-XYZToRGB(float X, float Y, float Z, float *R, float *G, float *B) {
-	float var_X = X / 100; // X from 0 to  95.047 (Observer = 2°, Illuminant = D65)
-	float var_Y = Y / 100; // Y from 0 to 100.000
-	float var_Z = Z / 100; // Z from 0 to 108.883
-
-	float var_R = var_X *  3.2406F + var_Y * -1.5372F + var_Z * -0.4986F;
-	float var_G = var_X * -0.9689F + var_Y *  1.8758F + var_Z *  0.0415F;
-	float var_B = var_X *  0.0557F + var_Y * -0.2040F + var_Z *  1.0570F;
-
-	float exponent = 1.F / 2.4F;
-
-	if(var_R > 0.0031308F) {
-		var_R = 1.055F * powf(var_R, exponent) - 0.055F;
-	} else {
-		var_R = 12.92F * var_R;
-	}
-	if(var_G > 0.0031308F) {
-		var_G = 1.055F * powf(var_G, exponent) - 0.055F;
-	} else {
-		var_G = 12.92F * var_G;
-	}
-	if(var_B > 0.0031308F) {
-		var_B = 1.055F * powf(var_B, exponent) - 0.055F;
-	} else {
-		var_B = 12.92F * var_B;
-	}
-
-	*R = var_R;
-	*G = var_G;
-	*B = var_B;
-}
-
-template<class T>
-static void 
-CIELabToRGB(float L, float a, float b, T *rgb) {
-	float X, Y, Z;
-	float R, G, B;
-	const float max_val = std::numeric_limits<T>::max();
-
-	CIELabToXYZ(L, a, b, &X, &Y, &Z);
-	XYZToRGB(X, Y, Z, &R, &G, &B);
-	
-	// clamp values to [0..max_val]
-	T red	= (T)CLAMP(R * max_val, 0.0F, max_val);
-	T green	= (T)CLAMP(G * max_val, 0.0F, max_val);
-	T blue	= (T)CLAMP(B * max_val, 0.0F, max_val);
-
-	assignRGB(red, green, blue, rgb);
-}
-
-template<class T>
-static void 
-_convertLABtoRGB(unsigned width, unsigned height, BYTE* line_start, unsigned pitch, unsigned samplesperpixel) {
-	const unsigned max_val = std::numeric_limits<T>::max();
-	const float sL = 100.F / max_val;
-	const float sa = 256.F / max_val;
-	const float sb = 256.F / max_val;
-	
-	for(unsigned y = 0; y < height; y++) {
-		T *line = (T*)line_start;
-
-		for(unsigned x = 0; x < width; x++) {
-			CIELabToRGB(line[0]* sL, line[1]* sa - 128.F, line[2]* sb - 128.F, line);
-			
-			line += samplesperpixel;
-		}
-		line_start += pitch;
-	}
-}
-
-BOOL
-ConvertLABtoRGB(FIBITMAP* dib) {
-	if(!FreeImage_HasPixels(dib)) {
-		return FALSE;
-	}
-		
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	const unsigned bytesperpixel = FreeImage_GetBPP(dib) / 8;
-	
-	unsigned channelSize = 1;
-	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
-	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
-		return FALSE;
-	}
-				
-	const unsigned width = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	BYTE *line_start = FreeImage_GetScanLine(dib, 0);
-	const unsigned pitch = FreeImage_GetPitch(dib);
-	
-	unsigned samplesperpixel = FreeImage_GetLine(dib) / width / channelSize;
-			
-	if(channelSize == 1) {
-		_convertLABtoRGB<BYTE>(width, height, line_start, pitch, samplesperpixel);
-	}
-	else {
-		_convertLABtoRGB<WORD>(width, height, line_start, pitch, samplesperpixel);
-	}
-
-	return TRUE;	
-}
-
-// ----------------------------------------------------------
-
-FIBITMAP* 
-RemoveAlphaChannel(FIBITMAP* src) { 
-
-	if(!FreeImage_HasPixels(src)) {
-		return NULL;
-	}
-
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-		
-	switch(image_type) {
-		case FIT_BITMAP:
-			if(FreeImage_GetBPP(src) == 32) {
-				// convert to 24-bit
-				return FreeImage_ConvertTo24Bits(src);
-			}
-			break;
-		case FIT_RGBA16:
-			// convert to RGB16
-			return FreeImage_ConvertToRGB16(src);
-		case FIT_RGBAF:
-			// convert to RGBF
-			return FreeImage_ConvertToRGBF(src);
-		default:
-			// unsupported image type
-			return NULL;
-	}
-
-	return NULL;
-}
-
-
-// ==========================================================
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize) {
-	return FreeImage_ColorQuantizeEx(dib, quantize);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize, int PaletteSize, int ReserveSize, RGBQUAD *ReservePalette) {
-	if( PaletteSize < 2 ) PaletteSize = 2;
-	if( PaletteSize > 256 ) PaletteSize = 256;
-	if( ReserveSize < 0 ) ReserveSize = 0;
-	if( ReserveSize > PaletteSize ) ReserveSize = PaletteSize;
-	if (FreeImage_HasPixels(dib)) {
-		const unsigned bpp = FreeImage_GetBPP(dib);
-		if((FreeImage_GetImageType(dib) == FIT_BITMAP) && (bpp == 24 || bpp == 32)) {
-			switch(quantize) {
-				case FIQ_WUQUANT :
-				{
-					try {
-						WuQuantizer Q (dib);
-						FIBITMAP *dst = Q.Quantize(PaletteSize, ReserveSize, ReservePalette);
-						if(dst) {
-							// copy metadata from src to dst
-							FreeImage_CloneMetadata(dst, dib);
-						}
-						return dst;
-					} catch (const char *) {
-						return NULL;
-					}
-					break;
-				}
-				case FIQ_NNQUANT :
-				{
-					if (bpp == 32) {
-						// 32-bit images not supported by NNQUANT
-						return NULL;
-					}
-					// sampling factor in range 1..30. 
-					// 1 => slower (but better), 30 => faster. Default value is 1
-					const int sampling = 1;
-
-					NNQuantizer Q(PaletteSize);
-					FIBITMAP *dst = Q.Quantize(dib, ReserveSize, ReservePalette, sampling);
-					if(dst) {
-						// copy metadata from src to dst
-						FreeImage_CloneMetadata(dst, dib);
-					}
-					return dst;
-				}
-				case FIQ_LFPQUANT :
-				{
-					LFPQuantizer Q(PaletteSize);
-					FIBITMAP *dst = Q.Quantize(dib, ReserveSize, ReservePalette);
-					if(dst) {
-						// copy metadata from src to dst
-						FreeImage_CloneMetadata(dst, dib);
-					}
-					return dst;
-				}
-			}
-		}
-	}
-
-	return NULL;
-}
-
-// ==========================================================
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertFromRawBitsEx(BOOL copySource, BYTE *bits, FREE_IMAGE_TYPE type, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown) {
-	FIBITMAP *dib = NULL;
-
-	if(copySource) {
-		// allocate a FIBITMAP with internally managed pixel buffer
-		dib = FreeImage_AllocateT(type, width, height, bpp, red_mask, green_mask, blue_mask);
-		if(!dib) {
-			return NULL;
-		}
-		// copy user provided pixel buffer into the dib
-		const unsigned linesize = FreeImage_GetLine(dib);
-		for(int y = 0; y < height; y++) {
-			memcpy(FreeImage_GetScanLine(dib, y), bits, linesize);
-			// next line in user's buffer
-			bits += pitch;
-		}
-		// flip pixels vertically if needed
-		if(topdown) {
-			FreeImage_FlipVertical(dib);
-		}
-	}
-	else {
-		// allocate a FIBITMAP using a wrapper to user provided pixel buffer
-		dib = FreeImage_AllocateHeaderForBits(bits, pitch, type, width, height, bpp, red_mask, green_mask, blue_mask);
-		if(!dib) {
-			return NULL;
-		}
-		// flip pixels vertically if needed
-		if(topdown) {
-			FreeImage_FlipVertical(dib);
-		}
-	}
-
-	return dib;
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertFromRawBits(BYTE *bits, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown) {
-	return FreeImage_ConvertFromRawBitsEx(TRUE /* copySource */, bits, FIT_BITMAP, width, height, pitch, bpp, red_mask, green_mask, blue_mask, topdown);
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown) {
-	if (FreeImage_HasPixels(dib) && (bits != NULL)) {
-		for (unsigned i = 0; i < FreeImage_GetHeight(dib); ++i) {
-			BYTE *scanline = FreeImage_GetScanLine(dib, topdown ? (FreeImage_GetHeight(dib) - i - 1) : i);
-
-			if ((bpp == 16) && (FreeImage_GetBPP(dib) == 16)) {
-				// convert 555 to 565 or vice versa
-
-				if ((red_mask == FI16_555_RED_MASK) && (green_mask == FI16_555_GREEN_MASK) && (blue_mask == FI16_555_BLUE_MASK)) {
-					if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-						FreeImage_ConvertLine16_565_To16_555(bits, scanline, FreeImage_GetWidth(dib));
-					} else {
-						memcpy(bits, scanline, FreeImage_GetLine(dib));
-					}
-				} else {
-					if ((FreeImage_GetRedMask(dib) == FI16_555_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_555_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_555_BLUE_MASK)) {
-						FreeImage_ConvertLine16_555_To16_565(bits, scanline, FreeImage_GetWidth(dib));
-					} else {
-						memcpy(bits, scanline, FreeImage_GetLine(dib));
-					}
-				}
-			} else if (FreeImage_GetBPP(dib) != bpp) {
-				switch(FreeImage_GetBPP(dib)) {
-					case 1 :
-						switch(bpp) {
-							CONVERT(1, 8)
-							CONVERTTO16WITHPALETTE(1)
-							CONVERTWITHPALETTE(1, 24)
-							CONVERTWITHPALETTE(1, 32)
-						}
-
-						break;
-
-					case 4 :
-						switch(bpp) {
-							CONVERT(4, 8)
-							CONVERTTO16WITHPALETTE(4)
-							CONVERTWITHPALETTE(4, 24)
-							CONVERTWITHPALETTE(4, 32)
-						}
-
-						break;
-
-					case 8 :
-						switch(bpp) {
-							CONVERTTO16WITHPALETTE(8)
-							CONVERTWITHPALETTE(8, 24)
-							CONVERTWITHPALETTE(8, 32)
-						}
-
-						break;
-
-					case 24 :
-						switch(bpp) {
-							CONVERT(24, 8)
-							CONVERTTO16(24)
-							CONVERT(24, 32)
-						}
-
-						break;
-
-					case 32 :
-						switch(bpp) {
-							CONVERT(32, 8)
-							CONVERTTO16(32)
-							CONVERT(32, 24)
-						}
-
-						break;
-				}
-			} else {
-				memcpy(bits, scanline, FreeImage_GetLine(dib));
-			}
-
-			bits += pitch;
-		}
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp b/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp
deleted file mode 100644
index 3eb4c330a5..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-
-#define RGB555(b, g, r) ((((b) >> 3) << FI16_555_BLUE_SHIFT) | (((g) >> 3) << FI16_555_GREEN_SHIFT) | (((r) >> 3) << FI16_555_RED_SHIFT))
-
-// ----------------------------------------------------------
-//  internal conversions X to 16 bits (555)
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
-
-		new_bits[cols] = RGB555(palette[index].rgbBlue, palette[index].rgbGreen, palette[index].rgbRed);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine4To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-	BOOL lonibble = FALSE;
-	int x = 0;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		RGBQUAD *grab_palette;
-
-		if (lonibble) {
-			grab_palette = palette + LOWNIBBLE(source[x++]);
-		} else {
-			grab_palette = palette + (HINIBBLE(source[x]) >> 4);								
-		}
-
-		new_bits[cols] = RGB555(grab_palette->rgbBlue, grab_palette->rgbGreen, grab_palette->rgbRed);
-
-		lonibble = !lonibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine8To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		RGBQUAD *grab_palette = palette + source[cols];
-
-		new_bits[cols] = RGB555(grab_palette->rgbBlue, grab_palette->rgbGreen, grab_palette->rgbRed);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16_565_To16_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB555((((src_bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F,
-			                    (((src_bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
-								(((src_bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine24To16_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
-
-		source += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
-
-		source += 4;
-	}
-}
-
-// ----------------------------------------------------------
-//   smart convert X to 16 bits
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo16Bits555(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL;
-
-	const int width = FreeImage_GetWidth(dib);
-	const int height = FreeImage_GetHeight(dib);
-	const int bpp = FreeImage_GetBPP(dib);
-
-	if(bpp == 16) {
-		if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-			// RGB 565
-			FIBITMAP *new_dib = FreeImage_Allocate(width, height, 16, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK);
-			if(new_dib == NULL) {
-				return NULL;
-			}
-			for (int rows = 0; rows < height; rows++) {
-				FreeImage_ConvertLine16_565_To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-			}
-
-			// copy metadata from src to dst
-			FreeImage_CloneMetadata(new_dib, dib);
-
-			return new_dib;
-		} else {
-			// RGB 555
-			return FreeImage_Clone(dib);
-		}
-	}
-	else {
-		// other bpp cases => convert to RGB 555
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 16, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		switch (bpp) {
-			case 1 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine1To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 4 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine4To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 8 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine8To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 24 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine24To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-
-				return new_dib;
-			}
-
-			case 32 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine32To16_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-
-				return new_dib;
-			}
-
-			default :
-				// unreachable code ...
-				FreeImage_Unload(new_dib);
-				break;
-
-		}
-	}
-
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp b/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp
deleted file mode 100644
index fd790b92f4..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//  internal conversions X to 16 bits (565)
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
-
-		new_bits[cols] = RGB565(palette[index].rgbBlue, palette[index].rgbGreen, palette[index].rgbRed);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine4To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-	BOOL lonibble = FALSE;
-	int x = 0;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		RGBQUAD *grab_palette;
-
-		if (lonibble) {
-			grab_palette = palette + LOWNIBBLE(source[x++]);
-		} else {
-			grab_palette = palette + (HINIBBLE(source[x]) >> 4);								
-		}
-
-		new_bits[cols] = RGB565(grab_palette->rgbBlue, grab_palette->rgbGreen, grab_palette->rgbRed);
-
-		lonibble = !lonibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine8To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		RGBQUAD *grab_palette = palette + source[cols];
-
-		new_bits[cols] = RGB565(grab_palette->rgbBlue, grab_palette->rgbGreen, grab_palette->rgbRed);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16_555_To16_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB565((((src_bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F,
-			                    (((src_bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
-								(((src_bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine24To16_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
-
-		source += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
-
-		source += 4;
-	}
-}
-
-// ----------------------------------------------------------
-//   smart convert X to 16 bits (565)
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo16Bits565(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL;
-
-	const int width = FreeImage_GetWidth(dib);
-	const int height = FreeImage_GetHeight(dib);
-	const int bpp = FreeImage_GetBPP(dib);
-
-	if(bpp == 16) {
-		if ((FreeImage_GetRedMask(dib) == FI16_555_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_555_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_555_BLUE_MASK)) {
-			// RGB 555
-			FIBITMAP *new_dib = FreeImage_Allocate(width, height, 16, FI16_565_RED_MASK, FI16_565_GREEN_MASK, FI16_565_BLUE_MASK);
-			if(new_dib == NULL) {
-				return NULL;
-			}
-			for (int rows = 0; rows < height; rows++) {
-				FreeImage_ConvertLine16_555_To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-			}
-
-			// copy metadata from src to dst
-			FreeImage_CloneMetadata(new_dib, dib);
-
-			return new_dib;
-		} else {
-			// RGB 565
-			return FreeImage_Clone(dib);
-		}
-	}
-	else {
-		// other bpp cases => convert to RGB 565
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 16, FI16_565_RED_MASK, FI16_565_GREEN_MASK, FI16_565_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		switch (bpp) {
-			case 1 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine1To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 4 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine4To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 8 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine8To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-
-				return new_dib;
-			}
-
-			case 24 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine24To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-
-				return new_dib;
-			}
-
-			case 32 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine32To16_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-
-				return new_dib;
-			}
-
-			default :
-				// unreachable code ...
-				FreeImage_Unload(new_dib);
-				break;
-		}
-	}
-
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion24.cpp b/plugins/AdvaImg/src/FreeImage/Conversion24.cpp
deleted file mode 100644
index 85ce90417b..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion24.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Dale Larson (dlarson@norsesoft.com)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//  internal conversions X to 24 bits
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		BYTE index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
-
-		target[FI_RGBA_BLUE] = palette[index].rgbBlue;
-		target[FI_RGBA_GREEN] = palette[index].rgbGreen;
-		target[FI_RGBA_RED] = palette[index].rgbRed;
-
-		target += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine4To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	BOOL low_nibble = FALSE;
-	int x = 0;
-
-	for (int cols = 0; cols < width_in_pixels; ++cols ) {
-		if (low_nibble) {
-			target[FI_RGBA_BLUE] = palette[LOWNIBBLE(source[x])].rgbBlue;
-			target[FI_RGBA_GREEN] = palette[LOWNIBBLE(source[x])].rgbGreen;
-			target[FI_RGBA_RED] = palette[LOWNIBBLE(source[x])].rgbRed;
-
-			x++;
-		} else {
-			target[FI_RGBA_BLUE] = palette[HINIBBLE(source[x]) >> 4].rgbBlue;
-			target[FI_RGBA_GREEN] = palette[HINIBBLE(source[x]) >> 4].rgbGreen;
-			target[FI_RGBA_RED] = palette[HINIBBLE(source[x]) >> 4].rgbRed;
-		}
-
-		low_nibble = !low_nibble;
-
-		target += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine8To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_BLUE] = palette[source[cols]].rgbBlue;
-		target[FI_RGBA_GREEN] = palette[source[cols]].rgbGreen;
-		target[FI_RGBA_RED] = palette[source[cols]].rgbRed;
-
-		target += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To24_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_RED]   = (BYTE)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_GREEN] = (BYTE)((((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_BLUE]  = (BYTE)((((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F);
-
-		target += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To24_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_RED]   = (BYTE)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_GREEN] = (BYTE)((((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F);
-		target[FI_RGBA_BLUE]  = (BYTE)((((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
-
-		target += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_BLUE] = source[FI_RGBA_BLUE];
-		target[FI_RGBA_GREEN] = source[FI_RGBA_GREEN];
-		target[FI_RGBA_RED] = source[FI_RGBA_RED];
-
-		target += 3;
-		source += 4;
-	}
-}
-
-// ----------------------------------------------------------
-//   smart convert X to 24 bits
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo24Bits(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const unsigned bpp = FreeImage_GetBPP(dib);
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-
-	if((image_type != FIT_BITMAP) && (image_type != FIT_RGB16) && (image_type != FIT_RGBA16)) {
-		return NULL;
-	}
-	
-	const int width = FreeImage_GetWidth(dib);
-	const int height = FreeImage_GetHeight(dib);
-
-	if(image_type == FIT_BITMAP) {
-		if(bpp == 24) {
-			return FreeImage_Clone(dib);
-		}
-
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		switch(bpp) {
-			case 1 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine1To24(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));					
-				}
-				return new_dib;
-			}
-
-			case 4 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine4To24(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-				return new_dib;
-			}
-				
-			case 8 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine8To24(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-				return new_dib;
-			}
-
-			case 16 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-						FreeImage_ConvertLine16To24_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					} else {
-						// includes case where all the masks are 0
-						FreeImage_ConvertLine16To24_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					}
-				}
-				return new_dib;
-			}
-
-			case 32 :
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine32To24(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-				return new_dib;
-			}
-		}
-	
-	} else if(image_type == FIT_RGB16) {
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		const unsigned src_pitch = FreeImage_GetPitch(dib);
-		const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-		const BYTE *src_bits = FreeImage_GetBits(dib);
-		BYTE *dst_bits = FreeImage_GetBits(new_dib);
-		for (int rows = 0; rows < height; rows++) {
-			const FIRGB16 *src_pixel = (FIRGB16*)src_bits;
-			RGBTRIPLE *dst_pixel = (RGBTRIPLE*)dst_bits;
-			for(int cols = 0; cols < width; cols++) {
-				dst_pixel[cols].rgbtRed   = (BYTE)(src_pixel[cols].red   >> 8);
-				dst_pixel[cols].rgbtGreen = (BYTE)(src_pixel[cols].green >> 8);
-				dst_pixel[cols].rgbtBlue  = (BYTE)(src_pixel[cols].blue  >> 8);
-			}
-			src_bits += src_pitch;
-			dst_bits += dst_pitch;
-		}
-
-		return new_dib;
-
-	} else if(image_type == FIT_RGBA16) {
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		const unsigned src_pitch = FreeImage_GetPitch(dib);
-		const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-		const BYTE *src_bits = FreeImage_GetBits(dib);
-		BYTE *dst_bits = FreeImage_GetBits(new_dib);
-		for (int rows = 0; rows < height; rows++) {
-			const FIRGBA16 *src_pixel = (FIRGBA16*)src_bits;
-			RGBTRIPLE *dst_pixel = (RGBTRIPLE*)dst_bits;
-			for(int cols = 0; cols < width; cols++) {
-				dst_pixel[cols].rgbtRed   = (BYTE)(src_pixel[cols].red   >> 8);
-				dst_pixel[cols].rgbtGreen = (BYTE)(src_pixel[cols].green >> 8);
-				dst_pixel[cols].rgbtBlue  = (BYTE)(src_pixel[cols].blue  >> 8);
-			}
-			src_bits += src_pitch;
-			dst_bits += dst_pitch;
-		}		
-
-		return new_dib;
-	}
-
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion32.cpp b/plugins/AdvaImg/src/FreeImage/Conversion32.cpp
deleted file mode 100644
index 0dc31287e6..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion32.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//  internal conversions X to 32 bits
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		int index = (source[cols>>3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
-
-		target[FI_RGBA_BLUE]	= palette[index].rgbBlue;
-		target[FI_RGBA_GREEN]	= palette[index].rgbGreen;
-		target[FI_RGBA_RED]		= palette[index].rgbRed;
-		target[FI_RGBA_ALPHA]	= 0xFF;
-		target += 4;
-	}	
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine4To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	BOOL low_nibble = FALSE;
-	int x = 0;
-
-	for (int cols = 0 ; cols < width_in_pixels ; ++cols) {
-		if (low_nibble) {
-			target[FI_RGBA_BLUE]	= palette[LOWNIBBLE(source[x])].rgbBlue;
-			target[FI_RGBA_GREEN]	= palette[LOWNIBBLE(source[x])].rgbGreen;
-			target[FI_RGBA_RED]		= palette[LOWNIBBLE(source[x])].rgbRed;
-
-			x++;
-		} else {
-			target[FI_RGBA_BLUE]	= palette[HINIBBLE(source[x]) >> 4].rgbBlue;
-			target[FI_RGBA_GREEN]	= palette[HINIBBLE(source[x]) >> 4].rgbGreen;
-			target[FI_RGBA_RED]		= palette[HINIBBLE(source[x]) >> 4].rgbRed;
-		}
-
-		low_nibble = !low_nibble;
-
-		target[FI_RGBA_ALPHA] = 0xFF;
-		target += 4;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine8To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_BLUE]	= palette[source[cols]].rgbBlue;
-		target[FI_RGBA_GREEN]	= palette[source[cols]].rgbGreen;
-		target[FI_RGBA_RED]		= palette[source[cols]].rgbRed;
-		target[FI_RGBA_ALPHA]	= 0xFF;
-		target += 4;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To32_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_RED]   = (BYTE)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_GREEN] = (BYTE)((((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_BLUE]  = (BYTE)((((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_ALPHA] = 0xFF;
-		target += 4;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To32_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_RED]   = (BYTE)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_GREEN] = (BYTE)((((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F);
-		target[FI_RGBA_BLUE]  = (BYTE)((((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
-		target[FI_RGBA_ALPHA] = 0xFF;
-		target += 4;
-	}
-}
-/*
-void DLL_CALLCONV
-FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		*(DWORD *)target = (*(DWORD *) source & FI_RGBA_RGB_MASK) | FI_RGBA_ALPHA_MASK;
-		target += 4;
-		source += 3;
-	}
-}
-*/
-/**
-This unoptimized version of the conversion function avoid an undetermined bug with VC++ SP6. 
-The bug occurs in release mode only, when the image height is equal to 537 
-(try e.g. a size of 432x537 to reproduce the bug with the optimized function).
-*/
-void DLL_CALLCONV
-FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_RED]   = source[FI_RGBA_RED];
-		target[FI_RGBA_GREEN] = source[FI_RGBA_GREEN];
-		target[FI_RGBA_BLUE]  = source[FI_RGBA_BLUE];
-		target[FI_RGBA_ALPHA] = 0xFF;
-		target += 4;
-		source += 3;
-	}
-}
-
-// ----------------------------------------------------------
-
-inline void 
-FreeImage_ConvertLine1To32MapTransparency(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette, BYTE *table, int transparent_pixels) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		int index = (source[cols>>3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
-
-		target[FI_RGBA_BLUE]	= palette[index].rgbBlue;
-		target[FI_RGBA_GREEN]	= palette[index].rgbGreen;
-		target[FI_RGBA_RED]		= palette[index].rgbRed;
-		target[FI_RGBA_ALPHA] = (index < transparent_pixels) ? table[index] : 255;		
-		target += 4;
-	}	
-}
-
-inline void 
-FreeImage_ConvertLine4To32MapTransparency(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette, BYTE *table, int transparent_pixels) {
-	BOOL low_nibble = FALSE;
-	int x = 0;
-
-	for (int cols = 0 ; cols < width_in_pixels ; ++cols) {
-		if (low_nibble) {
-			target[FI_RGBA_BLUE]	= palette[LOWNIBBLE(source[x])].rgbBlue;
-			target[FI_RGBA_GREEN]	= palette[LOWNIBBLE(source[x])].rgbGreen;
-			target[FI_RGBA_RED]		= palette[LOWNIBBLE(source[x])].rgbRed;
-			target[FI_RGBA_ALPHA]	= (LOWNIBBLE(source[x]) < transparent_pixels) ? table[LOWNIBBLE(source[x])] : 255;
-
-			x++;
-		} else {
-			target[FI_RGBA_BLUE]	= palette[HINIBBLE(source[x]) >> 4].rgbBlue;
-			target[FI_RGBA_GREEN]	= palette[HINIBBLE(source[x]) >> 4].rgbGreen;
-			target[FI_RGBA_RED]		= palette[HINIBBLE(source[x]) >> 4].rgbRed;
-			target[FI_RGBA_ALPHA]	= (HINIBBLE(source[x] >> 4) < transparent_pixels) ? table[HINIBBLE(source[x]) >> 4] : 255;
-		}
-
-		low_nibble = !low_nibble;
-				
-		target += 4;
-	}
-}
-
-inline void 
-FreeImage_ConvertLine8To32MapTransparency(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette, BYTE *table, int transparent_pixels) {
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		target[FI_RGBA_BLUE]	= palette[source[cols]].rgbBlue;
-		target[FI_RGBA_GREEN]	= palette[source[cols]].rgbGreen;
-		target[FI_RGBA_RED]		= palette[source[cols]].rgbRed;
-		target[FI_RGBA_ALPHA] = (source[cols] < transparent_pixels) ? table[source[cols]] : 255;
-		target += 4;		
-	}
-}
-
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo32Bits(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const int bpp = FreeImage_GetBPP(dib);
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	
-	if((image_type != FIT_BITMAP) && (image_type != FIT_RGB16) && (image_type != FIT_RGBA16)) {
-		return NULL;
-	}
-	
-	const int width = FreeImage_GetWidth(dib);
-	const int height = FreeImage_GetHeight(dib);
-
-	if(image_type == FIT_BITMAP) {
-
-		if(bpp == 32) {
-			return FreeImage_Clone(dib);
-		}
-
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		BOOL bIsTransparent = FreeImage_IsTransparent(dib);
-
-		switch(bpp) {
-			case 1:
-			{
-				if(bIsTransparent) {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine1To32MapTransparency(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib), FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib));
-					}
-				} else {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine1To32(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-					}					
-				}
-
-				return new_dib;
-			}
-
-			case 4:
-			{
-				if(bIsTransparent) {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine4To32MapTransparency(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib), FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib));
-					}
-				} else {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine4To32(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-					}					
-				}
-
-				return new_dib;
-			}
-				
-			case 8:
-			{
-				if(bIsTransparent) {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine8To32MapTransparency(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib), FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib));
-					}
-				} else {
-					for (int rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine8To32(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-					}					
-				}
-
-				return new_dib;
-			}
-
-			case 16:
-			{
-				for (int rows = 0; rows < height; rows++) {
-					if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-						FreeImage_ConvertLine16To32_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					} else {
-						// includes case where all the masks are 0
-						FreeImage_ConvertLine16To32_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					}
-				}
-
-				return new_dib;
-			}
-
-			case 24:
-			{
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine24To32(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-
-				return new_dib;
-			}
-		}
-
-	} else if(image_type == FIT_RGB16) {
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		const unsigned src_pitch = FreeImage_GetPitch(dib);
-		const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-		const BYTE *src_bits = FreeImage_GetBits(dib);
-		BYTE *dst_bits = FreeImage_GetBits(new_dib);
-		for (int rows = 0; rows < height; rows++) {
-			const FIRGB16 *src_pixel = (FIRGB16*)src_bits;
-			RGBQUAD *dst_pixel = (RGBQUAD*)dst_bits;
-			for(int cols = 0; cols < width; cols++) {
-				dst_pixel[cols].rgbRed		= (BYTE)(src_pixel[cols].red   >> 8);
-				dst_pixel[cols].rgbGreen	= (BYTE)(src_pixel[cols].green >> 8);
-				dst_pixel[cols].rgbBlue		= (BYTE)(src_pixel[cols].blue  >> 8);
-				dst_pixel[cols].rgbReserved = (BYTE)0xFF;
-			}
-			src_bits += src_pitch;
-			dst_bits += dst_pitch;
-		}
-
-		return new_dib;
-
-	} else if(image_type == FIT_RGBA16) {
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		const unsigned src_pitch = FreeImage_GetPitch(dib);
-		const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-		const BYTE *src_bits = FreeImage_GetBits(dib);
-		BYTE *dst_bits = FreeImage_GetBits(new_dib);
-		for (int rows = 0; rows < height; rows++) {
-			const FIRGBA16 *src_pixel = (FIRGBA16*)src_bits;
-			RGBQUAD *dst_pixel = (RGBQUAD*)dst_bits;
-			for(int cols = 0; cols < width; cols++) {
-				dst_pixel[cols].rgbRed		= (BYTE)(src_pixel[cols].red   >> 8);
-				dst_pixel[cols].rgbGreen	= (BYTE)(src_pixel[cols].green >> 8);
-				dst_pixel[cols].rgbBlue		= (BYTE)(src_pixel[cols].blue  >> 8);
-				dst_pixel[cols].rgbReserved = (BYTE)(src_pixel[cols].alpha >> 8);
-			}
-			src_bits += src_pitch;
-			dst_bits += dst_pitch;
-		}		
-
-		return new_dib;
-	}
-	
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion4.cpp b/plugins/AdvaImg/src/FreeImage/Conversion4.cpp
deleted file mode 100644
index 13048b6d3f..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion4.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Riley McNiff (rmcniff@marexgroup.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//  internal conversions X to 4 bits
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels) {
-	BOOL hinibble = TRUE;
-	for (int cols = 0; cols < width_in_pixels; cols++){
-		if (hinibble == TRUE){
-			target[cols >> 1] = ((source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 15 : 0) << 4;
-		} 
-		else {
-			target[cols >> 1] |= ((source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 15 : 0);
-		}
-
-		hinibble = !hinibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette) {
-	BOOL hinibble = TRUE;
-	BYTE index;
-
-	for (int cols = 0; cols < width_in_pixels; cols++){
-		index = GREY(palette[source[cols]].rgbRed, palette[source[cols]].rgbGreen, palette[source[cols]].rgbBlue);
-		if (hinibble) {
-			target[cols >> 1] = (index & 0xF0);
-		} else {
-			target[cols >> 1] |= (index >> 4);
-		}
-
-		hinibble = !hinibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To4_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-	BOOL hinibble = TRUE;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		if (hinibble) {
-			target[cols >> 1] = GREY((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F,
-								(((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
-								(((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F)
-								& 0xF0;
-		} else {
-			target[cols >> 1] |= GREY((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F,
-								(((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
-								(((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F)
-								>> 4;
-		}
-		
-		hinibble = !hinibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To4_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
-	BOOL hinibble = TRUE;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		if (hinibble) {
-			target[cols >> 1] = GREY((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F,
-				        (((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
-						(((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F)
-						& 0xF0;
-		} else {
-			target[cols >> 1] |= GREY((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F,
-				        (((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
-						(((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F)
-						>> 4;
-		}
-
-		hinibble = !hinibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine24To4(BYTE *target, BYTE *source, int width_in_pixels) {
-	BOOL hinibble = TRUE;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		if (hinibble) {
-			target[cols >> 1] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]) & 0xF0;
-		} else {
-			target[cols >> 1] |= GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]) >> 4;
-		}
-
-		source += 3;
-		hinibble = !hinibble;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels) {
-	BOOL hinibble = TRUE;
-
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		if (hinibble) {
-			target[cols >> 1] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]) & 0xF0;
-		} else {
-			target[cols >> 1] |= GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]) >> 4;
-		}
-
-		source += 4;
-		hinibble = !hinibble;
-	}
-}
-
-// ----------------------------------------------------------
-//   smart convert X to 4 bits
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo4Bits(FIBITMAP *dib) {
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const int bpp = FreeImage_GetBPP(dib);
-
-	if(bpp != 4) {
-		const int width  = FreeImage_GetWidth(dib);
-		const int height = FreeImage_GetHeight(dib);
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 4);
-
-		if(new_dib == NULL) {
-			return NULL;
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		// Build a greyscale palette (*always* needed for image processing)
-
-		RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
-
-		for(int i = 0; i < 16; i++) {
-			new_pal[i].rgbRed	= (BYTE)((i << 4) + i);
-			new_pal[i].rgbGreen = (BYTE)((i << 4) + i);
-			new_pal[i].rgbBlue	= (BYTE)((i << 4) + i);
-		}
-
-		switch(bpp) {
-			case 1:
-			{
-				if(FreeImage_GetColorType(dib) == FIC_PALETTE) {
-
-					// Copy the palette
-
-					RGBQUAD *old_pal = FreeImage_GetPalette(dib);
-					memcpy(&new_pal[0], &old_pal[0], sizeof(RGBQUAD));
-					memcpy(&new_pal[15], &old_pal[1], sizeof(RGBQUAD));
-
-				}
-				else if(FreeImage_GetColorType(dib) == FIC_MINISWHITE) {
-					
-					// Reverse the grayscale palette
-
-					for(int i = 0; i < 16; i++) {
-						new_pal[i].rgbRed = new_pal[i].rgbGreen = new_pal[i].rgbBlue = (BYTE)(255 - ((i << 4) + i));
-					}
-				}
-
-				// Expand and copy the bitmap data
-
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine1To4(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-				return new_dib;
-			}
-
-			case 8 :
-			{
-				// Expand and copy the bitmap data
-
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine8To4(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
-				}
-				return new_dib;
-			}
-
-			case 16 :
-			{
-				// Expand and copy the bitmap data
-
-				for (int rows = 0; rows < height; rows++) {
-					if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-						FreeImage_ConvertLine16To4_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					} else {
-						FreeImage_ConvertLine16To4_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					}
-				}
-				
-				return new_dib;
-			}
-
-			case 24 :
-			{
-				// Expand and copy the bitmap data
-
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine24To4(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);					
-				}
-				return new_dib;
-			}
-
-			case 32 :
-			{
-				// Expand and copy the bitmap data
-
-				for (int rows = 0; rows < height; rows++) {
-					FreeImage_ConvertLine32To4(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-				}
-				return new_dib;
-			}
-		}
-	}
-
-	return FreeImage_Clone(dib);
-}
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp b/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
deleted file mode 100644
index 861e8169ce..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jani Kajala (janik@remedy.fi)
-// - Karl-Heinz Bussian (khbussian@moss.de)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//  internal conversions X to 8 bits
-// ----------------------------------------------------------
-
-void DLL_CALLCONV
-FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++)
-		target[cols] = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 255 : 0;	
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels) {
-	unsigned count_new = 0;
-	unsigned count_org = 0;
-	BOOL hinibble = TRUE;
-
-	while (count_new < (unsigned)width_in_pixels) {
-		if (hinibble) {
-			target[count_new] = (source[count_org] >> 4);
-		} else {
-			target[count_new] = (source[count_org] & 0x0F);
-			count_org++;
-		}
-		hinibble = !hinibble;
-		count_new++;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
-	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
-		target[cols] = GREY((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F,
-			                (((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
-							(((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
-	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
-		target[cols] = GREY((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F,
-			        (((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
-					(((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
-		target[cols] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]);
-		source += 3;
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels) {
-	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
-		target[cols] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]);
-		source += 4;
-	}
-}
-
-// ----------------------------------------------------------
-//   smart convert X to 8 bits
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
-	if (!FreeImage_HasPixels(dib)) {
-		return NULL;
-	}
-
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-	if (image_type != FIT_BITMAP && image_type != FIT_UINT16) {
-		return NULL;
-	}
-
-	const unsigned bpp = FreeImage_GetBPP(dib);
-
-	if (bpp != 8) {
-
-		const unsigned width = FreeImage_GetWidth(dib);
-		const unsigned height = FreeImage_GetHeight(dib);
-
-		// Allocate a destination image
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
-		if (new_dib == NULL) {
-			return NULL;
-		}
-
-		// Copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		// Palette of destination image has already been initialized
-		RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
-
-		const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-
-		if (image_type == FIT_BITMAP) {
-
-			switch(bpp) {
-				case 1:
-				{
-					if (color_type == FIC_PALETTE) {
-						// Copy the palette
-						RGBQUAD *old_pal = FreeImage_GetPalette(dib);
-						new_pal[0] = old_pal[0];
-						new_pal[255] = old_pal[1];
-
-					} else if (color_type == FIC_MINISWHITE) {
-						// Create a reverse grayscale palette
-						CREATE_GREYSCALE_PALETTE_REVERSE(new_pal, 256);
-					}
-
-					// Expand and copy the bitmap data
-					for (unsigned rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine1To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					}
-					return new_dib;
-				}
-
-				case 4 :
-				{
-					if (color_type == FIC_PALETTE) {
-						// Copy the palette
-						memcpy(new_pal, FreeImage_GetPalette(dib), 16 * sizeof(RGBQUAD));
-					}
-
-					// Expand and copy the bitmap data
-					for (unsigned rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine4To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);					
-					}
-					return new_dib;
-				}
-
-				case 16 :
-				{
-					// Expand and copy the bitmap data
-					if (IS_FORMAT_RGB565(dib)) {
-						for (unsigned rows = 0; rows < height; rows++) {
-							FreeImage_ConvertLine16To8_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-						}
-					} else {
-						for (unsigned rows = 0; rows < height; rows++) {
-							FreeImage_ConvertLine16To8_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-						}
-					}
-					return new_dib;
-				}
-
-				case 24 :
-				{
-					// Expand and copy the bitmap data
-					for (unsigned rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine24To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);					
-					}
-					return new_dib;
-				}
-
-				case 32 :
-				{
-					// Expand and copy the bitmap data
-					for (unsigned rows = 0; rows < height; rows++) {
-						FreeImage_ConvertLine32To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
-					}
-					return new_dib;
-				}
-			}
-
-		} else if (image_type == FIT_UINT16) {
-
-			const unsigned src_pitch = FreeImage_GetPitch(dib);
-			const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-			const BYTE *src_bits = FreeImage_GetBits(dib);
-			BYTE *dst_bits = FreeImage_GetBits(new_dib);
-
-			for (unsigned rows = 0; rows < height; rows++) {
-				const WORD *const src_pixel = (WORD*)src_bits;
-				BYTE *dst_pixel = (BYTE*)dst_bits;
-				for(unsigned cols = 0; cols < width; cols++) {
-					dst_pixel[cols] = (BYTE)(src_pixel[cols] >> 8);
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-			return new_dib;
-		} 
-
-	} // bpp != 8
-
-	return FreeImage_Clone(dib);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToGreyscale(FIBITMAP *dib) {
-	if (!FreeImage_HasPixels(dib)) {
-		return NULL;
-	}
-
-	const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-
-	if (color_type == FIC_PALETTE || color_type == FIC_MINISWHITE) {
-
-		const unsigned bpp = FreeImage_GetBPP(dib);
-		const unsigned width  = FreeImage_GetWidth(dib);
-		const unsigned height = FreeImage_GetHeight(dib);
-
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
-		if (new_dib == NULL) {
-			return NULL;
-		}
-
-		// Copy metadata from src to dst
-		FreeImage_CloneMetadata(new_dib, dib);
-
-		// Create a greyscale palette
-		BYTE grey_pal[256];
-		const RGBQUAD *pal = FreeImage_GetPalette(dib);
-		const unsigned size = CalculateUsedPaletteEntries(bpp);
-		for (unsigned i = 0; i < size; i++) {
-			grey_pal[i] = GREY(pal->rgbRed, pal->rgbGreen, pal->rgbBlue);
-			pal++;
-		}
-
-		const BYTE *src_bits = FreeImage_GetBits(dib);
-		BYTE *dst_bits = FreeImage_GetBits(new_dib);
-
-		const unsigned src_pitch = FreeImage_GetPitch(dib);
-		const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
-
-		switch(bpp) {
-			case 1:
-			{
-				for (unsigned y = 0; y < height; y++) {
-					for (unsigned x = 0; x < width; x++) {
-						const unsigned pixel = (src_bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
-						dst_bits[x] = grey_pal[pixel];
-					}
-					src_bits += src_pitch;
-					dst_bits += dst_pitch;
-				}
-			}
-			break;
-
-			case 4:
-			{
-				for (unsigned y = 0; y < height; y++) {
-					for (unsigned x = 0; x < width; x++) {
-						const unsigned pixel = x & 0x01 ? src_bits[x >> 1] & 0x0F : src_bits[x >> 1] >> 4;
-						dst_bits[x] = grey_pal[pixel];
-					}
-					src_bits += src_pitch;
-					dst_bits += dst_pitch;
-				}
-			}
-			break;
-
-			case 8:
-			{
-				for (unsigned y = 0; y < height; y++) {
-					for (unsigned x = 0; x < width; x++) {
-						dst_bits[x] = grey_pal[src_bits[x]];
-					}
-					src_bits += src_pitch;
-					dst_bits += dst_pitch;
-				}
-			}
-			break;
-		}
-		return new_dib;
-	} 
-	
-	// Convert the bitmap to 8-bit greyscale
-	return FreeImage_ConvertTo8Bits(dib);
-}
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp b/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp
deleted file mode 100644
index 6a01d7f0af..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to Float
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToFloat(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// allow conversion from 8-bit
-			if((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) {
-				src = dib;
-			} else {
-				src = FreeImage_ConvertToGreyscale(dib);
-				if(!src) return NULL;
-			}
-			break;
-		}
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-			src = dib;
-			break;
-		case FIT_FLOAT:
-			// float type : clone the src
-			return FreeImage_Clone(dib);
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_FLOAT, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to float
-
-	const unsigned src_pitch = FreeImage_GetPitch(src);
-	const unsigned dst_pitch = FreeImage_GetPitch(dst);
-
-	const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-	BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE *src_pixel = (BYTE*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x] = (float)(src_pixel[x]) / 255;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x] = (float)(src_pixel[x]) / 65535;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGB16 *src_pixel = (FIRGB16*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x] = LUMA_REC709(src_pixel[x].red, src_pixel[x].green, src_pixel[x].blue) / 65535.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBA16 *src_pixel = (FIRGBA16*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x] = LUMA_REC709(src_pixel[x].red, src_pixel[x].green, src_pixel[x].blue) / 65535.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBF:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBF *src_pixel = (FIRGBF*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert (assume pixel values are in the range [0..1])
-					dst_pixel[x] = LUMA_REC709(src_pixel[x].red, src_pixel[x].green, src_pixel[x].blue);
-					dst_pixel[x] = CLAMP(dst_pixel[x], 0.0F, 1.0F);
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBAF:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBAF *src_pixel = (FIRGBAF*)src_bits;
-				float *dst_pixel = (float*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert (assume pixel values are in the range [0..1])
-					dst_pixel[x] = LUMA_REC709(src_pixel[x].red, src_pixel[x].green, src_pixel[x].blue);
-					dst_pixel[x] = CLAMP(dst_pixel[x], 0.0F, 1.0F);
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp
deleted file mode 100644
index 156a91b85b..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to RGB16
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToRGB16(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// convert to 24-bit if needed
-			if((FreeImage_GetBPP(dib) == 24) || (FreeImage_GetBPP(dib) == 32)) {
-				src = dib;
-			} else {
-				src = FreeImage_ConvertTo24Bits(dib);
-				if(!src) return NULL;
-			}
-			break;
-		}
-		case FIT_UINT16:
-			// allow conversion from unsigned 16-bit
-			src = dib;
-			break;
-		case FIT_RGB16:
-			// RGB16 type : clone the src
-			return FreeImage_Clone(dib);
-			break;
-		case FIT_RGBA16:
-			// allow conversion from 64-bit RGBA (ignore the alpha channel)
-			src = dib;
-			break;
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_RGB16, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to RGB16
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// Calculate the number of bytes per pixel (1 for 8-bit, 3 for 24-bit or 4 for 32-bit)
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE *src_bits = (BYTE*)FreeImage_GetScanLine(src, y);
-				FIRGB16 *dst_bits = (FIRGB16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					dst_bits[x].red   = src_bits[FI_RGBA_RED] << 8;
-					dst_bits[x].green = src_bits[FI_RGBA_GREEN] << 8;
-					dst_bits[x].blue  = src_bits[FI_RGBA_BLUE] << 8;
-					src_bits += bytespp;
-				}
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
-				FIRGB16 *dst_bits = (FIRGB16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert by copying greyscale channel to each R, G, B channels
-					dst_bits[x].red   = src_bits[x];
-					dst_bits[x].green = src_bits[x];
-					dst_bits[x].blue  = src_bits[x];
-				}
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBA16 *src_bits = (FIRGBA16*)FreeImage_GetScanLine(src, y);
-				FIRGB16 *dst_bits = (FIRGB16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert and skip alpha channel
-					dst_bits[x].red   = src_bits[x].red;
-					dst_bits[x].green = src_bits[x].green;
-					dst_bits[x].blue  = src_bits[x].blue;
-				}
-			}
-		}
-		break;
-
-		default:
-			break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp
deleted file mode 100644
index 600d8ea1e6..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to RGBA16
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToRGBA16(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// convert to 32-bit if needed
-			if(FreeImage_GetBPP(dib) == 32) {
-				src = dib;
-			} else {
-				src = FreeImage_ConvertTo32Bits(dib);
-				if(!src) return NULL;
-			}
-			break;
-		}
-		case FIT_UINT16:
-			// allow conversion from unsigned 16-bit
-			src = dib;
-			break;
-		case FIT_RGB16:
-			// allow conversion from 48-bit RGB
-			src = dib;
-			break;
-		case FIT_RGBA16:
-			// RGBA16 type : clone the src
-			return FreeImage_Clone(dib);
-			break;
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_RGBA16, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to RGBA16
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// Calculate the number of bytes per pixel (4 for 32-bit)
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE *src_bits = (BYTE*)FreeImage_GetScanLine(src, y);
-				FIRGBA16 *dst_bits = (FIRGBA16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					dst_bits[x].red		= src_bits[FI_RGBA_RED] << 8;
-					dst_bits[x].green	= src_bits[FI_RGBA_GREEN] << 8;
-					dst_bits[x].blue	= src_bits[FI_RGBA_BLUE] << 8;
-					dst_bits[x].alpha	= src_bits[FI_RGBA_ALPHA] << 8;
-					src_bits += bytespp;
-				}
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
-				FIRGBA16 *dst_bits = (FIRGBA16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert by copying greyscale channel to each R, G, B channels
-					dst_bits[x].red   = src_bits[x];
-					dst_bits[x].green = src_bits[x];
-					dst_bits[x].blue  = src_bits[x];
-					dst_bits[x].alpha = 0xFFFF;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGB16 *src_bits = (FIRGB16*)FreeImage_GetScanLine(src, y);
-				FIRGBA16 *dst_bits = (FIRGBA16*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert pixels directly, while adding a "dummy" alpha of 1.0
-					dst_bits[x].red   = src_bits[x].red;
-					dst_bits[x].green = src_bits[x].green;
-					dst_bits[x].blue  = src_bits[x].blue;
-					dst_bits[x].alpha = 0xFFFF;
-				}
-			}
-		}
-		break;
-
-		default:
-			break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp
deleted file mode 100644
index 2ba2b32b42..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Tanner Helland (tannerhelland@users.sf.net)
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to RGBAF
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// allow conversion from 32-bit
-			const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-			if(color_type != FIC_RGBALPHA) {
-				src = FreeImage_ConvertTo32Bits(dib);
-				if(!src) return NULL;
-			} else {
-				src = dib;
-			}
-			break;
-		}
-		case FIT_UINT16:
-			// allow conversion from 16-bit
-			src = dib;
-			break;
-		case FIT_RGB16:
-			// allow conversion from 48-bit RGB
-			src = dib;
-			break;
-		case FIT_RGBA16:
-			// allow conversion from 64-bit RGBA
-			src = dib;
-			break;
-		case FIT_FLOAT:
-			// allow conversion from 32-bit float
-			src = dib;
-			break;
-		case FIT_RGBF:
-			// allow conversion from 96-bit RGBF
-			src = dib;
-			break;
-		case FIT_RGBAF:
-			// RGBAF type : clone the src
-			return FreeImage_Clone(dib);
-			break;
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_RGBAF, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to RGBAF
-
-	const unsigned src_pitch = FreeImage_GetPitch(src);
-	const unsigned dst_pitch = FreeImage_GetPitch(dst);
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// calculate the number of bytes per pixel (4 for 32-bit)
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE *src_pixel = (BYTE*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel->red   = (float)(src_pixel[FI_RGBA_RED])   / 255.0F;
-					dst_pixel->green = (float)(src_pixel[FI_RGBA_GREEN]) / 255.0F;
-					dst_pixel->blue  = (float)(src_pixel[FI_RGBA_BLUE])  / 255.0F;
-					dst_pixel->alpha = (float)(src_pixel[FI_RGBA_ALPHA]) / 255.0F;
-
-					src_pixel += bytespp;
-					dst_pixel++;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					const float dst_value = (float)src_pixel[x] / 65535.0F;
-					dst_pixel[x].red   = dst_value;
-					dst_pixel[x].green = dst_value;
-					dst_pixel[x].blue  = dst_value;
-					dst_pixel[x].alpha = 1.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGB16 *src_pixel = (FIRGB16*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x].red   = (float)(src_pixel[x].red)   / 65535.0F;
-					dst_pixel[x].green = (float)(src_pixel[x].green) / 65535.0F;
-					dst_pixel[x].blue  = (float)(src_pixel[x].blue)  / 65535.0F;
-					dst_pixel[x].alpha = 1.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBA16 *src_pixel = (FIRGBA16*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x].red   = (float)(src_pixel[x].red)   / 65535.0F;
-					dst_pixel[x].green = (float)(src_pixel[x].green) / 65535.0F;
-					dst_pixel[x].blue  = (float)(src_pixel[x].blue)  / 65535.0F;
-					dst_pixel[x].alpha = (float)(src_pixel[x].alpha) / 65535.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_FLOAT:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const float *src_pixel = (float*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert by copying greyscale channel to each R, G, B channels
-					// assume float values are in [0..1]
-					const float value = CLAMP(src_pixel[x], 0.0F, 1.0F);
-					dst_pixel[x].red   = value;
-					dst_pixel[x].green = value;
-					dst_pixel[x].blue  = value;
-					dst_pixel[x].alpha = 1.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBF:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBF *src_pixel = (FIRGBF*)src_bits;
-				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert pixels directly, while adding a "dummy" alpha of 1.0
-					dst_pixel[x].red   = CLAMP(src_pixel[x].red, 0.0F, 1.0F);
-					dst_pixel[x].green = CLAMP(src_pixel[x].green, 0.0F, 1.0F);
-					dst_pixel[x].blue  = CLAMP(src_pixel[x].blue, 0.0F, 1.0F);
-					dst_pixel[x].alpha = 1.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp
deleted file mode 100644
index a30b36532e..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to RGBF
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToRGBF(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// allow conversion from 24- and 32-bit
-			const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-			if((color_type != FIC_RGB) && (color_type != FIC_RGBALPHA)) {
-				src = FreeImage_ConvertTo24Bits(dib);
-				if(!src) return NULL;
-			} else {
-				src = dib;
-			}
-			break;
-		}
-		case FIT_UINT16:
-			// allow conversion from 16-bit
-			src = dib;
-			break;
-		case FIT_RGB16:
-			// allow conversion from 48-bit RGB
-			src = dib;
-			break;
-		case FIT_RGBA16:
-			// allow conversion from 64-bit RGBA (ignore the alpha channel)
-			src = dib;
-			break;
-		case FIT_FLOAT:
-			// allow conversion from 32-bit float
-			src = dib;
-			break;
-		case FIT_RGBAF:
-			// allow conversion from 128-bit RGBAF
-			src = dib;
-			break;
-		case FIT_RGBF:
-			// RGBF type : clone the src
-			return FreeImage_Clone(dib);
-			break;
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_RGBF, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to RGBF
-
-	const unsigned src_pitch = FreeImage_GetPitch(src);
-	const unsigned dst_pitch = FreeImage_GetPitch(dst);
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// calculate the number of bytes per pixel (3 for 24-bit or 4 for 32-bit)
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE   *src_pixel = (BYTE*)src_bits;
-				FIRGBF *dst_pixel = (FIRGBF*)dst_bits;
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel->red   = (float)(src_pixel[FI_RGBA_RED])   / 255.0F;
-					dst_pixel->green = (float)(src_pixel[FI_RGBA_GREEN]) / 255.0F;
-					dst_pixel->blue  = (float)(src_pixel[FI_RGBA_BLUE])  / 255.0F;
-
-					src_pixel += bytespp;
-					dst_pixel ++;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
-				FIRGBF *dst_pixel = (FIRGBF*)dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					const float dst_value = (float)src_pixel[x] / 65535.0F;
-					dst_pixel[x].red   = dst_value;
-					dst_pixel[x].green = dst_value;
-					dst_pixel[x].blue  = dst_value;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGB16 *src_pixel = (FIRGB16*) src_bits;
-				FIRGBF  *dst_pixel = (FIRGBF*)  dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x].red   = (float)(src_pixel[x].red)   / 65535.0F;
-					dst_pixel[x].green = (float)(src_pixel[x].green) / 65535.0F;
-					dst_pixel[x].blue  = (float)(src_pixel[x].blue)  / 65535.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBA16 *src_pixel = (FIRGBA16*) src_bits;
-				FIRGBF  *dst_pixel = (FIRGBF*)  dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and scale to the range [0..1]
-					dst_pixel[x].red   = (float)(src_pixel[x].red)   / 65535.0F;
-					dst_pixel[x].green = (float)(src_pixel[x].green) / 65535.0F;
-					dst_pixel[x].blue  = (float)(src_pixel[x].blue)  / 65535.0F;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_FLOAT:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const float *src_pixel = (float*) src_bits;
-				FIRGBF  *dst_pixel = (FIRGBF*)  dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert by copying greyscale channel to each R, G, B channels
-					// assume float values are in [0..1]
-					const float value = CLAMP(src_pixel[x], 0.0F, 1.0F);
-					dst_pixel[x].red   = value;
-					dst_pixel[x].green = value;
-					dst_pixel[x].blue  = value;
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-
-		case FIT_RGBAF:
-		{
-			const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-			BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBAF *src_pixel = (FIRGBAF*) src_bits;
-				FIRGBF  *dst_pixel = (FIRGBF*)  dst_bits;
-
-				for(unsigned x = 0; x < width; x++) {
-					// convert and skip alpha channel
-					dst_pixel[x].red   = CLAMP(src_pixel[x].red, 0.0F, 1.0F);
-					dst_pixel[x].green = CLAMP(src_pixel[x].green, 0.0F, 1.0F);
-					dst_pixel[x].blue  = CLAMP(src_pixel[x].blue, 0.0F, 1.0F);
-				}
-				src_bits += src_pitch;
-				dst_bits += dst_pitch;
-			}
-		}
-		break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionType.cpp b/plugins/AdvaImg/src/FreeImage/ConversionType.cpp
deleted file mode 100644
index 09286e9a99..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionType.cpp
+++ /dev/null
@@ -1,699 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Tanner Helland (tannerhelland@users.sf.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-
-/** Convert a greyscale image of type Tsrc to type Tdst.
-	Conversion is done using standard C language casting convention.
-*/
-template<class Tdst, class Tsrc>
-class CONVERT_TYPE
-{
-public:
-	FIBITMAP* convert(FIBITMAP *src, FREE_IMAGE_TYPE dst_type);
-};
-
-template<class Tdst, class Tsrc> FIBITMAP* 
-CONVERT_TYPE<Tdst, Tsrc>::convert(FIBITMAP *src, FREE_IMAGE_TYPE dst_type) {
-
-	FIBITMAP *dst = NULL;
-
-	unsigned width	= FreeImage_GetWidth(src);
-	unsigned height = FreeImage_GetHeight(src);
-	unsigned bpp	= FreeImage_GetBPP(src);
-
-	// allocate dst image
-
-	dst = FreeImage_AllocateT(dst_type, width, height, bpp, 
-			FreeImage_GetRedMask(src), FreeImage_GetGreenMask(src), FreeImage_GetBlueMask(src));
-	if(!dst) return NULL;
-
-	// convert from src_type to dst_type
-	
-	for(unsigned y = 0; y < height; y++) {
-		const Tsrc *src_bits = reinterpret_cast<Tsrc*>(FreeImage_GetScanLine(src, y));
-		Tdst *dst_bits = reinterpret_cast<Tdst*>(FreeImage_GetScanLine(dst, y));
-
-		for(unsigned x = 0; x < width; x++) {
-			*dst_bits++ = static_cast<Tdst>(*src_bits++);
-		}
-	}
-
-	return dst;
-}
-
-
-/** Convert a greyscale image of type Tsrc to a 8-bit grayscale dib.
-	Conversion is done using either a linear scaling from [min, max] to [0, 255]
-	or a rounding from src_pixel to (BYTE) MIN(255, MAX(0, q)) where int q = int(src_pixel + 0.5); 
-*/
-template<class Tsrc>
-class CONVERT_TO_BYTE
-{
-public:
-	FIBITMAP* convert(FIBITMAP *src, BOOL scale_linear);
-};
-
-template<class Tsrc> FIBITMAP* 
-CONVERT_TO_BYTE<Tsrc>::convert(FIBITMAP *src, BOOL scale_linear) {
-	FIBITMAP *dst = NULL;
-	unsigned x, y;
-
-	unsigned width	= FreeImage_GetWidth(src);
-	unsigned height = FreeImage_GetHeight(src);
-
-	// allocate a 8-bit dib
-
-	dst = FreeImage_AllocateT(FIT_BITMAP, width, height, 8, 0, 0, 0);
-	if(!dst) return NULL;
-
-	// build a greyscale palette
-	RGBQUAD *pal = FreeImage_GetPalette(dst);
-	for(int i = 0; i < 256; i++) {
-		pal[i].rgbRed = (BYTE)i;
-		pal[i].rgbGreen = (BYTE)i;
-		pal[i].rgbBlue = (BYTE)i;
-	}
-
-	// convert the src image to dst
-	// (FIBITMAP are stored upside down)
-	if(scale_linear) {
-		Tsrc max, min;
-		double scale;
-
-		// find the min and max value of the image
-		Tsrc l_min, l_max;
-		min = 255, max = 0;
-		for(y = 0; y < height; y++) {
-			Tsrc *bits = reinterpret_cast<Tsrc*>(FreeImage_GetScanLine(src, y));
-			MAXMIN(bits, width, l_max, l_min);
-			if(l_max > max) max = l_max;
-			if(l_min < min) min = l_min;
-		}
-		if(max == min) {
-			max = 255; min = 0;
-		}
-
-		// compute the scaling factor
-		scale = 255 / (double)(max - min);
-
-		// scale to 8-bit
-		for(y = 0; y < height; y++) {
-			Tsrc *src_bits = reinterpret_cast<Tsrc*>(FreeImage_GetScanLine(src, y));
-			BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-			for(x = 0; x < width; x++) {
-				dst_bits[x] = (BYTE)( scale * (src_bits[x] - min) + 0.5);
-			}
-		}
-	} else {
-		for(y = 0; y < height; y++) {
-			Tsrc *src_bits = reinterpret_cast<Tsrc*>(FreeImage_GetScanLine(src, y));
-			BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-			for(x = 0; x < width; x++) {
-				// rounding
-				int q = int(src_bits[x] + 0.5);
-				dst_bits[x] = (BYTE) MIN(255, MAX(0, q));
-			}
-		}
-	}
-
-	return dst;
-}
-
-/** Convert a greyscale image of type Tsrc to a FICOMPLEX dib.
-*/
-template<class Tsrc>
-class CONVERT_TO_COMPLEX
-{
-public:
-	FIBITMAP* convert(FIBITMAP *src);
-};
-
-template<class Tsrc> FIBITMAP* 
-CONVERT_TO_COMPLEX<Tsrc>::convert(FIBITMAP *src) {
-	FIBITMAP *dst = NULL;
-
-	unsigned width	= FreeImage_GetWidth(src);
-	unsigned height = FreeImage_GetHeight(src);
-
-	// allocate dst image
-
-	dst = FreeImage_AllocateT(FIT_COMPLEX, width, height);
-	if(!dst) return NULL;
-
-	// convert from src_type to FIT_COMPLEX
-	
-	for(unsigned y = 0; y < height; y++) {
-		const Tsrc *src_bits = reinterpret_cast<Tsrc*>(FreeImage_GetScanLine(src, y));
-		FICOMPLEX *dst_bits = (FICOMPLEX *)FreeImage_GetScanLine(dst, y);
-
-		for(unsigned x = 0; x < width; x++) {
-			dst_bits[x].r = (double)src_bits[x];
-			dst_bits[x].i = 0;
-		}
-	}
-
-	return dst;
-}
-
-// ----------------------------------------------------------
-
-// Convert from type BYTE to type X
-CONVERT_TYPE<unsigned short, BYTE>	convertByteToUShort;
-CONVERT_TYPE<short, BYTE>			convertByteToShort;
-CONVERT_TYPE<DWORD, BYTE>			convertByteToULong;
-CONVERT_TYPE<LONG, BYTE>			convertByteToLong;
-CONVERT_TYPE<float, BYTE>			convertByteToFloat;
-CONVERT_TYPE<double, BYTE>			convertByteToDouble;
-
-// Convert from type X to type BYTE
-CONVERT_TO_BYTE<unsigned short>	convertUShortToByte;
-CONVERT_TO_BYTE<short>			convertShortToByte;
-CONVERT_TO_BYTE<DWORD>			convertULongToByte;
-CONVERT_TO_BYTE<LONG>			convertLongToByte;
-CONVERT_TO_BYTE<float>			convertFloatToByte;
-CONVERT_TO_BYTE<double>			convertDoubleToByte;
-
-// Convert from type X to type float
-CONVERT_TYPE<float, unsigned short>	convertUShortToFloat;
-CONVERT_TYPE<float, short>			convertShortToFloat;
-CONVERT_TYPE<float, DWORD>			convertULongToFloat;
-CONVERT_TYPE<float, LONG>			convertLongToFloat;
-
-// Convert from type X to type double
-CONVERT_TYPE<double, unsigned short>	convertUShortToDouble;
-CONVERT_TYPE<double, short>				convertShortToDouble;
-CONVERT_TYPE<double, DWORD>				convertULongToDouble;
-CONVERT_TYPE<double, LONG>				convertLongToDouble;
-CONVERT_TYPE<double, float>				convertFloatToDouble;
-
-// Convert from type X to type FICOMPLEX
-CONVERT_TO_COMPLEX<BYTE>			convertByteToComplex;
-CONVERT_TO_COMPLEX<unsigned short>	convertUShortToComplex;
-CONVERT_TO_COMPLEX<short>			convertShortToComplex;
-CONVERT_TO_COMPLEX<DWORD>			convertULongToComplex;
-CONVERT_TO_COMPLEX<LONG>			convertLongToComplex;
-CONVERT_TO_COMPLEX<float>			convertFloatToComplex;
-CONVERT_TO_COMPLEX<double>			convertDoubleToComplex;
-
-// ----------------------------------------------------------
-
-// ----------------------------------------------------------
-//   smart convert X to standard FIBITMAP
-// ----------------------------------------------------------
-
-/** Convert image of any type to a standard 8-bit greyscale image.
-For standard images, a clone of the input image is returned.
-When the scale_linear parameter is TRUE, conversion is done by scaling linearly 
-each pixel to an integer value between [0..255]. When it is FALSE, conversion is done 
-by rounding each float pixel to an integer between [0..255]. 
-For complex images, the magnitude is extracted as a double image, then converted according to the scale parameter. 
-@param image Image to convert
-@param scale_linear Linear scaling / rounding switch
-*/
-FIBITMAP* DLL_CALLCONV
-FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear) {
-	FIBITMAP *dst = NULL;
-
-	if(!src) return NULL;
-
-	// convert from src_type to FIT_BITMAP
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(src);
-
-	switch(src_type) {
-		case FIT_BITMAP:	// standard image: 1-, 4-, 8-, 16-, 24-, 32-bit
-			dst = FreeImage_Clone(src);
-			break;
-		case FIT_UINT16:	// array of unsigned short: unsigned 16-bit
-			dst = convertUShortToByte.convert(src, scale_linear);
-			break;
-		case FIT_INT16:		// array of short: signed 16-bit
-			dst = convertShortToByte.convert(src, scale_linear);
-			break;
-		case FIT_UINT32:	// array of unsigned long: unsigned 32-bit
-			dst = convertULongToByte.convert(src, scale_linear);
-			break;
-		case FIT_INT32:		// array of long: signed 32-bit
-			dst = convertLongToByte.convert(src, scale_linear);
-			break;
-		case FIT_FLOAT:		// array of float: 32-bit
-			dst = convertFloatToByte.convert(src, scale_linear);
-			break;
-		case FIT_DOUBLE:	// array of double: 64-bit
-			dst = convertDoubleToByte.convert(src, scale_linear);
-			break;
-		case FIT_COMPLEX:	// array of FICOMPLEX: 2 x 64-bit
-			{
-				// Convert to type FIT_DOUBLE
-				FIBITMAP *dib_double = FreeImage_GetComplexChannel(src, FICC_MAG);
-				if(dib_double) {
-					// Convert to a standard bitmap (linear scaling)
-					dst = convertDoubleToByte.convert(dib_double, scale_linear);
-					// Free image of type FIT_DOUBLE
-					FreeImage_Unload(dib_double);
-				}
-			}
-			break;
-		case FIT_RGB16:		// 48-bit RGB image: 3 x 16-bit
-			break;
-		case FIT_RGBA16:	// 64-bit RGBA image: 4 x 16-bit
-			break;
-		case FIT_RGBF:		// 96-bit RGB float image: 3 x 32-bit IEEE floating point
-			break;
-		case FIT_RGBAF:		// 128-bit RGBA float image: 4 x 32-bit IEEE floating point
-			break;
-	}
-
-	if(NULL == dst) {
-		FreeImage_OutputMessageProc(FIF_UNKNOWN, "FREE_IMAGE_TYPE: Unable to convert from type %d to type %d.\n No such conversion exists.", src_type, FIT_BITMAP);
-	} else {
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-	}
-	
-	return dst;
-}
-
-
-
-// ----------------------------------------------------------
-//   smart convert X to Y
-// ----------------------------------------------------------
-
-FIBITMAP* DLL_CALLCONV
-FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear) {
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	// convert from src_type to dst_type
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(src);
-
-	if(src_type == dst_type) {
-		return FreeImage_Clone(src);
-	}
-
-	const unsigned src_bpp = FreeImage_GetBPP(src);
-
-	switch(src_type) {
-		case FIT_BITMAP:
-			switch(dst_type) {
-				case FIT_UINT16:
-					dst = FreeImage_ConvertToUINT16(src);
-					break;
-				case FIT_INT16:
-					dst = (src_bpp == 8) ? convertByteToShort.convert(src, dst_type) : NULL;
-					break;
-				case FIT_UINT32:
-					dst = (src_bpp == 8) ? convertByteToULong.convert(src, dst_type) : NULL;
-					break;
-				case FIT_INT32:
-					dst = (src_bpp == 8) ? convertByteToLong.convert(src, dst_type) : NULL;
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					dst = (src_bpp == 8) ? convertByteToDouble.convert(src, dst_type) : NULL;
-					break;
-				case FIT_COMPLEX:
-					dst = (src_bpp == 8) ? convertByteToComplex.convert(src) : NULL;
-					break;
-				case FIT_RGB16:
-					dst = FreeImage_ConvertToRGB16(src);
-					break;
-				case FIT_RGBA16:
-					dst = FreeImage_ConvertToRGBA16(src);
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_UINT16:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					dst = convertUShortToDouble.convert(src, dst_type);
-					break;
-				case FIT_COMPLEX:
-					dst = convertUShortToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					dst = FreeImage_ConvertToRGB16(src);
-					break;
-				case FIT_RGBA16:
-					dst = FreeImage_ConvertToRGBA16(src);
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_INT16:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = convertShortToFloat.convert(src, dst_type);
-					break;
-				case FIT_DOUBLE:
-					dst = convertShortToDouble.convert(src, dst_type);
-					break;
-				case FIT_COMPLEX:
-					dst = convertShortToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					break;
-				case FIT_RGBAF:
-					break;
-			}
-			break;
-		case FIT_UINT32:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = convertULongToFloat.convert(src, dst_type);
-					break;
-				case FIT_DOUBLE:
-					dst = convertULongToDouble.convert(src, dst_type);
-					break;
-				case FIT_COMPLEX:
-					dst = convertULongToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					break;
-				case FIT_RGBAF:
-					break;
-			}
-			break;
-		case FIT_INT32:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_FLOAT:
-					dst = convertLongToFloat.convert(src, dst_type);
-					break;
-				case FIT_DOUBLE:
-					dst = convertLongToDouble.convert(src, dst_type);
-					break;
-				case FIT_COMPLEX:
-					dst = convertLongToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					break;
-				case FIT_RGBAF:
-					break;
-			}
-			break;
-		case FIT_FLOAT:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_DOUBLE:
-					dst = convertFloatToDouble.convert(src, dst_type);
-					break;
-				case FIT_COMPLEX:
-					dst = convertFloatToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_DOUBLE:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertToStandardType(src, scale_linear);
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					break;
-				case FIT_COMPLEX:
-					dst = convertDoubleToComplex.convert(src);
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					break;
-				case FIT_RGBAF:
-					break;
-			}
-			break;
-		case FIT_COMPLEX:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					break;
-				case FIT_DOUBLE:
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					break;
-				case FIT_RGBAF:
-					break;
-			}
-			break;
-		case FIT_RGB16:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertTo24Bits(src);
-					break;
-				case FIT_UINT16:
-					dst = FreeImage_ConvertToUINT16(src);
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					break;
-				case FIT_COMPLEX:
-					break;
-				case FIT_RGBA16:
-					dst = FreeImage_ConvertToRGBA16(src);
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_RGBA16:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					dst = FreeImage_ConvertTo32Bits(src);
-					break;
-				case FIT_UINT16:
-					dst = FreeImage_ConvertToUINT16(src);
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					break;
-				case FIT_COMPLEX:
-					break;
-				case FIT_RGB16:
-					dst = FreeImage_ConvertToRGB16(src);
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_RGBF:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					break;
-				case FIT_COMPLEX:
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBAF:
-					dst = FreeImage_ConvertToRGBAF(src);
-					break;
-			}
-			break;
-		case FIT_RGBAF:
-			switch(dst_type) {
-				case FIT_BITMAP:
-					break;
-				case FIT_UINT16:
-					break;
-				case FIT_INT16:
-					break;
-				case FIT_UINT32:
-					break;
-				case FIT_INT32:
-					break;
-				case FIT_FLOAT:
-					dst = FreeImage_ConvertToFloat(src);
-					break;
-				case FIT_DOUBLE:
-					break;
-				case FIT_COMPLEX:
-					break;
-				case FIT_RGB16:
-					break;
-				case FIT_RGBA16:
-					break;
-				case FIT_RGBF:
-					dst = FreeImage_ConvertToRGBF(src);
-					break;
-			}
-			break;
-	}
-
-	if(NULL == dst) {
-		FreeImage_OutputMessageProc(FIF_UNKNOWN, "FREE_IMAGE_TYPE: Unable to convert from type %d to type %d.\n No such conversion exists.", src_type, dst_type);
-	} else {
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-	}
-
-	return dst;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp
deleted file mode 100644
index 2de0f05ccc..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   smart convert X to UINT16
-// ----------------------------------------------------------
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_ConvertToUINT16(FIBITMAP *dib) {
-	FIBITMAP *src = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib);
-
-	// check for allowed conversions 
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			// convert to greyscale if needed
-			if((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) {
-				src = dib;
-			} else {
-				src = FreeImage_ConvertToGreyscale(dib);
-				if(!src) return NULL;
-			}
-			break;
-		}
-		case FIT_UINT16:
-			// UINT16 type : clone the src
-			return FreeImage_Clone(dib);
-			break;
-		case FIT_RGB16:
-			// allow conversion from 48-bit RGB
-			src = dib;
-			break;
-		case FIT_RGBA16:
-			// allow conversion from 64-bit RGBA (ignore the alpha channel)
-			src = dib;
-			break;
-		default:
-			return NULL;
-	}
-
-	// allocate dst image
-
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	dst = FreeImage_AllocateT(FIT_UINT16, width, height);
-	if(!dst) {
-		if(src != dib) {
-			FreeImage_Unload(src);
-		}
-		return NULL;
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	// convert from src type to UINT16
-
-	switch(src_type) {
-		case FIT_BITMAP:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const BYTE *src_bits = (BYTE*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					dst_bits[x] = src_bits[x] << 8;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGB16 *src_bits = (FIRGB16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
-				}
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			for(unsigned y = 0; y < height; y++) {
-				const FIRGBA16 *src_bits = (FIRGBA16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-				for(unsigned x = 0; x < width; x++) {
-					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
-				}
-			}
-		}
-		break;
-
-		default:
-			break;
-	}
-
-	if(src != dib) {
-		FreeImage_Unload(src);
-	}
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/FreeImage.cpp b/plugins/AdvaImg/src/FreeImage/FreeImage.cpp
deleted file mode 100644
index ac53449a14..0000000000
--- a/plugins/AdvaImg/src/FreeImage/FreeImage.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// ==========================================================
-// FreeImage implementation
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Karl-Heinz Bussian (khbussian@moss.de)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-//----------------------------------------------------------------------
-
-static const char *s_copyright = "This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details";
-
-//----------------------------------------------------------------------
-
-#if defined(_WIN32) && !defined(__MINGW32__)
-#ifndef FREEIMAGE_LIB
-
-BOOL APIENTRY
-DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
-	switch (ul_reason_for_call) {
-		case DLL_PROCESS_ATTACH :
-			FreeImage_Initialise(FALSE);
-			break;
-
-		case DLL_PROCESS_DETACH :
-			FreeImage_DeInitialise();
-			break;
-
-		case DLL_THREAD_ATTACH :
-		case DLL_THREAD_DETACH :
-			break;
-    }
-
-    return TRUE;
-}
-
-#endif // FREEIMAGE_LIB
-
-#else // !_WIN32 
-#ifndef FREEIMAGE_LIB
-
-void FreeImage_SO_Initialise() __attribute__((constructor));
-void FreeImage_SO_DeInitialise() __attribute__((destructor));
-
-void FreeImage_SO_Initialise() {
-  FreeImage_Initialise(FALSE);
-}
-
-void FreeImage_SO_DeInitialise() {
-  FreeImage_DeInitialise();
-}
-#endif // FREEIMAGE_LIB
-
-#endif // _WIN32
-
-//----------------------------------------------------------------------
-
-const char * DLL_CALLCONV
-FreeImage_GetVersion() {
-	static char s_version[16];
-	sprintf(s_version, "%d.%d.%d", FREEIMAGE_MAJOR_VERSION, FREEIMAGE_MINOR_VERSION, FREEIMAGE_RELEASE_SERIAL);
-	return s_version;
-}
-
-const char * DLL_CALLCONV
-FreeImage_GetCopyrightMessage() {
-	return s_copyright;
-}
-
-//----------------------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_IsLittleEndian() {
-	union {
-		DWORD i;
-		BYTE c[4];
-	} u;
-	u.i = 1;
-	return (u.c[0] != 0);
-}
-
-//----------------------------------------------------------------------
-
-static FreeImage_OutputMessageFunction freeimage_outputmessage_proc = NULL;
-static FreeImage_OutputMessageFunctionStdCall freeimage_outputmessagestdcall_proc = NULL; 
-
-void DLL_CALLCONV
-FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf) {
-	freeimage_outputmessage_proc = omf;
-}
-
-void DLL_CALLCONV
-FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf) {
-	freeimage_outputmessagestdcall_proc = omf;
-}
-
-void DLL_CALLCONV
-FreeImage_OutputMessageProc(int fif, const char *fmt, ...) {
-	const int MSG_SIZE = 512; // 512 bytes should be more than enough for a short message
-
-	if ((fmt != NULL) && ((freeimage_outputmessage_proc != NULL) || (freeimage_outputmessagestdcall_proc != NULL))) {
-		char message[MSG_SIZE];
-		memset(message, 0, MSG_SIZE);
-
-		// initialize the optional parameter list
-
-		va_list arg;
-		va_start(arg, fmt);
-
-		// check the length of the format string
-
-		int str_length = (int)( (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt) );
-
-		// parse the format string and put the result in 'message'
-
-		for (int i = 0, j = 0; i < str_length; ++i) {
-			if (fmt[i] == '%') {
-				if (i + 1 < str_length) {
-					switch(tolower(fmt[i + 1])) {
-						case '%' :
-							message[j++] = '%';
-							break;
-
-						case 'o' : // octal numbers
-						{
-							char tmp[16];
-
-							_itoa(va_arg(arg, int), tmp, 8);
-
-							strcat(message, tmp);
-
-							j += (int)strlen(tmp);
-
-							++i;
-
-							break;
-						}
-
-						case 'i' : // decimal numbers
-						case 'd' :
-						{
-							char tmp[16];
-
-							_itoa(va_arg(arg, int), tmp, 10);
-
-							strcat(message, tmp);
-
-							j += (int)strlen(tmp);
-
-							++i;
-
-							break;
-						}
-
-						case 'x' : // hexadecimal numbers
-						{
-							char tmp[16];
-
-							_itoa(va_arg(arg, int), tmp, 16);
-
-							strcat(message, tmp);
-
-							j += (int)strlen(tmp);
-
-							++i;
-
-							break;
-						}
-
-						case 's' : // strings
-						{
-							char *tmp = va_arg(arg, char*);
-
-							strcat(message, tmp);
-
-							j += (int)strlen(tmp);
-
-							++i;
-
-							break;
-						}
-					};
-				} else {
-					message[j++] = fmt[i];
-				}
-			} else {
-				message[j++] = fmt[i];
-			};
-		}
-
-		// deinitialize the optional parameter list
-
-		va_end(arg);
-
-		// output the message to the user program
-
-		if (freeimage_outputmessage_proc != NULL)
-			freeimage_outputmessage_proc((FREE_IMAGE_FORMAT)fif, message);
-
-		if (freeimage_outputmessagestdcall_proc != NULL)
-			freeimage_outputmessagestdcall_proc((FREE_IMAGE_FORMAT)fif, message); 
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/FreeImageIO.cpp b/plugins/AdvaImg/src/FreeImage/FreeImageIO.cpp
deleted file mode 100644
index 83394f049c..0000000000
--- a/plugins/AdvaImg/src/FreeImage/FreeImageIO.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// ==========================================================
-// Input/Output functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageIO.h"
-
-// =====================================================================
-// File IO functions
-// =====================================================================
-
-unsigned DLL_CALLCONV 
-_ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle) {
-	return (unsigned)fread(buffer, size, count, (FILE *)handle);
-}
-
-unsigned DLL_CALLCONV 
-_WriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle) {
-	return (unsigned)fwrite(buffer, size, count, (FILE *)handle);
-}
-
-int DLL_CALLCONV
-_SeekProc(fi_handle handle, long offset, int origin) {
-	return fseek((FILE *)handle, offset, origin);
-}
-
-long DLL_CALLCONV
-_TellProc(fi_handle handle) {
-	return ftell((FILE *)handle);
-}
-
-// ----------------------------------------------------------
-
-void
-SetDefaultIO(FreeImageIO *io) {
-	io->read_proc  = _ReadProc;
-	io->seek_proc  = _SeekProc;
-	io->tell_proc  = _TellProc;
-	io->write_proc = _WriteProc;
-}
-
-// =====================================================================
-// Memory IO functions
-// =====================================================================
-
-unsigned DLL_CALLCONV 
-_MemoryReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle) {
-	unsigned x;
-
-	FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(((FIMEMORY*)handle)->data);
-
-	for(x = 0; x < count; x++) {
-		long remaining_bytes = mem_header->file_length - mem_header->current_position;
-		//if there isn't size bytes left to read, set pos to eof and return a short count
-		if( remaining_bytes < (long)size ) {
-			if(remaining_bytes > 0) {
-				memcpy( buffer, (char *)mem_header->data + mem_header->current_position, remaining_bytes );
-			}
-			mem_header->current_position = mem_header->file_length;
-			break;
-		}
-		//copy size bytes count times
-		memcpy( buffer, (char *)mem_header->data + mem_header->current_position, size );
-		mem_header->current_position += size;
-		buffer = (char *)buffer + size;
-	}
-	return x;
-}
-
-unsigned DLL_CALLCONV 
-_MemoryWriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle) {
-	void *newdata;
-	long newdatalen;
-
-	FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(((FIMEMORY*)handle)->data);
-
-	//double the data block size if we need to
-	while( (mem_header->current_position + (long)(size * count)) >= mem_header->data_length ) {
-		//if we are at or above 1G, we cant double without going negative
-		if( mem_header->data_length & 0x40000000 ) {
-			//max 2G
-			if( mem_header->data_length == 0x7FFFFFFF ) {
-				return 0;
-			}
-			newdatalen = 0x7FFFFFFF;
-		} else if( mem_header->data_length == 0 ) {
-			//default to 4K if nothing yet
-			newdatalen = 4096;
-		} else {
-			//double size
-			newdatalen = mem_header->data_length << 1;
-		}
-		newdata = realloc( mem_header->data, newdatalen );
-		if( !newdata ) {
-			return 0;
-		}
-		mem_header->data = newdata;
-		mem_header->data_length = newdatalen;
-	}
-	memcpy( (char *)mem_header->data + mem_header->current_position, buffer, size * count );
-	mem_header->current_position += size * count;
-	if( mem_header->current_position > mem_header->file_length ) {
-		mem_header->file_length = mem_header->current_position;
-	}
-	return count;
-}
-
-int DLL_CALLCONV 
-_MemorySeekProc(fi_handle handle, long offset, int origin) {
-	FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(((FIMEMORY*)handle)->data);
-
-	// you can use _MemorySeekProc to reposition the pointer anywhere in a file
-	// the pointer can also be positioned beyond the end of the file
-
-	switch(origin) { //0 to filelen-1 are 'inside' the file
-		default:
-		case SEEK_SET: //can fseek() to 0-7FFFFFFF always
-			if( offset >= 0 ) {
-				mem_header->current_position = offset;
-				return 0;
-			}
-			break;
-
-		case SEEK_CUR:
-			if( mem_header->current_position + offset >= 0 ) {
-				mem_header->current_position += offset;
-				return 0;
-			}
-			break;
-
-		case SEEK_END:
-			if( mem_header->file_length + offset >= 0 ) {
-				mem_header->current_position = mem_header->file_length + offset;
-				return 0;
-			}
-			break;
-	}
-
-	return -1;
-}
-
-long DLL_CALLCONV 
-_MemoryTellProc(fi_handle handle) {
-	FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(((FIMEMORY*)handle)->data);
-
-	return mem_header->current_position;
-}
-
-// ----------------------------------------------------------
-
-void
-SetMemoryIO(FreeImageIO *io) {
-	io->read_proc  = _MemoryReadProc;
-	io->seek_proc  = _MemorySeekProc;
-	io->tell_proc  = _MemoryTellProc;
-	io->write_proc = _MemoryWriteProc;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/GetType.cpp b/plugins/AdvaImg/src/FreeImage/GetType.cpp
deleted file mode 100644
index 0ac15fc2e6..0000000000
--- a/plugins/AdvaImg/src/FreeImage/GetType.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// ==========================================================
-// GetType
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif 
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageIO.h"
-#include "Plugin.h"
-
-// ----------------------------------------------------------
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size) {
-	if (handle != NULL) {
-		int fif_count = FreeImage_GetFIFCount();
-
-		for (int i = 0; i < fif_count; ++i) {
-			FREE_IMAGE_FORMAT fif = (FREE_IMAGE_FORMAT)i;
-			if (FreeImage_Validate(fif, io, handle)) {
-				if(fif == FIF_TIFF) {
-					// many camera raw files use a TIFF signature ...
-					// ... try to revalidate against FIF_RAW (even if it breaks the code genericity)
-					if (FreeImage_Validate(FIF_RAW, io, handle)) {
-						return FIF_RAW;
-					}
-				}
-				return fif;
-			}
-		}
-	}
-
-	return FIF_UNKNOWN;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFileType(const char *filename, int size) {
-	FreeImageIO io;
-	SetDefaultIO(&io);
-	
-	FILE *handle = fopen(filename, "rb");
-
-	if (handle != NULL) {
-		FREE_IMAGE_FORMAT format = FreeImage_GetFileTypeFromHandle(&io, (fi_handle)handle, size);
-
-		fclose(handle);
-
-		return format;
-	}
-
-	return FIF_UNKNOWN;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV 
-FreeImage_GetFileTypeU(const wchar_t *filename, int size) {
-#ifdef _WIN32	
-	FreeImageIO io;
-	SetDefaultIO(&io);
-	FILE *handle = _wfopen(filename, L"rb");
-
-	if (handle != NULL) {
-		FREE_IMAGE_FORMAT format = FreeImage_GetFileTypeFromHandle(&io, (fi_handle)handle, size);
-
-		fclose(handle);
-
-		return format;
-	}
-#endif
-	return FIF_UNKNOWN;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/Halftoning.cpp b/plugins/AdvaImg/src/FreeImage/Halftoning.cpp
deleted file mode 100644
index bc9076c501..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Halftoning.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-// ==========================================================
-// Bitmap conversion routines
-// Thresholding and halftoning functions
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Dennis Lim (dlkj@users.sourceforge.net)
-// - Thomas Chmielewski (Chmielewski.Thomas@oce.de)
-//
-// Main reference : Ulichney, R., Digital Halftoning, The MIT Press, Cambridge, MA, 1987
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-static const int WHITE = 255;
-static const int BLACK = 0;
-
-// Floyd & Steinberg error diffusion dithering
-// This algorithm use the following filter
-//          *   7
-//      3   5   1     (1/16)
-static FIBITMAP* FloydSteinberg(FIBITMAP *dib) {
-
-#define RAND(RN) (((seed = 1103515245 * seed + 12345) >> 12) % (RN))
-#define INITERR(X, Y) (((int) X) - (((int) Y) ? WHITE : BLACK) + ((WHITE/2)-((int)X)) / 2)
-
-	int seed = 0;
-	int x, y, p, pixel, threshold, error;
-	int width, height, pitch;
-	BYTE *bits, *new_bits;
-	FIBITMAP *new_dib = NULL;
-
-	// allocate a 8-bit DIB
-	width = FreeImage_GetWidth(dib);
-	height = FreeImage_GetHeight(dib);
-	pitch = FreeImage_GetPitch(dib);
-	new_dib = FreeImage_Allocate(width, height, 8);
-	if(NULL == new_dib) return NULL;
-
-	// allocate space for error arrays
-	int *lerr = (int*)malloc (width * sizeof(int));
-	int *cerr = (int*)malloc (width * sizeof(int));
-	memset(lerr, 0, width * sizeof(int));
-	memset(cerr, 0, width * sizeof(int));
-
-	// left border
-	error = 0;
-	for(y = 0; y < height; y++) {
-		bits = FreeImage_GetScanLine(dib, y);
-		new_bits = FreeImage_GetScanLine(new_dib, y);
-
-		threshold = (WHITE / 2 + RAND(129) - 64);
-		pixel = bits[0] + error;
-		p = (pixel > threshold) ? WHITE : BLACK;
-		error = pixel - p;
-		new_bits[0] = (BYTE)p;
-	}
-	// right border
-	error = 0;
-	for(y = 0; y < height; y++) {
-		bits = FreeImage_GetScanLine(dib, y);
-		new_bits = FreeImage_GetScanLine(new_dib, y);
-
-		threshold = (WHITE / 2 + RAND(129) - 64);
-		pixel = bits[width-1] + error;
-		p = (pixel > threshold) ? WHITE : BLACK;
-		error = pixel - p;
-		new_bits[width-1] = (BYTE)p;
-	}
-	// top border
-	bits = FreeImage_GetBits(dib);
-	new_bits = FreeImage_GetBits(new_dib);
-	error = 0;
-	for(x = 0; x < width; x++) {
-		threshold = (WHITE / 2 + RAND(129) - 64);
-		pixel = bits[x] + error;
-		p = (pixel > threshold) ? WHITE : BLACK;
-		error = pixel - p;
-		new_bits[x] = (BYTE)p;
-		lerr[x] = INITERR(bits[x], p);
-	}
-
-	// interior bits
-	for(y = 1; y < height; y++) {
-		// scan left to right
-		bits = FreeImage_GetScanLine(dib, y);
-		new_bits = FreeImage_GetScanLine(new_dib, y);
-
-	    cerr[0] = INITERR(bits[0], new_bits[0]);
-		for(x = 1; x < width - 1; x++) {
-			error = (lerr[x-1] + 5 * lerr[x] + 3 * lerr[x+1] + 7 * cerr[x-1]) / 16;
-			pixel = bits[x] + error;
-			if(pixel > (WHITE / 2)) {		
-				new_bits[x] = WHITE;
-				cerr[x] = pixel - WHITE; 
-			} else {
-				new_bits[x] = BLACK;
-				cerr[x] = pixel - BLACK; 
-			}
-		}
-		// set errors for ends of the row
-		cerr[0] = INITERR (bits[0], new_bits[0]);
-		cerr[width - 1] = INITERR (bits[width - 1], new_bits[width - 1]);
-
-		// swap error buffers
-		int *terr = lerr; lerr = cerr; cerr = terr;
-	}
-
-	free(lerr);
-	free(cerr);
-
-	return new_dib;
-}
-
-// ==========================================================
-// Bayer ordered dispersed dot dithering
-//
-
-// Function taken from "Ordered Dithering, Stephen Hawley, Graphics Gems, Academic Press, 1990"
-// This function is used to generate a Bayer dithering matrice whose dimension are 2^size by 2^size
-//
-static int dithervalue(int x, int y, int size) {
-	int d = 0;
-	/*
-	 * calculate the dither value at a particular
-	 * (x, y) over the size of the matrix.
-	 */
-	while (size-->0)	{
-		/* Think of d as the density. At every iteration,
-		 * d is shifted left one and a new bit is put in the
-		 * low bit based on x and y. If x is odd and y is even,
-		 * or x is even and y is odd, a bit is put in. This
-		 * generates the checkerboard seen in dithering.
-		 * This quantity is shifted left again and the low bit of
-		 * y is added in.
-		 * This whole thing interleaves a checkerboard bit pattern
-		 * and y's bits, which is the value you want.
-		 */
-		d = (d <<1 | (x&1 ^ y&1))<<1 | y&1;
-		x >>= 1;
-		y >>= 1;
-	}
-	return d;
-}
-
-// Ordered dithering with a Bayer matrix of size 2^order by 2^order
-//
-static FIBITMAP* OrderedDispersedDot(FIBITMAP *dib, int order) {
-	int x, y;
-	int width, height;
-	BYTE *bits, *new_bits;
-	FIBITMAP *new_dib = NULL;
-
-	// allocate a 8-bit DIB
-	width = FreeImage_GetWidth(dib);
-	height = FreeImage_GetHeight(dib);
-	new_dib = FreeImage_Allocate(width, height, 8);
-	if(NULL == new_dib) return NULL;
-
-	// build the dithering matrix
-	int l = (1 << order);	// square of dither matrix order; the dimensions of the matrix
-	BYTE *matrix = (BYTE*)malloc(l*l * sizeof(BYTE));
-	for(int i = 0; i < l*l; i++) {
-		// according to "Purdue University: Digital Image Processing Laboratory: Image Halftoning, April 30th, 2006
-		matrix[i] = (BYTE)( 255 * (((double)dithervalue(i / l, i % l, order) + 0.5) / (l*l)) );
-	}
-
-	// perform the dithering
-	for(y = 0; y < height; y++) {
-		// scan left to right
-		bits = FreeImage_GetScanLine(dib, y);
-		new_bits = FreeImage_GetScanLine(new_dib, y);
-		for(x = 0; x < width; x++) {
-			if(bits[x] > matrix[(x % l) + l * (y % l)]) {
-				new_bits[x] = WHITE;
-			} else {
-				new_bits[x] = BLACK;
-			}
-		}
-	}
-
-	free(matrix);
-
-	return new_dib;
-}
-
-// ==========================================================
-// Ordered clustered dot dithering
-//
-
-// NB : The predefined dither matrices are the same as matrices used in 
-// the Netpbm package (http://netpbm.sourceforge.net) and are defined in Ulichney's book.
-// See also : The newsprint web site at http://www.cl.cam.ac.uk/~and1000/newsprint/
-// for more technical info on this dithering technique
-//
-static FIBITMAP* OrderedClusteredDot(FIBITMAP *dib, int order) {
-	// Order-3 clustered dithering matrix.
-	int cluster3[] = {
-	  9,11,10, 8, 6, 7,
-	  12,17,16, 5, 0, 1,
-	  13,14,15, 4, 3, 2,
-	  8, 6, 7, 9,11,10,
-	  5, 0, 1,12,17,16,
-	  4, 3, 2,13,14,15
-	};
-
-	// Order-4 clustered dithering matrix. 
-	int cluster4[] = {
-	  18,20,19,16,13,11,12,15,
-	  27,28,29,22, 4, 3, 2, 9,
-	  26,31,30,21, 5, 0, 1,10,
-	  23,25,24,17, 8, 6, 7,14,
-	  13,11,12,15,18,20,19,16,
-	  4, 3, 2, 9,27,28,29,22,
-	  5, 0, 1,10,26,31,30,21,
-	  8, 6, 7,14,23,25,24,17
-	};
-
-	// Order-8 clustered dithering matrix. 
-	int cluster8[] = {
-	   64, 69, 77, 87, 86, 76, 68, 67, 63, 58, 50, 40, 41, 51, 59, 60,
-	   70, 94,100,109,108, 99, 93, 75, 57, 33, 27, 18, 19, 28, 34, 52,
-	   78,101,114,116,115,112, 98, 83, 49, 26, 13, 11, 12, 15, 29, 44,
-	   88,110,123,124,125,118,107, 85, 39, 17,  4,  3,  2,  9, 20, 42,
-	   89,111,122,127,126,117,106, 84, 38, 16,  5,  0,  1, 10, 21, 43,
-	   79,102,119,121,120,113, 97, 82, 48, 25,  8,  6,  7, 14, 30, 45,
-	   71, 95,103,104,105, 96, 92, 74, 56, 32, 24, 23, 22, 31, 35, 53,
-	   65, 72, 80, 90, 91, 81, 73, 66, 62, 55, 47, 37, 36, 46, 54, 61,
-	   63, 58, 50, 40, 41, 51, 59, 60, 64, 69, 77, 87, 86, 76, 68, 67,
-	   57, 33, 27, 18, 19, 28, 34, 52, 70, 94,100,109,108, 99, 93, 75,
-	   49, 26, 13, 11, 12, 15, 29, 44, 78,101,114,116,115,112, 98, 83,
-	   39, 17,  4,  3,  2,  9, 20, 42, 88,110,123,124,125,118,107, 85,
-	   38, 16,  5,  0,  1, 10, 21, 43, 89,111,122,127,126,117,106, 84,
-	   48, 25,  8,  6,  7, 14, 30, 45, 79,102,119,121,120,113, 97, 82,
-	   56, 32, 24, 23, 22, 31, 35, 53, 71, 95,103,104,105, 96, 92, 74,
-	   62, 55, 47, 37, 36, 46, 54, 61, 65, 72, 80, 90, 91, 81, 73, 66
-	};
-
-	int x, y, pixel;
-	int width, height;
-	BYTE *bits, *new_bits;
-	FIBITMAP *new_dib = NULL;
-
-	// allocate a 8-bit DIB
-	width = FreeImage_GetWidth(dib);
-	height = FreeImage_GetHeight(dib);
-	new_dib = FreeImage_Allocate(width, height, 8);
-	if(NULL == new_dib) return NULL;
-
-	// select the dithering matrix
-	int *matrix = NULL;
-	switch(order) {
-		case 3:
-			matrix = &cluster3[0];
-			break;
-		case 4:
-			matrix = &cluster4[0];
-			break;
-		case 8:
-			matrix = &cluster8[0];
-			break;
-		default:
-			return NULL;
-	}
-
-	// scale the dithering matrix
-	int l = 2 * order;
-	int scale = 256 / (l * order);
-	for(y = 0; y < l; y++) {
-		for(x = 0; x < l; x++) {
-			matrix[y*l + x] *= scale;
-		}
-	}
-
-	// perform the dithering
-	for(y = 0; y < height; y++) {
-		// scan left to right
-		bits = FreeImage_GetScanLine(dib, y);
-		new_bits = FreeImage_GetScanLine(new_dib, y);
-		for(x = 0; x < width; x++) {
-			pixel = bits[x];
-			if(pixel >= matrix[(y % l) + l * (x % l)]) {
-				new_bits[x] = WHITE;
-			} else {
-				new_bits[x] = BLACK;
-			}
-		}
-	}
-
-	return new_dib;
-}
-
-
-// ==========================================================
-// Halftoning function
-//
-FIBITMAP * DLL_CALLCONV
-FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm) {
-	FIBITMAP *input = NULL, *dib8 = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const unsigned bpp = FreeImage_GetBPP(dib);
-
-	if(bpp == 1) {
-		// Just clone the dib and adjust the palette if needed
-		FIBITMAP *new_dib = FreeImage_Clone(dib);
-		if(NULL == new_dib) return NULL;
-		if(FreeImage_GetColorType(new_dib) == FIC_PALETTE) {
-			// Build a monochrome palette
-			RGBQUAD *pal = FreeImage_GetPalette(new_dib);
-			pal[0].rgbRed = pal[0].rgbGreen = pal[0].rgbBlue = 0;
-			pal[1].rgbRed = pal[1].rgbGreen = pal[1].rgbBlue = 255;
-		}
-		return new_dib;
-	}
-
-	// Convert the input dib to a 8-bit greyscale dib
-	//
-	switch(bpp) {
-		case 8:
-			if(FreeImage_GetColorType(dib) == FIC_MINISBLACK) {
-				input = dib;
-			} else {
-				input = FreeImage_ConvertToGreyscale(dib);
-			} 
-			break;
-		case 4:
-		case 16:
-		case 24:
-		case 32:
-			input = FreeImage_ConvertToGreyscale(dib);
-			break;			
-	}
-	if(NULL == input) return NULL;
-
-	// Apply the dithering algorithm
-	switch(algorithm) {
-		case FID_FS:
-			dib8 = FloydSteinberg(input);
-			break;
-		case FID_BAYER4x4:
-			dib8 = OrderedDispersedDot(input, 2);
-			break;
-		case FID_BAYER8x8:
-			dib8 = OrderedDispersedDot(input, 3);
-			break;
-		case FID_BAYER16x16:
-			dib8 = OrderedDispersedDot(input, 4);
-			break;
-		case FID_CLUSTER6x6:
-			dib8 = OrderedClusteredDot(input, 3);
-			break;
-		case FID_CLUSTER8x8:
-			dib8 = OrderedClusteredDot(input, 4);
-			break;
-		case FID_CLUSTER16x16:
-			dib8 = OrderedClusteredDot(input, 8);
-			break;
-	}
-	if(input != dib) {
-		FreeImage_Unload(input);
-	}
-
-	// Build a greyscale palette (needed by threshold)
-	RGBQUAD *grey_pal = FreeImage_GetPalette(dib8);
-	for(int i = 0; i < 256; i++) {
-		grey_pal[i].rgbRed	= (BYTE)i;
-		grey_pal[i].rgbGreen = (BYTE)i;
-		grey_pal[i].rgbBlue	= (BYTE)i;
-	}
-
-	// Convert to 1-bit
-	FIBITMAP *new_dib = FreeImage_Threshold(dib8, 128);
-	FreeImage_Unload(dib8);
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(new_dib, dib);
-
-	return new_dib;
-}
-
-// ==========================================================
-// Thresholding function
-//
-FIBITMAP * DLL_CALLCONV
-FreeImage_Threshold(FIBITMAP *dib, BYTE T) {
-	FIBITMAP *dib8 = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	const unsigned bpp = FreeImage_GetBPP(dib);
-
-	if(bpp == 1) {
-		// Just clone the dib and adjust the palette if needed
-		FIBITMAP *new_dib = FreeImage_Clone(dib);
-		if(NULL == new_dib) return NULL;
-		if(FreeImage_GetColorType(new_dib) == FIC_PALETTE) {
-			// Build a monochrome palette
-			RGBQUAD *pal = FreeImage_GetPalette(new_dib);
-			pal[0].rgbRed = pal[0].rgbGreen = pal[0].rgbBlue = 0;
-			pal[1].rgbRed = pal[1].rgbGreen = pal[1].rgbBlue = 255;
-		}
-		return new_dib;
-	}
-
-	// Convert the input dib to a 8-bit greyscale dib
-	//
-	switch(bpp) {
-		case 8:
-			if(FreeImage_GetColorType(dib) == FIC_MINISBLACK) {
-				dib8 = dib;
-			} else {
-				dib8 = FreeImage_ConvertToGreyscale(dib);
-			} 
-			break;
-		case 4:
-		case 16:
-		case 24:
-		case 32:
-			dib8 = FreeImage_ConvertToGreyscale(dib);
-			break;			
-	}
-	if(NULL == dib8) return NULL;
-
-	// Allocate a new 1-bit DIB
-	int width = FreeImage_GetWidth(dib);
-	int height = FreeImage_GetHeight(dib);
-	FIBITMAP *new_dib = FreeImage_Allocate(width, height, 1);
-	if(NULL == new_dib) return NULL;
-	// Build a monochrome palette
-	RGBQUAD *pal = FreeImage_GetPalette(new_dib);
-	pal[0].rgbRed = pal[0].rgbGreen = pal[0].rgbBlue = 0;
-	pal[1].rgbRed = pal[1].rgbGreen = pal[1].rgbBlue = 255;
-
-	// Perform the thresholding
-	//
-	for(int y = 0; y < height; y++) {
-		BYTE *bits8 = FreeImage_GetScanLine(dib8, y);
-		BYTE *bits1 = FreeImage_GetScanLine(new_dib, y);
-		for(int x = 0; x < width; x++) {
-			if(bits8[x] < T) {
-				// Set bit(x, y) to 0
-				bits1[x >> 3] &= (0xFF7F >> (x & 0x7));
-			} else {
-				// Set bit(x, y) to 1
-				bits1[x >> 3] |= (0x80 >> (x & 0x7));
-			}
-		}
-	}
-	if(dib8 != dib) {
-		FreeImage_Unload(dib8);
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(new_dib, dib);
-
-	return new_dib;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp b/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp
deleted file mode 100644
index 49bf9290d4..0000000000
--- a/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-// ==========================================================
-// JPEG2000 helpers
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
-#include "J2KHelper.h"
-
-// --------------------------------------------------------------------------
-
-static OPJ_UINT64 
-_LengthProc(J2KFIO_t *fio) {
-	long start_pos = fio->io->tell_proc(fio->handle);
-	fio->io->seek_proc(fio->handle, 0, SEEK_END);
-	unsigned file_length = fio->io->tell_proc(fio->handle) - start_pos;
-	fio->io->seek_proc(fio->handle, start_pos, SEEK_SET);
-	return (OPJ_UINT64)file_length;
-}
-
-static OPJ_SIZE_T 
-_ReadProc(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data) {
-	J2KFIO_t *fio = (J2KFIO_t*)p_user_data;
-	OPJ_SIZE_T l_nb_read = fio->io->read_proc(p_buffer, 1, (unsigned)p_nb_bytes, fio->handle);
-	return l_nb_read ? l_nb_read : (OPJ_SIZE_T)-1;
-}
-
-static OPJ_SIZE_T 
-_WriteProc(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data) {
-	J2KFIO_t *fio = (J2KFIO_t*)p_user_data;  
-	return fio->io->write_proc(p_buffer, 1, (unsigned)p_nb_bytes, fio->handle);
-}
-
-static OPJ_OFF_T 
-_SkipProc(OPJ_OFF_T p_nb_bytes, void *p_user_data) {
-	J2KFIO_t *fio = (J2KFIO_t*)p_user_data;
-	if( fio->io->seek_proc(fio->handle, (long)p_nb_bytes, SEEK_CUR) ) {
-		return -1;
-	}
-	return p_nb_bytes;
-}
-
-static OPJ_BOOL 
-_SeekProc(OPJ_OFF_T p_nb_bytes, FILE * p_user_data) {
-	J2KFIO_t *fio = (J2KFIO_t*)p_user_data;
-	if( fio->io->seek_proc(fio->handle, (long)p_nb_bytes, SEEK_SET) ) {
-		return OPJ_FALSE;
-	}
-	return OPJ_TRUE;
-}
-
-// --------------------------------------------------------------------------
-
-J2KFIO_t* 
-opj_freeimage_stream_create(FreeImageIO *io, fi_handle handle, BOOL bRead) {
-	if(!handle) {
-		return NULL;
-	}
-	J2KFIO_t *fio = (J2KFIO_t*)malloc(sizeof(J2KFIO_t));
-	if(fio) {
-		fio->io = io;
-		fio->handle = handle;
-
-		opj_stream_t *l_stream = opj_stream_create(OPJ_J2K_STREAM_CHUNK_SIZE, bRead ? OPJ_TRUE : OPJ_FALSE);
-		if (l_stream) {
-			opj_stream_set_user_data(l_stream, fio, NULL);
-			opj_stream_set_user_data_length(l_stream, _LengthProc(fio));
-			opj_stream_set_read_function(l_stream, (opj_stream_read_fn)_ReadProc);
-			opj_stream_set_write_function(l_stream, (opj_stream_write_fn)_WriteProc);
-			opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn)_SkipProc);
-			opj_stream_set_seek_function(l_stream, (opj_stream_seek_fn)_SeekProc);
-			fio->stream = l_stream;
-			return fio;
-		} else {
-			free(fio);
-		}
-	}
-
-	return NULL;		
-}
-
-void 
-opj_freeimage_stream_destroy(J2KFIO_t* fio) {
-	if(fio) {
-		if(fio->stream) {
-			opj_stream_destroy(fio->stream);
-		}
-		free(fio);
-	}
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Divide an integer by a power of 2 and round upwards
-@return Returns a divided by 2^b
-*/
-static int int_ceildivpow2(int a, int b) {
-	return (a + (1 << b) - 1) >> b;
-}
-
-/**
-Convert a OpenJPEG image to a FIBITMAP
-@param format_id Plugin ID
-@param image OpenJPEG image
-@param header_only If TRUE, allocate a 'header only' FIBITMAP, otherwise allocate a full FIBITMAP
-@return Returns the converted image if successful, returns NULL otherwise
-*/
-FIBITMAP* J2KImageToFIBITMAP(int format_id, const opj_image_t *image, BOOL header_only) {
-	FIBITMAP *dib = NULL;
-
-	try {
-		// compute image width and height
-
-		//int w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
-		int wr = image->comps[0].w;
-		int wrr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
-		
-		//int h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
-		//int hr = image->comps[0].h;
-		int hrr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
-
-		// check the number of components
-
-		int numcomps = image->numcomps;
-
-		BOOL bIsValid = TRUE;
-		for(int c = 0; c < numcomps - 1; c++) {
-			if(	(image->comps[c].dx == image->comps[c+1].dx) && 
-				(image->comps[c].dy == image->comps[c+1].dy) &&
-				(image->comps[c].prec == image->comps[c+1].prec) ) {
-				continue;
-			} else {
-				bIsValid = FALSE;
-				break;
-			}
-		}
-		bIsValid &= ((numcomps == 1) || (numcomps == 3) || (numcomps == 4));
-		if(!bIsValid) {
-			if(numcomps) {
-				FreeImage_OutputMessageProc(format_id, "Warning: image contains %d greyscale components. Only the first will be loaded.\n", numcomps);
-				numcomps = 1;
-			} else {
-				// unknown type
-				throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
-			}
-		}
-
-		// create a new DIB
-
-		if(image->comps[0].prec <= 8) {
-			switch(numcomps) {
-				case 1:
-					dib = FreeImage_AllocateHeader(header_only, wrr, hrr, 8);
-					break;
-				case 3:
-					dib = FreeImage_AllocateHeader(header_only, wrr, hrr, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					break;
-				case 4:
-					dib = FreeImage_AllocateHeader(header_only, wrr, hrr, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					break;
-			}
-		} else if(image->comps[0].prec <= 16) {
-			switch(numcomps) {
-				case 1:
-					dib = FreeImage_AllocateHeaderT(header_only, FIT_UINT16, wrr, hrr);
-					break;
-				case 3:
-					dib = FreeImage_AllocateHeaderT(header_only, FIT_RGB16, wrr, hrr);
-					break;
-				case 4:
-					dib = FreeImage_AllocateHeaderT(header_only, FIT_RGBA16, wrr, hrr);
-					break;
-			}
-		} else {
-			throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
-		}
-		if(!dib) {
-			throw FI_MSG_ERROR_DIB_MEMORY;
-		}
-
-		// "header only" FIBITMAP ?
-		if(header_only) {
-			return dib;
-		}
-		
-		if(image->comps[0].prec <= 8) {
-			if(numcomps == 1) {
-				// 8-bit greyscale
-				// ----------------------------------------------------------
-
-				// build a greyscale palette
-				
-				RGBQUAD *pal = FreeImage_GetPalette(dib);
-				for (int i = 0; i < 256; i++) {
-					pal[i].rgbRed	= (BYTE)i;
-					pal[i].rgbGreen = (BYTE)i;
-					pal[i].rgbBlue	= (BYTE)i;
-				}
-
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					BYTE *bits = FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int index = image->comps[0].data[pixel_pos];
-						index += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-
-						bits[x] = (BYTE)index;
-
-						pixel_count++;
-					}
-				}
-			}
-			else if(numcomps == 3) {
-
-				// 24-bit RGB
-				// ----------------------------------------------------------	
-				
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					BYTE *bits = FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int r = image->comps[0].data[pixel_pos];
-						r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-						
-						int g = image->comps[1].data[pixel_pos];
-						g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-						
-						int b = image->comps[2].data[pixel_pos];
-						b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-
-						bits[FI_RGBA_RED]   = (BYTE)r;
-						bits[FI_RGBA_GREEN] = (BYTE)g;
-						bits[FI_RGBA_BLUE]  = (BYTE)b;
-						bits += 3;
-
-						pixel_count++;
-					}
-				}
-			}
-			else if(numcomps == 4) {
-
-				// 32-bit RGBA
-				// ----------------------------------------------------------	
-				
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					BYTE *bits = FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int r = image->comps[0].data[pixel_pos];
-						r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-						
-						int g = image->comps[1].data[pixel_pos];
-						g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-						
-						int b = image->comps[2].data[pixel_pos];
-						b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-
-						int a = image->comps[3].data[pixel_pos];
-						a += (image->comps[3].sgnd ? 1 << (image->comps[3].prec - 1) : 0);
-
-						bits[FI_RGBA_RED]   = (BYTE)r;
-						bits[FI_RGBA_GREEN] = (BYTE)g;
-						bits[FI_RGBA_BLUE]  = (BYTE)b;
-						bits[FI_RGBA_ALPHA] = (BYTE)a;
-						bits += 4;
-
-						pixel_count++;
-					}
-				}
-			}
-		}
-		else if(image->comps[0].prec <= 16) {
-			if(numcomps == 1) {
-				// 16-bit greyscale
-				// ----------------------------------------------------------
-
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					WORD *bits = (WORD*)FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int index = image->comps[0].data[pixel_pos];
-						index += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-
-						bits[x] = (WORD)index;
-
-						pixel_count++;
-					}
-				}
-			}
-			else if(numcomps == 3) {
-
-				// 48-bit RGB
-				// ----------------------------------------------------------	
-				
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					FIRGB16 *bits = (FIRGB16*)FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int r = image->comps[0].data[pixel_pos];
-						r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-						
-						int g = image->comps[1].data[pixel_pos];
-						g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-						
-						int b = image->comps[2].data[pixel_pos];
-						b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-
-						bits[x].red   = (WORD)r;
-						bits[x].green = (WORD)g;
-						bits[x].blue  = (WORD)b;
-
-						pixel_count++;
-					}
-				}
-			}
-			else if(numcomps == 4) {
-
-				// 64-bit RGBA
-				// ----------------------------------------------------------	
-				
-				// load pixel data
-
-				unsigned pixel_count = 0;
-
-				for(int y = 0; y < hrr; y++) {		
-					FIRGBA16 *bits = (FIRGBA16*)FreeImage_GetScanLine(dib, hrr - 1 - y);
-
-					for(int x = 0; x < wrr; x++) {
-						const unsigned pixel_pos = pixel_count / wrr * wr + pixel_count % wrr;
-
-						int r = image->comps[0].data[pixel_pos];
-						r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-						
-						int g = image->comps[1].data[pixel_pos];
-						g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-						
-						int b = image->comps[2].data[pixel_pos];
-						b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-
-						int a = image->comps[3].data[pixel_pos];
-						a += (image->comps[3].sgnd ? 1 << (image->comps[3].prec - 1) : 0);
-
-						bits[x].red   = (WORD)r;
-						bits[x].green = (WORD)g;
-						bits[x].blue  = (WORD)b;
-						bits[x].alpha = (WORD)a;
-
-						pixel_count++;
-					}
-				}
-			}
-		}
-
-		return dib;
-
-	} catch(const char *text) {
-		if(dib) FreeImage_Unload(dib);
-		FreeImage_OutputMessageProc(format_id, text);
-		return NULL;
-	}
-
-}
-
-/**
-Convert a FIBITMAP to a OpenJPEG image
-@param format_id Plugin ID
-@param dib FreeImage image
-@param parameters Compression parameters
-@return Returns the converted image if successful, returns NULL otherwise
-*/
-opj_image_t* FIBITMAPToJ2KImage(int format_id, FIBITMAP *dib, const opj_cparameters_t *parameters) {
-	int prec, numcomps, x, y, index;
-	OPJ_COLOR_SPACE color_space;
-	opj_image_cmptparm_t cmptparm[4];	// maximum of 4 components 
-	opj_image_t *image = NULL;			// image to encode
-
-	try {
-		int w = FreeImage_GetWidth(dib);
-		int h = FreeImage_GetHeight(dib);
-
-		// get image characteristics
-		FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-
-		if(image_type == FIT_BITMAP) {
-			// standard image ...
-			prec = 8;
-			switch(FreeImage_GetColorType(dib)) {
-				case FIC_MINISBLACK:
-					numcomps = 1;
-					color_space = OPJ_CLRSPC_GRAY;
-					break;
-				case FIC_RGB:
-					if(FreeImage_GetBPP(dib) == 32) {
-						// 32-bit image with a fully opaque layer
-						numcomps = 4;
-						color_space = OPJ_CLRSPC_SRGB;
-					} else {
-						// 24-bit image
-						numcomps = 3;
-						color_space = OPJ_CLRSPC_SRGB;
-					}
-					break;
-				case FIC_RGBALPHA:
-					numcomps = 4;
-					color_space = OPJ_CLRSPC_SRGB;
-					break;
-				default:
-					return NULL;
-			}
-		} else {
-			// HDR image ...
-			prec = 16;
-			switch(image_type) {
-				case FIT_UINT16:
-					numcomps = 1;
-					color_space = OPJ_CLRSPC_GRAY;
-					break;
-				case FIT_RGB16:
-					numcomps = 3;
-					color_space = OPJ_CLRSPC_SRGB;
-					break;
-				case FIT_RGBA16:
-					numcomps = 4;
-					color_space = OPJ_CLRSPC_SRGB;
-					break;
-				default:
-					return NULL;
-			}
-		}
-
-		// initialize image components 
-		memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
-		for(int i = 0; i < numcomps; i++) {
-			cmptparm[i].dx = parameters->subsampling_dx;
-			cmptparm[i].dy = parameters->subsampling_dy;
-			cmptparm[i].w = w;
-			cmptparm[i].h = h;
-			cmptparm[i].prec = prec;
-			cmptparm[i].bpp = prec;
-			cmptparm[i].sgnd = 0;
-		}
-		// create the image 
-		image = opj_image_create(numcomps, &cmptparm[0], color_space);
-		if(!image) {
-			throw FI_MSG_ERROR_DIB_MEMORY;
-		}
-
-		// set image offset and reference grid 
-		image->x0 = parameters->image_offset_x0;
-		image->y0 = parameters->image_offset_y0;
-		image->x1 = parameters->image_offset_x0 + (w - 1) *	parameters->subsampling_dx + 1;
-		image->y1 = parameters->image_offset_y0 + (h - 1) *	parameters->subsampling_dy + 1;
-
-		// set image data 
-		if(prec == 8) {
-			switch(numcomps) {
-				case 1:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						BYTE *bits = FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[x];
-							index++;
-						}
-					}
-					break;
-				case 3:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						BYTE *bits = FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[FI_RGBA_RED];
-							image->comps[1].data[index] = bits[FI_RGBA_GREEN];
-							image->comps[2].data[index] = bits[FI_RGBA_BLUE];
-							bits += 3;
-							index++;
-						}
-					}
-					break;
-				case 4:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						BYTE *bits = FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[FI_RGBA_RED];
-							image->comps[1].data[index] = bits[FI_RGBA_GREEN];
-							image->comps[2].data[index] = bits[FI_RGBA_BLUE];
-							image->comps[3].data[index] = bits[FI_RGBA_ALPHA];
-							bits += 4;
-							index++;
-						}
-					}
-					break;
-			}
-		}
-		else if(prec == 16) {
-			switch(numcomps) {
-				case 1:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						WORD *bits = (WORD*)FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[x];
-							index++;
-						}
-					}
-					break;
-				case 3:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						FIRGB16 *bits = (FIRGB16*)FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[x].red;
-							image->comps[1].data[index] = bits[x].green;
-							image->comps[2].data[index] = bits[x].blue;
-							index++;
-						}
-					}
-					break;
-				case 4:
-					index = 0;
-					for(y = 0; y < h; y++) {
-						FIRGBA16 *bits = (FIRGBA16*)FreeImage_GetScanLine(dib, h - 1 - y);
-						for(x = 0; x < w; x++) {
-							image->comps[0].data[index] = bits[x].red;
-							image->comps[1].data[index] = bits[x].green;
-							image->comps[2].data[index] = bits[x].blue;
-							image->comps[3].data[index] = bits[x].alpha;
-							index++;
-						}
-					}
-					break;
-			}
-		}
-
-		return image;
-
-	} catch (const char *text) {
-		if(image) opj_image_destroy(image);
-		FreeImage_OutputMessageProc(format_id, text);
-		return NULL;
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/J2KHelper.h b/plugins/AdvaImg/src/FreeImage/J2KHelper.h
deleted file mode 100644
index a8121f164e..0000000000
--- a/plugins/AdvaImg/src/FreeImage/J2KHelper.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef J2K_HELPER_H
-#define J2K_HELPER_H
-
-// ==========================================================
-// Helper functions (see J2KHelper.cpp)
-// ==========================================================
-
-/** 
-FreeImageIO wrapper
-*/
-typedef struct tagJ2KFIO_t {
-	FreeImageIO *io;		//! FreeImage IO
-    fi_handle handle;		//! FreeImage handle
-	opj_stream_t *stream;	//! OpenJPEG stream
-} J2KFIO_t;
-
-/**
-Stream constructor
-*/
-J2KFIO_t* opj_freeimage_stream_create(FreeImageIO *io, fi_handle handle, BOOL bRead);
-
-/**
-Stream destructor
-*/
-void opj_freeimage_stream_destroy(J2KFIO_t* fio);
-
-/**
-Conversion opj_image_t => FIBITMAP
-*/
-FIBITMAP* J2KImageToFIBITMAP(int format_id, const opj_image_t *image, BOOL header_only);
-/**
-Conversion FIBITMAP => opj_image_t
-*/
-opj_image_t* FIBITMAPToJ2KImage(int format_id, FIBITMAP *dib, const opj_cparameters_t *parameters);
-
-#endif // J2K_HELPER_H
\ No newline at end of file
diff --git a/plugins/AdvaImg/src/FreeImage/LFPQuantizer.cpp b/plugins/AdvaImg/src/FreeImage/LFPQuantizer.cpp
deleted file mode 100644
index 8b592c30f1..0000000000
--- a/plugins/AdvaImg/src/FreeImage/LFPQuantizer.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// ==========================================================
-// LFPQuantizer class implementation
-//
-// Design and implementation by
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "Quantizers.h"
-#include "FreeImage.h"
-#include "Utilities.h"
-
-LFPQuantizer::LFPQuantizer(unsigned PaletteSize) :
-		m_size(0), m_limit(PaletteSize), m_index(0) {
-	m_map = new MapEntry[MAP_SIZE];
-	memset(m_map, 0xFF, MAP_SIZE * sizeof(MapEntry));
-}
-
-LFPQuantizer::~LFPQuantizer() {
-    delete[] m_map;
-}
-
-FIBITMAP* LFPQuantizer::Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *ReservePalette) {
-
-	if (ReserveSize > 0 && ReservePalette != NULL) {
-		AddReservePalette(ReservePalette, ReserveSize);
-	}
-
-	const unsigned width = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-
-	FIBITMAP *dib8 = FreeImage_Allocate(width, height, 8);
-	if (dib8 == NULL) {
-		return NULL;
-	}
-
-	const unsigned src_pitch = FreeImage_GetPitch(dib);
-	const unsigned dst_pitch = FreeImage_GetPitch(dib8);
-
-	const BYTE * const src_bits = FreeImage_GetBits(dib);
-	BYTE * const dst_bits = FreeImage_GetBits(dib8);
-
-	unsigned last_color = -1;
-	int last_index = 0;
-
-	if (FreeImage_GetBPP(dib) == 24) {
-
-		// Getting the source pixel as an unsigned int is much faster than
-		// working with FI_RGBA_xxx and shifting. However, this may fail
-		// for the very last pixel, since its rgbReserved member (alpha)
-		// may actually point to an address beyond the bitmap's memory. So,
-		// we do not process the last scanline in the first loop.
-
-		// Process all but the last scanline.
-		for (unsigned y = 0; y < height - 1; ++y) {
-			BYTE *dst_line = dst_bits + y * dst_pitch;
-			const BYTE *src_line = src_bits + y * src_pitch;
-			for (unsigned x = 0; x < width; ++x) {
-				const unsigned color = *((unsigned *) src_line) & 0x00FFFFFF;
-				if (color != last_color) {
-					last_color = color;
-					last_index = GetIndexForColor(color);
-					if (last_index == -1) {
-						FreeImage_Unload(dib8);
-						return NULL;
-					}
-				}
-				dst_line[x] = last_index;
-				src_line += 3;
-			}
-		}
-
-		// Process all but the last pixel of the last scanline.
-		BYTE *dst_line = dst_bits + (height - 1) * dst_pitch;
-		const BYTE *src_line = src_bits + (height - 1) * src_pitch;
-		for (unsigned x = 0; x < width - 1; ++x) {
-			const unsigned color = *((unsigned *) src_line) & 0x00FFFFFF;
-			if (color != last_color) {
-				last_color = color;
-				last_index = GetIndexForColor(color);
-				if (last_index == -1) {
-					FreeImage_Unload(dib8);
-					return NULL;
-				}
-			}
-			dst_line[x] = last_index;
-			src_line += 3;
-		}
-
-		// Process the last pixel (src_line should already point to it).
-		const unsigned color = 0 | src_line[FI_RGBA_BLUE] << FI_RGBA_BLUE_SHIFT
-				| src_line[FI_RGBA_GREEN] << FI_RGBA_GREEN_SHIFT
-				| src_line[FI_RGBA_RED] << FI_RGBA_RED_SHIFT;
-		if (color != last_color) {
-			last_color = color;
-			last_index = GetIndexForColor(color);
-			if (last_index == -1) {
-				FreeImage_Unload(dib8);
-				return NULL;
-			}
-		}
-		dst_line[width - 1] = last_index;
-
-	} else {
-		for (unsigned y = 0; y < height; ++y) {
-			BYTE *dst_line = dst_bits + y * dst_pitch;
-			const BYTE *src_line = src_bits + y * src_pitch;
-			for (unsigned x = 0; x < width; ++x) {
-				const unsigned color = *((unsigned *) src_line) & 0x00FFFFFF;
-				if (color != last_color) {
-					last_color = color;
-					last_index = GetIndexForColor(color);
-					if (last_index == -1) {
-						FreeImage_Unload(dib8);
-						return NULL;
-					}
-				}
-				dst_line[x] = last_index;
-				src_line += 4;
-			}
-		}
-	}
-
-	WritePalette(FreeImage_GetPalette(dib8));
-	return dib8;
-}
-
-/**
- * Returns the palette index of the specified color. Tries to put the
- * color into the map, if it's not already present in the map. In that
- * case, a new index is used for the color. Returns -1, if adding the
- * color would exceed the desired maximum number of colors in the
- * palette.
- * @param color the color to get the index from
- * @return the palette index of the specified color or -1, if there
- * is no space left in the palette
- */
-inline int LFPQuantizer::GetIndexForColor(unsigned color) {
-	unsigned bucket = hash(color) & (MAP_SIZE - 1);
-	while (m_map[bucket].color != color) {
-		if (m_map[bucket].color == EMPTY_BUCKET) {
-			if (m_size == m_limit) {
-				return -1;
-			}
-			m_map[bucket].color = color;
-			m_map[bucket].index = m_index++;
-			++m_size;
-			break;
-		}
-		bucket = (bucket + 1) % MAP_SIZE;
-	}
-	return m_map[bucket].index;
-}
-
-/**
- * Adds the specified number of entries of the specified reserve
- * palette to the newly created palette.
- * @param *palette a pointer to the reserve palette to copy from
- * @param size the number of entries to copy
- */
-void LFPQuantizer::AddReservePalette(const void *palette, unsigned size) {
-	if (size > MAX_SIZE) {
-		size = MAX_SIZE;
-	}
-	unsigned *ppal = (unsigned *) palette;
-	const unsigned offset = m_limit - size;
-	for (unsigned i = 0; i < size; ++i) {
-		const unsigned color = *ppal++;
-		const unsigned index = i + offset;
-		unsigned bucket = hash(color) & (MAP_SIZE - 1);
-		while((m_map[bucket].color != EMPTY_BUCKET) && (m_map[bucket].color != color)) {
-			bucket = (bucket + 1) % MAP_SIZE;
-		}
-		if(m_map[bucket].color != color) {
-			m_map[bucket].color = color;
-			m_map[bucket].index = index;
-		}
-	}
-	m_size += size;
-}
-
-/**
- * Copies the newly created palette into the specified destination
- * palette. Although unused palette entries are not overwritten in
- * the destination palette, it is assumed to have space for at
- * least 256 entries.
- * @param palette a pointer to the destination palette
- */
-void LFPQuantizer::WritePalette(void *palette) {
-	for (unsigned i = 0; i < MAP_SIZE; ++i) {
-		if (m_map[i].color != EMPTY_BUCKET) {
-			((unsigned *) palette)[m_map[i].index] = m_map[i].color;
-		}
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp b/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp
deleted file mode 100644
index 2bc3e833a4..0000000000
--- a/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp
+++ /dev/null
@@ -1,1320 +0,0 @@
-// ==========================================================
-// MNG / JNG helpers
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-/**
-References
-http://www.libpng.org/pub/mng/spec/jng.html
-http://www.w3.org/TR/PNG/
-http://libpng.org/pub/mng/spec/
-*/
-
-// --------------------------------------------------------------------------
-
-#define MNG_INCLUDE_JNG
-
-#ifdef MNG_INCLUDE_JNG
-#define MNG_COLORTYPE_JPEGGRAY           8       /* JHDR */
-#define MNG_COLORTYPE_JPEGCOLOR         10
-#define MNG_COLORTYPE_JPEGGRAYA         12
-#define MNG_COLORTYPE_JPEGCOLORA        14
-
-#define MNG_BITDEPTH_JPEG8               8       /* JHDR */
-#define MNG_BITDEPTH_JPEG12             12
-#define MNG_BITDEPTH_JPEG8AND12         20
-
-#define MNG_COMPRESSION_BASELINEJPEG     8       /* JHDR */
-
-#define MNG_INTERLACE_SEQUENTIAL         0       /* JHDR */
-#define MNG_INTERLACE_PROGRESSIVE        8
-#endif /* MNG_INCLUDE_JNG */
-
-// --------------------------------------------------------------------------
-
-#define JNG_SUPPORTED
-
-/** Size of a JDAT chunk on writing */
-const DWORD JPEG_CHUNK_SIZE	= 8192;
-
-/** PNG signature */
-static const BYTE g_png_signature[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
-/** JNG signature */
-static const BYTE g_jng_signature[8] = { 139, 74, 78, 71, 13, 10, 26, 10 };
-
-// --------------------------------------------------------------------------
-
-/** Chunk type converted to enum */
-enum eChunckType {
-	UNKNOWN_CHUNCK,
-	MHDR,
-	BACK,
-	BASI,
-	CLIP,
-	CLON,
-	DEFI,
-	DHDR,
-	DISC,
-	ENDL,
-	FRAM,
-	IEND,
-	IHDR,
-	JHDR,
-	LOOP,
-	MAGN,
-	MEND,
-	MOVE,
-	PAST,
-	PLTE,
-	SAVE,
-	SEEK,
-	SHOW,
-	TERM,
-	bKGD,
-	cHRM,
-	gAMA,
-	iCCP,
-	nEED,
-	pHYg,
-	vpAg,
-	pHYs,
-	sBIT,
-	sRGB,
-	tRNS,
-	IDAT,
-	JDAT,
-	JDAA,
-	JdAA,
-	JSEP,
-	oFFs,
-	hIST,
-	iTXt,
-	sPLT,
-	sTER,
-	tEXt,
-	tIME,
-	zTXt
-};
-
-/**
-Helper for map<key, value> where value is a pointer to a string. 
-Used to store tEXt metadata. 
-*/
-typedef std::map<std::string, std::string> tEXtMAP;
-
-// --------------------------------------------------------------------------
-
-/*
-  Constant strings for known chunk types.  If you need to add a chunk,
-  add a string holding the name here.   To make the code more
-  portable, we use ASCII numbers like this, not characters.
-*/
-
-static BYTE mng_MHDR[5]={ 77,  72,  68,  82, (BYTE) '\0'};
-static BYTE mng_BACK[5]={ 66,  65,  67,  75, (BYTE) '\0'};
-static BYTE mng_BASI[5]={ 66,  65,  83,  73, (BYTE) '\0'};
-static BYTE mng_CLIP[5]={ 67,  76,  73,  80, (BYTE) '\0'};
-static BYTE mng_CLON[5]={ 67,  76,  79,  78, (BYTE) '\0'};
-static BYTE mng_DEFI[5]={ 68,  69,  70,  73, (BYTE) '\0'};
-static BYTE mng_DHDR[5]={ 68,  72,  68,  82, (BYTE) '\0'};
-static BYTE mng_DISC[5]={ 68,  73,  83,  67, (BYTE) '\0'};
-static BYTE mng_ENDL[5]={ 69,  78,  68,  76, (BYTE) '\0'};
-static BYTE mng_FRAM[5]={ 70,  82,  65,  77, (BYTE) '\0'};
-static BYTE mng_IEND[5]={ 73,  69,  78,  68, (BYTE) '\0'};
-static BYTE mng_IHDR[5]={ 73,  72,  68,  82, (BYTE) '\0'};
-static BYTE mng_JHDR[5]={ 74,  72,  68,  82, (BYTE) '\0'};
-static BYTE mng_LOOP[5]={ 76,  79,  79,  80, (BYTE) '\0'};
-static BYTE mng_MAGN[5]={ 77,  65,  71,  78, (BYTE) '\0'};
-static BYTE mng_MEND[5]={ 77,  69,  78,  68, (BYTE) '\0'};
-static BYTE mng_MOVE[5]={ 77,  79,  86,  69, (BYTE) '\0'};
-static BYTE mng_PAST[5]={ 80,  65,  83,  84, (BYTE) '\0'};
-static BYTE mng_PLTE[5]={ 80,  76,  84,  69, (BYTE) '\0'};
-static BYTE mng_SAVE[5]={ 83,  65,  86,  69, (BYTE) '\0'};
-static BYTE mng_SEEK[5]={ 83,  69,  69,  75, (BYTE) '\0'};
-static BYTE mng_SHOW[5]={ 83,  72,  79,  87, (BYTE) '\0'};
-static BYTE mng_TERM[5]={ 84,  69,  82,  77, (BYTE) '\0'};
-static BYTE mng_bKGD[5]={ 98,  75,  71,  68, (BYTE) '\0'};
-static BYTE mng_cHRM[5]={ 99,  72,  82,  77, (BYTE) '\0'};
-static BYTE mng_gAMA[5]={103,  65,  77,  65, (BYTE) '\0'};
-static BYTE mng_iCCP[5]={105,  67,  67,  80, (BYTE) '\0'};
-static BYTE mng_nEED[5]={110,  69,  69,  68, (BYTE) '\0'};
-static BYTE mng_pHYg[5]={112,  72,  89, 103, (BYTE) '\0'};
-static BYTE mng_vpAg[5]={118, 112,  65, 103, (BYTE) '\0'};
-static BYTE mng_pHYs[5]={112,  72,  89, 115, (BYTE) '\0'};
-static BYTE mng_sBIT[5]={115,  66,  73,  84, (BYTE) '\0'};
-static BYTE mng_sRGB[5]={115,  82,  71,  66, (BYTE) '\0'};
-static BYTE mng_tRNS[5]={116,  82,  78,  83, (BYTE) '\0'};
-
-#if defined(JNG_SUPPORTED)
-static BYTE mng_IDAT[5]={ 73,  68,  65,  84, (BYTE) '\0'};
-static BYTE mng_JDAT[5]={ 74,  68,  65,  84, (BYTE) '\0'};
-static BYTE mng_JDAA[5]={ 74,  68,  65,  65, (BYTE) '\0'};
-static BYTE mng_JdAA[5]={ 74, 100,  65,  65, (BYTE) '\0'};
-static BYTE mng_JSEP[5]={ 74,  83,  69,  80, (BYTE) '\0'};
-static BYTE mng_oFFs[5]={111,  70,  70, 115, (BYTE) '\0'};
-#endif
-
-static BYTE mng_hIST[5]={104,  73,  83,  84, (BYTE) '\0'};
-static BYTE mng_iTXt[5]={105,  84,  88, 116, (BYTE) '\0'};
-static BYTE mng_sPLT[5]={115,  80,  76,  84, (BYTE) '\0'};
-static BYTE mng_sTER[5]={115,  84,  69,  82, (BYTE) '\0'};
-static BYTE mng_tEXt[5]={116,  69,  88, 116, (BYTE) '\0'};
-static BYTE mng_tIME[5]={116,  73,  77,  69, (BYTE) '\0'};
-static BYTE mng_zTXt[5]={122,  84,  88, 116, (BYTE) '\0'};
-
-
-// --------------------------------------------------------------------------
-
-/**
-Convert a chunk name to a unique ID
-*/
-static eChunckType 
-mng_GetChunckType(const BYTE *mChunkName) {
-	if(memcmp(mChunkName, mng_MHDR, 4) == 0) {
-		return MHDR;
-	}
-	if(memcmp(mChunkName, mng_LOOP, 4) == 0) {
-		return LOOP;
-	}
-	if(memcmp(mChunkName, mng_DEFI, 4) == 0) {
-		return DEFI;
-	}
-	if(memcmp(mChunkName, mng_PLTE, 4) == 0) {
-		return PLTE;
-	}
-	if(memcmp(mChunkName, mng_tRNS, 4) == 0) {
-		return tRNS;
-	}
-	if(memcmp(mChunkName, mng_IHDR, 4) == 0) {
-		return IHDR;
-	}
-	if(memcmp(mChunkName, mng_JHDR, 4) == 0) {
-		return JHDR;
-	}
-	if(memcmp(mChunkName, mng_MEND, 4) == 0) {
-		return MEND;
-	}
-	if(memcmp(mChunkName, mng_IEND, 4) == 0) {
-		return IEND;
-	}
-	if(memcmp(mChunkName, mng_JDAT, 4) == 0) {
-		return JDAT;
-	}
-	if(memcmp(mChunkName, mng_IDAT, 4) == 0) {
-		return IDAT;
-	}
-	if(memcmp(mChunkName, mng_JDAA, 4) == 0) {
-		return JDAA;
-	}
-	if(memcmp(mChunkName, mng_gAMA, 4) == 0) {
-		return gAMA;
-	}
-	if(memcmp(mChunkName, mng_pHYs, 4) == 0) {
-		return pHYs;
-	}
-	if(memcmp(mChunkName, mng_bKGD, 4) == 0) {
-		return bKGD;
-	}
-	if(memcmp(mChunkName, mng_tEXt, 4) == 0) {
-		return tEXt;
-	}
-
-	return UNKNOWN_CHUNCK;
-}
-
-inline void
-mng_SwapShort(WORD *sp) {
-#ifndef FREEIMAGE_BIGENDIAN
-	SwapShort(sp);
-#endif
-}
-
-inline void
-mng_SwapLong(DWORD *lp) {
-#ifndef FREEIMAGE_BIGENDIAN
-	SwapLong(lp);
-#endif
-}
-
-/**
-Returns the size, in bytes, of a FreeImageIO stream, from the current position. 
-*/
-static long
-mng_LOF(FreeImageIO *io, fi_handle handle) {
-	long start_pos = io->tell_proc(handle);
-	io->seek_proc(handle, 0, SEEK_END);
-	long file_length = io->tell_proc(handle);
-	io->seek_proc(handle, start_pos, SEEK_SET);
-	return file_length;
-}
-
-/**
-Count the number of bytes in a PNG stream, from IHDR to IEND. 
-If successful, the stream position, as given by io->tell_proc(handle), 
-should be the end of the PNG stream at the return of the function. 
-@param io
-@param handle
-@param inPos
-@param m_TotalBytesOfChunks
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-mng_CountPNGChunks(FreeImageIO *io, fi_handle handle, long inPos, unsigned *m_TotalBytesOfChunks) {
-	long mLOF;
-	long mPos;
-	BOOL mEnd = FALSE;
-	DWORD mLength = 0;
-	BYTE mChunkName[5];
-
-	*m_TotalBytesOfChunks = 0;
-
-	// get the length of the file
-	mLOF = mng_LOF(io, handle);
-
-	// go to the start of the file
-	io->seek_proc(handle, inPos, SEEK_SET);
-
-	try {
-		// parse chunks
-		while(mEnd == FALSE) {
-			// chunk length
-			mPos = io->tell_proc(handle);
-			if(mPos + 4 > mLOF) {
-				throw(1);
-			}
-			io->read_proc(&mLength, 1, 4, handle);
-			mng_SwapLong(&mLength);
-			// chunk name
-			mPos = io->tell_proc(handle);
-			if(mPos + 4 > mLOF) {
-				throw(1);
-			}
-			io->read_proc(&mChunkName[0], 1, 4, handle);
-			mChunkName[4] = '\0';
-
-			// go to next chunk
-			mPos = io->tell_proc(handle);
-			// 4 = size of the CRC
-			if(mPos + (long)mLength + 4 > mLOF) {
-				throw(1);
-			}
-			io->seek_proc(handle, mLength + 4, SEEK_CUR);
-
-			switch( mng_GetChunckType(mChunkName) ) {
-				case IHDR:
-					if(mLength != 13) {
-						throw(1);
-					}
-					break;
-				
-				case IEND:
-					mEnd = TRUE;		
-					// the length below includes 4 bytes CRC, but no bytes for Length
-					*m_TotalBytesOfChunks = io->tell_proc(handle) - inPos;
-					break;		
-				
-				case UNKNOWN_CHUNCK:
-				default:
-					break;
-			}
-
-		} // while(!mEnd)
-
-		return TRUE;
-		
-	} catch(int) {
-		return FALSE;
-	}
-}
-
-/**
-Retrieve the position of a chunk in a PNG stream
-@param hPngMemory PNG stream handle
-@param chunk_name Name of the chunk to be found
-@param offset Start of the search in the stream
-@param start_pos [returned value] Start position of the chunk
-@param next_pos [returned value] Start position of the next chunk
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-mng_FindChunk(FIMEMORY *hPngMemory, BYTE *chunk_name, long offset, DWORD *start_pos, DWORD *next_pos) {
-	DWORD mLength = 0;
-
-	BYTE *data = NULL;
-	DWORD size_in_bytes = 0;
-
-	*start_pos = 0;
-	*next_pos = 0;
-
-	// get a pointer to the stream buffer
-	FreeImage_AcquireMemory(hPngMemory, &data, &size_in_bytes);
-	if(!(data && size_in_bytes) || (size_in_bytes < 20) || (size_in_bytes - offset < 20)) {
-		// not enough space to read a signature(8 bytes) + a chunk(at least 12 bytes)
-		return FALSE;
-	}
-
-	try {
-	
-		// skip the signature and/or any following chunk(s)
-		DWORD chunk_pos = offset;
-
-		while(1) {
-			// get chunk length
-			if(chunk_pos + 4 > size_in_bytes) {
-				break;
-			}
-
-			memcpy(&mLength, &data[chunk_pos], 4);
-			mng_SwapLong(&mLength);
-			chunk_pos += 4;
-
-			const DWORD next_chunk_pos = chunk_pos + 4 + mLength + 4;
-			if(next_chunk_pos > size_in_bytes) {
-				break;
-			}
-
-			// get chunk name
-			if(memcmp(&data[chunk_pos], chunk_name, 4) == 0) {
-				chunk_pos -= 4;	// found chunk
-				*start_pos = chunk_pos;
-				*next_pos = next_chunk_pos;
-				return TRUE;
-			}
-			
-			chunk_pos = next_chunk_pos;
-		}
-
-		return FALSE;
-
-	} catch(int) {
-		return FALSE;
-	}
-}
-
-/**
-Remove a chunk located at (start_pos, next_pos) in the PNG stream
-@param hPngMemory PNG stream handle
-@param start_pos Start position of the chunk
-@param next_pos Start position of the next chunk
-@return Returns TRUE if successfull, returns FALSE otherwise
-*/
-static BOOL 
-mng_CopyRemoveChunks(FIMEMORY *hPngMemory, DWORD start_pos, DWORD next_pos) {
-	BYTE *data = NULL;
-	DWORD size_in_bytes = 0;
-
-	// length of the chunk to remove
-	DWORD chunk_length = next_pos - start_pos;
-	if(chunk_length == 0) {
-		return TRUE;
-	}
-
-	// get a pointer to the stream buffer
-	FreeImage_AcquireMemory(hPngMemory, &data, &size_in_bytes);
-	if(!(data && size_in_bytes) || (size_in_bytes < 20) || (chunk_length >= size_in_bytes)) {
-		// not enough space to read a signature(8 bytes) + a chunk(at least 12 bytes)
-		return FALSE;
-	}
-	
-	// new file length
-	unsigned buffer_size = size_in_bytes + chunk_length;
-
-	BYTE *buffer = (BYTE*)malloc(buffer_size * sizeof(BYTE));
-	if(!buffer) {
-		return FALSE;
-	}
-	memcpy(&buffer[0], &data[0], start_pos);
-	memcpy(&buffer[start_pos], &data[next_pos], size_in_bytes - next_pos);
-
-	// seek to the start of the stream
-	FreeImage_SeekMemory(hPngMemory, 0, SEEK_SET);
-	// re-write the stream
-	FreeImage_WriteMemory(buffer, 1, buffer_size, hPngMemory);
-
-	free(buffer);
-
-	return TRUE;
-}
-
-/**
-Insert a chunk just before the inNextChunkName chunk
-@param hPngMemory PNG stream handle
-@param start_pos Start position of the inNextChunkName chunk
-@param next_pos Start position of the next chunk
-@return Returns TRUE if successfull, returns FALSE otherwise
-*/
-static BOOL 
-mng_CopyInsertChunks(FIMEMORY *hPngMemory, BYTE *inNextChunkName, BYTE *inInsertChunk, DWORD inChunkLength, DWORD start_pos, DWORD next_pos) {
-	BYTE *data = NULL;
-	DWORD size_in_bytes = 0;
-
-	// length of the chunk to check
-	DWORD chunk_length = next_pos - start_pos;
-	if(chunk_length == 0) {
-		return TRUE;
-	}
-
-	// get a pointer to the stream buffer
-	FreeImage_AcquireMemory(hPngMemory, &data, &size_in_bytes);
-	if(!(data && size_in_bytes) || (size_in_bytes < 20) || (chunk_length >= size_in_bytes)) {
-		// not enough space to read a signature(8 bytes) + a chunk(at least 12 bytes)
-		return FALSE;
-	}
-	
-	// new file length
-	unsigned buffer_size = inChunkLength + size_in_bytes;
-
-	BYTE *buffer = (BYTE*)malloc(buffer_size * sizeof(BYTE));
-	if(!buffer) {
-		return FALSE;
-	}
-	unsigned p = 0;
-	memcpy(&buffer[p], &data[0], start_pos);
-	p += start_pos;
-	memcpy(&buffer[p], inInsertChunk, inChunkLength);
-	p += inChunkLength;
-	memcpy(&buffer[p], &data[start_pos], size_in_bytes - start_pos);
-
-	// seek to the start of the stream
-	FreeImage_SeekMemory(hPngMemory, 0, SEEK_SET);
-	// re-write the stream
-	FreeImage_WriteMemory(buffer, 1, buffer_size, hPngMemory);
-
-	free(buffer);
-
-	return TRUE;
-}
-
-static BOOL 
-mng_RemoveChunk(FIMEMORY *hPngMemory, BYTE *chunk_name) {
-	BOOL bResult = FALSE;
-
-	DWORD start_pos = 0;
-	DWORD next_pos = 0;
-	
-	bResult = mng_FindChunk(hPngMemory, chunk_name, 8, &start_pos, &next_pos);
-	if(!bResult) {
-		return FALSE;
-	}
-
-	bResult = mng_CopyRemoveChunks(hPngMemory, start_pos, next_pos);
-	if(!bResult) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static BOOL 
-mng_InsertChunk(FIMEMORY *hPngMemory, BYTE *inNextChunkName, BYTE *inInsertChunk, unsigned chunk_length) {
-	BOOL bResult = FALSE;
-
-	DWORD start_pos = 0;
-	DWORD next_pos = 0;
-	
-	bResult = mng_FindChunk(hPngMemory, inNextChunkName, 8, &start_pos, &next_pos);
-	if(!bResult) {
-		return FALSE;
-	}
-
-	bResult = mng_CopyInsertChunks(hPngMemory, inNextChunkName, inInsertChunk, chunk_length, start_pos, next_pos);
-	if(!bResult) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static FIBITMAP* 
-mng_LoadFromMemoryHandle(FIMEMORY *hmem, int flags = 0) {
-	long offset = 0;
-	FIBITMAP *dib = NULL;
-
-	if(hmem) {
-		// seek to the start of the stream
-		FreeImage_SeekMemory(hmem, offset, SEEK_SET);
-
-		// check the file signature and deduce its format
-		// (the second argument is currently not used by FreeImage)
-		FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(hmem, 0);
-		if(fif != FIF_UNKNOWN) {
-			dib = FreeImage_LoadFromMemory(fif, hmem, flags);
-		}
-	}
-	
-	return dib;
-}
-
-/**
-Write a chunk in a PNG stream from the current position. 
-@param chunk_name Name of the chunk
-@param chunk_data Chunk array
-@param length Chunk length
-@param hPngMemory PNG stream handle
-*/
-static void
-mng_WriteChunk(BYTE *chunk_name, BYTE *chunk_data, DWORD length, FIMEMORY *hPngMemory) {
-	DWORD crc_file = 0;
-	// write a PNG chunk ...
-	// - length
-	mng_SwapLong(&length);
-	FreeImage_WriteMemory(&length, 1, 4, hPngMemory);
-	mng_SwapLong(&length);
-	// - chunk name
-	FreeImage_WriteMemory(chunk_name, 1, 4, hPngMemory);
-	if(chunk_data && length) {
-		// - chunk data
-		FreeImage_WriteMemory(chunk_data, 1, length, hPngMemory);
-		// - crc
-		crc_file = FreeImage_ZLibCRC32(0, chunk_name, 4);
-		crc_file = FreeImage_ZLibCRC32(crc_file, chunk_data, length);
-		mng_SwapLong(&crc_file);
-		FreeImage_WriteMemory(&crc_file, 1, 4, hPngMemory);
-	} else {
-		// - crc
-		crc_file = FreeImage_ZLibCRC32(0, chunk_name, 4);
-		mng_SwapLong(&crc_file);
-		FreeImage_WriteMemory(&crc_file, 1, 4, hPngMemory);
-	}
-
-}
-
-/**
-Wrap a IDAT chunk as a PNG stream. 
-The stream has the structure { g_png_signature, IHDR, IDAT, IEND }
-The image is assumed to be a greyscale image. 
-
-@param jng_width Image width
-@param jng_height Image height
-@param jng_alpha_sample_depth Bits per pixel
-@param mChunk PNG grayscale IDAT format
-@param mLength IDAT chunk length
-@param hPngMemory Output memory stream
-*/
-static void 
-mng_WritePNGStream(DWORD jng_width, DWORD jng_height, BYTE jng_alpha_sample_depth, BYTE *mChunk, DWORD mLength, FIMEMORY *hPngMemory) {
-	// PNG grayscale IDAT format
-
-	BYTE data[14];
-
-	// wrap the IDAT chunk as a PNG stream
-
-	// write PNG file signature
-	FreeImage_WriteMemory(g_png_signature, 1, 8, hPngMemory);
-
-	// write a IHDR chunk ...
-	/*
-	The IHDR chunk must appear FIRST. It contains:
-	Width:              4 bytes
-	Height:             4 bytes
-	Bit depth:          1 byte
-	Color type:         1 byte
-	Compression method: 1 byte
-	Filter method:      1 byte
-	Interlace method:   1 byte
-	*/
-	// - chunk data
-	mng_SwapLong(&jng_width);
-	mng_SwapLong(&jng_height);
-	memcpy(&data[0], &jng_width, 4);
-	memcpy(&data[4], &jng_height, 4);
-	mng_SwapLong(&jng_width);
-	mng_SwapLong(&jng_height);
-	data[8] = jng_alpha_sample_depth;
-	data[9] = 0;	// color_type gray (jng_color_type)
-	data[10] = 0;	// compression method 0 (jng_alpha_compression_method)
-	data[11] = 0;	// filter_method 0 (jng_alpha_filter_method)
-	data[12] = 0;	// interlace_method 0 (jng_alpha_interlace_method)
-
-	mng_WriteChunk(mng_IHDR, &data[0], 13, hPngMemory);
-
-	// write a IDAT chunk ...
-	mng_WriteChunk(mng_IDAT, mChunk, mLength, hPngMemory);
-
-	// write a IEND chunk ...
-	mng_WriteChunk(mng_IEND, NULL, 0, hPngMemory);
-
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Build and set a FITAG whose type is FIDT_ASCII. 
-The tag must be destroyed by the caller using FreeImage_DeleteTag.
-@param model Metadata model to be filled
-@param dib Image to be filled
-@param key Tag key
-@param value Tag value
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-mng_SetKeyValue(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, const char *value) {
-	if(!dib || !key || !value) {
-		return FALSE;
-	}
-	// create a tag
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		BOOL bSuccess = TRUE;
-		// fill the tag
-		DWORD tag_length = (DWORD)(strlen(value) + 1);
-		bSuccess &= FreeImage_SetTagKey(tag, key);
-		bSuccess &= FreeImage_SetTagLength(tag, tag_length);
-		bSuccess &= FreeImage_SetTagCount(tag, tag_length);
-		bSuccess &= FreeImage_SetTagType(tag, FIDT_ASCII);
-		bSuccess &= FreeImage_SetTagValue(tag, value);
-		if(bSuccess) {
-			// set the tag
-			FreeImage_SetMetadata(model, dib, FreeImage_GetTagKey(tag), tag);
-		}
-		FreeImage_DeleteTag(tag);
-		return bSuccess;
-	}
-
-	return FALSE;
-}
-
-/**
-Read a tEXt chunk and extract the key/value pair. 
-@param key_value_pair [returned value] Array of key/value pairs
-@param mChunk Chunk data
-@param mLength Chunk length
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-mng_SetMetadata_tEXt(tEXtMAP &key_value_pair, const BYTE *mChunk, DWORD mLength) {
-	std::string key;
-	std::string value;
-	BYTE *buffer = (BYTE*)malloc(mLength * sizeof(BYTE));
-	if(!buffer) {
-		return FALSE;
-	}
-	DWORD pos = 0;
-
-	memset(buffer, 0, mLength * sizeof(BYTE));
-
-	for(DWORD i = 0; i < mLength; i++) {
-		buffer[pos++] = mChunk[i];
-		if(mChunk[i] == '\0') {
-			if(key.size() == 0) {
-				key = (char*)buffer;
-				pos = 0;
-				memset(buffer, 0, mLength * sizeof(BYTE));
-			} else {
-				break;
-			}
-		}
-	}
-	value = (char*)buffer;
-	free(buffer);
-
-	key_value_pair[key] = value;
-
-	return TRUE;
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Load a FIBITMAP from a MNG or a JNG stream
-@param format_id ID of the caller
-@param io Stream i/o functions
-@param handle Stream handle
-@param Offset Start of the first chunk
-@param flags Loading flags
-@return Returns a dib if successful, returns NULL otherwise
-*/
-FIBITMAP* 
-mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, int flags = 0) {
-	DWORD mLength = 0;
-	BYTE mChunkName[5];
-	BYTE *mChunk = NULL;
-	DWORD crc_file;
-	long LastOffset;
-	long mOrigPos;
-	BYTE *PLTE_file_chunk = NULL;	// whole PLTE chunk (lentgh, name, array, crc)
-	DWORD PLTE_file_size = 0;		// size of PLTE chunk
-
-	BOOL m_HasGlobalPalette = FALSE; // may turn to TRUE in PLTE chunk
-	unsigned m_TotalBytesOfChunks = 0;
-	FIBITMAP *dib = NULL;
-	FIBITMAP *dib_alpha = NULL;
-
-	FIMEMORY *hJpegMemory = NULL;
-	FIMEMORY *hPngMemory = NULL;
-	FIMEMORY *hIDATMemory = NULL;
-
-	// ---
-	DWORD jng_width = 0;
-	DWORD jng_height = 0;
-	BYTE jng_color_type = 0;
-	BYTE jng_image_sample_depth = 0;
-	BYTE jng_image_compression_method = 0;
-
-	BYTE jng_alpha_sample_depth = 0;
-	BYTE jng_alpha_compression_method = 0;
-	BYTE jng_alpha_filter_method = 0;
-	BYTE jng_alpha_interlace_method = 0;
-
-	DWORD mng_frame_width = 0;
-	DWORD mng_frame_height = 0;
-	DWORD mng_ticks_per_second = 0;
-	DWORD mng_nominal_layer_count = 0;
-	DWORD mng_nominal_frame_count = 0;
-	DWORD mng_nominal_play_time = 0;
-	DWORD mng_simplicity_profile = 0;
-
-
-	DWORD res_x = 2835;	// 72 dpi
-	DWORD res_y = 2835;	// 72 dpi
-	RGBQUAD rgbBkColor = {0, 0, 0, 0};
-	WORD bk_red, bk_green, bk_blue;
-	BOOL hasBkColor = FALSE;
-	BOOL mHasIDAT = FALSE;
-
-	tEXtMAP key_value_pair;
-
-	// ---
-
-	BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-	
-	// get the file size
-	const long mLOF = mng_LOF(io, handle);
-	// go to the first chunk
-	io->seek_proc(handle, Offset, SEEK_SET);
-
-	try {
-		BOOL mEnd = FALSE;
-
-		while(mEnd == FALSE) {
-			// start of the chunk
-			LastOffset = io->tell_proc(handle);
-			// read length
-			mLength = 0;			
-			io->read_proc(&mLength, 1, sizeof(mLength), handle);
-			mng_SwapLong(&mLength);
-			// read name			
-			io->read_proc(&mChunkName[0], 1, 4, handle);
-			mChunkName[4] = '\0';
-
-			if(mLength > 0) {
-				mChunk = (BYTE*)realloc(mChunk, mLength);
-				if(!mChunk) {
-					FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: out of memory", mChunkName);
-					throw (const char*)NULL;
-				}				
-				Offset = io->tell_proc(handle);
-				if(Offset + (long)mLength > mLOF) {
-					FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: unexpected end of file", mChunkName);
-					throw (const char*)NULL;
-				}
-				// read chunk
-				io->read_proc(mChunk, 1, mLength, handle);
-			}
-			// read crc
-			io->read_proc(&crc_file, 1, sizeof(crc_file), handle);
-			mng_SwapLong(&crc_file);
-			// check crc
-			DWORD crc_check = FreeImage_ZLibCRC32(0, &mChunkName[0], 4);
-			crc_check = FreeImage_ZLibCRC32(crc_check, mChunk, mLength);
-			if(crc_check != crc_file) {
-				FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: bad CRC", mChunkName);
-				throw (const char*)NULL;
-			}		
-
-			switch( mng_GetChunckType(mChunkName) ) {
-				case MHDR:
-					// The MHDR chunk is always first in all MNG datastreams except for those 
-					// that consist of a single PNG or JNG datastream with a PNG or JNG signature. 
-					if(mLength == 28) {
-						memcpy(&mng_frame_width, &mChunk[0], 4);
-						memcpy(&mng_frame_height, &mChunk[4], 4);
-						memcpy(&mng_ticks_per_second, &mChunk[8], 4);
-						memcpy(&mng_nominal_layer_count, &mChunk[12], 4);
-						memcpy(&mng_nominal_frame_count, &mChunk[16], 4);
-						memcpy(&mng_nominal_play_time, &mChunk[20], 4);
-						memcpy(&mng_simplicity_profile, &mChunk[24], 4);
-
-						mng_SwapLong(&mng_frame_width);
-						mng_SwapLong(&mng_frame_height);
-						mng_SwapLong(&mng_ticks_per_second);
-						mng_SwapLong(&mng_nominal_layer_count);
-						mng_SwapLong(&mng_nominal_frame_count);
-						mng_SwapLong(&mng_nominal_play_time);
-						mng_SwapLong(&mng_simplicity_profile);
-
-					} else {
-						FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: size is %d instead of 28", mChunkName, mLength);
-					}
-					break;
-
-				case MEND:
-					mEnd = TRUE;
-					break;
-
-				case LOOP:
-				case ENDL:
-					break;
-				case DEFI:
-					break;
-				case SAVE:
-				case SEEK:
-				case TERM:
-					break;
-				case BACK:
-					break;
-
-					// Global "PLTE" and "tRNS" (if any).  PNG "PLTE" will be of 0 byte, as it uses global data.
-				case PLTE:	// Global
-					m_HasGlobalPalette = TRUE;
-					PLTE_file_size = mLength + 12; // (lentgh, name, array, crc) = (4, 4, mLength, 4)
-					PLTE_file_chunk = (BYTE*)realloc(PLTE_file_chunk, PLTE_file_size);
-					if(!PLTE_file_chunk) {
-						FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: out of memory", mChunkName);
-						throw (const char*)NULL;
-					} else {
-						mOrigPos = io->tell_proc(handle);
-						// seek to the start of the chunk
-						io->seek_proc(handle, LastOffset, SEEK_SET);
-						// load the whole chunk
-						io->read_proc(PLTE_file_chunk, 1, PLTE_file_size, handle);
-						// go to the start of the next chunk
-						io->seek_proc(handle, mOrigPos, SEEK_SET);
-					}
-					break;
-
-				case tRNS:	// Global
-					break;
-					
-				case IHDR:
-					Offset = LastOffset;
-					// parse the PNG file and get its file size
-					if(mng_CountPNGChunks(io, handle, Offset, &m_TotalBytesOfChunks) == FALSE) {
-						// reach an unexpected end of file
-						mEnd = TRUE;
-						FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: unexpected end of PNG file", mChunkName);
-						break;
-					}
-					
-					// wrap the { IHDR, ..., IEND } chunks as a PNG stream
-					if(hPngMemory == NULL) {
-						hPngMemory = FreeImage_OpenMemory();
-					}
-
-					mOrigPos = io->tell_proc(handle);
-
-					// write PNG file signature
-					FreeImage_SeekMemory(hPngMemory, 0, SEEK_SET);
-					FreeImage_WriteMemory(g_png_signature, 1, 8, hPngMemory);
-
-					mChunk = (BYTE*)realloc(mChunk, m_TotalBytesOfChunks);
-					if(!mChunk) {
-						FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: out of memory", mChunkName);
-						throw (const char*)NULL;
-					}
-					
-					// on calling CountPNGChunks earlier, we were in Offset pos,
-					// go back there
-					io->seek_proc(handle, Offset, SEEK_SET);
-					io->read_proc(mChunk, 1, m_TotalBytesOfChunks, handle);
-					// Put back to original pos
-					io->seek_proc(handle, mOrigPos, SEEK_SET);
-					// write the PNG chunks
-					FreeImage_WriteMemory(mChunk, 1, m_TotalBytesOfChunks, hPngMemory);
-
-					// plug in global PLTE if local PLTE exists
-					if(m_HasGlobalPalette) {
-						// ensure we remove some local chunks, so that global
-						// "PLTE" can be inserted right before "IDAT".
-						mng_RemoveChunk(hPngMemory, mng_PLTE);
-						mng_RemoveChunk(hPngMemory, mng_tRNS);
-						mng_RemoveChunk(hPngMemory, mng_bKGD);
-						// insert global "PLTE" chunk in its entirety before "IDAT"
-						mng_InsertChunk(hPngMemory, mng_IDAT, PLTE_file_chunk, PLTE_file_size);
-					}
-
-					if(dib) FreeImage_Unload(dib);
-					dib = mng_LoadFromMemoryHandle(hPngMemory, flags);
-
-					// stop after the first image
-					mEnd = TRUE;
-					break;
-
-				case JHDR:
-					if(mLength == 16) {
-						memcpy(&jng_width, &mChunk[0], 4);
-						memcpy(&jng_height, &mChunk[4], 4);
-						mng_SwapLong(&jng_width);
-						mng_SwapLong(&jng_height);
-
-						jng_color_type = mChunk[8];
-						jng_image_sample_depth = mChunk[9];
-						jng_image_compression_method = mChunk[10];
-						//BYTE jng_image_interlace_method = mChunk[11];	// for debug only
-
-						jng_alpha_sample_depth = mChunk[12];
-						jng_alpha_compression_method = mChunk[13];
-						jng_alpha_filter_method = mChunk[14];
-						jng_alpha_interlace_method = mChunk[15];
-					} else {
-						FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: invalid chunk length", mChunkName);
-						throw (const char*)NULL;
-					}
-					break;
-
-				case JDAT:
-					if(hJpegMemory == NULL) {
-						hJpegMemory = FreeImage_OpenMemory();
-					}
-					// as there may be several JDAT chunks, concatenate them
-					FreeImage_WriteMemory(mChunk, 1, mLength, hJpegMemory);
-					break;
-
-				case IDAT:
-					if(!header_only && (jng_alpha_compression_method == 0)) {
-						// PNG grayscale IDAT format
-						if(hIDATMemory == NULL) {
-							hIDATMemory = FreeImage_OpenMemory();
-							mHasIDAT = TRUE;
-						}
-						// as there may be several IDAT chunks, concatenate them
-						FreeImage_WriteMemory(mChunk, 1, mLength, hIDATMemory);
-					}
-					break;
-
-				case IEND:
-					if(!hJpegMemory) {
-						mEnd = TRUE;
-						break;
-					}
-					// load the JPEG
-					if(dib) {
-						FreeImage_Unload(dib);
-					}
-					dib = mng_LoadFromMemoryHandle(hJpegMemory, flags);
-
-					// load the PNG alpha layer
-					if(mHasIDAT) {
-						BYTE *data = NULL;
-						DWORD size_in_bytes = 0;
-
-						// get a pointer to the IDAT buffer
-						FreeImage_AcquireMemory(hIDATMemory, &data, &size_in_bytes);
-						if(data && size_in_bytes) {
-							// wrap the IDAT chunk as a PNG stream
-							if(hPngMemory == NULL) {
-								hPngMemory = FreeImage_OpenMemory();
-							}
-							mng_WritePNGStream(jng_width, jng_height, jng_alpha_sample_depth, data, size_in_bytes, hPngMemory);
-							// load the PNG
-							if(dib_alpha) {
-								FreeImage_Unload(dib_alpha);
-							}
-							dib_alpha = mng_LoadFromMemoryHandle(hPngMemory, flags);
-						}
-					}
-					// stop the parsing
-					mEnd = TRUE;
-					break;
-
-				case JDAA:
-					break;
-
-				case gAMA:
-					break;
-
-				case pHYs:
-					// unit is pixels per meter
-					memcpy(&res_x, &mChunk[0], 4);
-					mng_SwapLong(&res_x);
-					memcpy(&res_y, &mChunk[4], 4);
-					mng_SwapLong(&res_y);
-					break;
-
-				case bKGD:
-					memcpy(&bk_red, &mChunk[0], 2);
-					mng_SwapShort(&bk_red);
-					rgbBkColor.rgbRed = (BYTE)bk_red;
-					memcpy(&bk_green, &mChunk[2], 2);
-					mng_SwapShort(&bk_green);
-					rgbBkColor.rgbGreen = (BYTE)bk_green;
-					memcpy(&bk_blue, &mChunk[4], 2);
-					mng_SwapShort(&bk_blue);
-					rgbBkColor.rgbBlue = (BYTE)bk_blue;
-					hasBkColor = TRUE;
-					break;
-				
-				case tEXt:
-					mng_SetMetadata_tEXt(key_value_pair, mChunk, mLength);
-					break;
-
-				case UNKNOWN_CHUNCK:
-				default:
-					break;
-
-
-			} // switch( GetChunckType )
-		} // while(!mEnd)
-
-		FreeImage_CloseMemory(hJpegMemory);
-		FreeImage_CloseMemory(hPngMemory);
-		FreeImage_CloseMemory(hIDATMemory);
-		free(mChunk);
-		free(PLTE_file_chunk);
-
-		// convert to 32-bit if a transparent layer is available
-		if(!header_only && dib_alpha) {
-			FIBITMAP *dst = FreeImage_ConvertTo32Bits(dib);
-			if((FreeImage_GetBPP(dib_alpha) == 8) && (FreeImage_GetImageType(dib_alpha) == FIT_BITMAP)) {
-				FreeImage_SetChannel(dst, dib_alpha, FICC_ALPHA);
-			} else {
-				FIBITMAP *dst_alpha = FreeImage_ConvertTo8Bits(dib_alpha);
-				FreeImage_SetChannel(dst, dst_alpha, FICC_ALPHA);
-				FreeImage_Unload(dst_alpha);
-			}			
-			FreeImage_Unload(dib);
-			dib = dst;
-		}
-		FreeImage_Unload(dib_alpha);
-
-		if(dib) {
-			// set metadata
-			FreeImage_SetDotsPerMeterX(dib, res_x);
-			FreeImage_SetDotsPerMeterY(dib, res_y);
-			if(hasBkColor) {
-				FreeImage_SetBackgroundColor(dib, &rgbBkColor);
-			}
-			if(key_value_pair.size()) {
-				for(tEXtMAP::iterator j = key_value_pair.begin(); j != key_value_pair.end(); j++) {
-					std::string key = (*j).first;
-					std::string value = (*j).second;
-					mng_SetKeyValue(FIMD_COMMENTS, dib, key.c_str(), value.c_str());
-				}
-			}
-		}
-			
-		return dib;
-
-	} catch(const char *text) {
-		FreeImage_CloseMemory(hJpegMemory);
-		FreeImage_CloseMemory(hPngMemory);
-		FreeImage_CloseMemory(hIDATMemory);
-		free(mChunk);
-		free(PLTE_file_chunk);
-		FreeImage_Unload(dib);
-		FreeImage_Unload(dib_alpha);
-		if(text) {
-			FreeImage_OutputMessageProc(format_id, text);
-		}
-		return NULL;
-	}
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Write a FIBITMAP to a JNG stream
-@param format_id ID of the caller
-@param io Stream i/o functions
-@param dib Image to be saved
-@param handle Stream handle
-@param flags Saving flags
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int flags) {
-	DWORD jng_width = 0;
-	DWORD jng_height = 0;
-	BYTE jng_color_type = 0;
-	BYTE jng_image_sample_depth = 8;
-	BYTE jng_image_compression_method = 8;	//  8: ISO-10918-1 Huffman-coded baseline JPEG.
-	BYTE jng_image_interlace_method = 0;
-
-	BYTE jng_alpha_sample_depth = 0;
-	BYTE jng_alpha_compression_method = 0;
-	BYTE jng_alpha_filter_method = 0;
-	BYTE jng_alpha_interlace_method = 0;
-
-	BYTE buffer[16];
-
-	FIMEMORY *hJngMemory = NULL;
-	FIMEMORY *hJpegMemory = NULL;
-	FIMEMORY *hPngMemory = NULL;
-
-	FIBITMAP *dib_rgb = NULL;
-	FIBITMAP *dib_alpha = NULL;
-
-	if(!dib || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return FALSE;
-	}
-
-	unsigned bpp = FreeImage_GetBPP(dib);
-
-	switch(bpp) {
-		case 8:
-			if(FreeImage_GetColorType(dib) == FIC_MINISBLACK) {
-				dib_rgb = dib;
-				jng_color_type = MNG_COLORTYPE_JPEGGRAY;
-			} else {
-				// JPEG plugin will convert other types (FIC_MINISWHITE, FIC_PALETTE) to 24-bit on the fly
-				//dib_rgb = FreeImage_ConvertTo24Bits(dib);
-				dib_rgb = dib;
-				jng_color_type = MNG_COLORTYPE_JPEGCOLOR;
-
-			}
-			break;
-		case 24:
-			dib_rgb = dib;
-			jng_color_type = MNG_COLORTYPE_JPEGCOLOR;
-			break;
-		case 32:
-			dib_rgb = FreeImage_ConvertTo24Bits(dib);
-			jng_color_type = MNG_COLORTYPE_JPEGCOLORA;
-			jng_alpha_sample_depth = 8;
-			break;
-		default:
-			return FALSE;
-	}
-
-	jng_width = (DWORD)FreeImage_GetWidth(dib);
-	jng_height = (DWORD)FreeImage_GetHeight(dib);
-
-	try {
-		hJngMemory = FreeImage_OpenMemory();
-
-		// --- write JNG file signature ---
-		FreeImage_WriteMemory(g_jng_signature, 1, 8, hJngMemory);
-
-		// --- write a JHDR chunk ---
-		SwapLong(&jng_width);
-		SwapLong(&jng_height);
-		memcpy(&buffer[0], &jng_width, 4);
-		memcpy(&buffer[4], &jng_height, 4);
-		SwapLong(&jng_width);
-		SwapLong(&jng_height);
-		buffer[8] = jng_color_type;
-		buffer[9] = jng_image_sample_depth;
-		buffer[10] = jng_image_compression_method;
-		buffer[11] = jng_image_interlace_method;
-		buffer[12] = jng_alpha_sample_depth;
-		buffer[13] = jng_alpha_compression_method;
-		buffer[14] = jng_alpha_filter_method;
-		buffer[15] = jng_alpha_interlace_method;
-		mng_WriteChunk(mng_JHDR, &buffer[0], 16, hJngMemory);
-
-		// --- write a sequence of JDAT chunks ---
-		hJpegMemory = FreeImage_OpenMemory();
-		flags |= JPEG_BASELINE;
-		if(!FreeImage_SaveToMemory(FIF_JPEG, dib_rgb, hJpegMemory, flags)) {
-			throw (const char*)NULL;
-		}
-		if(dib_rgb != dib) {
-			FreeImage_Unload(dib_rgb);
-			dib_rgb = NULL;
-		}
-		{
-			BYTE *jpeg_data = NULL;
-			DWORD size_in_bytes = 0;
-			
-			// get a pointer to the stream buffer
-			FreeImage_AcquireMemory(hJpegMemory, &jpeg_data, &size_in_bytes);
-			// write chunks
-			for(DWORD k = 0; k < size_in_bytes;) {
-				DWORD bytes_left = size_in_bytes - k;
-				DWORD chunk_size = MIN(JPEG_CHUNK_SIZE, bytes_left);
-				mng_WriteChunk(mng_JDAT, &jpeg_data[k], chunk_size, hJngMemory);
-				k += chunk_size;
-			}
-		}
-		FreeImage_CloseMemory(hJpegMemory);
-		hJpegMemory = NULL;
-
-		// --- write alpha layer as a sequence of IDAT chunk ---
-		if((bpp == 32) && (jng_color_type == MNG_COLORTYPE_JPEGCOLORA)) {
-			dib_alpha = FreeImage_GetChannel(dib, FICC_ALPHA);
-
-			hPngMemory = FreeImage_OpenMemory();
-			if(!FreeImage_SaveToMemory(FIF_PNG, dib_alpha, hPngMemory, PNG_DEFAULT)) {
-				throw (const char*)NULL;
-			}
-			FreeImage_Unload(dib_alpha);
-			dib_alpha = NULL;
-			// get the IDAT chunk
-			{		
-				BOOL bResult = FALSE;
-				DWORD start_pos = 0;
-				DWORD next_pos = 0;
-				long offset = 8;
-				
-				do {
-					// find the next IDAT chunk from 'offset' position
-					bResult = mng_FindChunk(hPngMemory, mng_IDAT, offset, &start_pos, &next_pos);
-					if(!bResult) break;
-					
-					BYTE *png_data = NULL;
-					DWORD size_in_bytes = 0;
-					
-					// get a pointer to the stream buffer
-					FreeImage_AcquireMemory(hPngMemory, &png_data, &size_in_bytes);
-					// write the IDAT chunk
-					mng_WriteChunk(mng_IDAT, &png_data[start_pos+8], next_pos - start_pos - 12, hJngMemory);
-
-					offset = next_pos;
-
-				} while(bResult);
-			}
-
-			FreeImage_CloseMemory(hPngMemory);
-			hPngMemory = NULL;
-		}
-
-		// --- write a IEND chunk ---
-		mng_WriteChunk(mng_IEND, NULL, 0, hJngMemory);
-
-		// write the JNG on output stream
-		{
-			BYTE *jng_data = NULL;
-			DWORD size_in_bytes = 0;
-			FreeImage_AcquireMemory(hJngMemory, &jng_data, &size_in_bytes);
-			io->write_proc(jng_data, 1, size_in_bytes, handle);			
-		}
-
-		FreeImage_CloseMemory(hJngMemory);
-		FreeImage_CloseMemory(hJpegMemory);
-		FreeImage_CloseMemory(hPngMemory);
-
-		return TRUE;
-
-	} catch(const char *text) {
-		FreeImage_CloseMemory(hJngMemory);
-		FreeImage_CloseMemory(hJpegMemory);
-		FreeImage_CloseMemory(hPngMemory);
-		if(dib_rgb && (dib_rgb != dib)) {
-			FreeImage_Unload(dib_rgb);
-		}
-		FreeImage_Unload(dib_alpha);
-		if(text) {
-			FreeImage_OutputMessageProc(format_id, text);
-		}
-		return FALSE;
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp b/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp
deleted file mode 100644
index 7f587d3fa3..0000000000
--- a/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-// ==========================================================
-// Memory Input/Output functions
-//
-// Design and implementation by
-// - Ryan Rubley <ryan@lostreality.org> 
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageIO.h"
-
-// =====================================================================
-
-
-// =====================================================================
-// Open and close a memory handle
-// =====================================================================
-
-FIMEMORY * DLL_CALLCONV 
-FreeImage_OpenMemory(BYTE *data, DWORD size_in_bytes) {
-	// allocate a memory handle
-	FIMEMORY *stream = (FIMEMORY*)malloc(sizeof(FIMEMORY));
-	if(stream) {
-		stream->data = (BYTE*)malloc(sizeof(FIMEMORYHEADER));
-
-		if(stream->data) {
-			FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(stream->data);
-
-			// initialize the memory header
-			memset(mem_header, 0, sizeof(FIMEMORYHEADER));
-			
-			if(data && size_in_bytes) {
-				// wrap a user buffer
-				mem_header->delete_me = FALSE;
-				mem_header->data = (BYTE*)data;
-				mem_header->data_length = mem_header->file_length = size_in_bytes;
-			} else {
-				mem_header->delete_me = TRUE;
-			}
-
-			return stream;
-		}
-		free(stream);
-	}
-
-	return NULL;
-}
-
-
-void DLL_CALLCONV
-FreeImage_CloseMemory(FIMEMORY *stream) {
-	if(stream && stream->data) {
-		FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(stream->data);
-		if(mem_header->delete_me) {
-			free(mem_header->data);
-		}
-		free(mem_header);
-		free(stream);
-	}
-}
-
-// =====================================================================
-// Memory stream load/save functions
-// =====================================================================
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags) {
-	if (stream && stream->data) {
-		FreeImageIO io;
-		SetMemoryIO(&io);
-
-		return FreeImage_LoadFromHandle(fif, &io, (fi_handle)stream, flags);
-	}
-
-	return NULL;
-}
-
-
-BOOL DLL_CALLCONV
-FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags) {
-	if (stream) {
-		FreeImageIO io;
-		SetMemoryIO(&io);
-
-		FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(stream->data);
-
-		if(mem_header->delete_me == TRUE) {
-			return FreeImage_SaveToHandle(fif, dib, &io, (fi_handle)stream, flags);
-		} else {
-			// do not save in a user buffer
-			FreeImage_OutputMessageProc(fif, "Memory buffer is read only");
-		}
-	}
-
-	return FALSE;
-}
-
-// =====================================================================
-// Memory stream buffer access
-// =====================================================================
-
-BOOL DLL_CALLCONV
-FreeImage_AcquireMemory(FIMEMORY *stream, BYTE **data, DWORD *size_in_bytes) {
-	if (stream) {
-		FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(stream->data);
-
-		*data = (BYTE*)mem_header->data;
-		*size_in_bytes = mem_header->file_length;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// =====================================================================
-// Memory stream file type access
-// =====================================================================
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFileTypeFromMemory(FIMEMORY *stream, int size) {
-	FreeImageIO io;
-	SetMemoryIO(&io);
-
-	if (stream != NULL) {
-		return FreeImage_GetFileTypeFromHandle(&io, (fi_handle)stream, size);
-	}
-
-	return FIF_UNKNOWN;
-}
-
-// =====================================================================
-// Seeking in Memory stream
-// =====================================================================
-
-/**
-Moves the memory pointer to a specified location
-@param stream Pointer to FIMEMORY structure
-@param offset Number of bytes from origin
-@param origin Initial position
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL DLL_CALLCONV
-FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin) {
-	FreeImageIO io;
-	SetMemoryIO(&io);
-
-	if (stream != NULL) {
-		int success = io.seek_proc((fi_handle)stream, offset, origin);
-		return (success == 0) ? TRUE : FALSE;
-	}
-
-	return FALSE;
-}
-
-/**
-Gets the current position of a memory pointer
-@param stream Target FIMEMORY structure
-@return Returns the current file position if successful, -1 otherwise
-*/
-long DLL_CALLCONV
-FreeImage_TellMemory(FIMEMORY *stream) {
-	FreeImageIO io;
-	SetMemoryIO(&io);
-
-	if (stream != NULL) {
-		return io.tell_proc((fi_handle)stream);
-	}
-
-	return -1L;
-}
-
-// =====================================================================
-// Reading or Writing in Memory stream
-// =====================================================================
-
-/**
-Reads data from a memory stream
-@param buffer Storage location for data
-@param size Item size in bytes
-@param count Maximum number of items to be read
-@param stream Pointer to FIMEMORY structure
-@return Returns the number of full items actually read, which may be less than count if an error occurs
-*/
-unsigned DLL_CALLCONV 
-FreeImage_ReadMemory(void *buffer, unsigned size, unsigned count, FIMEMORY *stream) {
-	FreeImageIO io;
-	SetMemoryIO(&io);
-
-	if (stream != NULL) {
-		return io.read_proc(buffer, size, count, stream);
-	}
-
-	return 0;
-}
-
-/**
-Writes data to a memory stream.
-@param buffer Pointer to data to be written
-@param size Item size in bytes
-@param count Maximum number of items to be written
-@param stream Pointer to FIMEMORY structure
-@return Returns the number of full items actually written, which may be less than count if an error occurs
-*/
-unsigned DLL_CALLCONV 
-FreeImage_WriteMemory(const void *buffer, unsigned size, unsigned count, FIMEMORY *stream) {
-	if (stream != NULL) {
-		FreeImageIO io;
-		SetMemoryIO(&io);
-
-		FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(((FIMEMORY*)stream)->data);
-
-		if(mem_header->delete_me == TRUE) {
-			return io.write_proc((void *)buffer, size, count, stream);
-		} else {
-			// do not write in a user buffer
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Memory buffer is read only");
-		}
-	}
-
-	return 0;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/MultiPage.cpp b/plugins/AdvaImg/src/FreeImage/MultiPage.cpp
deleted file mode 100644
index 8c49d45396..0000000000
--- a/plugins/AdvaImg/src/FreeImage/MultiPage.cpp
+++ /dev/null
@@ -1,990 +0,0 @@
-// ==========================================================
-// Multi-Page functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Laurent Rocher (rocherl@club-internet.fr)
-// - Steve Johnson (steve@parisgroup.net)
-// - Petr Pytelka (pyta@lightcomp.com)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Vadim Alexandrov (vadimalexandrov@users.sourceforge.net
-// - Martin Dyring-Andersen (mda@spamfighter.com)
-// - Volodymyr Goncharov (volodymyr.goncharov@gmail.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "CacheFile.h"
-#include "FreeImageIO.h"
-#include "Plugin.h"
-#include "Utilities.h"
-#include "FreeImage.h"
-
-// ----------------------------------------------------------
-
-enum BlockType { BLOCK_CONTINUEUS, BLOCK_REFERENCE };
-
-// ----------------------------------------------------------
-
-struct BlockTypeS {
-	BlockType m_type;
-
-	BlockTypeS(BlockType type) : m_type(type) {
-	}
-	virtual ~BlockTypeS() {}
-};
-
-struct BlockContinueus : public BlockTypeS {
-	int       m_start;
-	int       m_end;
-
-	BlockContinueus(int s, int e) : BlockTypeS(BLOCK_CONTINUEUS),
-	m_start(s),
-	m_end(e) {
-	}	
-};
-
-struct BlockReference : public BlockTypeS {
-	int       m_reference;
-	int       m_size;
-
-	BlockReference(int r, int size) : BlockTypeS(BLOCK_REFERENCE),
-	m_reference(r),
-	m_size(size) {
-	}
-};
-
-// ----------------------------------------------------------
-
-typedef std::list<BlockTypeS *> BlockList;
-typedef std::list<BlockTypeS *>::iterator BlockListIterator;
-
-// ----------------------------------------------------------
-
-FI_STRUCT (MULTIBITMAPHEADER) {
-	PluginNode *node;
-	FREE_IMAGE_FORMAT fif;
-	FreeImageIO *io;
-	fi_handle handle;
-	CacheFile *m_cachefile;
-	std::map<FIBITMAP *, int> locked_pages;
-	BOOL changed;
-	int page_count;
-	BlockList m_blocks;
-	char *m_filename;
-	BOOL read_only;
-	FREE_IMAGE_FORMAT cache_fif;
-	int load_flags;
-};
-
-// =====================================================================
-// Helper functions
-// =====================================================================
-
-inline void
-ReplaceExtension(std::string& dst_filename, const std::string& src_filename, const std::string& dst_extension) {
-	size_t lastDot = src_filename.find_last_of('.');
-	if (lastDot == std::string::npos) {
-		dst_filename = src_filename;
-		dst_filename += ".";
-		dst_filename += dst_extension;
-	}
-	else {
-		dst_filename = src_filename.substr(0, lastDot + 1);
-		dst_filename += dst_extension;
-	}
-}
-
-// =====================================================================
-// Internal Multipage functions
-// =====================================================================
-
-inline MULTIBITMAPHEADER *
-FreeImage_GetMultiBitmapHeader(FIMULTIBITMAP *bitmap) {
-	return (MULTIBITMAPHEADER *)bitmap->data;
-}
-
-static BlockListIterator DLL_CALLCONV
-FreeImage_FindBlock(FIMULTIBITMAP *bitmap, int position) {
-	assert(NULL != bitmap);
-
-	MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-	// step 1: find the block that matches the given position
-
-	int prev_count = 0;
-	int count = 0;
-	BlockListIterator i;
-	BlockTypeS *current_block = NULL;
-
-	for (i = header->m_blocks.begin(); i != header->m_blocks.end(); ++i) {
-		prev_count = count;
-
-		switch((*i)->m_type) {
-			case BLOCK_CONTINUEUS :
-				count += ((BlockContinueus *)(*i))->m_end - ((BlockContinueus *)(*i))->m_start + 1;
-				break;
-
-			case BLOCK_REFERENCE :
-				count++;
-				break;
-		}
-
-		current_block = *i;
-
-		if (count > position)
-			break;
-	}
-
-	// step 2: make sure we found the node. from here it gets a little complicated:
-	// * if the block is there, just return it
-	// * if the block is a series of blocks, split it in max 3 new blocks
-	//   and return the splitted block
-
-	if ((current_block) && (count > position)) {
-		switch(current_block->m_type) {
-			case BLOCK_REFERENCE :
-				return i;
-
-			case BLOCK_CONTINUEUS :
-			{
-				BlockContinueus *block = (BlockContinueus *)current_block;
-
-				if (block->m_start != block->m_end) {
-					int item = block->m_start + (position - prev_count);
-
-					// left part
-
-					if (item != block->m_start) {
-						BlockContinueus *block_a = new BlockContinueus(block->m_start, item - 1);
-						header->m_blocks.insert(i, (BlockTypeS *)block_a);
-					}
-
-					// middle part
-
-					BlockContinueus *block_b = new BlockContinueus(item, item);
-					BlockListIterator block_target = header->m_blocks.insert(i, (BlockTypeS *)block_b);
-
-					// right part
-
-					if (item != block->m_end) {
-						BlockContinueus *block_c = new BlockContinueus(item + 1, block->m_end);
-						header->m_blocks.insert(i, (BlockTypeS *)block_c);
-					}
-
-					// remove the old block that was just splitted
-
-					header->m_blocks.remove((BlockTypeS *)block);
-					delete block;
-
-					// return the splitted block
-					
-					return block_target;
-				}
-
-				return i;
-			}
-		}
-	}
-	// we should never go here ...
-	assert(false);
-	return header->m_blocks.end();
-}
-
-int DLL_CALLCONV
-FreeImage_InternalGetPageCount(FIMULTIBITMAP *bitmap) {	
-	if (bitmap) {
-		if (((MULTIBITMAPHEADER *)bitmap->data)->handle) {
-			MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-			header->io->seek_proc(header->handle, 0, SEEK_SET);
-
-   			void *data = FreeImage_Open(header->node, header->io, header->handle, TRUE);
-
-			int page_count = (header->node->m_plugin->pagecount_proc != NULL) ? header->node->m_plugin->pagecount_proc(header->io, header->handle, data) : 1;
-
-			FreeImage_Close(header->node, header->io, header->handle, data);
-
-			return page_count;
-		}
-	}
-
-	return 0;
-}
-
-// =====================================================================
-// Multipage functions
-// =====================================================================
-
-FIMULTIBITMAP * DLL_CALLCONV
-FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory, int flags) {
-
-	FILE *handle = NULL;
-	try {
-		// sanity check on the parameters
-
-		if (create_new) {
-			read_only = FALSE;
-		}
-
-		// retrieve the plugin list to find the node belonging to this plugin
-
-		PluginList *list = FreeImage_GetPluginList();
-
-		if (list) {
-			PluginNode *node = list->FindNodeFromFIF(fif);
-
-			if (node) {
-				std::auto_ptr<FreeImageIO> io (new FreeImageIO);
-
-				SetDefaultIO(io.get());
-
-				if (!create_new) {
-					handle = fopen(filename, "rb");
-					if (handle == NULL) {
-						return NULL;
-					}
-				}
-
-				std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
-				std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
-				header->m_filename = new char[strlen(filename) + 1];
-				strcpy(header->m_filename, filename);
-				header->node = node;
-				header->fif = fif;
-				header->io = io.get ();
-				header->handle = handle;						
-				header->changed = FALSE;						
-				header->read_only = read_only;
-				header->m_cachefile = NULL;
-				header->cache_fif = fif;
-				header->load_flags = flags;
-
-				// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure
-
-				bitmap->data = header.get();
-
-				// cache the page count
-
-				header->page_count = FreeImage_InternalGetPageCount(bitmap.get());
-
-				// allocate a continueus block to describe the bitmap
-
-				if (!create_new) {
-					header->m_blocks.push_back((BlockTypeS *)new BlockContinueus(0, header->page_count - 1));
-				}
-
-				// set up the cache
-
-				if (!read_only) {
-					std::string cache_name;
-					ReplaceExtension(cache_name, filename, "ficache");
-
-					std::auto_ptr<CacheFile> cache_file (new CacheFile(cache_name, keep_cache_in_memory));
-
-					if (cache_file->open()) {
-						// we can use release() as std::bad_alloc won't be thrown from here on
-						header->m_cachefile = cache_file.release();
-					} else {
-						// an error occured ...
-						fclose(handle);
-						return NULL;
-					}
-				}
-				// return the multibitmap
-				// std::bad_alloc won't be thrown from here on
-				header.release(); // now owned by bitmap
-				io.release();	  // now owned by bitmap
-				return bitmap.release(); // now owned by caller
-			}
-		}
-	} catch (std::bad_alloc &) {
-		/** @todo report error */
-	}
-	if (handle)
-		fclose(handle);
-	return NULL;
-}
-
-FIMULTIBITMAP * DLL_CALLCONV
-FreeImage_OpenMultiBitmapU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory, int flags) {
-
-	// convert to single character - no national chars in extensions
-	char *extension = (char *)malloc(wcslen(filename)+1);
-	unsigned int i=0;
-	for (; i < wcslen(filename); i++) // convert 16-bit to 8-bit
-		extension[i] = (char)(filename[i] & 0x00FF);
-	// set terminating 0
-	extension[i]=0;
-	FIMULTIBITMAP *fRet = FreeImage_OpenMultiBitmap(fif, extension, create_new, read_only, keep_cache_in_memory, flags);
-	free(extension);
-
-	return fRet;
-}
-
-FIMULTIBITMAP * DLL_CALLCONV
-FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags) {
-	try {
-		BOOL read_only = FALSE;	// modifications (if any) will be stored into the memory cache
-
-		if (io && handle) {
-		
-			// retrieve the plugin list to find the node belonging to this plugin
-			PluginList *list = FreeImage_GetPluginList();
-		
-			if (list) {
-				PluginNode *node = list->FindNodeFromFIF(fif);
-			
-				if (node) {
-					std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
-					std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
-					std::auto_ptr<FreeImageIO> tmp_io (new FreeImageIO (*io));
-					header->io = tmp_io.get();
-					header->m_filename = NULL;
-					header->node = node;
-					header->fif = fif;
-					header->handle = handle;						
-					header->changed = FALSE;						
-					header->read_only = read_only;	
-					header->m_cachefile = NULL;
-					header->cache_fif = fif;
-					header->load_flags = flags;
-							
-					// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure
-
-					bitmap->data = header.get();
-
-					// cache the page count
-
-					header->page_count = FreeImage_InternalGetPageCount(bitmap.get());
-
-					// allocate a continueus block to describe the bitmap
-
-					header->m_blocks.push_back((BlockTypeS *)new BlockContinueus(0, header->page_count - 1));
-
-					if (!read_only) {
-						// set up the cache
-						std::auto_ptr<CacheFile> cache_file (new CacheFile("", TRUE));
-						
-						if (cache_file->open()) {
-							header->m_cachefile = cache_file.release();
-						}
-					}
-					tmp_io.release();
-					header.release();
-					return bitmap.release();
-				}
-			}
-		}
-	} catch (std::bad_alloc &) {
-		/** @todo report error */
-	}
-	return NULL;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SaveMultiBitmapToHandle(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FreeImageIO *io, fi_handle handle, int flags) {
-	if(!bitmap || !bitmap->data || !io || !handle) {
-		return FALSE;
-	}
-
-	BOOL success = TRUE;
-
-	// retrieve the plugin list to find the node belonging to this plugin
-	PluginList *list = FreeImage_GetPluginList();
-	
-	if (list) {
-		PluginNode *node = list->FindNodeFromFIF(fif);
-
-		if(node) {
-			MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-			
-			// dst data
-			void *data = FreeImage_Open(node, io, handle, FALSE);
-			// src data
-			void *data_read = NULL;
-			
-			if(header->handle) {
-				// open src
-				header->io->seek_proc(header->handle, 0, SEEK_SET);
-				data_read = FreeImage_Open(header->node, header->io, header->handle, TRUE);
-			}
-			
-			// write all the pages to the file using handle and io
-			
-			int count = 0;
-			
-			for (BlockListIterator i = header->m_blocks.begin(); i != header->m_blocks.end(); i++) {
-				if (success) {
-					switch((*i)->m_type) {
-						case BLOCK_CONTINUEUS:
-						{
-							BlockContinueus *block = (BlockContinueus *)(*i);
-							
-							for (int j = block->m_start; j <= block->m_end; j++) {
-
-								// load the original source data
-								FIBITMAP *dib = header->node->m_plugin->load_proc(header->io, header->handle, j, header->load_flags, data_read);
-								
-								// save the data
-								success = node->m_plugin->save_proc(io, dib, handle, count, flags, data);
-								count++;
-								
-								FreeImage_Unload(dib);
-							}
-							
-							break;
-						}
-						
-						case BLOCK_REFERENCE:
-						{
-							BlockReference *ref = (BlockReference *)(*i);
-							
-							// read the compressed data
-							
-							BYTE *compressed_data = (BYTE*)malloc(ref->m_size * sizeof(BYTE));
-							
-							header->m_cachefile->readFile((BYTE *)compressed_data, ref->m_reference, ref->m_size);
-							
-							// uncompress the data
-							
-							FIMEMORY *hmem = FreeImage_OpenMemory(compressed_data, ref->m_size);
-							FIBITMAP *dib = FreeImage_LoadFromMemory(header->cache_fif, hmem, 0);
-							FreeImage_CloseMemory(hmem);
-							
-							// get rid of the buffer
-							free(compressed_data);
-							
-							// save the data
-							
-							success = node->m_plugin->save_proc(io, dib, handle, count, flags, data);
-							count++;
-							
-							// unload the dib
-
-							FreeImage_Unload(dib);
-
-							break;
-						}
-					}
-				} else {
-					break;
-				}
-			}
-			
-			// close the files
-			
-			FreeImage_Close(header->node, header->io, header->handle, data_read);
-
-			FreeImage_Close(node, io, handle, data); 
-			
-			return success;
-		}
-	}
-
-	return FALSE;
-}
-
-
-BOOL DLL_CALLCONV
-FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags) {
-	if (bitmap) {
-		BOOL success = TRUE;
-		
-		if (bitmap->data) {
-			MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);			
-			
-			// saves changes only of images loaded directly from a file
-			if (header->changed && header->m_filename) {
-				try {
-					// open a temp file
-
-					std::string spool_name;
-
-					ReplaceExtension(spool_name, header->m_filename, "fispool");
-
-					// open the spool file and the source file
-        
-					FILE *f = fopen(spool_name.c_str(), "w+b");
-				
-					// saves changes
-					if (f == NULL) {
-						FreeImage_OutputMessageProc(header->fif, "Failed to open %s, %s", spool_name.c_str(), strerror(errno));
-						success = FALSE;
-					} else {
-						success = FreeImage_SaveMultiBitmapToHandle(header->fif, bitmap, header->io, (fi_handle)f, flags);
-
-						// close the files
-
-						if (fclose(f) != 0) {
-							success = FALSE;
-							FreeImage_OutputMessageProc(header->fif, "Failed to close %s, %s", spool_name.c_str(), strerror(errno));
-						}
-					}
-					if (header->handle) {
-						fclose((FILE *)header->handle);
-					}
-				
-					// applies changes to the destination file
-
-					if (success) {
-						remove(header->m_filename);
-						success = (rename(spool_name.c_str(), header->m_filename) == 0) ? TRUE:FALSE;
-						if(!success) {
-							FreeImage_OutputMessageProc(header->fif, "Failed to rename %s to %s", spool_name.c_str(), header->m_filename);
-						}
-					} else {
-						remove(spool_name.c_str());
-					}
-				} catch (std::bad_alloc &) {
-					success = FALSE;
-				}
-
-			} else {
-				if (header->handle && header->m_filename) {
-					fclose((FILE *)header->handle);
-				}
-			}
-
-			// clear the blocks list
-
-			for (BlockListIterator i = header->m_blocks.begin(); i != header->m_blocks.end(); ++i) {
-				delete *i;
-			}
-
-			// flush and dispose the cache
-
-			if (header->m_cachefile) {
-				header->m_cachefile->close();
-				delete header->m_cachefile;
-			}
-
-			// delete the last open bitmaps
-
-			while (!header->locked_pages.empty()) {
-				FreeImage_Unload(header->locked_pages.begin()->first);
-
-				header->locked_pages.erase(header->locked_pages.begin()->first);
-			}
-
-			// get rid of the IO structure
-
-			delete header->io;
-
-			// delete the filename
-
-			if(header->m_filename) {
-				delete[] header->m_filename;
-			}
-
-			// delete the FIMULTIBITMAPHEADER
-
-			delete header;
-		}
-
-		delete bitmap;
-
-		return success;
-	}
-
-	return FALSE;
-}
-
-int DLL_CALLCONV
-FreeImage_GetPageCount(FIMULTIBITMAP *bitmap) {
-	if (bitmap) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		if (header->page_count == -1) {
-			header->page_count = 0;
-
-			for (BlockListIterator i = header->m_blocks.begin(); i != header->m_blocks.end(); ++i) {
-				switch((*i)->m_type) {
-					case BLOCK_CONTINUEUS :
-						header->page_count += ((BlockContinueus *)(*i))->m_end - ((BlockContinueus *)(*i))->m_start + 1;
-						break;
-
-					case BLOCK_REFERENCE :
-						header->page_count++;
-						break;
-				}
-			}
-		}
-
-		return header->page_count;
-	}
-
-	return 0;
-}
-
-static BlockReference* 
-FreeImage_SavePageToBlock(MULTIBITMAPHEADER *header, FIBITMAP *data) {
-	if (header->read_only || !header->locked_pages.empty())
-		return NULL;
-
-	DWORD compressed_size = 0;
-	BYTE *compressed_data = NULL;
-
-	// compress the bitmap data
-
-	// open a memory handle
-	FIMEMORY *hmem = FreeImage_OpenMemory();
-	if(hmem==NULL) return NULL;
-	// save the file to memory
-	if(!FreeImage_SaveToMemory(header->cache_fif, data, hmem, 0)) {
-		FreeImage_CloseMemory(hmem);
-		return NULL;
-	}
-	// get the buffer from the memory stream
-	if(!FreeImage_AcquireMemory(hmem, &compressed_data, &compressed_size)) {
-		FreeImage_CloseMemory(hmem);
-		return NULL;
-	}
-
-	// write the compressed data to the cache
-	int ref = header->m_cachefile->writeFile(compressed_data, compressed_size);
-	// get rid of the compressed data
-	FreeImage_CloseMemory(hmem);
-
-	return new(std::nothrow) BlockReference(ref, compressed_size);
-}
-
-void DLL_CALLCONV
-FreeImage_AppendPage(FIMULTIBITMAP *bitmap, FIBITMAP *data) {
-	if (!bitmap || !data) 
-		return;
-
-	MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-	BlockReference *block = FreeImage_SavePageToBlock(header, data);
-	if(block==NULL) return;
-
-	// add the block
-	header->m_blocks.push_back((BlockTypeS *)block);
-	header->changed = TRUE;
-	header->page_count = -1;
-}
-
-void DLL_CALLCONV
-FreeImage_InsertPage(FIMULTIBITMAP *bitmap, int page, FIBITMAP *data) {
-	if (!bitmap || !data) 
-		return;
-
-	if (page >= FreeImage_GetPageCount(bitmap)) 
-		return;
-			
-	MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-	BlockReference *block = FreeImage_SavePageToBlock(header, data);
-	if(block==NULL) return;
-
-	// add a block
-	if (page > 0) {
-		BlockListIterator block_source = FreeImage_FindBlock(bitmap, page);		
-
-		header->m_blocks.insert(block_source, (BlockTypeS *)block);
-	} else {
-		header->m_blocks.push_front((BlockTypeS *)block);
-	}
-
-	header->changed = TRUE;
-	header->page_count = -1;
-}
-
-void DLL_CALLCONV
-FreeImage_DeletePage(FIMULTIBITMAP *bitmap, int page) {
-	if (bitmap) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		if ((!header->read_only) && (header->locked_pages.empty())) {
-			if (FreeImage_GetPageCount(bitmap) > 1) {
-				BlockListIterator i = FreeImage_FindBlock(bitmap, page);
-
-				if (i != header->m_blocks.end()) {
-					switch((*i)->m_type) {
-						case BLOCK_CONTINUEUS :
-							delete *i;
-							header->m_blocks.erase(i);
-							break;
-
-						case BLOCK_REFERENCE :
-							header->m_cachefile->deleteFile(((BlockReference *)(*i))->m_reference);
-							delete *i;
-							header->m_blocks.erase(i);
-							break;
-					}
-
-					header->changed = TRUE;
-					header->page_count = -1;
-				}
-			}
-		}
-	}
-}
-
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_LockPage(FIMULTIBITMAP *bitmap, int page) {
-	if (bitmap) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		// only lock if the page wasn't locked before...
-
-		for (std::map<FIBITMAP *, int>::iterator i = header->locked_pages.begin(); i != header->locked_pages.end(); ++i) {
-			if (i->second == page) {
-				return NULL;
-			}
-		}
-
-		// open the bitmap
-
-		header->io->seek_proc(header->handle, 0, SEEK_SET);
-
-   		void *data = FreeImage_Open(header->node, header->io, header->handle, TRUE);
-
-		// load the bitmap data
-
-		if (data != NULL) {
-			FIBITMAP *dib = (header->node->m_plugin->load_proc != NULL) ? header->node->m_plugin->load_proc(header->io, header->handle, page, header->load_flags, data) : NULL;
-
-			// close the file
-
-			FreeImage_Close(header->node, header->io, header->handle, data);
-
-			// if there was still another bitmap open, get rid of it
-
-			if (dib) {
-				header->locked_pages[dib] = page;
-
-				return dib;
-			}	
-
-			return NULL;
-		}
-	}
-
-	return NULL;
-}
-
-void DLL_CALLCONV
-FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *page, BOOL changed) {
-	if ((bitmap) && (page)) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		// find out if the page we try to unlock is actually locked...
-
-		if (header->locked_pages.find(page) != header->locked_pages.end()) {
-			// store the bitmap compressed in the cache for later writing
-
-			if (changed && !header->read_only) {
-				header->changed = TRUE;
-
-				// cut loose the block from the rest
-
-				BlockListIterator i = FreeImage_FindBlock(bitmap, header->locked_pages[page]);
-
-				// compress the data
-
-				DWORD compressed_size = 0;
-				BYTE *compressed_data = NULL;
-
-				// open a memory handle
-				FIMEMORY *hmem = FreeImage_OpenMemory();
-				// save the page to memory
-				FreeImage_SaveToMemory(header->cache_fif, page, hmem, 0);
-				// get the buffer from the memory stream
-				FreeImage_AcquireMemory(hmem, &compressed_data, &compressed_size);
-
-				// write the data to the cache
-
-				switch ((*i)->m_type) {
-					case BLOCK_CONTINUEUS :
-					{
-						int iPage = header->m_cachefile->writeFile(compressed_data, compressed_size);
-
-						delete (*i);
-
-						*i = (BlockTypeS *)new BlockReference(iPage, compressed_size);
-
-						break;
-					}
-
-					case BLOCK_REFERENCE :
-					{
-						BlockReference *reference = (BlockReference *)(*i);
-
-						header->m_cachefile->deleteFile(reference->m_reference);
-
-						delete (*i);
-
-						int iPage = header->m_cachefile->writeFile(compressed_data, compressed_size);
-
-						*i = (BlockTypeS *)new BlockReference(iPage, compressed_size);
-
-						break;
-					}
-				}
-
-				// get rid of the compressed data
-
-				FreeImage_CloseMemory(hmem);
-			}
-
-			// reset the locked page so that another page can be locked
-
-			FreeImage_Unload(page);
-
-			header->locked_pages.erase(page);
-		}
-	}
-}
-
-BOOL DLL_CALLCONV
-FreeImage_MovePage(FIMULTIBITMAP *bitmap, int target, int source) {
-	if (bitmap) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		if ((!header->read_only) && (header->locked_pages.empty())) {
-			if ((target != source) && ((target >= 0) && (target < FreeImage_GetPageCount(bitmap))) && ((source >= 0) && (source < FreeImage_GetPageCount(bitmap)))) {
-				BlockListIterator block_source = FreeImage_FindBlock(bitmap, target);
-				BlockListIterator block_target = FreeImage_FindBlock(bitmap, source);
-
-				header->m_blocks.insert(block_target, *block_source);			
-				header->m_blocks.erase(block_source);
-
-				header->changed = TRUE;
-
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_GetLockedPageNumbers(FIMULTIBITMAP *bitmap, int *pages, int *count) {
-	if ((bitmap) && (count)) {
-		MULTIBITMAPHEADER *header = FreeImage_GetMultiBitmapHeader(bitmap);
-
-		if ((pages == NULL) || (*count == 0)) {
-			*count = (int)header->locked_pages.size();
-		} else {
-			int c = 0;
-
-			for (std::map<FIBITMAP *, int>::iterator i = header->locked_pages.begin(); i != header->locked_pages.end(); ++i) {
-				pages[c] = i->second;
-
-				c++;
-
-				if (c == *count)
-					break;
-			}
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// =====================================================================
-// Memory IO Multipage functions
-// =====================================================================
-
-FIMULTIBITMAP * DLL_CALLCONV
-FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags) {
-	BOOL read_only = FALSE;	// modifications (if any) will be stored into the memory cache
-
-	// retrieve the plugin list to find the node belonging to this plugin
-
-	PluginList *list = FreeImage_GetPluginList();
-
-	if (list) {
-		PluginNode *node = list->FindNodeFromFIF(fif);
-
-		if (node) {
-			FreeImageIO *io = new(std::nothrow) FreeImageIO;
-
-			if (io) {
-				SetMemoryIO(io);
-
-				FIMULTIBITMAP *bitmap = new(std::nothrow) FIMULTIBITMAP;
-
-				if (bitmap) {
-					MULTIBITMAPHEADER *header = new(std::nothrow) MULTIBITMAPHEADER;
-
-					if (header) {
-						header->m_filename = NULL;
-						header->node = node;
-						header->fif = fif;
-						header->io = io;
-						header->handle = (fi_handle)stream;						
-						header->changed = FALSE;						
-						header->read_only = read_only;
-						header->m_cachefile = NULL;
-						header->cache_fif = fif;
-						header->load_flags = flags;
-
-						// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure
-
-						bitmap->data = header;
-
-						// cache the page count
-
-						header->page_count = FreeImage_InternalGetPageCount(bitmap);
-
-						// allocate a continueus block to describe the bitmap
-
-						header->m_blocks.push_back((BlockTypeS *)new BlockContinueus(0, header->page_count - 1));
-						
-						if (!read_only) {
-							// set up the cache
-							CacheFile *cache_file = new(std::nothrow) CacheFile("", TRUE);
-							
-							if (cache_file && cache_file->open()) {
-								header->m_cachefile = cache_file;
-							}
-						}
-
-						return bitmap;
-					}
-					
-					delete bitmap;
-				}
-				
-				delete io;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SaveMultiBitmapToMemory(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FIMEMORY *stream, int flags) {
-	if (stream && stream->data) {
-		FreeImageIO io;
-		SetMemoryIO(&io);
-
-		return FreeImage_SaveMultiBitmapToHandle(fif, bitmap, &io, (fi_handle)stream, flags);
-	}
-
-	return FALSE;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp b/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp
deleted file mode 100644
index 4f02446d8e..0000000000
--- a/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// NeuQuant Neural-Net Quantization Algorithm
-// ------------------------------------------
-//
-// Copyright (c) 1994 Anthony Dekker
-//
-// NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994.
-// See "Kohonen neural networks for optimal colour quantization"
-// in "Network: Computation in Neural Systems" Vol. 5 (1994) pp 351-367.
-// for a discussion of the algorithm.
-//
-// Any party obtaining a copy of these files from the author, directly or
-// indirectly, is granted, free of charge, a full and unrestricted irrevocable,
-// world-wide, paid up, royalty-free, nonexclusive right and license to deal
-// in this software and documentation files (the "Software"), including without
-// limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons who receive
-// copies from any such party to do so, with the only requirement being
-// that this copyright notice remain intact.
-
-///////////////////////////////////////////////////////////////////////
-// History
-// -------
-// January 2001: Adaptation of the Neural-Net Quantization Algorithm
-//               for the FreeImage 2 library
-//               Author: Hervé Drolon (drolon@infonie.fr)
-// March 2004:   Adaptation for the FreeImage 3 library (port to big endian processors)
-//               Author: Hervé Drolon (drolon@infonie.fr)
-// April 2004:   Algorithm rewritten as a C++ class. 
-//               Fixed a bug in the algorithm with handling of 4-byte boundary alignment.
-//               Author: Hervé Drolon (drolon@infonie.fr)
-///////////////////////////////////////////////////////////////////////
-
-#include "Quantizers.h"
-#include "FreeImage.h"
-#include "Utilities.h"
-
-
-// Four primes near 500 - assume no image has a length so large
-// that it is divisible by all four primes
-// ==========================================================
-
-#define prime1		499
-#define prime2		491
-#define prime3		487
-#define prime4		503
-
-// ----------------------------------------------------------------
-
-NNQuantizer::NNQuantizer(int PaletteSize)
-{
-	netsize = PaletteSize;
-	maxnetpos = netsize - 1;
-	initrad = netsize < 8 ? 1 : (netsize >> 3);
-	initradius = (initrad * radiusbias);
-
-	network = NULL;
-
-	network = (pixel *)malloc(netsize * sizeof(pixel));
-	bias = (int *)malloc(netsize * sizeof(int));
-	freq = (int *)malloc(netsize * sizeof(int));
-	radpower = (int *)malloc(initrad * sizeof(int));
-
-	if( !network || !bias || !freq || !radpower ) {
-		if(network) free(network);
-		if(bias) free(bias);
-		if(freq) free(freq);
-		if(radpower) free(radpower);
-		throw FI_MSG_ERROR_MEMORY;
-	}
-}
-
-NNQuantizer::~NNQuantizer()
-{
-	if(network) free(network);
-	if(bias) free(bias);
-	if(freq) free(freq);
-	if(radpower) free(radpower);
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Initialise network in range (0,0,0) to (255,255,255) and set parameters
-// -----------------------------------------------------------------------
-
-void NNQuantizer::initnet() {
-	int i, *p;
-
-	for (i = 0; i < netsize; i++) {
-		p = network[i];
-		p[FI_RGBA_BLUE] = p[FI_RGBA_GREEN] = p[FI_RGBA_RED] = (i << (netbiasshift+8))/netsize;
-		freq[i] = intbias/netsize;	/* 1/netsize */
-		bias[i] = 0;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////	
-// Unbias network to give byte values 0..255 and record position i to prepare for sort
-// ------------------------------------------------------------------------------------
-
-void NNQuantizer::unbiasnet() {
-	int i, j, temp;
-
-	for (i = 0; i < netsize; i++) {
-		for (j = 0; j < 3; j++) {
-			// OLD CODE: network[i][j] >>= netbiasshift; 
-			// Fix based on bug report by Juergen Weigert jw@suse.de
-			temp = (network[i][j] + (1 << (netbiasshift - 1))) >> netbiasshift;
-			if (temp > 255) temp = 255;
-			network[i][j] = temp;
-		}
-		network[i][3] = i;			// record colour no 
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-// Insertion sort of network and building of netindex[0..255] (to do after unbias)
-// -------------------------------------------------------------------------------
-
-void NNQuantizer::inxbuild() {
-	int i,j,smallpos,smallval;
-	int *p,*q;
-	int previouscol,startpos;
-
-	previouscol = 0;
-	startpos = 0;
-	for (i = 0; i < netsize; i++) {
-		p = network[i];
-		smallpos = i;
-		smallval = p[FI_RGBA_GREEN];			// index on g
-		// find smallest in i..netsize-1
-		for (j = i+1; j < netsize; j++) {
-			q = network[j];
-			if (q[FI_RGBA_GREEN] < smallval) {	// index on g
-				smallpos = j;
-				smallval = q[FI_RGBA_GREEN];	// index on g
-			}
-		}
-		q = network[smallpos];
-		// swap p (i) and q (smallpos) entries
-		if (i != smallpos) {
-			j = q[FI_RGBA_BLUE];  q[FI_RGBA_BLUE]  = p[FI_RGBA_BLUE];  p[FI_RGBA_BLUE]  = j;
-			j = q[FI_RGBA_GREEN]; q[FI_RGBA_GREEN] = p[FI_RGBA_GREEN]; p[FI_RGBA_GREEN] = j;
-			j = q[FI_RGBA_RED];   q[FI_RGBA_RED]   = p[FI_RGBA_RED];   p[FI_RGBA_RED]   = j;
-			j = q[3];   q[3] = p[3];   p[3] = j;
-		}
-		// smallval entry is now in position i
-		if (smallval != previouscol) {
-			netindex[previouscol] = (startpos+i)>>1;
-			for (j = previouscol+1; j < smallval; j++)
-				netindex[j] = i;
-			previouscol = smallval;
-			startpos = i;
-		}
-	}
-	netindex[previouscol] = (startpos+maxnetpos)>>1;
-	for (j = previouscol+1; j < 256; j++)
-		netindex[j] = maxnetpos; // really 256
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Search for BGR values 0..255 (after net is unbiased) and return colour index
-// ----------------------------------------------------------------------------
-
-int NNQuantizer::inxsearch(int b, int g, int r) {
-	int i, j, dist, a, bestd;
-	int *p;
-	int best;
-
-	bestd = 1000;		// biggest possible dist is 256*3
-	best = -1;
-	i = netindex[g];	// index on g
-	j = i-1;			// start at netindex[g] and work outwards
-
-	while ((i < netsize) || (j >= 0)) {
-		if (i < netsize) {
-			p = network[i];
-			dist = p[FI_RGBA_GREEN] - g;				// inx key
-			if (dist >= bestd)
-				i = netsize;	// stop iter
-			else {
-				i++;
-				if (dist < 0)
-					dist = -dist;
-				a = p[FI_RGBA_BLUE] - b;
-				if (a < 0)
-					a = -a;
-				dist += a;
-				if (dist < bestd) {
-					a = p[FI_RGBA_RED] - r;
-					if (a<0)
-						a = -a;
-					dist += a;
-					if (dist < bestd) {
-						bestd = dist;
-						best = p[3];
-					}
-				}
-			}
-		}
-		if (j >= 0) {
-			p = network[j];
-			dist = g - p[FI_RGBA_GREEN];			// inx key - reverse dif
-			if (dist >= bestd)
-				j = -1;	// stop iter
-			else {
-				j--;
-				if (dist < 0)
-					dist = -dist;
-				a = p[FI_RGBA_BLUE] - b;
-				if (a<0)
-					a = -a;
-				dist += a;
-				if (dist < bestd) {
-					a = p[FI_RGBA_RED] - r;
-					if (a<0)
-						a = -a;
-					dist += a;
-					if (dist < bestd) {
-						bestd = dist;
-						best = p[3];
-					}
-				}
-			}
-		}
-	}
-	return best;
-}
-
-///////////////////////////////
-// Search for biased BGR values
-// ----------------------------
-
-int NNQuantizer::contest(int b, int g, int r) {
-	// finds closest neuron (min dist) and updates freq
-	// finds best neuron (min dist-bias) and returns position
-	// for frequently chosen neurons, freq[i] is high and bias[i] is negative
-	// bias[i] = gamma*((1/netsize)-freq[i])
-
-	int i,dist,a,biasdist,betafreq;
-	int bestpos,bestbiaspos,bestd,bestbiasd;
-	int *p,*f, *n;
-
-	bestd = ~(((int) 1)<<31);
-	bestbiasd = bestd;
-	bestpos = -1;
-	bestbiaspos = bestpos;
-	p = bias;
-	f = freq;
-
-	for (i = 0; i < netsize; i++) {
-		n = network[i];
-		dist = n[FI_RGBA_BLUE] - b;
-		if (dist < 0)
-			dist = -dist;
-		a = n[FI_RGBA_GREEN] - g;
-		if (a < 0)
-			a = -a;
-		dist += a;
-		a = n[FI_RGBA_RED] - r;
-		if (a < 0)
-			a = -a;
-		dist += a;
-		if (dist < bestd) {
-			bestd = dist;
-			bestpos = i;
-		}
-		biasdist = dist - ((*p)>>(intbiasshift-netbiasshift));
-		if (biasdist < bestbiasd) {
-			bestbiasd = biasdist;
-			bestbiaspos = i;
-		}
-		betafreq = (*f >> betashift);
-		*f++ -= betafreq;
-		*p++ += (betafreq << gammashift);
-	}
-	freq[bestpos] += beta;
-	bias[bestpos] -= betagamma;
-	return bestbiaspos;
-}
-
-///////////////////////////////////////////////////////
-// Move neuron i towards biased (b,g,r) by factor alpha
-// ---------------------------------------------------- 
-
-void NNQuantizer::altersingle(int alpha, int i, int b, int g, int r) {
-	int *n;
-
-	n = network[i];				// alter hit neuron
-	n[FI_RGBA_BLUE]	 -= (alpha * (n[FI_RGBA_BLUE]  - b)) / initalpha;
-	n[FI_RGBA_GREEN] -= (alpha * (n[FI_RGBA_GREEN] - g)) / initalpha;
-	n[FI_RGBA_RED]   -= (alpha * (n[FI_RGBA_RED]   - r)) / initalpha;
-}
-
-////////////////////////////////////////////////////////////////////////////////////
-// Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|]
-// ---------------------------------------------------------------------------------
-
-void NNQuantizer::alterneigh(int rad, int i, int b, int g, int r) {
-	int j, k, lo, hi, a;
-	int *p, *q;
-
-	lo = i - rad;   if (lo < -1) lo = -1;
-	hi = i + rad;   if (hi > netsize) hi = netsize;
-
-	j = i+1;
-	k = i-1;
-	q = radpower;
-	while ((j < hi) || (k > lo)) {
-		a = (*(++q));
-		if (j < hi) {
-			p = network[j];
-			p[FI_RGBA_BLUE]  -= (a * (p[FI_RGBA_BLUE] - b)) / alpharadbias;
-			p[FI_RGBA_GREEN] -= (a * (p[FI_RGBA_GREEN] - g)) / alpharadbias;
-			p[FI_RGBA_RED]   -= (a * (p[FI_RGBA_RED] - r)) / alpharadbias;
-			j++;
-		}
-		if (k > lo) {
-			p = network[k];
-			p[FI_RGBA_BLUE]  -= (a * (p[FI_RGBA_BLUE] - b)) / alpharadbias;
-			p[FI_RGBA_GREEN] -= (a * (p[FI_RGBA_GREEN] - g)) / alpharadbias;
-			p[FI_RGBA_RED]   -= (a * (p[FI_RGBA_RED] - r)) / alpharadbias;
-			k--;
-		}
-	}
-}
-
-/////////////////////
-// Main Learning Loop
-// ------------------
-
-/**
- Get a pixel sample at position pos. Handle 4-byte boundary alignment.
- @param pos pixel position in a WxHx3 pixel buffer
- @param b blue pixel component
- @param g green pixel component
- @param r red pixel component
-*/
-void NNQuantizer::getSample(long pos, int *b, int *g, int *r) {
-	// get equivalent pixel coordinates 
-	// - assume it's a 24-bit image -
-	int x = pos % img_line;
-	int y = pos / img_line;
-
-	BYTE *bits = FreeImage_GetScanLine(dib_ptr, y) + x;
-
-	*b = bits[FI_RGBA_BLUE] << netbiasshift;
-	*g = bits[FI_RGBA_GREEN] << netbiasshift;
-	*r = bits[FI_RGBA_RED] << netbiasshift;
-}
-
-void NNQuantizer::learn(int sampling_factor) {
-	int i, j, b, g, r;
-	int radius, rad, alpha, step, delta, samplepixels;
-	int alphadec; // biased by 10 bits
-	long pos, lengthcount;
-
-	// image size as viewed by the scan algorithm
-	lengthcount = img_width * img_height * 3;
-
-	// number of samples used for the learning phase
-	samplepixels = lengthcount / (3 * sampling_factor);
-
-	// decrease learning rate after delta pixel presentations
-	delta = samplepixels / ncycles;
-	if(delta == 0) {
-		// avoid a 'divide by zero' error with very small images
-		delta = 1;
-	}
-
-	// initialize learning parameters
-	alphadec = 30 + ((sampling_factor - 1) / 3);
-	alpha = initalpha;
-	radius = initradius;
-	
-	rad = radius >> radiusbiasshift;
-	if (rad <= 1) rad = 0;
-	for (i = 0; i < rad; i++) 
-		radpower[i] = alpha*(((rad*rad - i*i)*radbias)/(rad*rad));
-	
-	// initialize pseudo-random scan
-	if ((lengthcount % prime1) != 0)
-		step = 3*prime1;
-	else {
-		if ((lengthcount % prime2) != 0)
-			step = 3*prime2;
-		else {
-			if ((lengthcount % prime3) != 0) 
-				step = 3*prime3;
-			else
-				step = 3*prime4;
-		}
-	}
-	
-	i = 0;		// iteration
-	pos = 0;	// pixel position
-
-	while (i < samplepixels) {
-		// get next learning sample
-		getSample(pos, &b, &g, &r);
-
-		// find winning neuron
-		j = contest(b, g, r);
-
-		// alter winner
-		altersingle(alpha, j, b, g, r);
-
-		// alter neighbours 
-		if (rad) alterneigh(rad, j, b, g, r);
-
-		// next sample
-		pos += step;
-		while (pos >= lengthcount) pos -= lengthcount;
-	
-		i++;
-		if (i % delta == 0) {	
-			// decrease learning rate and also the neighborhood
-			alpha -= alpha / alphadec;
-			radius -= radius / radiusdec;
-			rad = radius >> radiusbiasshift;
-			if (rad <= 1) rad = 0;
-			for (j = 0; j < rad; j++) 
-				radpower[j] = alpha * (((rad*rad - j*j) * radbias) / (rad*rad));
-		}
-	}
-	
-}
-
-//////////////
-// Quantizer
-// -----------
-
-FIBITMAP* NNQuantizer::Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *ReservePalette, int sampling) {
-
-	if ((!dib) || (FreeImage_GetBPP(dib) != 24)) {
-		return NULL;
-	}
-
-	// 1) Select a sampling factor in range 1..30 (input parameter 'sampling')
-	//    1 => slower, 30 => faster. Default value is 1
-
-
-	// 2) Get DIB parameters
-
-	dib_ptr = dib;
-	
-	img_width  = FreeImage_GetWidth(dib);	// DIB width
-	img_height = FreeImage_GetHeight(dib);	// DIB height
-	img_line   = FreeImage_GetLine(dib);	// DIB line length in bytes (should be equal to 3 x W)
-
-	// For small images, adjust the sampling factor to avoid a 'divide by zero' error later 
-	// (see delta in learn() routine)
-	int adjust = (img_width * img_height) / ncycles;
-	if(sampling >= adjust)
-		sampling = 1;
-
-
-	// 3) Initialize the network and apply the learning algorithm
-
-	if( netsize > ReserveSize ) {
-		netsize -= ReserveSize;
-		initnet();
-		learn(sampling);
-		unbiasnet();
-		netsize += ReserveSize;
-	}
-
-	// 3.5) Overwrite the last few palette entries with the reserved ones
-    for (int i = 0; i < ReserveSize; i++) {
-		network[netsize - ReserveSize + i][FI_RGBA_BLUE] = ReservePalette[i].rgbBlue;
-		network[netsize - ReserveSize + i][FI_RGBA_GREEN] = ReservePalette[i].rgbGreen;
-		network[netsize - ReserveSize + i][FI_RGBA_RED] = ReservePalette[i].rgbRed;
-		network[netsize - ReserveSize + i][3] = netsize - ReserveSize + i;
-	}
-
-	// 4) Allocate a new 8-bit DIB
-
-	FIBITMAP *new_dib = FreeImage_Allocate(img_width, img_height, 8);
-
-	if (new_dib == NULL)
-		return NULL;
-
-	// 5) Write the quantized palette
-
-	RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
-
-    for (int j = 0; j < netsize; j++) {
-		new_pal[j].rgbBlue  = (BYTE)network[j][FI_RGBA_BLUE];
-		new_pal[j].rgbGreen = (BYTE)network[j][FI_RGBA_GREEN];
-		new_pal[j].rgbRed	= (BYTE)network[j][FI_RGBA_RED];
-	}
-
-	inxbuild();
-
-	// 6) Write output image using inxsearch(b,g,r)
-
-	for (WORD rows = 0; rows < img_height; rows++) {
-		BYTE *new_bits = FreeImage_GetScanLine(new_dib, rows);			
-		BYTE *bits = FreeImage_GetScanLine(dib_ptr, rows);
-
-		for (WORD cols = 0; cols < img_width; cols++) {
-			new_bits[cols] = (BYTE)inxsearch(bits[FI_RGBA_BLUE], bits[FI_RGBA_GREEN], bits[FI_RGBA_RED]);
-
-			bits += 3;
-		}
-	}
-
-	return (FIBITMAP*) new_dib;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PSDParser.cpp b/plugins/AdvaImg/src/FreeImage/PSDParser.cpp
deleted file mode 100644
index fba54c2421..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PSDParser.cpp
+++ /dev/null
@@ -1,1057 +0,0 @@
-// ==========================================================
-// Photoshop Loader
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// Based on LGPL code created and published by http://sourceforge.net/projects/elynx/
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "PSDParser.h"
-
-// --------------------------------------------------------------------------
-
-// PSD signature (= '8BPS')
-#define PSD_SIGNATURE	0x38425053
-// Image resource block signature (= '8BIM')
-#define PSD_RESOURCE	0x3842494D 
-
-// PSD color modes
-#define PSDP_BITMAP			0
-#define PSDP_GRAYSCALE		1
-#define PSDP_INDEXED		2
-#define PSDP_RGB			3
-#define PSDP_CMYK			4
-#define PSDP_MULTICHANNEL	7
-#define PSDP_DUOTONE		8
-#define PSDP_LAB			9
-
-// PSD compression schemes
-#define PSDP_COMPRESSION_NONE	0	// Raw data
-#define PSDP_COMPRESSION_RLE	1	// RLE compression (same as TIFF packed bits)
-
-#define SAFE_DELETE_ARRAY(_p_) { if (NULL != (_p_)) { delete [] (_p_); (_p_) = NULL; } }
-
-// --------------------------------------------------------------------------
-
-static inline int 
-psdGetValue(const BYTE * iprBuffer, const int iBytes) {
-	int v = iprBuffer[0];
-	for (int i=1; i<iBytes; ++i) {
-		v = (v << 8) | iprBuffer[i];
-	}
-	return v;
-}
-
-// --------------------------------------------------------------------------
-
-psdHeaderInfo::psdHeaderInfo() : _Channels(-1), _Height(-1), _Width(-1), _BitsPerChannel(-1), _ColourMode(-1) {
-}
-
-psdHeaderInfo::~psdHeaderInfo() {
-}
-	
-bool psdHeaderInfo::Read(FreeImageIO *io, fi_handle handle) {
-	psdHeader header;
-
-	const int n = (int)io->read_proc(&header, sizeof(header), 1, handle);
-	if(!n) {
-		return false;
-	}
-
-	// check the signature
-	int nSignature = psdGetValue(header.Signature, sizeof(header.Signature));
-	if (PSD_SIGNATURE == nSignature) {
-		// check the version
-		int nVersion = psdGetValue( header.Version, sizeof(header.Version) );
-		if (1 == nVersion) {
-			// header.Reserved must be zero
-			BYTE psd_reserved[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-			if(memcmp(header.Reserved, psd_reserved, 6) != 0) {
-				FreeImage_OutputMessageProc(FIF_PSD, "Warning: file header reserved member is not equal to zero");
-			}
-			// read the header
-			_Channels = (short)psdGetValue( header.Channels, sizeof(header.Channels) );
-			_Height = psdGetValue( header.Rows, sizeof(header.Rows) );
-			_Width = psdGetValue( header.Columns, sizeof(header.Columns) );
-			_BitsPerChannel = (short)psdGetValue( header.Depth, sizeof(header.Depth) );
-			_ColourMode = (short)psdGetValue( header.Mode, sizeof(header.Mode) );
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-// --------------------------------------------------------------------------
-
-psdColourModeData::psdColourModeData() : _Length(-1), _plColourData(NULL) {
-}
-
-psdColourModeData::~psdColourModeData() { 
-	SAFE_DELETE_ARRAY(_plColourData); 
-}
-	
-bool psdColourModeData::Read(FreeImageIO *io, fi_handle handle) {
-	if (0 < _Length) { 
-		SAFE_DELETE_ARRAY(_plColourData);
-	}
-	
-	BYTE Length[4];
-	io->read_proc(&Length, sizeof(Length), 1, handle);
-	
-	_Length = psdGetValue( Length, sizeof(_Length) );
-	if (0 < _Length) {
-		_plColourData = new BYTE[_Length];
-		io->read_proc(_plColourData, _Length, 1, handle);
-	}
-
-	return true;
-}
-	
-bool psdColourModeData::FillPalette(FIBITMAP *dib) {
-	RGBQUAD *pal = FreeImage_GetPalette(dib);
-	if(pal) {
-		for (int i = 0; i < 256; i++) {
-			pal[i].rgbRed	= _plColourData[i + 0*256];
-			pal[i].rgbGreen = _plColourData[i + 1*256];
-			pal[i].rgbBlue	= _plColourData[i + 2*256];
-		}
-		return true;
-	}
-	return false;
-}
-
-// --------------------------------------------------------------------------
-
-psdImageResource::psdImageResource() : _plName (0) { 
-	Reset(); 
-}
-
-psdImageResource::~psdImageResource() { 
-	SAFE_DELETE_ARRAY(_plName);
-}
-
-void psdImageResource::Reset() {
-	_Length = -1;
-	memset( _OSType, '\0', sizeof(_OSType) );
-	_ID = -1;
-	SAFE_DELETE_ARRAY(_plName);
-	_Size = -1;
-}
-
-// --------------------------------------------------------------------------
-
-psdResolutionInfo::psdResolutionInfo() : _widthUnit(-1), _heightUnit(-1), _hRes(-1), _vRes(-1), _hResUnit(-1), _vResUnit(-1) {
-}
-
-psdResolutionInfo::~psdResolutionInfo() {
-}
-	
-int psdResolutionInfo::Read(FreeImageIO *io, fi_handle handle) {
-	BYTE IntValue[4], ShortValue[2];
-	int nBytes=0, n;
-	
-	// Horizontal resolution in pixels per inch.
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_hRes = (short)psdGetValue(ShortValue, sizeof(_hRes) );
-	// 1=display horizontal resolution in pixels per inch; 2=display horizontal resolution in pixels per cm.
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_hResUnit = psdGetValue(IntValue, sizeof(_hResUnit) );
-	// Display width as 1=inches; 2=cm; 3=points; 4=picas; 5=columns.
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_widthUnit = (short)psdGetValue(ShortValue, sizeof(_widthUnit) );
-	// Vertical resolution in pixels per inch.
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_vRes = (short)psdGetValue(ShortValue, sizeof(_vRes) );
-	// 1=display vertical resolution in pixels per inch; 2=display vertical resolution in pixels per cm.
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_vResUnit = psdGetValue(IntValue, sizeof(_vResUnit) );
-	// Display height as 1=inches; 2=cm; 3=points; 4=picas; 5=columns.
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_heightUnit = (short)psdGetValue(ShortValue, sizeof(_heightUnit) );
-	
-	return nBytes;
-}
-
-void psdResolutionInfo::GetResolutionInfo(unsigned &res_x, unsigned &res_y) {
-	if(_hResUnit == 1) {
-		// convert pixels / inch to pixel / m
-		res_x = (unsigned) (_hRes / 0.0254000 + 0.5);
-	} else if(_hResUnit == 2) {
-		// convert pixels / cm to pixel / m
-		res_x = (unsigned) (_hRes * 100.0 + 0.5);
-	}
-	if(_vResUnit == 1) {
-		// convert pixels / inch to pixel / m
-		res_y = (unsigned) (_vRes / 0.0254000 + 0.5);
-	} else if(_vResUnit == 2) {
-		// convert pixels / cm to pixel / m
-		res_y = (unsigned) (_vRes * 100.0 + 0.5);
-	}
-}
-
-// --------------------------------------------------------------------------
-
-psdResolutionInfo_v2::psdResolutionInfo_v2() { 
-	_Channels = _Rows = _Columns = _Depth = _Mode = -1; 
-}
-
-psdResolutionInfo_v2::~psdResolutionInfo_v2() {
-}
-
-int psdResolutionInfo_v2::Read(FreeImageIO *io, fi_handle handle) {
-	BYTE ShortValue[2];
-	int nBytes=0, n;
-	
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Channels = (short)psdGetValue(ShortValue, sizeof(_Channels) );
-
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Rows = (short)psdGetValue(ShortValue, sizeof(_Rows) );
-	
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Columns = (short)psdGetValue(ShortValue, sizeof(_Columns) );
-
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Depth = (short)psdGetValue(ShortValue, sizeof(_Depth) );
-
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Mode = (short)psdGetValue(ShortValue, sizeof(_Mode) );
-	
-	return nBytes;
-}
-
-// --------------------------------------------------------------------------
-
-psdDisplayInfo::psdDisplayInfo() {
-	_Opacity = _ColourSpace = -1;
-	for (unsigned n = 0; n < 4; ++n) {
-		_Colour[n] = 0;
-	}
-	_Kind = 0;
-	_padding = '0';
-}
-
-psdDisplayInfo::~psdDisplayInfo() {
-}
-	
-int psdDisplayInfo::Read(FreeImageIO *io, fi_handle handle) {
-	BYTE ShortValue[2];
-	int nBytes=0, n;
-	
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_ColourSpace = (short)psdGetValue(ShortValue, sizeof(_ColourSpace) );
-	
-	for (unsigned i = 0; i < 4; ++i) {
-		n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-		nBytes += n * sizeof(ShortValue);
-		_Colour[i] = (short)psdGetValue(ShortValue, sizeof(_Colour[i]) );
-	}
-	
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Opacity = (short)psdGetValue(ShortValue, sizeof(_Opacity) );
-	if((_Opacity < 0) || (_Opacity > 100)) {
-		throw "Invalid DisplayInfo::Opacity value";
-	}
-	
-	BYTE c[1];
-	n = (int)io->read_proc(&c, sizeof(c), 1, handle);
-	nBytes += n * sizeof(c);
-	_Kind = (BYTE)psdGetValue(c, sizeof(c));
-	
-	n = (int)io->read_proc(&c, sizeof(c), 1, handle);
-	nBytes += n * sizeof(c);
-	_padding = (BYTE)psdGetValue(c, sizeof(c));
-	if(_padding != 0) {
-		throw "Invalid DisplayInfo::Padding value";
-	}
-	
-	return nBytes;
-}
-
-// --------------------------------------------------------------------------
-
-psdThumbnail::psdThumbnail() : 
-_Format(-1), _Width(-1), _Height(-1), _WidthBytes(-1), _Size(-1), _CompressedSize(-1), _BitPerPixel(-1), _Planes(-1), _dib(NULL) {
-}
-
-psdThumbnail::~psdThumbnail() { 
-	FreeImage_Unload(_dib);
-}
-
-int psdThumbnail::Read(FreeImageIO *io, fi_handle handle, int iResourceSize, bool isBGR) {
-	BYTE ShortValue[2], IntValue[4];
-	int nBytes=0, n;
-
-	// remove the header size (28 bytes) from the total data size
-	int iTotalData = iResourceSize - 28;
-
-	const long block_end = io->tell_proc(handle) + iTotalData;	
-	
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_Format = psdGetValue(IntValue, sizeof(_Format) );
-	
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_Width = psdGetValue(IntValue, sizeof(_Width) );
-	
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_Height = psdGetValue(IntValue, sizeof(_Height) );
-	
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_WidthBytes = psdGetValue(IntValue, sizeof(_WidthBytes) );
-
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_Size = psdGetValue(IntValue, sizeof(_Size) );
-
-	n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-	nBytes += n * sizeof(IntValue);
-	_CompressedSize = psdGetValue(IntValue, sizeof(_CompressedSize) );
-
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_BitPerPixel = (short)psdGetValue(ShortValue, sizeof(_BitPerPixel) );
-
-	n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-	nBytes += n * sizeof(ShortValue);
-	_Planes = (short)psdGetValue(ShortValue, sizeof(_Planes) );
-
-	const long JFIF_startpos = io->tell_proc(handle);
-
-	if(_dib) {
-		FreeImage_Unload(_dib);
-	}
-
-	if(_Format == 1) {
-		// kJpegRGB thumbnail image
-		_dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle);
-		if(isBGR) {
-			SwapRedBlue32(_dib);
-		}			
-		// HACK: manually go to end of thumbnail, because (for some reason) LoadFromHandle consumes more bytes then available! 
-		io->seek_proc(handle, block_end, SEEK_SET);
-	}
-	else {
-		// kRawRGB thumbnail image		
-		// ### Unimplemented (should be trivial)
-
-		// skip the thumbnail part
-		io->seek_proc(handle, iTotalData, SEEK_CUR);
-		return iResourceSize;
-	}
-	
-	nBytes += (block_end - JFIF_startpos); 
-
-	return nBytes;
-}
-
-//---------------------------------------------------------------------------
-
-psdICCProfile::psdICCProfile() : _ProfileSize(0), _ProfileData(NULL) {
-}
-
-psdICCProfile::~psdICCProfile() {
-	clear();
-}
-
-void psdICCProfile::clear() { SAFE_DELETE_ARRAY(_ProfileData); _ProfileSize = 0;}
-
-int psdICCProfile::Read(FreeImageIO *io, fi_handle handle, int size) {
-	int nBytes = 0, n;
-	
-	clear();
-	
-	_ProfileData = new (std::nothrow) BYTE[size];
-	if(NULL != _ProfileData) {
-		n = (int)io->read_proc(_ProfileData, 1, size, handle);
-		_ProfileSize = size;
-		nBytes += n * sizeof(BYTE);
-	}
-
-	return nBytes;
-}
-
-//---------------------------------------------------------------------------
-
-/**
-Invert only color components, skipping Alpha/Black
-(Can be useful as public/utility function)
-*/
-static
-BOOL invertColor(FIBITMAP* dib) {
-	FREE_IMAGE_TYPE type = FreeImage_GetImageType(dib);
-	const unsigned Bpp = FreeImage_GetBPP(dib)/8;
-	
-	if((type == FIT_BITMAP && Bpp == 4) || type == FIT_RGBA16) {
-		const unsigned width = FreeImage_GetWidth(dib);
-		const unsigned height = FreeImage_GetHeight(dib);
-		BYTE *line_start = FreeImage_GetScanLine(dib, 0);
-		const unsigned pitch = FreeImage_GetPitch(dib);
-		const unsigned triBpp = Bpp - (Bpp == 4 ? 1 : 2);
-				
-		for(unsigned y = 0; y < height; y++) {
-			BYTE *line = line_start;
-
-			for(unsigned x = 0; x < width; x++) {
-				for(unsigned b=0; b < triBpp; ++b) {
-					line[b] = ~line[b];
-				}
-					
-				line += Bpp;
-			}
-			line_start += pitch;
-		}
-		
-		return TRUE;
-	}
-	else {
-		return FreeImage_Invert(dib);
-	}
-}
-
-//---------------------------------------------------------------------------
-
-psdParser::psdParser() {
-	_bThumbnailFilled = false;
-	_bDisplayInfoFilled = false;
-	_bResolutionInfoFilled = false;
-	_bResolutionInfoFilled_v2 = false;
-	_bCopyright = false;
-	_GlobalAngle = 30;
-	_ColourCount = -1;
-	_TransparentIndex = -1;
-	_fi_flags = 0;
-	_fi_format_id = FIF_UNKNOWN;
-}
-
-psdParser::~psdParser() {
-}
-
-bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle handle)	{
-	bool bSuccess = false;
-	
-	BYTE DataLength[4];
-	int nBytes = 0;
-	int n = (int)io->read_proc(&DataLength, sizeof(DataLength), 1, handle);
-	int nTotalBytes = psdGetValue( DataLength, sizeof(DataLength) );
-	
-	BYTE data[1];
-	while( n && ( nBytes < nTotalBytes ) ) {
-		data[0] = '\0';
-		n = (int)io->read_proc(&data, sizeof(data), 1, handle);
-		nBytes += n * sizeof(data);
-	}
-	
-	if ( nBytes == nTotalBytes ) {
-		bSuccess = true;
-	}
-	
-	return bSuccess;
-}
-
-bool psdParser::ReadImageResources(FreeImageIO *io, fi_handle handle, LONG length) {
-	psdImageResource oResource;
-	bool bSuccess = false;
-	
-	if(length > 0) {
-		oResource._Length = length;
-	} else {
-		BYTE Length[4];
-		int n = (int)io->read_proc(&Length, sizeof(Length), 1, handle);
-		
-		oResource._Length = psdGetValue( Length, sizeof(oResource._Length) );
-	}
-	
-	int nBytes = 0;
-	int nTotalBytes = oResource._Length;
-	
-	while(nBytes < nTotalBytes) {
-		int n = 0;
-		oResource.Reset();
-		
-		n = (int)io->read_proc(&oResource._OSType, sizeof(oResource._OSType), 1, handle);
-		if(n != 1) {
-			FreeImage_OutputMessageProc(_fi_format_id, "This file contains damaged data causing an unexpected end-of-file - stop reading resources");
-			return false;
-		}
-		nBytes += n * sizeof(oResource._OSType);
-
-		if( (nBytes % 2) != 0 ) {
-			return false;
-		}
-		
-		int nOSType = psdGetValue((BYTE*)&oResource._OSType, sizeof(oResource._OSType));
-
-		if ( PSD_RESOURCE == nOSType ) {
-			BYTE ID[2];
-			n = (int)io->read_proc(&ID, sizeof(ID), 1, handle);
-			nBytes += n * sizeof(ID);
-			
-			oResource._ID = (short)psdGetValue( ID, sizeof(ID) );
-			
-			BYTE SizeOfName;
-			n = (int)io->read_proc(&SizeOfName, sizeof(SizeOfName), 1, handle);
-			nBytes += n * sizeof(SizeOfName);
-			
-			int nSizeOfName = psdGetValue( &SizeOfName, sizeof(SizeOfName) );
-			if ( 0 < nSizeOfName ) {
-				oResource._plName = new BYTE[nSizeOfName];
-				n = (int)io->read_proc(oResource._plName, nSizeOfName, 1, handle);
-				nBytes += n * nSizeOfName;
-			}
-			
-			if ( 0 == (nSizeOfName % 2) ) {
-				n = (int)io->read_proc(&SizeOfName, sizeof(SizeOfName), 1, handle);
-				nBytes += n * sizeof(SizeOfName);
-			}
-			
-			BYTE Size[4];
-			n = (int)io->read_proc(&Size, sizeof(Size), 1, handle);
-			nBytes += n * sizeof(Size);
-			
-			oResource._Size = psdGetValue( Size, sizeof(oResource._Size) );
-			
-			if ( 0 != (oResource._Size % 2) ) {
-				// resource data must be even
-				oResource._Size++;
-			}
-			if ( 0 < oResource._Size ) {
-				BYTE IntValue[4];
-				BYTE ShortValue[2];
-				
-				switch( oResource._ID ) {
-					case 1000:
-						// Obsolete - Photoshop 2.0
-						_bResolutionInfoFilled_v2 = true;
-						nBytes += _resolutionInfo_v2.Read(io, handle);
-						break;
-					
-					// ResolutionInfo structure
-					case 1005:
-						_bResolutionInfoFilled = true;
-						nBytes += _resolutionInfo.Read(io, handle);
-						break;
-						
-					// DisplayInfo structure
-					case 1007:
-						_bDisplayInfoFilled = true;
-						nBytes += _displayInfo.Read(io, handle);
-						break;
-						
-					// (Photoshop 4.0) Copyright flag
-					// Boolean indicating whether image is copyrighted. Can be set via Property suite or by user in File Info...
-					case 1034:
-						n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-						nBytes += n * sizeof(ShortValue);
-						_bCopyright = (1 == psdGetValue(ShortValue, sizeof(ShortValue)));
-						break;
-						
-					// (Photoshop 4.0) Thumbnail resource for Photoshop 4.0 only
-					case 1033:
-					// (Photoshop 5.0) Thumbnail resource (supersedes resource 1033)
-					case 1036:
-					{
-						_bThumbnailFilled = true;
-						bool bBGR = (1033==oResource._ID);
-						nBytes += _thumbnail.Read(io, handle, oResource._Size, bBGR);
-						break;
-					}
-					
-					// (Photoshop 5.0) Global Angle
-					// 4 bytes that contain an integer between 0 and 359, which is the global
-					// lighting angle for effects layer. If not present, assumed to be 30.
-					case 1037:
-						n = (int)io->read_proc(&IntValue, sizeof(IntValue), 1, handle);
-						nBytes += n * sizeof(IntValue);
-						_GlobalAngle = psdGetValue(IntValue, sizeof(_GlobalAngle) );
-						break;
-
-					// ICC profile
-					case 1039:
-						nBytes += _iccProfile.Read(io, handle, oResource._Size);
-						break;
-
-					// (Photoshop 6.0) Indexed Color Table Count
-					// 2 bytes for the number of colors in table that are actually defined
-					case 1046:
-						n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-						nBytes += n * sizeof(ShortValue);
-						_ColourCount = (short)psdGetValue(ShortValue, sizeof(ShortValue) );
-						break;
-						
-					// (Photoshop 6.0) Transparency Index.
-					// 2 bytes for the index of transparent color, if any.
-					case 1047:
-						n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle);
-						nBytes += n * sizeof(ShortValue);
-						_TransparentIndex = (short)psdGetValue(ShortValue, sizeof(ShortValue) );
-						break;
-						
-					default:
-					{
-						// skip resource
-						unsigned skip_length = MIN(oResource._Size, nTotalBytes - nBytes);
-						io->seek_proc(handle, skip_length, SEEK_CUR);
-						nBytes += skip_length;
-					}
-					break;
-				}
-			}
-		}
-  }
-  
-  if (nBytes == nTotalBytes) {
-	  bSuccess = true;
-  }
-  
-  return bSuccess;
-  
-} 
-
-FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) {
-	if(handle == NULL) 
-		return NULL;
-	
-	bool header_only = (_fi_flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-	
-	WORD nCompression = 0;
-	io->read_proc(&nCompression, sizeof(nCompression), 1, handle);
-	
-#ifndef FREEIMAGE_BIGENDIAN
-	SwapShort(&nCompression);
-#endif
-	
-	if((nCompression != PSDP_COMPRESSION_NONE && nCompression != PSDP_COMPRESSION_RLE))	{
-		FreeImage_OutputMessageProc(_fi_format_id, "Unsupported compression %d", nCompression);
-		return NULL;
-	}
-	
-	const unsigned nWidth = _headerInfo._Width;
-	const unsigned nHeight = _headerInfo._Height;
-	const unsigned nChannels = _headerInfo._Channels;
-	const unsigned depth = _headerInfo._BitsPerChannel;
-	const unsigned bytes = (depth == 1) ? 1 : depth / 8;
-		
-	// channel(plane) line (BYTE aligned)
-	const unsigned lineSize = (_headerInfo._BitsPerChannel == 1) ? (nWidth + 7) / 8 : nWidth * bytes;
-	
-	if(nCompression == PSDP_COMPRESSION_RLE && depth > 16) {
-		FreeImage_OutputMessageProc(_fi_format_id, "Unsupported RLE with depth %d", depth);
-		return NULL;
-	}
-	
-	// build output buffer
-	
-	FIBITMAP* bitmap = NULL;
-	unsigned dstCh = 0;
-	
-	short mode = _headerInfo._ColourMode;
-	
-	if(mode == PSDP_MULTICHANNEL && nChannels < 3) {
-		// CM 
-		mode = PSDP_GRAYSCALE; // C as gray, M as extra channel
-	}
-		
-	bool needPalette = false;
-	switch (mode) {
-		case PSDP_BITMAP:
-		case PSDP_DUOTONE:	
-		case PSDP_INDEXED:
-		case PSDP_GRAYSCALE:
-			dstCh = 1;
-			switch(depth) {
-				case 16:
-				bitmap = FreeImage_AllocateHeaderT(header_only, FIT_UINT16, nWidth, nHeight, depth*dstCh);
-				break;
-				case 32:
-				bitmap = FreeImage_AllocateHeaderT(header_only, FIT_FLOAT, nWidth, nHeight, depth*dstCh);
-				break;
-				default: // 1-, 8-
-				needPalette = true;
-				bitmap = FreeImage_AllocateHeader(header_only, nWidth, nHeight, depth*dstCh);
-				break;
-			}
-			break;
-		case PSDP_RGB:	
-		case PSDP_LAB:		
-		case PSDP_CMYK	:
-		case PSDP_MULTICHANNEL	:
-			// force PSDP_MULTICHANNEL CMY as CMYK
-			dstCh = (mode == PSDP_MULTICHANNEL && !header_only) ? 4 : MIN<unsigned>(nChannels, 4);
-			if(dstCh < 3) {
-				throw "Invalid number of channels";
-			}
-
-			switch(depth) {
-				case 16:
-				bitmap = FreeImage_AllocateHeaderT(header_only, dstCh < 4 ? FIT_RGB16 : FIT_RGBA16, nWidth, nHeight, depth*dstCh);
-				break;
-				case 32:
-				bitmap = FreeImage_AllocateHeaderT(header_only, dstCh < 4 ? FIT_RGBF : FIT_RGBAF, nWidth, nHeight, depth*dstCh);
-				break;
-				default:
-				bitmap = FreeImage_AllocateHeader(header_only, nWidth, nHeight, depth*dstCh);
-				break;
-			}
-			break;
-		default:
-			throw "Unsupported color mode";
-			break;
-	}
-	if(!bitmap) {
-		throw FI_MSG_ERROR_DIB_MEMORY;
-	}
-
-	// write thumbnail
-	FreeImage_SetThumbnail(bitmap, _thumbnail.getDib());
-		
-	// @todo Add some metadata model
-		
-	if(header_only) {
-		return bitmap;
-	}
-	
-	// Load pixels data
-
-	const unsigned dstChannels = dstCh;
-	
-	const unsigned dstBpp =  (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8;
-	const unsigned dstLineSize = FreeImage_GetPitch(bitmap);	
-	BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped
-	
-	BYTE* line_start = new BYTE[lineSize]; //< fileline cache
-
-	switch ( nCompression ) {
-		case PSDP_COMPRESSION_NONE: // raw data	
-		{			
-			for(unsigned c = 0; c < nChannels; c++) {
-				if(c >= dstChannels) {
-					// @todo write extra channels
-					break; 
-				}
-					
-				const unsigned channelOffset = c * bytes;
-				
-				BYTE* dst_line_start = dst_first_line;
-				for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
-
-					io->read_proc(line_start, lineSize, 1, handle);
-					
-					for (BYTE *line = line_start, *dst_line = dst_line_start; line < line_start + lineSize; 
-						line += bytes, dst_line += dstBpp) {
-#ifdef FREEIMAGE_BIGENDIAN
-							memcpy(dst_line + channelOffset, line, bytes);
-#else
-						// reverse copy bytes
-						for (unsigned b = 0; b < bytes; ++b) {
-							dst_line[channelOffset + b] = line[(bytes-1) - b];
-						}
-#endif // FREEIMAGE_BIGENDIAN
-					}
-				} //< h
-			}//< ch
-			
-			SAFE_DELETE_ARRAY(line_start);
-					
-		}
-		break;
-		
-		case PSDP_COMPRESSION_RLE: // RLE compression	
-		{			
-									
-			// The RLE-compressed data is preceeded by a 2-byte line size for each row in the data,
-			// store an array of these
-
-			// later use this array as WORD rleLineSizeList[nChannels][nHeight];
-			WORD *rleLineSizeList = new (std::nothrow) WORD[nChannels*nHeight];
-
-			if(!rleLineSizeList) {
-				FreeImage_Unload(bitmap);
-				SAFE_DELETE_ARRAY(line_start);
-				throw std::bad_alloc();
-			}	
-			
-			io->read_proc(rleLineSizeList, 2, nChannels * nHeight, handle);
-			
-			WORD largestRLELine = 0;
-			for(unsigned ch = 0; ch < nChannels; ++ch) {
-				for(unsigned h = 0; h < nHeight; ++h) {
-					const unsigned index = ch * nHeight + h;
-
-#ifndef FREEIMAGE_BIGENDIAN 
-					SwapShort(&rleLineSizeList[index]);
-#endif
-					if(largestRLELine < rleLineSizeList[index]) {
-						largestRLELine = rleLineSizeList[index];
-					}
-				}
-			}
-
-			BYTE* rle_line_start = new (std::nothrow) BYTE[largestRLELine];
-			if(!rle_line_start) {
-				FreeImage_Unload(bitmap);
-				SAFE_DELETE_ARRAY(line_start);
-				SAFE_DELETE_ARRAY(rleLineSizeList);
-				throw std::bad_alloc();
-			}
-			
-			// Read the RLE data (assume 8-bit)
-			
-			const BYTE* const line_end = line_start + lineSize;
-
-			for (unsigned ch = 0; ch < nChannels; ch++) {
-				const unsigned channelOffset = ch * bytes;
-				
-				BYTE* dst_line_start = dst_first_line;
-				for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
-					const unsigned index = ch * nHeight + h;
-					
-					// - read and uncompress line -
-					
-					const WORD rleLineSize = rleLineSizeList[index];
-					
-					io->read_proc(rle_line_start, rleLineSize, 1, handle);
-					
-					for (BYTE* rle_line = rle_line_start, *line = line_start; 
-						rle_line < rle_line_start + rleLineSize, line < line_end;) {
-
-						int len = *rle_line++;
-						
-						// NOTE len is signed byte in PackBits RLE
-						
-						if ( len < 128 ) { //<- MSB is not set
-							// uncompressed packet
-							
-							// (len + 1) bytes of data are copied
-							
-							++len;
-							
-							// assert we don't write beyound eol
-							memcpy(line, rle_line, line + len > line_end ? line_end - line : len);
-							line += len;
-							rle_line += len;
-						}
-						else if ( len > 128 ) { //< MSB is set
-						
-							// RLE compressed packet
-							
-							// One byte of data is repeated (–len + 1) times
-							
-							len ^= 0xFF; // same as (-len + 1) & 0xFF 
-							len += 2;    //
-
-							// assert we don't write beyound eol
-							memset(line, *rle_line++, line + len > line_end ? line_end - line : len);							
-							line += len;
-
-						}
-						else if ( 128 == len ) {
-							// Do nothing
-						}
-					}//< rle_line
-					
-					// - write line to destination -
-					
-					if(ch >= dstChannels) {
-						// @todo write to extra channels
-						break; 
-					}
-						
-					// byte by byte copy a single channel to pixel
-					for (BYTE *line = line_start, *dst_line = dst_line_start; line < line_start + lineSize; 
-						line += bytes, dst_line += dstBpp) {
-
-#ifdef FREEIMAGE_BIGENDIAN
-							memcpy(dst_line + channelOffset, line, bytes);
-#else
-							// reverse copy bytes
-							for (unsigned b = 0; b < bytes; ++b) {
-								dst_line[channelOffset + b] = line[(bytes-1) - b];							
-							}
-#endif // FREEIMAGE_BIGENDIAN
-					}	
-				}//< h
-			}//< ch
-			
-			SAFE_DELETE_ARRAY(line_start);
-			SAFE_DELETE_ARRAY(rleLineSizeList);
-			SAFE_DELETE_ARRAY(rle_line_start);
-		}
-		break;
-		
-		case 2: // ZIP without prediction, no specification
-			break;
-			
-		case 3: // ZIP with prediction, no specification
-			break;
-			
-		default: // Unknown format
-			break;
-		
-	}
-	
-	// --- Further process the bitmap ---
-	
-	if((mode == PSDP_CMYK || mode == PSDP_MULTICHANNEL)) {	
-		// CMYK values are "inverted", invert them back		
-
-		if(mode == PSDP_MULTICHANNEL) {
-			invertColor(bitmap);
-		} else {
-			FreeImage_Invert(bitmap);
-		}
-
-		if((_fi_flags & PSD_CMYK) == PSD_CMYK) {
-			// keep as CMYK
-
-			if(mode == PSDP_MULTICHANNEL) {
-				//### we force CMY to be CMYK, but CMY has no ICC. 
-				// Create empty profile and add the flag.
-				FreeImage_CreateICCProfile(bitmap, NULL, 0);
-				FreeImage_GetICCProfile(bitmap)->flags |= FIICC_COLOR_IS_CMYK;
-			}
-		}
-		else { 
-			// convert to RGB
-			
-			ConvertCMYKtoRGBA(bitmap);
-			
-			// The ICC Profile is no longer valid
-			_iccProfile.clear();
-			
-			// remove the pending A if not present in source 
-			if(nChannels == 4 || nChannels == 3 ) {
-				FIBITMAP* t = RemoveAlphaChannel(bitmap);
-				if(t) {
-					FreeImage_Unload(bitmap);
-					bitmap = t;
-				} // else: silently fail
-			}
-		}
-	}
-	else if ( mode == PSDP_LAB && !((_fi_flags & PSD_LAB) == PSD_LAB)) {
-		ConvertLABtoRGB(bitmap);
-	}
-	else {
-		if (needPalette && FreeImage_GetPalette(bitmap)) {
-			
-			if(mode == PSDP_BITMAP) {
-				CREATE_GREYSCALE_PALETTE_REVERSE(FreeImage_GetPalette(bitmap), 2);
-			}
-			else if(mode == PSDP_INDEXED) {
-				if(!_colourModeData._plColourData || _colourModeData._Length != 768 || _ColourCount < 0) {
-					FreeImage_OutputMessageProc(_fi_format_id, "Indexed image has no palette. Using the default grayscale one.");
-				} else {
-					_colourModeData.FillPalette(bitmap);
-				}
-			}
-			// GRAYSCALE, DUOTONE - use default grayscale palette
-		}
-		
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-		if(FreeImage_GetImageType(bitmap) == FIT_BITMAP) {
-			SwapRedBlue32(bitmap);
-		}
-#endif
-	}
-	
-	return bitmap;
-} 
-
-FIBITMAP* psdParser::Load(FreeImageIO *io, fi_handle handle, int s_format_id, int flags) {
-	FIBITMAP *Bitmap = NULL;
-	
-	_fi_flags = flags;
-	_fi_format_id = s_format_id;
-	
-	try {
-		if (NULL == handle) {
-			throw("Cannot open file");
-		}
-		
-		if (!_headerInfo.Read(io, handle)) {
-			throw("Error in header");
-		}
-
-		if (!_colourModeData.Read(io, handle)) {
-			throw("Error in ColourMode Data");
-		}
-		
-		if (!ReadImageResources(io, handle)) {
-			throw("Error in Image Resource");
-		}
-		
-		if (!ReadLayerAndMaskInfoSection(io, handle)) {
-			throw("Error in Mask Info");
-		}
-		
-		Bitmap = ReadImageData(io, handle);
-		if (NULL == Bitmap) {
-			throw("Error in Image Data");
-		}
-
-		// set resolution info
-		if(NULL != Bitmap) {
-			unsigned res_x = 2835;	// 72 dpi
-			unsigned res_y = 2835;	// 72 dpi
-			if (_bResolutionInfoFilled) {
-				_resolutionInfo.GetResolutionInfo(res_x, res_y);
-			}
-			FreeImage_SetDotsPerMeterX(Bitmap, res_x);
-			FreeImage_SetDotsPerMeterY(Bitmap, res_y);	
-		}
-
-		// set ICC profile
-		FreeImage_CreateICCProfile(Bitmap, _iccProfile._ProfileData, _iccProfile._ProfileSize);
-		if ((flags & PSD_CMYK) == PSD_CMYK) {
-			short mode = _headerInfo._ColourMode;
-			if((mode == PSDP_CMYK) || (mode == PSDP_MULTICHANNEL)) {
-				FreeImage_GetICCProfile(Bitmap)->flags |= FIICC_COLOR_IS_CMYK;
-			}
-		}
-		
-	} catch(const char *text) {
-		FreeImage_OutputMessageProc(s_format_id, text);
-	}
-	catch(const std::exception& e) {
-		FreeImage_OutputMessageProc(s_format_id, "%s", e.what());
-	}
-
-	return Bitmap;
-} 
diff --git a/plugins/AdvaImg/src/FreeImage/PSDParser.h b/plugins/AdvaImg/src/FreeImage/PSDParser.h
deleted file mode 100644
index 15ab5425ca..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PSDParser.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// ==========================================================
-// Photoshop Loader
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// Based on LGPL code created and published by http://sourceforge.net/projects/elynx/
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef PSDPARSER_H
-#define PSDPARSER_H
-
-/**
-Table 2-12: File header section. 
-The file header contains the basic properties of the image. 
-*/
-typedef struct psdHeader {
-	BYTE Signature[4];	//! Always equal 8BPS, do not try to read the file if the signature does not match this value.
-	BYTE Version[2];	//! Always equal 1, do not read file if the version does not match this value.
-	char Reserved[6];	//! Must be zero.
-	BYTE Channels[2];	//! Number of channels including any alpha channels, supported range is 1 to 24.
-	BYTE Rows[4];		//! The height of the image in pixels. Supported range is 1 to 30,000.
-	BYTE Columns[4];	//! The width of the image in pixels. Supported range is 1 to 30,000.
-	BYTE Depth[2];		//! The number of bits per channel. Supported values are 1, 8, and 16.
-	BYTE Mode[2];		//! Colour mode of the file, Bitmap=0, Grayscale=1, Indexed=2, RGB=3, CMYK=4, Multichannel=7, Duotone=8, Lab=9. 
-} psdHeader;
-
-/**
-Table 2-12: HeaderInfo Color spaces
-@see psdHeader
-*/
-class psdHeaderInfo {
-public:
-	short _Channels;	//! Numer of channels including any alpha channels, supported range is 1 to 24.
-	int   _Height;		//! The height of the image in pixels. Supported range is 1 to 30,000.
-	int   _Width;		//! The width of the image in pixels. Supported range is 1 to 30,000.
-	short _BitsPerChannel;//! The number of bits per channel. Supported values are 1, 8, and 16.
-	short _ColourMode;	//! Colour mode of the file, Bitmap=0, Grayscale=1, Indexed=2, RGB=3, CMYK=4, Multichannel=7, Duotone=8, Lab=9. 
-
-public:
-	psdHeaderInfo();
-	~psdHeaderInfo();
-	/**
-	@return Returns the number of bytes read
-	*/
-	bool Read(FreeImageIO *io, fi_handle handle);
-};
-
-/**
-Table 2-13 Color mode data section
-
-Only indexed color and duotone have color mode data. For all other modes,
-this section is just 4 bytes: the length field, which is set to zero.
-For indexed color images, the length will be equal to 768, and the color data
-will contain the color table for the image, in non-interleaved order.
-For duotone images, the color data will contain the duotone specification,
-the format of which is not documented. Other applications that read
-Photoshop files can treat a duotone image as a grayscale image, and just
-preserve the contents of the duotone information when reading and writing
-the file.
-*/
-class psdColourModeData {
-public:
-	int _Length;			//! The length of the following color data
-	BYTE * _plColourData;	//! The color data
-
-public:
-	psdColourModeData();
-	~psdColourModeData();
-	/**
-	@return Returns the number of bytes read
-	*/
-	bool Read(FreeImageIO *io, fi_handle handle);
-	bool FillPalette(FIBITMAP *dib);
-};
-
-/**
-Table 2-1: Image resource block
-NB: Resource data is padded to make size even
-*/
-class psdImageResource {
-public:
-	int     _Length;
-	char    _OSType[4];	//! Photoshop always uses its signature, 8BIM
-	short   _ID;		//! Unique identifier. Image resource IDs on page 8
-	BYTE * _plName;		//! A pascal string, padded to make size even (a null name consists of two bytes of 0)
-	int     _Size;		//! Actual size of resource data. This does not include the Type, ID, Name or Size fields.
-
-public:
-	psdImageResource();
-	~psdImageResource();
-	void Reset();
-};
-
-/**
-Table A-6: ResolutionInfo structure
-This structure contains information about the resolution of an image. It is
-written as an image resource. See the Document file formats chapter for more
-details.
-*/
-class psdResolutionInfo {
-public:
-	short _widthUnit;	//! Display width as 1=inches; 2=cm; 3=points; 4=picas; 5=columns.
-	short _heightUnit;	//! Display height as 1=inches; 2=cm; 3=points; 4=picas; 5=columns.
-	short _hRes;		//! Horizontal resolution in pixels per inch.
-	short _vRes;		//! Vertical resolution in pixels per inch.
-	int _hResUnit;		//! 1=display horizontal resolution in pixels per inch; 2=display horizontal resolution in pixels per cm.
-	int _vResUnit;		//! 1=display vertical resolution in pixels per inch; 2=display vertical resolution in pixels per cm.
-
-public:
-	psdResolutionInfo();
-	~psdResolutionInfo();	
-	/**
-	@return Returns the number of bytes read
-	*/
-	int Read(FreeImageIO *io, fi_handle handle);
-	/**
-	@param res_x [out] X resolution in pixels/meter
-	@param res_y [out] Y resolution in pixels/meter
-	*/
-	void GetResolutionInfo(unsigned &res_x, unsigned &res_y);
-};
-
-// Obsolete - Photoshop 2.0
-class psdResolutionInfo_v2 {
-public:
-	short _Channels;
-	short _Rows;
-	short _Columns;
-	short _Depth;
-	short _Mode;
-	
-public:
-	psdResolutionInfo_v2();
-	~psdResolutionInfo_v2();
-	/**
-	@return Returns the number of bytes read
-	*/
-	int Read(FreeImageIO *io, fi_handle handle);
-};
-
-/**
-Table A-7: DisplayInfo Color spaces
-This structure contains display information about each channel. It is written as an image resource.
-*/
-class psdDisplayInfo {
-public:
-	short _ColourSpace;
-	short _Colour[4];
-	short _Opacity;  //! 0..100
-	BYTE _Kind;     //! selected = 0, protected = 1
-	BYTE _padding;  //! should be zero
-	
-public:
-	psdDisplayInfo();
-	~psdDisplayInfo();
-	/**
-	@return Returns the number of bytes read
-	*/
-	int Read(FreeImageIO *io, fi_handle handle);
-};
-
-/**
-Table 2-5: Thumbnail resource header
-Adobe Photoshop 5.0 and later stores thumbnail information for preview
-display in an image resource block. These resource blocks consist of an initial
-28 byte header, followed by a JFIF thumbnail in RGB (red, green, blue) order
-for both Macintosh and Windows. Adobe Photoshop 4.0 stored the
-thumbnail information in the same format except the data section is BGR
-(blue, green, red). The Adobe Photoshop 4.0 format is at resource ID 1033
-and the Adobe Photoshop 5.0 format is at resource ID 1036.
-*/
-class psdThumbnail {
-public:
-	int _Format;			//! = 1 (kJpegRGB). Also supports kRawRGB (0).
-	int _Width;				//! Width of thumbnail in pixels.
-	int _Height;			//! Height of thumbnail in pixels.
-	int _WidthBytes;		//! Padded row bytes as (width * bitspixel + 31) / 32 * 4.
-	int _Size;				//! Total size as widthbytes * height * planes
-	int _CompressedSize;	//! Size after compression. Used for consistentcy check. 
-	short _BitPerPixel;		//! = 24. Bits per pixel.
-	short _Planes;			//! = 1. Number of planes.
-	FIBITMAP * _dib;		//! JFIF data as uncompressed dib. Note: For resource ID 1033 the data is in BGR format.
-	
-public:
-	psdThumbnail();
-	~psdThumbnail();
-	FIBITMAP* getDib() { return _dib; }
-	/**
-	@return Returns the number of bytes read
-	*/
-	int Read(FreeImageIO *io, fi_handle handle, int iResourceSize, bool isBGR);
-
-private:
-	psdThumbnail(const psdThumbnail&);
-	psdThumbnail& operator=(const psdThumbnail&);
-};
-
-class psdICCProfile {
-public:
-	int _ProfileSize;
-	BYTE * _ProfileData;
-public:
-	psdICCProfile();
-	~psdICCProfile();
-	void clear();
-	/**
-	@return Returns the number of bytes read
-	*/
-	int Read(FreeImageIO *io, fi_handle handle, int size);
-};
-
-/**
-PSD loader
-*/
-class psdParser {
-private:
-	psdHeaderInfo			_headerInfo;
-	psdColourModeData		_colourModeData;
-	psdResolutionInfo		_resolutionInfo;
-	psdResolutionInfo_v2	_resolutionInfo_v2;
-	psdDisplayInfo			_displayInfo;
-	psdThumbnail			_thumbnail;
-	psdICCProfile			_iccProfile;
-
-	short _ColourCount;
-	short _TransparentIndex;
-	int _GlobalAngle;
-	bool _bResolutionInfoFilled;
-	bool _bResolutionInfoFilled_v2;
-	bool _bDisplayInfoFilled;
-	bool _bThumbnailFilled;
-	bool _bCopyright;
-
-	int _fi_flags;
-	int _fi_format_id;
-	
-private:
-	/**	Actually ignore it */
-	bool ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle handle);
-	FIBITMAP* ReadImageData(FreeImageIO *io, fi_handle handle);
-
-public:
-	psdParser();
-	~psdParser();
-	FIBITMAP* Load(FreeImageIO *io, fi_handle handle, int s_format_id, int flags=0);
-	/** Also used by the TIFF plugin */
-	bool ReadImageResources(FreeImageIO *io, fi_handle handle, LONG length=0);
-	/** Used by the TIFF plugin */
-	FIBITMAP* GetThumbnail() {
-		return _thumbnail.getDib();
-	}
-};
-
-#endif // PSDPARSER_H
-
diff --git a/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp b/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp
deleted file mode 100644
index 70b381f105..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// ==========================================================
-// Pixel access functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Ryan Rubley (ryan@lostreality.org)
-// - Riley McNiff (rmcniff@marexgroup.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-
-BYTE * DLL_CALLCONV
-FreeImage_GetScanLine(FIBITMAP *dib, int scanline) {
-	if(!FreeImage_HasPixels(dib)) {
-		return NULL;
-	}
-	return CalculateScanLine(FreeImage_GetBits(dib), FreeImage_GetPitch(dib), scanline);
-}
-
-BOOL DLL_CALLCONV
-FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) {
-	BYTE shift;
-
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP))
-		return FALSE;
-
-	if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) {
-		BYTE *bits = FreeImage_GetScanLine(dib, y);
-
-		switch(FreeImage_GetBPP(dib)) {
-			case 1:
-				*value = (bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
-				break;
-			case 4:
-				shift = (BYTE)((1 - x % 2) << 2);
-				*value = (bits[x >> 1] & (0x0F << shift)) >> shift;
-				break;
-			case 8:
-				*value = bits[x];
-				break;
-			default:
-				return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP))
-		return FALSE;
-
-	if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) {
-		BYTE *bits = FreeImage_GetScanLine(dib, y);
-
-		switch(FreeImage_GetBPP(dib)) {
-			case 16:
-			{
-				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
-				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-					value->rgbBlue		= (BYTE)((((*pixel & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
-					value->rgbGreen		= (BYTE)((((*pixel & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F);
-					value->rgbRed		= (BYTE)((((*pixel & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
-					value->rgbReserved	= 0;
-				} else {
-					value->rgbBlue		= (BYTE)((((*pixel & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F);
-					value->rgbGreen		= (BYTE)((((*pixel & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F);
-					value->rgbRed		= (BYTE)((((*pixel & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
-					value->rgbReserved	= 0;
-				}
-				break;
-			}
-			case 24:
-				bits += 3*x;
-				value->rgbBlue		= bits[FI_RGBA_BLUE];	// B
-				value->rgbGreen		= bits[FI_RGBA_GREEN];	// G
-				value->rgbRed		= bits[FI_RGBA_RED];	// R
-				value->rgbReserved	= 0;
-				break;
-			case 32:
-				bits += 4*x;
-				value->rgbBlue		= bits[FI_RGBA_BLUE];	// B
-				value->rgbGreen		= bits[FI_RGBA_GREEN];	// G
-				value->rgbRed		= bits[FI_RGBA_RED];	// R
-				value->rgbReserved	= bits[FI_RGBA_ALPHA];	// A
-				break;
-			default:
-				return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) {
-	BYTE shift;
-
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP))
-		return FALSE;
-
-	if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) {
-		BYTE *bits = FreeImage_GetScanLine(dib, y);
-
-		switch(FreeImage_GetBPP(dib)) {
-			case 1:
-				*value ? bits[x >> 3] |= (0x80 >> (x & 0x7)) : bits[x >> 3] &= (0xFF7F >> (x & 0x7));
-				break;
-			case 4:
-				shift = (BYTE)((1 - x % 2) << 2);
-				bits[x >> 1] &= ~(0x0F << shift);
-				bits[x >> 1] |= ((*value & 0x0F) << shift);
-				break;
-			case 8:
-				bits[x] = *value;
-				break;
-			default:
-				return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
-	if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP))
-		return FALSE;
-
-	if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) {
-		BYTE *bits = FreeImage_GetScanLine(dib, y);
-
-		switch(FreeImage_GetBPP(dib)) {
-			case 16:
-			{
-				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
-				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
-					*pixel = ((value->rgbBlue >> 3) << FI16_565_BLUE_SHIFT) |
-						((value->rgbGreen >> 2) << FI16_565_GREEN_SHIFT) |
-						((value->rgbRed >> 3) << FI16_565_RED_SHIFT);
-				} else {
-					*pixel = ((value->rgbBlue >> 3) << FI16_555_BLUE_SHIFT) |
-						((value->rgbGreen >> 3) << FI16_555_GREEN_SHIFT) |
-						((value->rgbRed >> 3) << FI16_555_RED_SHIFT);
-				}
-				break;
-			}
-			case 24:
-				bits += 3*x;
-				bits[FI_RGBA_BLUE]	= value->rgbBlue;	// B
-				bits[FI_RGBA_GREEN] = value->rgbGreen;	// G
-				bits[FI_RGBA_RED]	= value->rgbRed;	// R
-				break;
-			case 32:
-				bits += 4*x;
-				bits[FI_RGBA_BLUE]	= value->rgbBlue;		// B
-				bits[FI_RGBA_GREEN] = value->rgbGreen;		// G
-				bits[FI_RGBA_RED]	= value->rgbRed;		// R
-				bits[FI_RGBA_ALPHA] = value->rgbReserved;	// A
-				break;
-			default:
-				return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/Plugin.cpp b/plugins/AdvaImg/src/FreeImage/Plugin.cpp
deleted file mode 100644
index 1bc13412a5..0000000000
--- a/plugins/AdvaImg/src/FreeImage/Plugin.cpp
+++ /dev/null
@@ -1,822 +0,0 @@
-// =====================================================================
-// FreeImage Plugin Interface
-//
-// Design and implementation by
-// - Floris van den Berg (floris@geekhq.nl)
-// - Rui Lopes (ruiglopes@yahoo.com)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-// - Petr Pytelka (pyta@lightcomp.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// =====================================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#ifdef _WIN32
-#include <windows.h>
-#include <io.h>
-#else
-#include <ctype.h>
-#endif // _WIN32
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageIO.h"
-#include "Plugin.h"
-
-#include "../Metadata/FreeImageTag.h"
-
-// =====================================================================
-
-using namespace std;
-
-// =====================================================================
-// Plugin search list
-// =====================================================================
-
-const char *
-s_search_list[] = {
-	"",
-	"plugins\\",
-};
-
-static int s_search_list_size = sizeof(s_search_list) / sizeof(char *);
-static PluginList *s_plugins = NULL;
-static int s_plugin_reference_count = 0;
-
-
-// =====================================================================
-// Reimplementation of stricmp (it is not supported on some systems)
-// =====================================================================
-
-int
-FreeImage_stricmp(const char *s1, const char *s2) {
-	int c1, c2;
-
-	do {
-		c1 = tolower(*s1++);
-		c2 = tolower(*s2++);
-	} while (c1 && c1 == c2);
-
-	return c1 - c2;
-}
-
-// =====================================================================
-//  Implementation of PluginList
-// =====================================================================
-
-PluginList::PluginList() :
-m_plugin_map(),
-m_node_count(0) {
-}
-
-FREE_IMAGE_FORMAT
-PluginList::AddNode(FI_InitProc init_proc, void *instance, const char *format, const char *description, const char *extension, const char *regexpr) {
-	if (init_proc != NULL) {
-		PluginNode *node = new(std::nothrow) PluginNode;
-		Plugin *plugin = new(std::nothrow) Plugin;
-		if(!node || !plugin) {
-			if(node) delete node;
-			if(plugin) delete plugin;
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, FI_MSG_ERROR_MEMORY);
-			return FIF_UNKNOWN;
-		}
-
-		memset(plugin, 0, sizeof(Plugin));
-
-		// fill-in the plugin structure
-		// note we have memset to 0, so all unset pointers should be NULL)
-
-		init_proc(plugin, (int)m_plugin_map.size());
-
-		// get the format string (two possible ways)
-
-		const char *the_format = NULL;
-
-		if (format != NULL) {
-			the_format = format;
-		} else if (plugin->format_proc != NULL) {
-			the_format = plugin->format_proc();
-		}
-
-		// add the node if it wasn't there already
-
-		if (the_format != NULL) {
-			node->m_id = (int)m_plugin_map.size();
-			node->m_instance = instance;
-			node->m_plugin = plugin;
-			node->m_format = format;
-			node->m_description = description;
-			node->m_extension = extension;
-			node->m_regexpr = regexpr;
-			node->m_enabled = TRUE;
-
-			m_plugin_map[(const int)m_plugin_map.size()] = node;
-
-			return (FREE_IMAGE_FORMAT)node->m_id;
-		}
-
-		// something went wrong while allocating the plugin... cleanup
-
-		delete plugin;
-		delete node;
-	}
-
-	return FIF_UNKNOWN;
-}
-
-PluginNode *
-PluginList::FindNodeFromFormat(const char *format) {
-	for (map<int, PluginNode *>::iterator i = m_plugin_map.begin(); i != m_plugin_map.end(); ++i) {
-		const char *the_format = ((*i).second->m_format != NULL) ? (*i).second->m_format : (*i).second->m_plugin->format_proc();
-
-		if ((*i).second->m_enabled) {
-			if (FreeImage_stricmp(the_format, format) == 0) {
-				return (*i).second;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-PluginNode *
-PluginList::FindNodeFromMime(const char *mime) {
-	for (map<int, PluginNode *>::iterator i = m_plugin_map.begin(); i != m_plugin_map.end(); ++i) {
-		const char *the_mime = ((*i).second->m_plugin->mime_proc != NULL) ? (*i).second->m_plugin->mime_proc() : "";
-
-		if ((*i).second->m_enabled) {
-			if ((the_mime != NULL) && (strcmp(the_mime, mime) == 0)) {
-				return (*i).second;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-PluginNode *
-PluginList::FindNodeFromFIF(int node_id) {
-	map<int, PluginNode *>::iterator i = m_plugin_map.find(node_id);
-
-	if (i != m_plugin_map.end()) {
-		return (*i).second;
-	}
-
-	return NULL;
-}
-
-int
-PluginList::Size() const {
-	return (int)m_plugin_map.size();
-}
-
-BOOL
-PluginList::IsEmpty() const {
-	return m_plugin_map.empty();
-}
-
-PluginList::~PluginList() {
-	for (map<int, PluginNode *>::iterator i = m_plugin_map.begin(); i != m_plugin_map.end(); ++i) {
-#ifdef _WIN32
-		if ((*i).second->m_instance != NULL) {
-			FreeLibrary((HINSTANCE)(*i).second->m_instance);
-		}
-#endif
-		delete (*i).second->m_plugin;
-		delete ((*i).second);
-	}
-}
-
-// =====================================================================
-// Retrieve a pointer to the plugin list container
-// =====================================================================
-
-PluginList * DLL_CALLCONV
-FreeImage_GetPluginList() {
-	return s_plugins;
-}
-
-// =====================================================================
-// Plugin System Initialization
-// =====================================================================
-
-void DLL_CALLCONV
-FreeImage_Initialise(BOOL load_local_plugins_only) {
-	if (s_plugin_reference_count++ == 0) {
-		
-		/*
-		Note: initialize all singletons here 
-		in order to avoid race conditions with multi-threading
-		*/
-
-		// initialise the TagLib singleton
-		TagLib& s = TagLib::instance();
-
-		// internal plugin initialization
-
-		s_plugins = new(std::nothrow) PluginList;
-
-		if (s_plugins) {
-			/* NOTE : 
-			The order used to initialize internal plugins below MUST BE the same order 
-			as the one used to define the FREE_IMAGE_FORMAT enum. 
-			*/
-			s_plugins->AddNode(InitBMP);
-			s_plugins->AddNode(InitICO);
-			s_plugins->AddNode(InitJPEG);
-			s_plugins->AddNode(InitPNG);
-			s_plugins->AddNode(InitGIF);
-			//s_plugins->AddNode(InitJNG);
-			//s_plugins->AddNode(InitKOALA);
-			//s_plugins->AddNode(InitIFF);
-			//s_plugins->AddNode(InitMNG);
-			//s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
-			//s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
-			//s_plugins->AddNode(InitPCD);
-			//s_plugins->AddNode(InitPCX);
-			//s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
-			//s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
-			//s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
-			//s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
-			//s_plugins->AddNode(InitRAS);
-			//s_plugins->AddNode(InitTARGA);
-			//s_plugins->AddNode(InitTIFF);
-			//s_plugins->AddNode(InitWBMP);
-			//s_plugins->AddNode(InitPSD);
-			//s_plugins->AddNode(InitCUT);
-			//s_plugins->AddNode(InitXBM);
-			//s_plugins->AddNode(InitXPM);
-			//s_plugins->AddNode(InitDDS);
-        	//s_plugins->AddNode(InitHDR);
-			//s_plugins->AddNode(InitG3);
-			//s_plugins->AddNode(InitSGI);
-			//s_plugins->AddNode(InitEXR);
-			//s_plugins->AddNode(InitJ2K);
-			//s_plugins->AddNode(InitJP2);
-			//s_plugins->AddNode(InitPFM);
-			//s_plugins->AddNode(InitPICT);
-			//s_plugins->AddNode(InitRAW);
-			//s_plugins->AddNode(InitWEBP);
-//#if !(defined(_MSC_VER) && (_MSC_VER <= 1310))
-			//s_plugins->AddNode(InitJXR);
-//#endif // unsupported by MS Visual Studio 2003 !!!
-			
-			// external plugin initialization
-
-#ifdef _WIN32
-			if (!load_local_plugins_only) {
-				int count = 0;
-				char buffer[MAX_PATH + 200];
-				wchar_t current_dir[2 * _MAX_PATH], module[2 * _MAX_PATH];
-				BOOL bOk = FALSE;
-
-				// store the current directory. then set the directory to the application location
-
-				if (GetCurrentDirectoryW(2 * _MAX_PATH, current_dir) != 0) {
-					if (GetModuleFileNameW(NULL, module, 2 * _MAX_PATH) != 0) {
-						wchar_t *last_point = wcsrchr(module, L'\\');
-
-						if (last_point) {
-							*last_point = L'\0';
-
-							bOk = SetCurrentDirectoryW(module);
-						}
-					}
-				}
-
-				// search for plugins
-
-				while (count < s_search_list_size) {
-					_finddata_t find_data;
-					long find_handle;
-
-					strcpy(buffer, s_search_list[count]);
-					strcat(buffer, "*.fip");
-
-					if ((find_handle = (long)_findfirst(buffer, &find_data)) != -1L) {
-						do {
-							strcpy(buffer, s_search_list[count]);
-							strncat(buffer, find_data.name, MAX_PATH + 200);
-
-							HINSTANCE instance = LoadLibraryA(buffer);
-
-							if (instance != NULL) {
-								FARPROC proc_address = GetProcAddress(instance, "_Init@8");
-
-								if (proc_address != NULL) {
-									s_plugins->AddNode((FI_InitProc)proc_address, (void *)instance);
-								} else {
-									FreeLibrary(instance);
-								}
-							}
-						} while (_findnext(find_handle, &find_data) != -1L);
-
-						_findclose(find_handle);
-					}
-
-					count++;
-				}
-
-				// restore the current directory
-
-				if (bOk) {
-					SetCurrentDirectoryW(current_dir);
-				}
-			}
-#endif // _WIN32
-		}
-	}
-}
-
-void DLL_CALLCONV
-FreeImage_DeInitialise() {
-	--s_plugin_reference_count;
-
-	if (s_plugin_reference_count == 0) {
-		delete s_plugins;
-	}
-}
-
-// =====================================================================
-// Open and close a bitmap
-// =====================================================================
-
-void * DLL_CALLCONV
-FreeImage_Open(PluginNode *node, FreeImageIO *io, fi_handle handle, BOOL open_for_reading) {
-	if (node->m_plugin->open_proc != NULL) {
-       return node->m_plugin->open_proc(io, handle, open_for_reading);
-	}
-
-	return NULL;
-}
-
-void DLL_CALLCONV
-FreeImage_Close(PluginNode *node, FreeImageIO *io, fi_handle handle, void *data) {
-	if (node->m_plugin->close_proc != NULL) {
-		node->m_plugin->close_proc(io, handle, data);
-	}
-}
-
-// =====================================================================
-// Plugin System Load/Save Functions
-// =====================================================================
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_LoadFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags) {
-	if ((fif >= 0) && (fif < FreeImage_GetFIFCount())) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-		
-		if (node != NULL) {
-			if(node->m_plugin->load_proc != NULL) {
-				void *data = FreeImage_Open(node, io, handle, TRUE);
-					
-				FIBITMAP *bitmap = node->m_plugin->load_proc(io, handle, -1, flags, data);
-					
-				FreeImage_Close(node, io, handle, data);
-					
-				return bitmap;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_Load(FREE_IMAGE_FORMAT fif, const char *filename, int flags) {
-	FreeImageIO io;
-	SetDefaultIO(&io);
-	
-	FILE *handle = fopen(filename, "rb");
-
-	if (handle) {
-		FIBITMAP *bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)handle, flags);
-
-		fclose(handle);
-
-		return bitmap;
-	} else {
-		FreeImage_OutputMessageProc((int)fif, "FreeImage_Load: failed to open file %s", filename);
-	}
-
-	return NULL;
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_LoadU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags) {
-	FreeImageIO io;
-	SetDefaultIO(&io);
-#ifdef _WIN32	
-	FILE *handle = _wfopen(filename, L"rb");
-
-	if (handle) {
-		FIBITMAP *bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)handle, flags);
-
-		fclose(handle);
-
-		return bitmap;
-	} else {
-		FreeImage_OutputMessageProc((int)fif, "FreeImage_LoadU: failed to open input file");
-	}
-#endif
-	return NULL;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SaveToHandle(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FreeImageIO *io, fi_handle handle, int flags) {
-	// cannot save "header only" formats
-	if(FreeImage_HasPixels(dib) == FALSE) {
-		FreeImage_OutputMessageProc((int)fif, "FreeImage_SaveToHandle: cannot save \"header only\" formats");
-		return FALSE;
-	}
-
-	if ((fif >= 0) && (fif < FreeImage_GetFIFCount())) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-		
-		if (node) {
-			if(node->m_plugin->save_proc != NULL) {
-				void *data = FreeImage_Open(node, io, handle, FALSE);
-					
-				BOOL result = node->m_plugin->save_proc(io, dib, handle, -1, flags, data);
-					
-				FreeImage_Close(node, io, handle, data);
-					
-				return result;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-
-BOOL DLL_CALLCONV
-FreeImage_Save(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const char *filename, int flags) {
-	FreeImageIO io;
-	SetDefaultIO(&io);
-	
-	FILE *handle = fopen(filename, "w+b");
-	
-	if (handle) {
-		BOOL success = FreeImage_SaveToHandle(fif, dib, &io, (fi_handle)handle, flags);
-
-		fclose(handle);
-
-		return success;
-	} else {
-		FreeImage_OutputMessageProc((int)fif, "FreeImage_Save: failed to open file %s", filename);
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_SaveU(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const wchar_t *filename, int flags) {
-	FreeImageIO io;
-	SetDefaultIO(&io);
-#ifdef _WIN32	
-	FILE *handle = _wfopen(filename, L"w+b");
-	
-	if (handle) {
-		BOOL success = FreeImage_SaveToHandle(fif, dib, &io, (fi_handle)handle, flags);
-
-		fclose(handle);
-
-		return success;
-	} else {
-		FreeImage_OutputMessageProc((int)fif, "FreeImage_SaveU: failed to open output file");
-	}
-#endif
-	return FALSE;
-}
-
-// =====================================================================
-// Plugin construction + enable/disable functions
-// =====================================================================
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_RegisterLocalPlugin(FI_InitProc proc_address, const char *format, const char *description, const char *extension, const char *regexpr) {
-	return s_plugins->AddNode(proc_address, NULL, format, description, extension, regexpr);
-}
-
-#ifdef _WIN32
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_RegisterExternalPlugin(const char *path, const char *format, const char *description, const char *extension, const char *regexpr) {
-	if (path != NULL) {
-		HINSTANCE instance = LoadLibraryA(path);
-
-		if (instance != NULL) {
-			FARPROC proc_address = GetProcAddress(instance, "_Init@8");
-
-			FREE_IMAGE_FORMAT result = s_plugins->AddNode((FI_InitProc)proc_address, (void *)instance, format, description, extension, regexpr);
-
-			if (result == FIF_UNKNOWN)
-				FreeLibrary(instance);
-
-			return result;
-		}
-	}
-
-	return FIF_UNKNOWN;
-}
-#endif // _WIN32
-
-int DLL_CALLCONV
-FreeImage_SetPluginEnabled(FREE_IMAGE_FORMAT fif, BOOL enable) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		if (node != NULL) {
-			BOOL previous_state = node->m_enabled;
-
-			node->m_enabled = enable;
-
-			return previous_state;
-		}
-	}
-
-	return -1;
-}
-
-int DLL_CALLCONV
-FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? node->m_enabled : FALSE;
-	}
-	
-	return -1;
-}
-
-// =====================================================================
-// Plugin Access Functions
-// =====================================================================
-
-int DLL_CALLCONV
-FreeImage_GetFIFCount() {
-	return (s_plugins != NULL) ? s_plugins->Size() : 0;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFIFFromFormat(const char *format) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFormat(format);
-
-		return (node != NULL) ? (FREE_IMAGE_FORMAT)node->m_id : FIF_UNKNOWN;
-	}
-
-	return FIF_UNKNOWN;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFIFFromMime(const char *mime) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromMime(mime);
-
-		return (node != NULL) ? (FREE_IMAGE_FORMAT)node->m_id : FIF_UNKNOWN;
-	}
-
-	return FIF_UNKNOWN;
-}
-
-const char * DLL_CALLCONV
-FreeImage_GetFormatFromFIF(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? (node->m_format != NULL) ? node->m_format : node->m_plugin->format_proc() : NULL;
-	}
-
-	return NULL;
-}
-
-const char * DLL_CALLCONV 
-FreeImage_GetFIFMimeType(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? (node->m_plugin != NULL) ? ( node->m_plugin->mime_proc != NULL )? node->m_plugin->mime_proc() : NULL : NULL : NULL;
-	}
-
-	return NULL;
-}
-
-const char * DLL_CALLCONV
-FreeImage_GetFIFExtensionList(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? (node->m_extension != NULL) ? node->m_extension : (node->m_plugin->extension_proc != NULL) ? node->m_plugin->extension_proc() : NULL : NULL;
-	}
-
-	return NULL;
-}
-
-const char * DLL_CALLCONV
-FreeImage_GetFIFDescription(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? (node->m_description != NULL) ? node->m_description : (node->m_plugin->description_proc != NULL) ? node->m_plugin->description_proc() : NULL : NULL;
-	}
-
-	return NULL;
-}
-
-const char * DLL_CALLCONV
-FreeImage_GetFIFRegExpr(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? (node->m_regexpr != NULL) ? node->m_regexpr : (node->m_plugin->regexpr_proc != NULL) ? node->m_plugin->regexpr_proc() : NULL : NULL;
-	}
-
-	return NULL;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsReading(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? node->m_plugin->load_proc != NULL : FALSE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsWriting(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? node->m_plugin->save_proc != NULL : FALSE ;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsExportBPP(FREE_IMAGE_FORMAT fif, int depth) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? 
-			(node->m_plugin->supports_export_bpp_proc != NULL) ? 
-				node->m_plugin->supports_export_bpp_proc(depth) : FALSE : FALSE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsExportType(FREE_IMAGE_FORMAT fif, FREE_IMAGE_TYPE type) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? 
-			(node->m_plugin->supports_export_type_proc != NULL) ? 
-				node->m_plugin->supports_export_type_proc(type) : FALSE : FALSE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? 
-			(node->m_plugin->supports_icc_profiles_proc != NULL) ? 
-				node->m_plugin->supports_icc_profiles_proc() : FALSE : FALSE;
-	}
-
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_FIFSupportsNoPixels(FREE_IMAGE_FORMAT fif) {
-	if (s_plugins != NULL) {
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		return (node != NULL) ? 
-			(node->m_plugin->supports_no_pixels_proc != NULL) ? 
-				node->m_plugin->supports_no_pixels_proc() : FALSE : FALSE;
-	}
-
-	return FALSE;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV
-FreeImage_GetFIFFromFilename(const char *filename) {
-	if (filename != NULL) {
-		const char *extension;
-
-		// get the proper extension if we received a filename
-
-		char *place = strrchr((char *)filename, '.');	
-		extension = (place != NULL) ? ++place : filename;
-
-		// look for the extension in the plugin table
-
-		for (int i = 0; i < FreeImage_GetFIFCount(); ++i) {
-
-			if (s_plugins->FindNodeFromFIF(i)->m_enabled) {
-
-				// compare the format id with the extension
-
-				if (FreeImage_stricmp(FreeImage_GetFormatFromFIF((FREE_IMAGE_FORMAT)i), extension) == 0) {
-					return (FREE_IMAGE_FORMAT)i;
-				} else {
-					// make a copy of the extension list and split it
-
-					char *copy = (char *)malloc(strlen(FreeImage_GetFIFExtensionList((FREE_IMAGE_FORMAT)i)) + 1);
-					memset(copy, 0, strlen(FreeImage_GetFIFExtensionList((FREE_IMAGE_FORMAT)i)) + 1);
-					memcpy(copy, FreeImage_GetFIFExtensionList((FREE_IMAGE_FORMAT)i), strlen(FreeImage_GetFIFExtensionList((FREE_IMAGE_FORMAT)i)));
-
-					// get the first token
-
-					char *token = strtok(copy, ",");
-
-					while (token != NULL) {
-						if (FreeImage_stricmp(token, extension) == 0) {
-							free(copy);
-
-								return (FREE_IMAGE_FORMAT)i;
-						}
-
-						token = strtok(NULL, ",");
-					}
-
-					// free the copy of the extension list
-
-					free(copy);
-				}	
-			}
-		}
-	}
-
-	return FIF_UNKNOWN;
-}
-
-FREE_IMAGE_FORMAT DLL_CALLCONV 
-FreeImage_GetFIFFromFilenameU(const wchar_t *filename) {
-#ifdef _WIN32	
-	if (filename == NULL) return FIF_UNKNOWN;
-    	
-	// get the proper extension if we received a filename
-	wchar_t *place = wcsrchr((wchar_t *)filename, '.');	
-	if (place == NULL) return FIF_UNKNOWN;
-	// convert to single character - no national chars in extensions
-	char *extension = (char *)malloc(wcslen(place)+1);
-	unsigned int i=0;
-	for(; i < wcslen(place); i++) // convert 16-bit to 8-bit
-		extension[i] = (char)(place[i] & 0x00FF);
-	// set terminating 0
-	extension[i]=0;
-	FREE_IMAGE_FORMAT fRet = FreeImage_GetFIFFromFilename(extension);
-	free(extension);
-
-	return fRet;
-#else
-	return FIF_UNKNOWN;
-#endif // _WIN32
-}
-
-BOOL DLL_CALLCONV
-FreeImage_Validate(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle) {
-	if (s_plugins != NULL) {
-		BOOL validated = FALSE;
-
-		PluginNode *node = s_plugins->FindNodeFromFIF(fif);
-
-		if (node) {
-			long tell = io->tell_proc(handle);
-
-			validated = (node != NULL) ? (node->m_enabled) ? (node->m_plugin->validate_proc != NULL) ? node->m_plugin->validate_proc(io, handle) : FALSE : FALSE : FALSE;
-
-			io->seek_proc(handle, tell, SEEK_SET);
-		}
-
-		return validated;
-	}
-
-	return FALSE;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp b/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp
deleted file mode 100644
index 13206f7b71..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp
+++ /dev/null
@@ -1,1494 +0,0 @@
-// ==========================================================
-// BMP Loader and Writer
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Markus Loibl (markus.loibl@epost.de)
-// - Martin Weber (martweb@gmx.net)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Michal Novotny (michal@etc.cz)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   Constants + headers
-// ----------------------------------------------------------
-
-static const BYTE RLE_COMMAND     = 0;
-static const BYTE RLE_ENDOFLINE   = 0;
-static const BYTE RLE_ENDOFBITMAP = 1;
-static const BYTE RLE_DELTA       = 2;
-
-static const BYTE BI_RGB            = 0;	// compression: none
-static const BYTE BI_RLE8           = 1;	// compression: RLE 8-bit/pixel
-static const BYTE BI_RLE4           = 2;	// compression: RLE 4-bit/pixel
-static const BYTE BI_BITFIELDS      = 3;	// compression: Bit field or Huffman 1D compression for BITMAPCOREHEADER2
-static const BYTE BI_JPEG           = 4;	// compression: JPEG or RLE-24 compression for BITMAPCOREHEADER2
-static const BYTE BI_PNG            = 5;	// compression: PNG
-static const BYTE BI_ALPHABITFIELDS = 6;	// compression: Bit field (this value is valid in Windows CE .NET 4.0 and later)
-
-// ----------------------------------------------------------
-
-#ifdef _WIN32
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif
-
-typedef struct tagBITMAPCOREHEADER {
-  DWORD   bcSize;
-  WORD    bcWidth;
-  WORD    bcHeight;
-  WORD    bcPlanes;
-  WORD    bcBitCnt;
-} BITMAPCOREHEADER, *PBITMAPCOREHEADER; 
-
-typedef struct tagBITMAPINFOOS2_1X_HEADER {
-  DWORD  biSize;
-  WORD   biWidth;
-  WORD   biHeight; 
-  WORD   biPlanes; 
-  WORD   biBitCount;
-} BITMAPINFOOS2_1X_HEADER, *PBITMAPINFOOS2_1X_HEADER; 
-
-typedef struct tagBITMAPFILEHEADER {
-  WORD    bfType;		//! The file type
-  DWORD   bfSize;		//! The size, in bytes, of the bitmap file
-  WORD    bfReserved1;	//! Reserved; must be zero
-  WORD    bfReserved2;	//! Reserved; must be zero
-  DWORD   bfOffBits;	//! The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits
-} BITMAPFILEHEADER, *PBITMAPFILEHEADER;
-
-#ifdef _WIN32
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif
-
-// ==========================================================
-// Plugin Interface
-// ==========================================================
-
-static int s_format_id;
-
-// ==========================================================
-// Internal functions
-// ==========================================================
-
-#ifdef FREEIMAGE_BIGENDIAN
-static void
-SwapInfoHeader(BITMAPINFOHEADER *header) {
-	SwapLong(&header->biSize);
-	SwapLong((DWORD *)&header->biWidth);
-	SwapLong((DWORD *)&header->biHeight);
-	SwapShort(&header->biPlanes);
-	SwapShort(&header->biBitCount);
-	SwapLong(&header->biCompression);
-	SwapLong(&header->biSizeImage);
-	SwapLong((DWORD *)&header->biXPelsPerMeter);
-	SwapLong((DWORD *)&header->biYPelsPerMeter);
-	SwapLong(&header->biClrUsed);
-	SwapLong(&header->biClrImportant);
-}
-
-static void
-SwapCoreHeader(BITMAPCOREHEADER *header) {
-	SwapLong(&header->bcSize);
-	SwapShort(&header->bcWidth);
-	SwapShort(&header->bcHeight);
-	SwapShort(&header->bcPlanes);
-	SwapShort(&header->bcBitCnt);
-}
-
-static void
-SwapOS21XHeader(BITMAPINFOOS2_1X_HEADER *header) {
-	SwapLong(&header->biSize);
-	SwapShort(&header->biWidth);
-	SwapShort(&header->biHeight);
-	SwapShort(&header->biPlanes);
-	SwapShort(&header->biBitCount);
-}
-
-static void
-SwapFileHeader(BITMAPFILEHEADER *header) {
-	SwapShort(&header->bfType);
-  	SwapLong(&header->bfSize);
-  	SwapShort(&header->bfReserved1);
-  	SwapShort(&header->bfReserved2);
-	SwapLong(&header->bfOffBits);
-}
-#endif
-
-// --------------------------------------------------------------------------
-
-/**
-Load uncompressed image pixels for 1-, 4-, 8-, 16-, 24- and 32-bit dib
-@param io FreeImage IO
-@param handle FreeImage IO handle
-@param dib Image to be loaded 
-@param height Image height
-@param pitch Image pitch
-@param bit_count Image bit-depth (1-, 4-, 8-, 16-, 24- or 32-bit)
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-LoadPixelData(FreeImageIO *io, fi_handle handle, FIBITMAP *dib, int height, unsigned pitch, unsigned bit_count) {
-	unsigned count = 0;
-
-	// Load pixel data
-	// NB: height can be < 0 for BMP data
-	if (height > 0) {
-		count = io->read_proc((void *)FreeImage_GetBits(dib), height * pitch, 1, handle);
-		if(count != 1) {
-			return FALSE;
-		}
-	} else {
-		int positiveHeight = abs(height);
-		for (int c = 0; c < positiveHeight; ++c) {
-			count = io->read_proc((void *)FreeImage_GetScanLine(dib, positiveHeight - c - 1), pitch, 1, handle);
-			if(count != 1) {
-				return FALSE;
-			}
-		}
-	}
-
-	// swap as needed
-#ifdef FREEIMAGE_BIGENDIAN
-	if (bit_count == 16) {
-		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
-			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				SwapShort(pixel);
-				pixel++;
-			}
-		}
-	}
-#endif
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-	if (bit_count == 24 || bit_count == 32) {
-		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			BYTE *pixel = FreeImage_GetScanLine(dib, y);
-			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				INPLACESWAP(pixel[0], pixel[2]);
-				pixel += (bit_count >> 3);
-			}
-		}
-	}
-#endif
-
-	return TRUE;
-}
-
-/**
-Load image pixels for 4-bit RLE compressed dib
-@param io FreeImage IO
-@param handle FreeImage IO handle
-@param width Image width
-@param height Image height
-@param dib Image to be loaded 
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-LoadPixelDataRLE4(FreeImageIO *io, fi_handle handle, int width, int height, FIBITMAP *dib) {
-	int status_byte = 0;
-	BYTE second_byte = 0;
-	int bits = 0;
-
-	BYTE *pixels = NULL;	// temporary 8-bit buffer
-
-	try {
-		height = abs(height);
-
-		pixels = (BYTE*)malloc(width * height * sizeof(BYTE));
-		if(!pixels) throw(1);
-		memset(pixels, 0, width * height * sizeof(BYTE));
-
-		BYTE *q = pixels;
-		BYTE *end = pixels + height * width;
-
-		for (int scanline = 0; scanline < height; ) {
-			if (q < pixels || q  >= end) {
-				break;
-			}
-			if(io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) {
-				throw(1);
-			}
-			if (status_byte != 0)	{
-				status_byte = (int)MIN((size_t)status_byte, (size_t)(end - q));
-				// Encoded mode
-				if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
-					throw(1);
-				}
-				for (int i = 0; i < status_byte; i++)	{
-					*q++=(BYTE)((i & 0x01) ? (second_byte & 0x0f) : ((second_byte >> 4) & 0x0f));
-				}
-				bits += status_byte;
-			}
-			else {
-				// Escape mode
-				if(io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) {
-					throw(1);
-				}
-				switch (status_byte) {
-					case RLE_ENDOFLINE:
-					{
-						// End of line
-						bits = 0;
-						scanline++;
-						q = pixels + scanline*width;
-					}
-					break;
-
-					case RLE_ENDOFBITMAP:
-						// End of bitmap
-						q = end;
-						break;
-
-					case RLE_DELTA:
-					{
-						// read the delta values
-
-						BYTE delta_x = 0;
-						BYTE delta_y = 0;
-
-						if(io->read_proc(&delta_x, sizeof(BYTE), 1, handle) != 1) {
-							throw(1);
-						}
-						if(io->read_proc(&delta_y, sizeof(BYTE), 1, handle) != 1) {
-							throw(1);
-						}
-
-						// apply them
-
-						bits += delta_x;
-						scanline += delta_y;
-						q = pixels + scanline*width+bits;
-					}
-					break;
-
-					default:
-					{
-						// Absolute mode
-						status_byte = (int)MIN((size_t)status_byte, (size_t)(end - q));
-						for (int i = 0; i < status_byte; i++) {
-							if ((i & 0x01) == 0) {
-								if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
-									throw(1);
-								}
-							}
-							*q++=(BYTE)((i & 0x01) ? (second_byte & 0x0f) : ((second_byte >> 4) & 0x0f));
-						}
-						bits += status_byte;
-						// Read pad byte
-						if (((status_byte & 0x03) == 1) || ((status_byte & 0x03) == 2)) {
-							BYTE padding = 0;
-							if(io->read_proc(&padding, sizeof(BYTE), 1, handle) != 1) {
-								throw(1);
-							}
-						}
-					}
-					break;
-				}
-			}
-		}
-		
-		{
-			// Convert to 4-bit
-			for(int y = 0; y < height; y++) {
-				const BYTE *src = (BYTE*)pixels + y * width;
-				BYTE *dst = FreeImage_GetScanLine(dib, y);
-
-				BOOL hinibble = TRUE;
-
-				for (int cols = 0; cols < width; cols++){
-					if (hinibble) {
-						dst[cols >> 1] = (src[cols] << 4);
-					} else {
-						dst[cols >> 1] |= src[cols];
-					}
-
-					hinibble = !hinibble;
-				}
-			}
-		}
-
-		free(pixels);
-
-		return TRUE;
-
-	} catch(int) {
-		if(pixels) free(pixels);
-		return FALSE;
-	}
-}
-
-/**
-Load image pixels for 8-bit RLE compressed dib
-@param io FreeImage IO
-@param handle FreeImage IO handle
-@param width Image width
-@param height Image height
-@param dib Image to be loaded 
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-LoadPixelDataRLE8(FreeImageIO *io, fi_handle handle, int width, int height, FIBITMAP *dib) {
-	BYTE status_byte = 0;
-	BYTE second_byte = 0;
-	int scanline = 0;
-	int bits = 0;
-
-	for (;;) {
-		if( io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) {
-			return FALSE;
-		}
-
-		switch (status_byte) {
-			case RLE_COMMAND :
-				if(io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) {
-					return FALSE;
-				}
-
-				switch (status_byte) {
-					case RLE_ENDOFLINE :
-						bits = 0;
-						scanline++;
-						break;
-
-					case RLE_ENDOFBITMAP :
-						return TRUE;
-
-					case RLE_DELTA :
-					{
-						// read the delta values
-
-						BYTE delta_x = 0;
-						BYTE delta_y = 0;
-
-						if(io->read_proc(&delta_x, sizeof(BYTE), 1, handle) != 1) {
-							return FALSE;
-						}
-						if(io->read_proc(&delta_y, sizeof(BYTE), 1, handle) != 1) {
-							return FALSE;
-						}
-
-						// apply them
-
-						bits     += delta_x;
-						scanline += delta_y;
-
-						break;
-					}
-
-					default :
-					{
-						if(scanline >= abs(height)) {
-							return TRUE;
-						}
-
-						int count = MIN((int)status_byte, width - bits);
-
-						BYTE *sline = FreeImage_GetScanLine(dib, scanline);
-
-						if(io->read_proc((void *)(sline + bits), sizeof(BYTE) * count, 1, handle) != 1) {
-							return FALSE;
-						}
-						
-						// align run length to even number of bytes 
-
-						if ((status_byte & 1) == 1) {
-							if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
-								return FALSE;
-							}
-						}
-
-						bits += status_byte;													
-
-						break;	
-					}
-				}
-
-				break;
-
-			default :
-			{
-				if(scanline >= abs(height)) {
-					return TRUE;
-				}
-
-				int count = MIN((int)status_byte, width - bits);
-
-				BYTE *sline = FreeImage_GetScanLine(dib, scanline);
-
-				if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
-					return FALSE;
-				}
-
-				for (int i = 0; i < count; i++) {
-					*(sline + bits) = second_byte;
-
-					bits++;					
-				}
-
-				break;
-			}
-		}
-	}
-}
-
-// --------------------------------------------------------------------------
-
-static FIBITMAP *
-LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_offset, int type) {
-	FIBITMAP *dib = NULL;
-
-	try {
-		BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-		// load the info header
-
-		BITMAPINFOHEADER bih;
-
-		io->read_proc(&bih, sizeof(BITMAPINFOHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapInfoHeader(&bih);
-#endif
-
-		// keep some general information about the bitmap
-
-		unsigned used_colors	= bih.biClrUsed;
-		int width				= bih.biWidth;
-		int height				= bih.biHeight;		// WARNING: height can be < 0 => check each call using 'height' as a parameter
-		unsigned bit_count		= bih.biBitCount;
-		unsigned compression	= bih.biCompression;
-		unsigned pitch			= CalculatePitch(CalculateLine(width, bit_count));
-
-		switch (bit_count) {
-			case 1 :
-			case 4 :
-			case 8 :
-			{
-				if ((used_colors == 0) || (used_colors > CalculateUsedPaletteEntries(bit_count))) {
-					used_colors = CalculateUsedPaletteEntries(bit_count);
-				}
-				
-				// allocate enough memory to hold the bitmap (header, palette, pixels) and read the palette
-
-				dib = FreeImage_AllocateHeader(header_only, width, height, bit_count);
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-
-				// seek to the end of the header (depending on the BMP header version)
-				// type == sizeof(BITMAPVxINFOHEADER)
-				switch(type) {
-					case 40:	// sizeof(BITMAPINFOHEADER) - all Windows versions since Windows 3.0
-						break;
-					case 52:	// sizeof(BITMAPV2INFOHEADER) (undocumented)
-					case 56:	// sizeof(BITMAPV3INFOHEADER) (undocumented)
-					case 108:	// sizeof(BITMAPV4HEADER) - all Windows versions since Windows 95/NT4 (not supported)
-					case 124:	// sizeof(BITMAPV5HEADER) - Windows 98/2000 and newer (not supported)
-						io->seek_proc(handle, (long)(type - sizeof(BITMAPINFOHEADER)), SEEK_CUR);
-						break;
-				}
-				
-				// load the palette
-
-				io->read_proc(FreeImage_GetPalette(dib), used_colors * sizeof(RGBQUAD), 1, handle);
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-				RGBQUAD *pal = FreeImage_GetPalette(dib);
-				for(int i = 0; i < used_colors; i++) {
-					INPLACESWAP(pal[i].rgbRed, pal[i].rgbBlue);
-				}
-#endif
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// seek to the actual pixel data.
-				// this is needed because sometimes the palette is larger than the entries it contains predicts
-				io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-
-				// read the pixel data
-
-				switch (compression) {
-					case BI_RGB :
-						if( LoadPixelData(io, handle, dib, height, pitch, bit_count) ) {
-							return dib;
-						} else {
-							throw "Error encountered while decoding BMP data";
-						}
-						break;
-
-					case BI_RLE4 :
-						if( LoadPixelDataRLE4(io, handle, width, height, dib) ) {
-							return dib;
-						} else {
-							throw "Error encountered while decoding RLE4 BMP data";
-						}
-						break;
-
-					case BI_RLE8 :
-						if( LoadPixelDataRLE8(io, handle, width, height, dib) ) {
-							return dib;
-						} else {
-							throw "Error encountered while decoding RLE8 BMP data";
-						}
-						break;
-
-					default :
-						throw FI_MSG_ERROR_UNSUPPORTED_COMPRESSION;
-				}
-			}
-			break; // 1-, 4-, 8-bit
-
-			case 16 :
-			{
-				int use_bitfields = 0;
-				if (bih.biCompression == BI_BITFIELDS) use_bitfields = 3;
-				else if (bih.biCompression == BI_ALPHABITFIELDS) use_bitfields = 4;
-				else if (type == 52) use_bitfields = 3;
-				else if (type >= 56) use_bitfields = 4;
-				
-				if (use_bitfields > 0) {
- 					DWORD bitfields[4];
-					io->read_proc(bitfields, use_bitfields * sizeof(DWORD), 1, handle);
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]);
-				} else {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK);
-				}
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;						
-				}
-
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-				
-				// seek to the actual pixel data
-				io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				return dib;
-			}
-			break; // 16-bit
-
-			case 24 :
-			case 32 :
-			{
-				int use_bitfields = 0;
-				if (bih.biCompression == BI_BITFIELDS) use_bitfields = 3;
-				else if (bih.biCompression == BI_ALPHABITFIELDS) use_bitfields = 4;
-				else if (type == 52) use_bitfields = 3;
-				else if (type >= 56) use_bitfields = 4;
-
- 				if (use_bitfields > 0) {
-					DWORD bitfields[4];
-					io->read_proc(bitfields, use_bitfields * sizeof(DWORD), 1, handle);
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]);
-				} else {
-					if( bit_count == 32 ) {
-						dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					} else {
-						dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					}
-				}
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// Skip over the optional palette 
-				// A 24 or 32 bit DIB may contain a palette for faster color reduction
-				// i.e. you can have (FreeImage_GetColorsUsed(dib) > 0)
-
-				// seek to the actual pixel data
-				io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-
-				// read in the bitmap bits
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				// check if the bitmap contains transparency, if so enable it in the header
-
-				FreeImage_SetTransparent(dib, (FreeImage_GetColorType(dib) == FIC_RGBALPHA));
-
-				return dib;
-			}
-			break; // 24-, 32-bit
-		}
-	} catch(const char *message) {
-		if(dib) {
-			FreeImage_Unload(dib);
-		}
-		if(message) {
-			FreeImage_OutputMessageProc(s_format_id, message);
-		}
-	}
-
-	return NULL;
-}
-
-// --------------------------------------------------------------------------
-
-static FIBITMAP *
-LoadOS22XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_offset) {
-	FIBITMAP *dib = NULL;
-
-	try {
-		BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-		// load the info header
-
-		BITMAPINFOHEADER bih;
-
-		io->read_proc(&bih, sizeof(BITMAPINFOHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapInfoHeader(&bih);
-#endif
-
-		// keep some general information about the bitmap
-
-		unsigned used_colors	= bih.biClrUsed;
-		int width				= bih.biWidth;
-		int height				= bih.biHeight;		// WARNING: height can be < 0 => check each read_proc using 'height' as a parameter
-		unsigned bit_count		= bih.biBitCount;
-		unsigned compression	= bih.biCompression;
-		unsigned pitch			= CalculatePitch(CalculateLine(width, bit_count));
-		
-		switch (bit_count) {
-			case 1 :
-			case 4 :
-			case 8 :
-			{
-				if ((used_colors == 0) || (used_colors > CalculateUsedPaletteEntries(bit_count)))
-					used_colors = CalculateUsedPaletteEntries(bit_count);
-					
-				// allocate enough memory to hold the bitmap (header, palette, pixels) and read the palette
-
-				dib = FreeImage_AllocateHeader(header_only, width, height, bit_count);
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-				
-				// load the palette
-				// note that it may contain RGB or RGBA values : we will calculate this
-				unsigned pal_size = (bitmap_bits_offset - sizeof(BITMAPFILEHEADER) - bih.biSize) / used_colors; 
-
-				io->seek_proc(handle, sizeof(BITMAPFILEHEADER) + bih.biSize, SEEK_SET);
-
-				RGBQUAD *pal = FreeImage_GetPalette(dib);
-
-				if(pal_size == 4) {
-					for (unsigned count = 0; count < used_colors; count++) {
-						FILE_BGRA bgra;
-
-						io->read_proc(&bgra, sizeof(FILE_BGRA), 1, handle);
-						
-						pal[count].rgbRed	= bgra.r;
-						pal[count].rgbGreen = bgra.g;
-						pal[count].rgbBlue	= bgra.b;
-					} 
-				} else if(pal_size == 3) {
-					for (unsigned count = 0; count < used_colors; count++) {
-						FILE_BGR bgr;
-
-						io->read_proc(&bgr, sizeof(FILE_BGR), 1, handle);
-						
-						pal[count].rgbRed	= bgr.r;
-						pal[count].rgbGreen = bgr.g;
-						pal[count].rgbBlue	= bgr.b;
-					} 
-				}
-				
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// seek to the actual pixel data.
-				// this is needed because sometimes the palette is larger than the entries it contains predicts
-
-				if (bitmap_bits_offset > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (used_colors * 3))) {
-					io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-				}
-
-				// read the pixel data
-
-				switch (compression) {
-					case BI_RGB :
-						// load pixel data 
-						LoadPixelData(io, handle, dib, height, pitch, bit_count);						
-						return dib;
-
-					case BI_RLE4 :
-						if( LoadPixelDataRLE4(io, handle, width, height, dib) ) {
-							return dib;
-						} else {
-							throw "Error encountered while decoding RLE4 BMP data";
-						}
-						break;
-
-					case BI_RLE8 :
-						if( LoadPixelDataRLE8(io, handle, width, height, dib) ) {
-							return dib;
-						} else {
-							throw "Error encountered while decoding RLE8 BMP data";
-						}
-						break;
-
-					default :		
-						throw FI_MSG_ERROR_UNSUPPORTED_COMPRESSION;
-				}	
-			}
-
-			case 16 :
-			{
-				if (bih.biCompression == 3) {
-					DWORD bitfields[3];
-
-					io->read_proc(bitfields, 3 * sizeof(DWORD), 1, handle);
-
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]);
-				} else {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK);
-				}
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				if (bitmap_bits_offset > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (used_colors * 3))) {
-					io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-				}
-
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				return dib;
-			}
-
-			case 24 :
-			case 32 :
-			{
-				if( bit_count == 32 ) {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-				} else {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-				}
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-				
-				// set resolution information
-				FreeImage_SetDotsPerMeterX(dib, bih.biXPelsPerMeter);
-				FreeImage_SetDotsPerMeterY(dib, bih.biYPelsPerMeter);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// Skip over the optional palette 
-				// A 24 or 32 bit DIB may contain a palette for faster color reduction
-
-				if (bitmap_bits_offset > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (used_colors * 3))) {
-					io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-				}
-				
-				// read in the bitmap bits
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				// check if the bitmap contains transparency, if so enable it in the header
-
-				FreeImage_SetTransparent(dib, (FreeImage_GetColorType(dib) == FIC_RGBALPHA));
-
-				return dib;
-			}
-		}
-	} catch(const char *message) {
-		if(dib)
-			FreeImage_Unload(dib);
-
-		FreeImage_OutputMessageProc(s_format_id, message);
-	}
-
-	return NULL;
-}
-
-// --------------------------------------------------------------------------
-
-static FIBITMAP *
-LoadOS21XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_offset) {
-	FIBITMAP *dib = NULL;
-
-	try {
-		BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-		BITMAPINFOOS2_1X_HEADER bios2_1x;
-
-		io->read_proc(&bios2_1x, sizeof(BITMAPINFOOS2_1X_HEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapOS21XHeader(&bios2_1x);
-#endif
-		// keep some general information about the bitmap
-
-		unsigned used_colors = 0;
-		unsigned width		= bios2_1x.biWidth;
-		unsigned height		= bios2_1x.biHeight;	// WARNING: height can be < 0 => check each read_proc using 'height' as a parameter
-		unsigned bit_count	= bios2_1x.biBitCount;
-		unsigned pitch		= CalculatePitch(CalculateLine(width, bit_count));
-		
-		switch (bit_count) {
-			case 1 :
-			case 4 :
-			case 8 :
-			{
-				used_colors = CalculateUsedPaletteEntries(bit_count);
-				
-				// allocate enough memory to hold the bitmap (header, palette, pixels) and read the palette
-
-				dib = FreeImage_AllocateHeader(header_only, width, height, bit_count);
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-
-				// set resolution information to default values (72 dpi in english units)
-				FreeImage_SetDotsPerMeterX(dib, 2835);
-				FreeImage_SetDotsPerMeterY(dib, 2835);
-				
-				// load the palette
-
-				RGBQUAD *pal = FreeImage_GetPalette(dib);
-
-				for (unsigned count = 0; count < used_colors; count++) {
-					FILE_BGR bgr;
-
-					io->read_proc(&bgr, sizeof(FILE_BGR), 1, handle);
-					
-					pal[count].rgbRed	= bgr.r;
-					pal[count].rgbGreen = bgr.g;
-					pal[count].rgbBlue	= bgr.b;
-				}
-				
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// Skip over the optional palette 
-				// A 24 or 32 bit DIB may contain a palette for faster color reduction
-
-				io->seek_proc(handle, bitmap_bits_offset, SEEK_SET);
-				
-				// read the pixel data
-
-				// load pixel data 
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-						
-				return dib;
-			}
-
-			case 16 :
-			{
-				dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK);
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;						
-				}
-
-				// set resolution information to default values (72 dpi in english units)
-				FreeImage_SetDotsPerMeterX(dib, 2835);
-				FreeImage_SetDotsPerMeterY(dib, 2835);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				return dib;
-			}
-
-			case 24 :
-			case 32 :
-			{
-				if( bit_count == 32 ) {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-				} else {
-					dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-				}
-
-				if (dib == NULL) {
-					throw FI_MSG_ERROR_DIB_MEMORY;						
-				}
-
-				// set resolution information to default values (72 dpi in english units)
-				FreeImage_SetDotsPerMeterX(dib, 2835);
-				FreeImage_SetDotsPerMeterY(dib, 2835);
-
-				if(header_only) {
-					// header only mode
-					return dib;
-				}
-
-				// Skip over the optional palette 
-				// A 24 or 32 bit DIB may contain a palette for faster color reduction
-
-				// load pixel data and swap as needed if OS is Big Endian
-				LoadPixelData(io, handle, dib, height, pitch, bit_count);
-
-				// check if the bitmap contains transparency, if so enable it in the header
-
-				FreeImage_SetTransparent(dib, (FreeImage_GetColorType(dib) == FIC_RGBALPHA));
-
-				return dib;
-			}
-		}
-	} catch(const char *message) {	
-		if(dib)
-			FreeImage_Unload(dib);
-
-		FreeImage_OutputMessageProc(s_format_id, message);
-	}
-
-	return NULL;
-}
-
-// ==========================================================
-// Plugin Implementation
-// ==========================================================
-
-static const char * DLL_CALLCONV
-Format() {
-	return "BMP";
-}
-
-static const char * DLL_CALLCONV
-Description() {
-	return "Windows or OS/2 Bitmap";
-}
-
-static const char * DLL_CALLCONV
-Extension() {
-	return "bmp";
-}
-
-static const char * DLL_CALLCONV
-RegExpr() {
-	return "^BM";
-}
-
-static const char * DLL_CALLCONV
-MimeType() {
-	return "image/bmp";
-}
-
-static BOOL DLL_CALLCONV
-Validate(FreeImageIO *io, fi_handle handle) {
-	BYTE bmp_signature1[] = { 0x42, 0x4D };
-	BYTE bmp_signature2[] = { 0x42, 0x41 };
-	BYTE signature[2] = { 0, 0 };
-
-	io->read_proc(signature, 1, sizeof(bmp_signature1), handle);
-
-	if (memcmp(bmp_signature1, signature, sizeof(bmp_signature1)) == 0)
-		return TRUE;
-
-	if (memcmp(bmp_signature2, signature, sizeof(bmp_signature2)) == 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsExportDepth(int depth) {
-	return (
-			(depth == 1) ||
-			(depth == 4) ||
-			(depth == 8) ||
-			(depth == 16) ||
-			(depth == 24) ||
-			(depth == 32)
-		);
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportType(FREE_IMAGE_TYPE type) {
-	return (type == FIT_BITMAP) ? TRUE : FALSE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsNoPixels() {
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-static FIBITMAP * DLL_CALLCONV
-Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
-	if (handle != NULL) {
-		BITMAPFILEHEADER bitmapfileheader;
-		DWORD type = 0;
-
-		// we use this offset value to make seemingly absolute seeks relative in the file
-		
-		long offset_in_file = io->tell_proc(handle);
-
-		// read the fileheader
-
-		io->read_proc(&bitmapfileheader, sizeof(BITMAPFILEHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapFileHeader(&bitmapfileheader);
-#endif
-
-		// check the signature
-
-		if((bitmapfileheader.bfType != 0x4D42) && (bitmapfileheader.bfType != 0x4142)) {
-			FreeImage_OutputMessageProc(s_format_id, FI_MSG_ERROR_MAGIC_NUMBER);
-			return NULL;
-		}
-
-		// read the first byte of the infoheader
-
-		io->read_proc(&type, sizeof(DWORD), 1, handle);
-		io->seek_proc(handle, 0 - (long)sizeof(DWORD), SEEK_CUR);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapLong(&type);
-#endif
-
-		// call the appropriate load function for the found bitmap type
-
-		switch(type) {
-			case 12:
-				// OS/2 and also all Windows versions since Windows 3.0
-				return LoadOS21XBMP(io, handle, flags, offset_in_file + bitmapfileheader.bfOffBits);
-
-			case 64:
-				// OS/2
-				return LoadOS22XBMP(io, handle, flags, offset_in_file + bitmapfileheader.bfOffBits);
-
-			case 40:	// BITMAPINFOHEADER - all Windows versions since Windows 3.0
-			case 52:	// BITMAPV2INFOHEADER (undocumented, partially supported)
-			case 56:	// BITMAPV3INFOHEADER (undocumented, partially supported)
-			case 108:	// BITMAPV4HEADER - all Windows versions since Windows 95/NT4 (partially supported)
-			case 124:	// BITMAPV5HEADER - Windows 98/2000 and newer (partially supported)
-				return LoadWindowsBMP(io, handle, flags, offset_in_file + bitmapfileheader.bfOffBits, type);
-
-			default:
-				break;
-		}
-
-		FreeImage_OutputMessageProc(s_format_id, "unknown bmp subtype with id %d", type);
-	}
-
-	return NULL;
-}
-
-// ----------------------------------------------------------
-
-/**
-Encode a 8-bit source buffer into a 8-bit target buffer using a RLE compression algorithm. 
-The size of the target buffer must be equal to the size of the source buffer. 
-On return, the function will return the real size of the target buffer, which should be less that or equal to the source buffer size. 
-@param target 8-bit Target buffer
-@param source 8-bit Source buffer
-@param size Source/Target input buffer size
-@return Returns the target buffer size
-*/
-static int
-RLEEncodeLine(BYTE *target, BYTE *source, int size) {
-	BYTE buffer[256];
-	int buffer_size = 0;
-	int target_pos = 0;
-
-	for (int i = 0; i < size; ++i) {
-		if ((i < size - 1) && (source[i] == source[i + 1])) {
-			// find a solid block of same bytes
-
-			int j = i + 1;
-			int jmax = 254 + i;
-
-			while ((j < size - 1) && (j < jmax) && (source[j] == source[j + 1]))
-				++j;
-
-			// if the block is larger than 3 bytes, use it
-			// else put the data into the larger pool
-
-			if (((j - i) + 1) > 3) {
-				// don't forget to write what we already have in the buffer
-
-				switch(buffer_size) {
-					case 0 :
-						break;
-
-					case RLE_DELTA :
-						target[target_pos++] = 1;
-						target[target_pos++] = buffer[0];
-						target[target_pos++] = 1;
-						target[target_pos++] = buffer[1];
-						break;
-
-					case RLE_ENDOFBITMAP :
-						target[target_pos++] = (BYTE)buffer_size;
-						target[target_pos++] = buffer[0];
-						break;
-
-					default :
-						target[target_pos++] = RLE_COMMAND;
-						target[target_pos++] = (BYTE)buffer_size;
-						memcpy(target + target_pos, buffer, buffer_size);
-
-						// prepare for next run
-						
-						target_pos += buffer_size;
-
-						if ((buffer_size & 1) == 1)
-							target_pos++;
-
-						break;
-				}
-
-				// write the continuous data
-
-				target[target_pos++] = (BYTE)((j - i) + 1);
-				target[target_pos++] = source[i];
-
-				buffer_size = 0;
-			} else {
-				for (int k = 0; k < (j - i) + 1; ++k) {
-					buffer[buffer_size++] = source[i + k];
-
-					if (buffer_size == 254) {
-						// write what we have
-
-						target[target_pos++] = RLE_COMMAND;
-						target[target_pos++] = (BYTE)buffer_size;
-						memcpy(target + target_pos, buffer, buffer_size);
-
-						// prepare for next run
-
-						target_pos += buffer_size;
-						buffer_size = 0;
-					}
-				}
-			}
-
-			i = j;
-		} else {
-			buffer[buffer_size++] = source[i];
-		}
-
-		// write the buffer if it's full
-
-		if (buffer_size == 254) {
-			target[target_pos++] = RLE_COMMAND;
-			target[target_pos++] = (BYTE)buffer_size;
-			memcpy(target + target_pos, buffer, buffer_size);
-
-			// prepare for next run
-
-			target_pos += buffer_size;
-			buffer_size = 0;
-		}
-	}
-
-	// write the last bytes
-
-	switch(buffer_size) {
-		case 0 :
-			break;
-
-		case RLE_DELTA :
-			target[target_pos++] = 1;
-			target[target_pos++] = buffer[0];
-			target[target_pos++] = 1;
-			target[target_pos++] = buffer[1];
-			break;
-
-		case RLE_ENDOFBITMAP :
-			target[target_pos++] = (BYTE)buffer_size;
-			target[target_pos++] = buffer[0];
-			break;
-
-		default :
-			target[target_pos++] = RLE_COMMAND;
-			target[target_pos++] = (BYTE)buffer_size;
-			memcpy(target + target_pos, buffer, buffer_size);
-
-			// prepare for next run
-			
-			target_pos += buffer_size;
-
-			if ((buffer_size & 1) == 1)
-				target_pos++;
-
-			break;			
-	}
-
-	// write the END_OF_LINE marker
-
-	target[target_pos++] = RLE_COMMAND;
-	target[target_pos++] = RLE_ENDOFLINE;
-
-	// return the written size
-
-	return target_pos;
-}
-
-static BOOL DLL_CALLCONV
-Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
-	if ((dib != NULL) && (handle != NULL)) {
-		// write the file header
-
-		BITMAPFILEHEADER bitmapfileheader;
-		bitmapfileheader.bfType = 0x4D42;
-		bitmapfileheader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + FreeImage_GetColorsUsed(dib) * sizeof(RGBQUAD);
-		bitmapfileheader.bfSize = bitmapfileheader.bfOffBits + FreeImage_GetHeight(dib) * FreeImage_GetPitch(dib);
-		bitmapfileheader.bfReserved1 = 0;
-		bitmapfileheader.bfReserved2 = 0;
-
-		// take care of the bit fields data of any
-
-		bool bit_fields = (FreeImage_GetBPP(dib) == 16);
-
-		if (bit_fields) {
-			bitmapfileheader.bfSize += 3 * sizeof(DWORD);
-			bitmapfileheader.bfOffBits += 3 * sizeof(DWORD);
-		}
-
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapFileHeader(&bitmapfileheader);
-#endif
-		if (io->write_proc(&bitmapfileheader, sizeof(BITMAPFILEHEADER), 1, handle) != 1)
-			return FALSE;		
-
-		// update the bitmap info header
-
-		BITMAPINFOHEADER bih;
-		memcpy(&bih, FreeImage_GetInfoHeader(dib), sizeof(BITMAPINFOHEADER));
-
-		if (bit_fields)
-			bih.biCompression = BI_BITFIELDS;
-		else if ((bih.biBitCount == 8) && (flags & BMP_SAVE_RLE))
-			bih.biCompression = BI_RLE8;
-		else
-			bih.biCompression = BI_RGB;
-
-		// write the bitmap info header
-
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapInfoHeader(&bih);
-#endif
-		if (io->write_proc(&bih, sizeof(BITMAPINFOHEADER), 1, handle) != 1)
-			return FALSE;
-
-		// write the bit fields when we are dealing with a 16 bit BMP
-
-		if (bit_fields) {
-			DWORD d;
-
-			d = FreeImage_GetRedMask(dib);
-
-			if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1)
-				return FALSE;
-
-			d = FreeImage_GetGreenMask(dib);
-
-			if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1)
-				return FALSE;
-
-			d = FreeImage_GetBlueMask(dib);
-
-			if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1)
-				return FALSE;
-		}
-
-		// write the palette
-
-		if (FreeImage_GetPalette(dib) != NULL) {
-			RGBQUAD *pal = FreeImage_GetPalette(dib);
-			FILE_BGRA bgra;
-			for(unsigned i = 0; i < FreeImage_GetColorsUsed(dib); i++ ) {
-				bgra.b = pal[i].rgbBlue;
-				bgra.g = pal[i].rgbGreen;
-				bgra.r = pal[i].rgbRed;
-				bgra.a = pal[i].rgbReserved;
-				if (io->write_proc(&bgra, sizeof(FILE_BGRA), 1, handle) != 1)
-					return FALSE;
-			}
-		}
-
-		// write the bitmap data... if RLE compression is enable, use it
-
-		unsigned bpp = FreeImage_GetBPP(dib);
-		if ((bpp == 8) && (flags & BMP_SAVE_RLE)) {
-			BYTE *buffer = (BYTE*)malloc(FreeImage_GetPitch(dib) * 2 * sizeof(BYTE));
-
-			for (DWORD i = 0; i < FreeImage_GetHeight(dib); ++i) {
-				int size = RLEEncodeLine(buffer, FreeImage_GetScanLine(dib, i), FreeImage_GetLine(dib));
-
-				if (io->write_proc(buffer, size, 1, handle) != 1) {
-					free(buffer);
-					return FALSE;
-				}
-			}
-
-			buffer[0] = RLE_COMMAND;
-			buffer[1] = RLE_ENDOFBITMAP;
-
-			if (io->write_proc(buffer, 2, 1, handle) != 1) {
-				free(buffer);
-				return FALSE;
-			}
-
-			free(buffer);
-#ifdef FREEIMAGE_BIGENDIAN
-		} else if (bpp == 16) {
-			int padding = FreeImage_GetPitch(dib) - FreeImage_GetWidth(dib) * sizeof(WORD);
-			WORD pad = 0;
-			WORD pixel;
-			for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-				BYTE *line = FreeImage_GetScanLine(dib, y);
-				for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-					pixel = ((WORD *)line)[x];
-					SwapShort(&pixel);
-					if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1)
-						return FALSE;
-				}
-				if(padding != 0) {
-					if(io->write_proc(&pad, padding, 1, handle) != 1) {
-						return FALSE;				
-					}
-				}
-			}
-#endif
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-		} else if (bpp == 24) {
-			int padding = FreeImage_GetPitch(dib) - FreeImage_GetWidth(dib) * sizeof(FILE_BGR);
-			DWORD pad = 0;
-			FILE_BGR bgr;
-			for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-				BYTE *line = FreeImage_GetScanLine(dib, y);
-				for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-					RGBTRIPLE *triple = ((RGBTRIPLE *)line)+x;
-					bgr.b = triple->rgbtBlue;
-					bgr.g = triple->rgbtGreen;
-					bgr.r = triple->rgbtRed;
-					if (io->write_proc(&bgr, sizeof(FILE_BGR), 1, handle) != 1)
-						return FALSE;
-				}
-				if(padding != 0) {
-					if(io->write_proc(&pad, padding, 1, handle) != 1) {
-						return FALSE;					
-					}
-				}
-			}
-		} else if (bpp == 32) {
-			FILE_BGRA bgra;
-			for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-				BYTE *line = FreeImage_GetScanLine(dib, y);
-				for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-					RGBQUAD *quad = ((RGBQUAD *)line)+x;
-					bgra.b = quad->rgbBlue;
-					bgra.g = quad->rgbGreen;
-					bgra.r = quad->rgbRed;
-					bgra.a = quad->rgbReserved;
-					if (io->write_proc(&bgra, sizeof(FILE_BGRA), 1, handle) != 1)
-						return FALSE;
-				}
-			}
-#endif
-		} else if (io->write_proc(FreeImage_GetBits(dib), FreeImage_GetHeight(dib) * FreeImage_GetPitch(dib), 1, handle) != 1) {
-			return FALSE;
-		}
-
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-// ==========================================================
-//   Init
-// ==========================================================
-
-void DLL_CALLCONV
-InitBMP(Plugin *plugin, int format_id) {
-	s_format_id = format_id;
-
-	plugin->format_proc = Format;
-	plugin->description_proc = Description;
-	plugin->extension_proc = Extension;
-	plugin->regexpr_proc = RegExpr;
-	plugin->open_proc = NULL;
-	plugin->close_proc = NULL;
-	plugin->pagecount_proc = NULL;
-	plugin->pagecapability_proc = NULL;
-	plugin->load_proc = Load;
-	plugin->save_proc = Save;
-	plugin->validate_proc = Validate;
-	plugin->mime_proc = MimeType;
-	plugin->supports_export_bpp_proc = SupportsExportDepth;
-	plugin->supports_export_type_proc = SupportsExportType;
-	plugin->supports_icc_profiles_proc = NULL;	// not implemented yet;
-	plugin->supports_no_pixels_proc = SupportsNoPixels;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp b/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp
deleted file mode 100644
index d9b430eac5..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp
+++ /dev/null
@@ -1,1406 +0,0 @@
-// ==========================================================
-// GIF Loader and Writer
-//
-// Design and implementation by
-// - Ryan Rubley <ryan@lostreality.org>
-// - Raphaлl Gaquer <raphael.gaquer@alcer.com>
-// - Aaron Shumate <aaron@shumate.us>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "../Metadata/FreeImageTag.h"
-
-// ==========================================================
-//   Metadata declarations
-// ==========================================================
-
-#define GIF_DISPOSAL_UNSPECIFIED	0
-#define GIF_DISPOSAL_LEAVE			1
-#define GIF_DISPOSAL_BACKGROUND		2
-#define GIF_DISPOSAL_PREVIOUS		3
-
-// ==========================================================
-//   Constant/Typedef declarations
-// ==========================================================
-
-struct GIFinfo {
-	BOOL read;
-	//only really used when reading
-	size_t global_color_table_offset;
-	int global_color_table_size;
-	BYTE background_color;
-	std::vector<size_t> application_extension_offsets;
-	std::vector<size_t> comment_extension_offsets;
-	std::vector<size_t> graphic_control_extension_offsets;
-	std::vector<size_t> image_descriptor_offsets;
-
-	GIFinfo() : read(0), global_color_table_offset(0), global_color_table_size(0), background_color(0)
-	{
-	}
-};
-
-struct PageInfo {
-	PageInfo(int d, int l, int t, int w, int h) { 
-		disposal_method = d; left = (WORD)l; top = (WORD)t; width = (WORD)w; height = (WORD)h; 
-	}
-	int disposal_method;
-	WORD left, top, width, height;
-};
-
-//GIF defines a max of 12 bits per code
-#define MAX_LZW_CODE			4096
-
-class StringTable
-{
-public:
-	StringTable();
-	~StringTable();
-	void Initialize(int minCodeSize);
-	BYTE *FillInputBuffer(int len);
-	void CompressStart(int bpp, int width);
-	int CompressEnd(BYTE *buf); //0-4 bytes
-	bool Compress(BYTE *buf, int *len);
-	bool Decompress(BYTE *buf, int *len);
-	void Done(void);
-
-protected:
-	bool m_done;
-
-	int m_minCodeSize, m_clearCode, m_endCode, m_nextCode;
-
-	int m_bpp, m_slack; //Compressor information
-
-	int m_prefix; //Compressor state variable
-	int m_codeSize, m_codeMask; //Compressor/Decompressor state variables
-	int m_oldCode; //Decompressor state variable
-	int m_partial, m_partialSize; //Compressor/Decompressor bit buffer
-
-	int firstPixelPassed; // A specific flag that indicates if the first pixel
-	                      // of the whole image had already been read
-
-	std::string m_strings[MAX_LZW_CODE]; //This is what is really the "string table" data for the Decompressor
-	int* m_strmap;
-
-	//input buffer
-	BYTE *m_buffer;
-	int m_bufferSize, m_bufferRealSize, m_bufferPos, m_bufferShift;
-
-	void ClearCompressorTable(void);
-	void ClearDecompressorTable(void);
-};
-
-#define GIF_PACKED_LSD_HAVEGCT		0x80
-#define GIF_PACKED_LSD_COLORRES		0x70
-#define GIF_PACKED_LSD_GCTSORTED	0x08
-#define GIF_PACKED_LSD_GCTSIZE		0x07
-#define GIF_PACKED_ID_HAVELCT		0x80
-#define GIF_PACKED_ID_INTERLACED	0x40
-#define GIF_PACKED_ID_LCTSORTED		0x20
-#define GIF_PACKED_ID_RESERVED		0x18
-#define GIF_PACKED_ID_LCTSIZE		0x07
-#define GIF_PACKED_GCE_RESERVED		0xE0
-#define GIF_PACKED_GCE_DISPOSAL		0x1C
-#define GIF_PACKED_GCE_WAITINPUT	0x02
-#define GIF_PACKED_GCE_HAVETRANS	0x01
-
-#define GIF_BLOCK_IMAGE_DESCRIPTOR	0x2C
-#define GIF_BLOCK_EXTENSION			0x21
-#define GIF_BLOCK_TRAILER			0x3B
-
-#define GIF_EXT_PLAINTEXT			0x01
-#define GIF_EXT_GRAPHIC_CONTROL		0xF9
-#define GIF_EXT_COMMENT				0xFE
-#define GIF_EXT_APPLICATION			0xFF
-
-#define GIF_INTERLACE_PASSES		4
-static int g_GifInterlaceOffset[GIF_INTERLACE_PASSES] = {0, 4, 2, 1};
-static int g_GifInterlaceIncrement[GIF_INTERLACE_PASSES] = {8, 8, 4, 2};
-
-// ==========================================================
-// Helpers Functions
-// ==========================================================
-
-static BOOL 
-FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, WORD id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value)
-{
-	BOOL bResult = FALSE;
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		FreeImage_SetTagKey(tag, key);
-		FreeImage_SetTagID(tag, id);
-		FreeImage_SetTagType(tag, type);
-		FreeImage_SetTagCount(tag, count);
-		FreeImage_SetTagLength(tag, length);
-		FreeImage_SetTagValue(tag, value);
-		if(model == FIMD_ANIMATION) {
-			TagLib& s = TagLib::instance();
-			// get the tag description
-			const char *description = s.getTagDescription(TagLib::ANIMATION, id);
-			FreeImage_SetTagDescription(tag, description);
-		}
-		// store the tag
-		bResult = FreeImage_SetMetadata(model, dib, key, tag);
-		FreeImage_DeleteTag(tag);
-	}
-	return bResult;
-}
-
-static BOOL 
-FreeImage_GetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FREE_IMAGE_MDTYPE type, FITAG **tag)
-{
-	if( FreeImage_GetMetadata(model, dib, key, tag) ) {
-		if( FreeImage_GetTagType(*tag) == type ) {
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-StringTable::StringTable()
-{
-	m_buffer = NULL;
-	firstPixelPassed = 0; // Still no pixel read
-	// Maximum number of entries in the map is MAX_LZW_CODE * 256 
-	// (aka 2**12 * 2**8 => a 20 bits key)
-	// This Map could be optmized to only handle MAX_LZW_CODE * 2**(m_bpp)
-	m_strmap = new(std::nothrow) int[1<<20];
-}
-
-StringTable::~StringTable()
-{
-	if( m_buffer != NULL ) {
-		delete [] m_buffer;
-	}
-	if( m_strmap != NULL ) {
-		delete [] m_strmap;
-		m_strmap = NULL;
-	}
-}
-
-void StringTable::Initialize(int minCodeSize)
-{
-	m_done = false;
-
-	m_bpp = 8;
-	m_minCodeSize = minCodeSize;
-	m_clearCode = 1 << m_minCodeSize;
-	if(m_clearCode > MAX_LZW_CODE) {
-		m_clearCode = MAX_LZW_CODE;
-	}
-	m_endCode = m_clearCode + 1;
-
-	m_partial = 0;
-	m_partialSize = 0;
-
-	m_bufferSize = 0;
-	ClearCompressorTable();
-	ClearDecompressorTable();
-}
-
-BYTE *StringTable::FillInputBuffer(int len)
-{
-	if( m_buffer == NULL ) {
-		m_buffer = new(std::nothrow) BYTE[len];
-		m_bufferRealSize = len;
-	} else if( len > m_bufferRealSize ) {
-		delete [] m_buffer;
-		m_buffer = new(std::nothrow) BYTE[len];
-		m_bufferRealSize = len;
-	}
-	m_bufferSize = len;
-	m_bufferPos = 0;
-	m_bufferShift = 8 - m_bpp;
-	return m_buffer;
-}
-
-void StringTable::CompressStart(int bpp, int width)
-{
-	m_bpp = bpp;
-	m_slack = (8 - ((width * bpp) % 8)) % 8;
-
-	m_partial |= m_clearCode << m_partialSize;
-	m_partialSize += m_codeSize;
-	ClearCompressorTable();
-}
-
-int StringTable::CompressEnd(BYTE *buf)
-{
-	int len = 0;
-
-	//output code for remaining prefix
-	m_partial |= m_prefix << m_partialSize;
-	m_partialSize += m_codeSize;
-	while( m_partialSize >= 8 ) {
-		*buf++ = (BYTE)m_partial;
-		m_partial >>= 8;
-		m_partialSize -= 8;
-		len++;
-	}
-
-	//add the end of information code and flush the entire buffer out
-	m_partial |= m_endCode << m_partialSize;
-	m_partialSize += m_codeSize;
-	while( m_partialSize > 0 ) {
-		*buf++ = (BYTE)m_partial;
-		m_partial >>= 8;
-		m_partialSize -= 8;
-		len++;
-	}
-
-	//most this can be is 4 bytes.  7 bits in m_partial to start + 12 for the
-	//last code + 12 for the end code = 31 bits total.
-	return len;
-}
-
-bool StringTable::Compress(BYTE *buf, int *len)
-{
-	if( m_bufferSize == 0 || m_done ) {
-		return false;
-	}
-
-	int mask = (1 << m_bpp) - 1;
-	BYTE *bufpos = buf;
-	while( m_bufferPos < m_bufferSize ) {
-		//get the current pixel value
-		char ch = (char)((m_buffer[m_bufferPos] >> m_bufferShift) & mask);
-
-		// The next prefix is : 
-		// <the previous LZW code (on 12 bits << 8)> | <the code of the current pixel (on 8 bits)>
-		int nextprefix = (((m_prefix)<<8)&0xFFF00) + (ch & 0x000FF);
-		if(firstPixelPassed) {
-			
-			if( m_strmap[nextprefix] > 0) {
-				m_prefix = m_strmap[nextprefix];
-			} else {
-				m_partial |= m_prefix << m_partialSize;
-				m_partialSize += m_codeSize;
-				//grab full bytes for the output buffer
-				while( m_partialSize >= 8 && bufpos - buf < *len ) {
-					*bufpos++ = (BYTE)m_partial;
-					m_partial >>= 8;
-					m_partialSize -= 8;
-				}
-
-				//add the code to the "table map"
-				m_strmap[nextprefix] = m_nextCode;
-
-				//increment the next highest valid code, increase the code size
-				if( m_nextCode == (1 << m_codeSize) ) {
-					m_codeSize++;
-				}
-				m_nextCode++;
-
-				//if we're out of codes, restart the string table
-				if( m_nextCode == MAX_LZW_CODE ) {
-					m_partial |= m_clearCode << m_partialSize;
-					m_partialSize += m_codeSize;
-					ClearCompressorTable();
-				}
-
-				// Only keep the 8 lowest bits (prevent problems with "negative chars")
-				m_prefix = ch & 0x000FF;
-			}
-
-			//increment to the next pixel
-			if( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) {
-				m_bufferShift -= m_bpp;
-			} else {
-				m_bufferPos++;
-				m_bufferShift = 8 - m_bpp;
-			}
-
-			//jump out here if the output buffer is full
-			if( bufpos - buf == *len ) {
-				return true;
-			}
-		
-		} else {
-			// Specific behavior for the first pixel of the whole image
-
-			firstPixelPassed=1;
-			// Only keep the 8 lowest bits (prevent problems with "negative chars")
-			m_prefix = ch & 0x000FF;
-
-			//increment to the next pixel
-			if( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) {
-				m_bufferShift -= m_bpp;
-			} else {
-				m_bufferPos++;
-				m_bufferShift = 8 - m_bpp;
-			}
-
-			//jump out here if the output buffer is full
-			if( bufpos - buf == *len ) {
-				return true;
-			}
-		}
-	}
-
-	m_bufferSize = 0;
-	*len = (int)(bufpos - buf);
-
-	return true;
-}
-
-bool StringTable::Decompress(BYTE *buf, int *len)
-{
-	if( m_bufferSize == 0 || m_done ) {
-		return false;
-	}
-
-	BYTE *bufpos = buf;
-	for( ; m_bufferPos < m_bufferSize; m_bufferPos++ ) {
-		m_partial |= (int)m_buffer[m_bufferPos] << m_partialSize;
-		m_partialSize += 8;
-		while( m_partialSize >= m_codeSize ) {
-			int code = m_partial & m_codeMask;
-			m_partial >>= m_codeSize;
-			m_partialSize -= m_codeSize;
-
-			if( code > m_nextCode || /*(m_nextCode == MAX_LZW_CODE && code != m_clearCode) || */code == m_endCode ) {
-				m_done = true;
-				*len = (int)(bufpos - buf);
-				return true;
-			}
-			if( code == m_clearCode ) {
-				ClearDecompressorTable();
-				continue;
-			}
-
-			//add new string to string table, if not the first pass since a clear code
-			if( m_oldCode != MAX_LZW_CODE && m_nextCode < MAX_LZW_CODE) {
-				m_strings[m_nextCode] = m_strings[m_oldCode] + m_strings[code == m_nextCode ? m_oldCode : code][0];
-			}
-
-			if( (int)m_strings[code].size() > *len - (bufpos - buf) ) {
-				//out of space, stuff the code back in for next time
-				m_partial <<= m_codeSize;
-				m_partialSize += m_codeSize;
-				m_partial |= code;
-				m_bufferPos++;
-				*len = (int)(bufpos - buf);
-				return true;
-			}
-
-			//output the string into the buffer
-			memcpy(bufpos, m_strings[code].data(), m_strings[code].size());
-			bufpos += m_strings[code].size();
-
-			//increment the next highest valid code, add a bit to the mask if we need to increase the code size
-			if( m_oldCode != MAX_LZW_CODE && m_nextCode < MAX_LZW_CODE ) {
-				if( ++m_nextCode < MAX_LZW_CODE ) {
-					if( (m_nextCode & m_codeMask) == 0 ) {
-						m_codeSize++;
-						m_codeMask |= m_nextCode;
-					}
-				}
-			}
-
-			m_oldCode = code;
-		}
-	}
-
-	m_bufferSize = 0;
-	*len = (int)(bufpos - buf);
-
-	return true;
-}
-
-void StringTable::Done(void)
-{
-	m_done = true;
-}
-
-void StringTable::ClearCompressorTable(void)
-{
-	if(m_strmap) {
-		memset(m_strmap, 0xFF, sizeof(unsigned int)*(1<<20));
-	}
-	m_nextCode = m_endCode + 1;
-
-	m_prefix = 0;
-	m_codeSize = m_minCodeSize + 1;
-}
-
-void StringTable::ClearDecompressorTable(void)
-{
-	for( int i = 0; i < m_clearCode; i++ ) {
-		m_strings[i].resize(1);
-		m_strings[i][0] = (char)i;
-	}
-	m_nextCode = m_endCode + 1;
-
-	m_codeSize = m_minCodeSize + 1;
-	m_codeMask = (1 << m_codeSize) - 1;
-	m_oldCode = MAX_LZW_CODE;
-}
-
-// ==========================================================
-// Plugin Interface
-// ==========================================================
-
-static int s_format_id;
-
-// ==========================================================
-// Plugin Implementation
-// ==========================================================
-
-static const char * DLL_CALLCONV 
-Format() {
-	return "GIF";
-}
-
-static const char * DLL_CALLCONV 
-Description() {
-	return "Graphics Interchange Format";
-}
-
-static const char * DLL_CALLCONV 
-Extension() {
-	return "gif";
-}
-
-static const char * DLL_CALLCONV 
-RegExpr() {
-	return "^GIF";
-}
-
-static const char * DLL_CALLCONV 
-MimeType() {
-	return "image/gif";
-}
-
-static BOOL DLL_CALLCONV 
-Validate(FreeImageIO *io, fi_handle handle) {
-	char buf[6];
-	if( io->read_proc(buf, 6, 1, handle) < 1 ) {
-		return FALSE;
-	}
-
-	BOOL bResult = FALSE;
-	if( !strncmp(buf, "GIF", 3) ) {
-		if( buf[3] >= '0' && buf[3] <= '9' && buf[4] >= '0' && buf[4] <= '9' && buf[5] >= 'a' && buf[5] <= 'z' ) {
-			bResult = TRUE;
-		}
-	}
-
-	io->seek_proc(handle, -6, SEEK_CUR);
-
-	return bResult;
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportDepth(int depth) {
-	return	(depth == 1) ||
-			(depth == 4) ||
-			(depth == 8);
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportType(FREE_IMAGE_TYPE type) {
-	return (type == FIT_BITMAP) ? TRUE : FALSE;
-}
-
-// ----------------------------------------------------------
-
-static void *DLL_CALLCONV 
-Open(FreeImageIO *io, fi_handle handle, BOOL read) {
-	GIFinfo *info = new(std::nothrow) GIFinfo;
-	if( info == NULL ) {
-		return NULL;
-	}
-
-	// 25/02/2008 MDA:	Not safe to memset GIFinfo structure with VS 2008 (safe iterators),
-	//					perform initialization in constructor instead.
-	// memset(info, 0, sizeof(GIFinfo));
-
-	info->read = read;
-	if( read ) {
-		try {
-			//Header
-			if( !Validate(io, handle) ) {
-				throw FI_MSG_ERROR_MAGIC_NUMBER;
-			}
-			io->seek_proc(handle, 6, SEEK_CUR);
-
-			//Logical Screen Descriptor
-			io->seek_proc(handle, 4, SEEK_CUR);
-			BYTE packed;
-			if( io->read_proc(&packed, 1, 1, handle) < 1 ) {
-				throw "EOF reading Logical Screen Descriptor";
-			}
-			if( io->read_proc(&info->background_color, 1, 1, handle) < 1 ) {
-				throw "EOF reading Logical Screen Descriptor";
-			}
-			io->seek_proc(handle, 1, SEEK_CUR);
-
-			//Global Color Table
-			if( packed & GIF_PACKED_LSD_HAVEGCT ) {
-				info->global_color_table_offset = io->tell_proc(handle);
-				info->global_color_table_size = 2 << (packed & GIF_PACKED_LSD_GCTSIZE);
-				io->seek_proc(handle, 3 * info->global_color_table_size, SEEK_CUR);
-			}
-
-			//Scan through all the rest of the blocks, saving offsets
-			size_t gce_offset = 0;
-			BYTE block = 0;
-			while( block != GIF_BLOCK_TRAILER ) {
-				if( io->read_proc(&block, 1, 1, handle) < 1 ) {
-					throw "EOF reading blocks";
-				}
-				if( block == GIF_BLOCK_IMAGE_DESCRIPTOR ) {
-					info->image_descriptor_offsets.push_back(io->tell_proc(handle));
-					//GCE may be 0, meaning no GCE preceded this ID
-					info->graphic_control_extension_offsets.push_back(gce_offset);
-					gce_offset = 0;
-
-					io->seek_proc(handle, 8, SEEK_CUR);
-					if( io->read_proc(&packed, 1, 1, handle) < 1 ) {
-						throw "EOF reading Image Descriptor";
-					}
-
-					//Local Color Table
-					if( packed & GIF_PACKED_ID_HAVELCT ) {
-						io->seek_proc(handle, 3 * (2 << (packed & GIF_PACKED_ID_LCTSIZE)), SEEK_CUR);
-					}
-
-					//LZW Minimum Code Size
-					io->seek_proc(handle, 1, SEEK_CUR);
-				} else if( block == GIF_BLOCK_EXTENSION ) {
-					BYTE ext;
-					if( io->read_proc(&ext, 1, 1, handle) < 1 ) {
-						throw "EOF reading extension";
-					}
-
-					if( ext == GIF_EXT_GRAPHIC_CONTROL ) {
-						//overwrite previous offset if more than one GCE found before an ID
-						gce_offset = io->tell_proc(handle);
-					} else if( ext == GIF_EXT_COMMENT ) {
-						info->comment_extension_offsets.push_back(io->tell_proc(handle));
-					} else if( ext == GIF_EXT_APPLICATION ) {
-						info->application_extension_offsets.push_back(io->tell_proc(handle));
-					}
-				} else if( block == GIF_BLOCK_TRAILER ) {
-					continue;
-				} else {
-					throw "Invalid GIF block found";
-				}
-
-				//Data Sub-blocks
-				BYTE len;
-				if( io->read_proc(&len, 1, 1, handle) < 1 ) {
-					throw "EOF reading sub-block";
-				}
-				while( len != 0 ) {
-					io->seek_proc(handle, len, SEEK_CUR);
-					if( io->read_proc(&len, 1, 1, handle) < 1 ) {
-						throw "EOF reading sub-block";
-					}
-				}
-			}
-		} catch (const char *msg) {
-			FreeImage_OutputMessageProc(s_format_id, msg);
-			delete info;
-			return NULL;
-		}
-	} else {
-		//Header
-		io->write_proc((void *)"GIF89a", 6, 1, handle);
-	}
-
-	return info;
-}
-
-static void DLL_CALLCONV 
-Close(FreeImageIO *io, fi_handle handle, void *data) {
-	if( data == NULL ) {
-		return;
-	}
-	GIFinfo *info = (GIFinfo *)data;
-
-	if( !info->read ) {
-		//Trailer
-		BYTE b = GIF_BLOCK_TRAILER;
-		io->write_proc(&b, 1, 1, handle);
-	}
-
-	delete info;
-}
-
-static int DLL_CALLCONV
-PageCount(FreeImageIO *io, fi_handle handle, void *data) {
-	if( data == NULL ) {
-		return 0;
-	}
-	GIFinfo *info = (GIFinfo *)data;
-
-	return (int) info->image_descriptor_offsets.size();
-}
-
-static FIBITMAP * DLL_CALLCONV 
-Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
-	if( data == NULL ) {
-		return NULL;
-	}
-	GIFinfo *info = (GIFinfo *)data;
-
-	if( page == -1 ) {
-		page = 0;
-	}
-	if( page < 0 || page >= (int)info->image_descriptor_offsets.size() ) {
-		return NULL;
-	}
-
-	FIBITMAP *dib = NULL;
-	try {
-		bool have_transparent = false, no_local_palette = false, interlaced = false;
-		int disposal_method = GIF_DISPOSAL_LEAVE, delay_time = 0, transparent_color = 0;
-		WORD left, top, width, height;
-		BYTE packed, b;
-		WORD w;
-
-		//playback pages to generate what the user would see for this frame
-		if( (flags & GIF_PLAYBACK) == GIF_PLAYBACK ) {
-			//Logical Screen Descriptor
-			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
-			io->read_proc(&logicalwidth, 2, 1, handle);
-			io->read_proc(&logicalheight, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-			SwapShort(&logicalwidth);
-			SwapShort(&logicalheight);
-#endif
-			//set the background color with 0 alpha
-			RGBQUAD background;
-			if( info->global_color_table_offset != 0 && info->background_color < info->global_color_table_size ) {
-				io->seek_proc(handle, (long)(info->global_color_table_offset + (info->background_color * 3)), SEEK_SET);
-				io->read_proc(&background.rgbRed, 1, 1, handle);
-				io->read_proc(&background.rgbGreen, 1, 1, handle);
-				io->read_proc(&background.rgbBlue, 1, 1, handle);
-			} else {
-				background.rgbRed = 0;
-				background.rgbGreen = 0;
-				background.rgbBlue = 0;
-			}
-			background.rgbReserved = 0;
-
-			//allocate entire logical area
-			dib = FreeImage_Allocate(logicalwidth, logicalheight, 32);
-			if( dib == NULL ) {
-				throw FI_MSG_ERROR_DIB_MEMORY;
-			}
-
-			//fill with background color to start
-			int x, y;
-			RGBQUAD *scanline;
-			for( y = 0; y < logicalheight; y++ ) {
-				scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, y);
-				for( x = 0; x < logicalwidth; x++ ) {
-					*scanline++ = background;
-				}
-			}
-
-			//cache some info about each of the pages so we can avoid decoding as many of them as possible
-			std::vector<PageInfo> pageinfo;
-			int start = page, end = page;
-			while( start >= 0 ) {
-				//Graphic Control Extension
-				io->seek_proc(handle, (long)(info->graphic_control_extension_offsets[start] + 1), SEEK_SET);
-				io->read_proc(&packed, 1, 1, handle);
-				have_transparent = (packed & GIF_PACKED_GCE_HAVETRANS) ? true : false;
-				disposal_method = (packed & GIF_PACKED_GCE_DISPOSAL) >> 2;
-				//Image Descriptor
-				io->seek_proc(handle, (long)(info->image_descriptor_offsets[start]), SEEK_SET);
-				io->read_proc(&left, 2, 1, handle);
-				io->read_proc(&top, 2, 1, handle);
-				io->read_proc(&width, 2, 1, handle);
-				io->read_proc(&height, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-				SwapShort(&left);
-				SwapShort(&top);
-				SwapShort(&width);
-				SwapShort(&height);
-#endif
-
-				pageinfo.push_back(PageInfo(disposal_method, left, top, width, height));
-
-				if( start != end ) {
-					if( left == 0 && top == 0 && width == logicalwidth && height == logicalheight ) {
-						if( disposal_method == GIF_DISPOSAL_BACKGROUND ) {
-							pageinfo.pop_back();
-							start++;
-							break;
-						} else if( disposal_method != GIF_DISPOSAL_PREVIOUS ) {
-							if( !have_transparent ) {
-								break;
-							}
-						}
-					}
-				}
-				start--;
-			}
-			if( start < 0 ) {
-				start = 0;
-			}
-
-			//draw each page into the logical area
-			delay_time = 0;
-			for( page = start; page <= end; page++ ) {
-				PageInfo &info = pageinfo[end - page];
-				//things we can skip having to decode
-				if( page != end ) {
-					if( info.disposal_method == GIF_DISPOSAL_PREVIOUS ) {
-						continue;
-					}
-					if( info.disposal_method == GIF_DISPOSAL_BACKGROUND ) {
-						for( y = 0; y < info.height; y++ ) {
-							const int scanidx = logicalheight - (y + info.top) - 1;
-							if ( scanidx < 0 ) {
-								break;  // If data is corrupt, don't calculate in invalid scanline
-							}
-							scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, scanidx) + info.left;
-							for( x = 0; x < info.width; x++ ) {
-								*scanline++ = background;
-							}
-						}
-						continue;
-					}
-				}
-
-				//decode page
-				FIBITMAP *pagedib = Load(io, handle, page, GIF_LOAD256, data);
-				if( pagedib != NULL ) {
-					RGBQUAD *pal = FreeImage_GetPalette(pagedib);
-					have_transparent = false;
-					if( FreeImage_IsTransparent(pagedib) ) {
-						int count = FreeImage_GetTransparencyCount(pagedib);
-						BYTE *table = FreeImage_GetTransparencyTable(pagedib);
-						for( int i = 0; i < count; i++ ) {
-							if( table[i] == 0 ) {
-								have_transparent = true;
-								transparent_color = i;
-								break;
-							}
-						}
-					}
-					//copy page data into logical buffer, with full alpha opaqueness
-					for( y = 0; y < info.height; y++ ) {
-						const int scanidx = logicalheight - (y + info.top) - 1;
-						if ( scanidx < 0 ) {
-							break;  // If data is corrupt, don't calculate in invalid scanline
-						}
-						scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, scanidx) + info.left;
-						BYTE *pageline = FreeImage_GetScanLine(pagedib, info.height - y - 1);
-						for( x = 0; x < info.width; x++ ) {
-							if( !have_transparent || *pageline != transparent_color ) {
-								*scanline = pal[*pageline];
-								scanline->rgbReserved = 255;
-							}
-							scanline++;
-							pageline++;
-						}
-					}
-					//copy frame time
-					if( page == end ) {
-						FITAG *tag;
-						if( FreeImage_GetMetadataEx(FIMD_ANIMATION, pagedib, "FrameTime", FIDT_LONG, &tag) ) {
-							delay_time = *(LONG *)FreeImage_GetTagValue(tag);
-						}
-					}
-					FreeImage_Unload(pagedib);
-				}
-			}
-
-			//setup frame time
-			FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "FrameTime", ANIMTAG_FRAMETIME, FIDT_LONG, 1, 4, &delay_time);
-			return dib;
-		}
-
-		//get the actual frame image data for a single frame
-
-		//Image Descriptor
-		io->seek_proc(handle, (long)info->image_descriptor_offsets[page], SEEK_SET);
-		io->read_proc(&left, 2, 1, handle);
-		io->read_proc(&top, 2, 1, handle);
-		io->read_proc(&width, 2, 1, handle);
-		io->read_proc(&height, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapShort(&left);
-		SwapShort(&top);
-		SwapShort(&width);
-		SwapShort(&height);
-#endif
-		io->read_proc(&packed, 1, 1, handle);
-		interlaced = (packed & GIF_PACKED_ID_INTERLACED) ? true : false;
-		no_local_palette = (packed & GIF_PACKED_ID_HAVELCT) ? false : true;
-
-		int bpp = 8;
-		if( (flags & GIF_LOAD256) == 0 ) {
-			if( !no_local_palette ) {
-				int size = 2 << (packed & GIF_PACKED_ID_LCTSIZE);
-				if( size <= 2 ) bpp = 1;
-				else if( size <= 16 ) bpp = 4;
-			} else if( info->global_color_table_offset != 0 ) {
-				if( info->global_color_table_size <= 2 ) bpp = 1;
-				else if( info->global_color_table_size <= 16 ) bpp = 4;
-			}
-		}
-		dib = FreeImage_Allocate(width, height, bpp);
-		if( dib == NULL ) {
-			throw FI_MSG_ERROR_DIB_MEMORY;
-		}
-
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", ANIMTAG_FRAMELEFT, FIDT_SHORT, 1, 2, &left);
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", ANIMTAG_FRAMETOP, FIDT_SHORT, 1, 2, &top);
-		b = no_local_palette ? 1 : 0;
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", ANIMTAG_NOLOCALPALETTE, FIDT_BYTE, 1, 1, &b);
-		b = interlaced ? 1 : 0;
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "Interlaced", ANIMTAG_INTERLACED, FIDT_BYTE, 1, 1, &b);
-
-		//Palette
-		RGBQUAD *pal = FreeImage_GetPalette(dib);
-		if( !no_local_palette ) {
-			int size = 2 << (packed & GIF_PACKED_ID_LCTSIZE);
-
-			int i = 0;
-			while( i < size ) {
-				io->read_proc(&pal[i].rgbRed, 1, 1, handle);
-				io->read_proc(&pal[i].rgbGreen, 1, 1, handle);
-				io->read_proc(&pal[i].rgbBlue, 1, 1, handle);
-				i++;
-			}
-		} else if( info->global_color_table_offset != 0 ) {
-			long pos = io->tell_proc(handle);
-			io->seek_proc(handle, (long)info->global_color_table_offset, SEEK_SET);
-
-			int i = 0;
-			while( i < info->global_color_table_size ) {
-				io->read_proc(&pal[i].rgbRed, 1, 1, handle);
-				io->read_proc(&pal[i].rgbGreen, 1, 1, handle);
-				io->read_proc(&pal[i].rgbBlue, 1, 1, handle);
-				i++;
-			}
-
-			io->seek_proc(handle, pos, SEEK_SET);
-		} else {
-			//its legal to have no palette, but we're going to generate *something*
-			for( int i = 0; i < 256; i++ ) {
-				pal[i].rgbRed   = (BYTE)i;
-				pal[i].rgbGreen = (BYTE)i;
-				pal[i].rgbBlue  = (BYTE)i;
-			}
-		}
-
-		//LZW Minimum Code Size
-		io->read_proc(&b, 1, 1, handle);
-		StringTable *stringtable = new(std::nothrow) StringTable;
-		stringtable->Initialize(b);
-
-		//Image Data Sub-blocks
-		int x = 0, xpos = 0, y = 0, shift = 8 - bpp, mask = (1 << bpp) - 1, interlacepass = 0;
-		BYTE *scanline = FreeImage_GetScanLine(dib, height - 1);
-		BYTE buf[4096];
-		io->read_proc(&b, 1, 1, handle);
-		while( b ) {
-			io->read_proc(stringtable->FillInputBuffer(b), b, 1, handle);
-			int size = sizeof(buf);
-			while( stringtable->Decompress(buf, &size) ) {
-				for( int i = 0; i < size; i++ ) {
-					scanline[xpos] |= (buf[i] & mask) << shift;
-					if( shift > 0 ) {
-						shift -= bpp;
-					} else {
-						xpos++;
-						shift = 8 - bpp;
-					}
-					if( ++x >= width ) {
-						if( interlaced ) {
-							y += g_GifInterlaceIncrement[interlacepass];
-							if( y >= height && ++interlacepass < GIF_INTERLACE_PASSES ) {
-								y = g_GifInterlaceOffset[interlacepass];
-							} 						
-						} else {
-							y++;
-						}
-						if( y >= height ) {
-							stringtable->Done();
-							break;
-						}
-						x = xpos = 0;
-						shift = 8 - bpp;
-						scanline = FreeImage_GetScanLine(dib, height - y - 1);
-					}
-				}
-				size = sizeof(buf);
-			}
-			io->read_proc(&b, 1, 1, handle);
-		}
-
-		if( page == 0 ) {
-			size_t idx;
-
-			//Logical Screen Descriptor
-			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
-			io->read_proc(&logicalwidth, 2, 1, handle);
-			io->read_proc(&logicalheight, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-			SwapShort(&logicalwidth);
-			SwapShort(&logicalheight);
-#endif
-			FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", ANIMTAG_LOGICALWIDTH, FIDT_SHORT, 1, 2, &logicalwidth);
-			FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", ANIMTAG_LOGICALHEIGHT, FIDT_SHORT, 1, 2, &logicalheight);
-
-			//Global Color Table
-			if( info->global_color_table_offset != 0 ) {
-				RGBQUAD globalpalette[256];
-				io->seek_proc(handle, (long)info->global_color_table_offset, SEEK_SET);
-				int i = 0;
-				while( i < info->global_color_table_size ) {
-					io->read_proc(&globalpalette[i].rgbRed, 1, 1, handle);
-					io->read_proc(&globalpalette[i].rgbGreen, 1, 1, handle);
-					io->read_proc(&globalpalette[i].rgbBlue, 1, 1, handle);
-					globalpalette[i].rgbReserved = 0;
-					i++;
-				}
-				FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "GlobalPalette", ANIMTAG_GLOBALPALETTE, FIDT_PALETTE, info->global_color_table_size, info->global_color_table_size * 4, globalpalette);
-				//background color
-				if( info->background_color < info->global_color_table_size ) {
-					FreeImage_SetBackgroundColor(dib, &globalpalette[info->background_color]);
-				}
-			}
-
-			//Application Extension
-			LONG loop = 1; //If no AE with a loop count is found, the default must be 1
-			for( idx = 0; idx < info->application_extension_offsets.size(); idx++ ) {
-				io->seek_proc(handle, (long)info->application_extension_offsets[idx], SEEK_SET);
-				io->read_proc(&b, 1, 1, handle);
-				if( b == 11 ) { //All AEs start with an 11 byte sub-block to determine what type of AE it is
-					char buf[11];
-					io->read_proc(buf, 11, 1, handle);
-					if( !memcmp(buf, "NETSCAPE2.0", 11) || !memcmp(buf, "ANIMEXTS1.0", 11) ) { //Not everybody recognizes ANIMEXTS1.0 but it is valid
-						io->read_proc(&b, 1, 1, handle);
-						if( b == 3 ) { //we're supposed to have a 3 byte sub-block now
-							io->read_proc(&b, 1, 1, handle); //this should be 0x01 but isn't really important
-							io->read_proc(&w, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-							SwapShort(&w);
-#endif
-							loop = w;
-							if( loop > 0 ) loop++;
-							break;
-						}
-					}
-				}
-			}
-			FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "Loop", ANIMTAG_LOOP, FIDT_LONG, 1, 4, &loop);
-
-			// Comment Extension
-			for (idx = 0; idx < info->comment_extension_offsets.size(); idx++) {
-				io->seek_proc(handle, (long)info->comment_extension_offsets[idx], SEEK_SET);
-				std::string comment;
-				char buf[255];
-				io->read_proc(&b, 1, 1, handle);
-				while (b) {
-					io->read_proc(buf, b, 1, handle);
-					comment.append(buf, b);
-					io->read_proc(&b, 1, 1, handle);
-				}
-				comment.append(1, '\0');
-				sprintf(buf, "Comment%d", (int)idx);
-				DWORD comment_size = (DWORD)comment.size();
-				FreeImage_SetMetadataEx(FIMD_COMMENTS, dib, buf, 1, FIDT_ASCII, comment_size, comment_size, comment.c_str());
-			}
-		}
-
-		//Graphic Control Extension
-		if( info->graphic_control_extension_offsets[page] != 0 ) {
-			io->seek_proc(handle, (long)(info->graphic_control_extension_offsets[page] + 1), SEEK_SET);
-			io->read_proc(&packed, 1, 1, handle);
-			io->read_proc(&w, 2, 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-			SwapShort(&w);
-#endif
-			io->read_proc(&b, 1, 1, handle);
-			have_transparent = (packed & GIF_PACKED_GCE_HAVETRANS) ? true : false;
-			disposal_method = (packed & GIF_PACKED_GCE_DISPOSAL) >> 2;
-			delay_time = w * 10; //convert cs to ms
-			transparent_color = b;
-			if( have_transparent ) {
-				int size = 1 << bpp;
-				if( transparent_color <= size ) {
-					BYTE table[256];
-					memset(table, 0xFF, size);
-					table[transparent_color] = 0;
-					FreeImage_SetTransparencyTable(dib, table, size);
-				}
-			}
-		}
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "FrameTime", ANIMTAG_FRAMETIME, FIDT_LONG, 1, 4, &delay_time);
-		b = (BYTE)disposal_method;
-		FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "DisposalMethod", ANIMTAG_DISPOSALMETHOD, FIDT_BYTE, 1, 1, &b);
-
-		delete stringtable;
-
-	} catch (const char *msg) {
-		if( dib != NULL ) {
-			FreeImage_Unload(dib);
-		}
-		FreeImage_OutputMessageProc(s_format_id, msg);
-		return NULL;
-	}
-
-	return dib;
-}
-
-static BOOL DLL_CALLCONV 
-Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
-	if( data == NULL ) {
-		return FALSE;
-	}
-	//GIFinfo *info = (GIFinfo *)data;
-
-	if( page == -1 ) {
-		page = 0;
-	}
-
-	try {
-		BYTE packed, b;
-		WORD w;
-		FITAG *tag;
-
-		int bpp = FreeImage_GetBPP(dib);
-		if( bpp != 1 && bpp != 4 && bpp != 8 ) {
-			throw "Only 1, 4, or 8 bpp images supported";
-		}
-
-		bool have_transparent = false, no_local_palette = false, interlaced = false;
-		int disposal_method = GIF_DISPOSAL_BACKGROUND, delay_time = 100, transparent_color = 0;
-		WORD left = 0, top = 0, width = (WORD)FreeImage_GetWidth(dib), height = (WORD)FreeImage_GetHeight(dib);
-		WORD output_height = height;
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", FIDT_SHORT, &tag) ) {
-			left = *(WORD *)FreeImage_GetTagValue(tag);
-		}
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", FIDT_SHORT, &tag) ) {
-			top = *(WORD *)FreeImage_GetTagValue(tag);
-		}
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", FIDT_BYTE, &tag) ) {
-			no_local_palette = *(BYTE *)FreeImage_GetTagValue(tag) ? true : false;
-		}
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Interlaced", FIDT_BYTE, &tag) ) {
-			interlaced = *(BYTE *)FreeImage_GetTagValue(tag) ? true : false;
-		}
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTime", FIDT_LONG, &tag) ) {
-			delay_time = *(LONG *)FreeImage_GetTagValue(tag);
-		}
-		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "DisposalMethod", FIDT_BYTE, &tag) ) {
-			disposal_method = *(BYTE *)FreeImage_GetTagValue(tag);
-		}
-
-		RGBQUAD *pal = FreeImage_GetPalette(dib);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapShort(&left);
-		SwapShort(&top);
-		SwapShort(&width);
-		SwapShort(&height);
-#endif
-
-		if( page == 0 ) {
-			//gather some info
-			WORD logicalwidth = width; // width has already been swapped...
-			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", FIDT_SHORT, &tag) ) {
-				logicalwidth = *(WORD *)FreeImage_GetTagValue(tag);
-#ifdef FREEIMAGE_BIGENDIAN
-				SwapShort(&logicalwidth);
-#endif
-			}
-			WORD logicalheight = height; // height has already been swapped...
-			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", FIDT_SHORT, &tag) ) {
-				logicalheight = *(WORD *)FreeImage_GetTagValue(tag);
-#ifdef FREEIMAGE_BIGENDIAN
-				SwapShort(&logicalheight);
-#endif
-			}
-			RGBQUAD *globalpalette = NULL;
-			int globalpalette_size = 0;
-			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "GlobalPalette", FIDT_PALETTE, &tag) ) {
-				globalpalette_size = FreeImage_GetTagCount(tag);
-				if( globalpalette_size >= 2 ) {
-					globalpalette = (RGBQUAD *)FreeImage_GetTagValue(tag);
-				}
-			}
-
-			//Logical Screen Descriptor
-			io->write_proc(&logicalwidth, 2, 1, handle);
-			io->write_proc(&logicalheight, 2, 1, handle);
-			packed = GIF_PACKED_LSD_COLORRES;
-			b = 0;
-			RGBQUAD background_color;
-			if( globalpalette != NULL ) {
-				packed |= GIF_PACKED_LSD_HAVEGCT;
-				if( globalpalette_size < 4 ) {
-					globalpalette_size = 2;
-					packed |= 0 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 8 ) {
-					globalpalette_size = 4;
-					packed |= 1 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 16 ) {
-					globalpalette_size = 8;
-					packed |= 2 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 32 ) {
-					globalpalette_size = 16;
-					packed |= 3 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 64 ) {
-					globalpalette_size = 32;
-					packed |= 4 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 128 ) {
-					globalpalette_size = 64;
-					packed |= 5 & GIF_PACKED_LSD_GCTSIZE;
-				} else if( globalpalette_size < 256 ) {
-					globalpalette_size = 128;
-					packed |= 6 & GIF_PACKED_LSD_GCTSIZE;
-				} else {
-					globalpalette_size = 256;
-					packed |= 7 & GIF_PACKED_LSD_GCTSIZE;
-				}
-				if( FreeImage_GetBackgroundColor(dib, &background_color) ) {
-					for( int i = 0; i < globalpalette_size; i++ ) {
-						if( background_color.rgbRed == globalpalette[i].rgbRed &&
-							background_color.rgbGreen == globalpalette[i].rgbGreen &&
-							background_color.rgbBlue == globalpalette[i].rgbBlue ) {
-
-							b = (BYTE)i;
-							break;
-						}
-					}
-				}
-			} else {
-				packed |= (bpp - 1) & GIF_PACKED_LSD_GCTSIZE;
-			}
-			io->write_proc(&packed, 1, 1, handle);
-			io->write_proc(&b, 1, 1, handle);
-			b = 0;
-			io->write_proc(&b, 1, 1, handle);
-
-			//Global Color Table
-			if( globalpalette != NULL ) {
-				int i = 0;
-				while( i < globalpalette_size ) {
-					io->write_proc(&globalpalette[i].rgbRed, 1, 1, handle);
-					io->write_proc(&globalpalette[i].rgbGreen, 1, 1, handle);
-					io->write_proc(&globalpalette[i].rgbBlue, 1, 1, handle);
-					i++;
-				}
-			}
-
-			//Application Extension
-			LONG loop = 0;
-			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Loop", FIDT_LONG, &tag) ) {
-				loop = *(LONG *)FreeImage_GetTagValue(tag);
-			}
-			if( loop != 1 ) {
-				//the Netscape extension is really "repeats" not "loops"
-				if( loop > 1 ) loop--;
-				if( loop > 0xFFFF ) loop = 0xFFFF;
-				w = (WORD)loop;
-#ifdef FREEIMAGE_BIGENDIAN
-				SwapShort(&w);
-#endif
-				io->write_proc((void *)"\x21\xFF\x0BNETSCAPE2.0\x03\x01", 16, 1, handle);
-				io->write_proc(&w, 2, 1, handle);
-				b = 0;
-				io->write_proc(&b, 1, 1, handle);
-			}
-
-			//Comment Extension
-			FIMETADATA *mdhandle = NULL;
-			FITAG *tag = NULL;
-			mdhandle = FreeImage_FindFirstMetadata(FIMD_COMMENTS, dib, &tag);
-			if( mdhandle ) {
-				do {
-					if( FreeImage_GetTagType(tag) == FIDT_ASCII ) {
-						int length = FreeImage_GetTagLength(tag) - 1;
-						char *value = (char *)FreeImage_GetTagValue(tag);
-						io->write_proc((void *)"\x21\xFE", 2, 1, handle);
-						while( length > 0 ) {
-							b = (BYTE)(length >= 255 ? 255 : length);
-							io->write_proc(&b, 1, 1, handle);
-							io->write_proc(value, b, 1, handle);
-							value += b;
-							length -= b;
-						}
-						b = 0;
-						io->write_proc(&b, 1, 1, handle);
-					}
-				} while(FreeImage_FindNextMetadata(mdhandle, &tag));
-
-				FreeImage_FindCloseMetadata(mdhandle);
-			}
-		}
-
-		//Graphic Control Extension
-		if( FreeImage_IsTransparent(dib) ) {
-			int count = FreeImage_GetTransparencyCount(dib);
-			BYTE *table = FreeImage_GetTransparencyTable(dib);
-			for( int i = 0; i < count; i++ ) {
-				if( table[i] == 0 ) {
-					have_transparent = true;
-					transparent_color = i;
-					break;
-				}
-			}
-		}
-		io->write_proc((void *)"\x21\xF9\x04", 3, 1, handle);
-		b = (BYTE)((disposal_method << 2) & GIF_PACKED_GCE_DISPOSAL);
-		if( have_transparent ) b |= GIF_PACKED_GCE_HAVETRANS;
-		io->write_proc(&b, 1, 1, handle);
-		//Notes about delay time for GIFs:
-		//IE5/IE6 have a minimum and default of 100ms
-		//Mozilla/Firefox/Netscape 6+/Opera have a minimum of 20ms and a default of 100ms if <20ms is specified or the GCE is absent
-		//Netscape 4 has a minimum of 10ms if 0ms is specified, but will use 0ms if the GCE is absent
-		w = (WORD)(delay_time / 10); //convert ms to cs
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapShort(&w);
-#endif
-		io->write_proc(&w, 2, 1, handle);
-		b = (BYTE)transparent_color;
-		io->write_proc(&b, 1, 1, handle);
-		b = 0;
-		io->write_proc(&b, 1, 1, handle);
-
-		//Image Descriptor
-		b = GIF_BLOCK_IMAGE_DESCRIPTOR;
-		io->write_proc(&b, 1, 1, handle);
-		io->write_proc(&left, 2, 1, handle);
-		io->write_proc(&top, 2, 1, handle);
-		io->write_proc(&width, 2, 1, handle);
-		io->write_proc(&height, 2, 1, handle);
-		packed = 0;
-		if( !no_local_palette ) packed |= GIF_PACKED_ID_HAVELCT | ((bpp - 1) & GIF_PACKED_ID_LCTSIZE);
-		if( interlaced ) packed |= GIF_PACKED_ID_INTERLACED;
-		io->write_proc(&packed, 1, 1, handle);
-
-		//Local Color Table
-		if( !no_local_palette ) {
-			int palsize = 1 << bpp;
-			for( int i = 0; i < palsize; i++ ) {
-				io->write_proc(&pal[i].rgbRed, 1, 1, handle);
-				io->write_proc(&pal[i].rgbGreen, 1, 1, handle);
-				io->write_proc(&pal[i].rgbBlue, 1, 1, handle);
-			}
-		}
-
-
-		//LZW Minimum Code Size
-		b = (BYTE)(bpp == 1 ? 2 : bpp);
-		io->write_proc(&b, 1, 1, handle);
-		StringTable *stringtable = new(std::nothrow) StringTable;
-		stringtable->Initialize(b);
-		stringtable->CompressStart(bpp, width);
-
-		//Image Data Sub-blocks
-		int y = 0, interlacepass = 0, line = FreeImage_GetLine(dib);
-		BYTE buf[255], *bufptr = buf; //255 is the max sub-block length
-		int size = sizeof(buf);
-		b = sizeof(buf);
-		while( y < output_height ) {
-			memcpy(stringtable->FillInputBuffer(line), FreeImage_GetScanLine(dib, output_height - y - 1), line);
-			while( stringtable->Compress(bufptr, &size) ) {
-				bufptr += size;
-				if( bufptr - buf == sizeof(buf) ) {
-					io->write_proc(&b, 1, 1, handle);
-					io->write_proc(buf, sizeof(buf), 1, handle);
-					size = sizeof(buf);
-					bufptr = buf;
-				} else {
-					size = (int)(sizeof(buf) - (bufptr - buf));
-				}
-			}
-			if( interlaced ) {
-				y += g_GifInterlaceIncrement[interlacepass];
-				if( y >= output_height && ++interlacepass < GIF_INTERLACE_PASSES ) {
-					y = g_GifInterlaceOffset[interlacepass];
-				}		
-			} else {
-				y++;
-			}
-		}
-		size = (int)(bufptr - buf);
-		BYTE last[4];
-		w = (WORD)stringtable->CompressEnd(last);
-		if( size + w >= sizeof(buf) ) {
-			//one last full size sub-block
-			io->write_proc(&b, 1, 1, handle);
-			io->write_proc(buf, size, 1, handle);
-			io->write_proc(last, sizeof(buf) - size, 1, handle);
-			//and possibly a tiny additional sub-block
-			b = (BYTE)(w - (sizeof(buf) - size));
-			if( b > 0 ) {
-				io->write_proc(&b, 1, 1, handle);
-				io->write_proc(last + w - b, b, 1, handle);
-			}
-		} else {
-			//last sub-block less than full size
-			b = (BYTE)(size + w);
-			io->write_proc(&b, 1, 1, handle);
-			io->write_proc(buf, size, 1, handle);
-			io->write_proc(last, w, 1, handle);
-		}
-
-		//Block Terminator
-		b = 0;
-		io->write_proc(&b, 1, 1, handle);
-
-		delete stringtable;
-
-	} catch (const char *msg) {
-		FreeImage_OutputMessageProc(s_format_id, msg);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-// ==========================================================
-//   Init
-// ==========================================================
-
-void DLL_CALLCONV 
-InitGIF(Plugin *plugin, int format_id) {
-	s_format_id = format_id;
-
-	plugin->format_proc = Format;
-	plugin->description_proc = Description;
-	plugin->extension_proc = Extension;
-	plugin->regexpr_proc = RegExpr;
-	plugin->open_proc = Open;
-	plugin->close_proc = Close;
-	plugin->pagecount_proc = PageCount;
-	plugin->pagecapability_proc = NULL;
-	plugin->load_proc = Load;
-	plugin->save_proc = Save;
-	plugin->validate_proc = Validate;
-	plugin->mime_proc = MimeType;
-	plugin->supports_export_bpp_proc = SupportsExportDepth;
-	plugin->supports_export_type_proc = SupportsExportType;
-	plugin->supports_icc_profiles_proc = NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PluginICO.cpp b/plugins/AdvaImg/src/FreeImage/PluginICO.cpp
deleted file mode 100644
index 5c4673e4de..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PluginICO.cpp
+++ /dev/null
@@ -1,824 +0,0 @@
-// ==========================================================
-// ICO Loader and Writer
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   Constants + headers
-// ----------------------------------------------------------
-
-#ifdef _WIN32
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif
-
-// These next two structs represent how the icon information is stored
-// in an ICO file.
-
-typedef struct tagICONHEADER {
-	WORD			idReserved;   // reserved
-	WORD			idType;       // resource type (1 for icons)
-	WORD			idCount;      // how many images?
-} ICONHEADER;
-
-typedef struct tagICONDIRECTORYENTRY {
-	BYTE	bWidth;               // width of the image
-	BYTE	bHeight;              // height of the image (times 2)
-	BYTE	bColorCount;          // number of colors in image (0 if >=8bpp)
-	BYTE	bReserved;            // reserved
-	WORD	wPlanes;              // color Planes
-	WORD	wBitCount;            // bits per pixel
-	DWORD	dwBytesInRes;         // how many bytes in this resource?
-	DWORD	dwImageOffset;        // where in the file is this image
-} ICONDIRENTRY;
-
-#ifdef _WIN32
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif
-
-// ==========================================================
-// Static helpers
-// ==========================================================
-
-/**  How wide, in bytes, would this many bits be, DWORD aligned ?
-*/
-static int 
-WidthBytes(int bits) {
-	return ((((bits) + 31)>>5)<<2);
-}
-
-/** Calculates the size of a single icon image
-@return Returns the size for that image
-*/
-static DWORD 
-CalculateImageSize(FIBITMAP* icon_dib) {
-	DWORD dwNumBytes = 0;
-
-	unsigned colors		= FreeImage_GetColorsUsed(icon_dib);
-	unsigned width		= FreeImage_GetWidth(icon_dib);
-	unsigned height		= FreeImage_GetHeight(icon_dib);
-	unsigned pitch		= FreeImage_GetPitch(icon_dib);
-
-	dwNumBytes = sizeof( BITMAPINFOHEADER );	// header
-	dwNumBytes += colors * sizeof(RGBQUAD);		// palette
-	dwNumBytes += height * pitch;				// XOR mask
-	dwNumBytes += height * WidthBytes(width);	// AND mask
-
-	return dwNumBytes;
-}
-
-/** Calculates the file offset for an icon image
-@return Returns the file offset for that image
-*/
-static DWORD 
-CalculateImageOffset(std::vector<FIBITMAP*>& vPages, int nIndex ) {
-	DWORD	dwSize;
-
-    // calculate the ICO header size
-    dwSize = sizeof(ICONHEADER); 
-    // add the ICONDIRENTRY's
-    dwSize += (DWORD)( vPages.size() * sizeof(ICONDIRENTRY) );
-    // add the sizes of the previous images
-    for(int k = 0; k < nIndex; k++) {
-		FIBITMAP *icon_dib = (FIBITMAP*)vPages[k];
-		dwSize += CalculateImageSize(icon_dib);
-	}
-
-    return dwSize;
-}
-
-/**
-Vista icon support
-@return Returns TRUE if the bitmap data is stored in PNG format
-*/
-static BOOL
-IsPNG(FreeImageIO *io, fi_handle handle) {
-	BYTE png_signature[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
-	BYTE signature[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	long tell = io->tell_proc(handle);
-	io->read_proc(&signature, 1, 8, handle);
-	BOOL bIsPNG = (memcmp(png_signature, signature, 8) == 0);
-	io->seek_proc(handle, tell, SEEK_SET);
-
-	return bIsPNG;
-}
-
-#ifdef FREEIMAGE_BIGENDIAN
-static void
-SwapInfoHeader(BITMAPINFOHEADER *header) {
-	SwapLong(&header->biSize);
-	SwapLong((DWORD *)&header->biWidth);
-	SwapLong((DWORD *)&header->biHeight);
-	SwapShort(&header->biPlanes);
-	SwapShort(&header->biBitCount);
-	SwapLong(&header->biCompression);
-	SwapLong(&header->biSizeImage);
-	SwapLong((DWORD *)&header->biXPelsPerMeter);
-	SwapLong((DWORD *)&header->biYPelsPerMeter);
-	SwapLong(&header->biClrUsed);
-	SwapLong(&header->biClrImportant);
-}
-
-static void
-SwapIconHeader(ICONHEADER *header) {
-	SwapShort(&header->idReserved);
-	SwapShort(&header->idType);
-	SwapShort(&header->idCount);
-}
-
-static void
-SwapIconDirEntries(ICONDIRENTRY *ent, int num) {
-	while(num) {
-		SwapShort(&ent->wPlanes);
-		SwapShort(&ent->wBitCount);
-		SwapLong(&ent->dwBytesInRes);
-		SwapLong(&ent->dwImageOffset);
-		num--;
-		ent++;
-	}
-}
-#endif
-
-// ==========================================================
-// Plugin Interface
-// ==========================================================
-
-static int s_format_id;
-
-// ==========================================================
-// Plugin Implementation
-// ==========================================================
-
-static const char * DLL_CALLCONV
-Format() {
-	return "ICO";
-}
-
-static const char * DLL_CALLCONV
-Description() {
-	return "Windows Icon";
-}
-
-static const char * DLL_CALLCONV
-Extension() {
-	return "ico";
-}
-
-static const char * DLL_CALLCONV
-RegExpr() {
-	return NULL;
-}
-
-static const char * DLL_CALLCONV
-MimeType() {
-	return "image/vnd.microsoft.icon";
-}
-
-static BOOL DLL_CALLCONV
-Validate(FreeImageIO *io, fi_handle handle) {
-	ICONHEADER icon_header;
-
-	io->read_proc(&icon_header, sizeof(ICONHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-	SwapIconHeader(&icon_header);
-#endif
-
-	return ((icon_header.idReserved == 0) && (icon_header.idType == 1) && (icon_header.idCount > 0));
-}
-
-static BOOL DLL_CALLCONV
-SupportsExportDepth(int depth) {
-	return (
-			(depth == 1) ||
-			(depth == 4) ||
-			(depth == 8) ||
-			(depth == 16) ||
-			(depth == 24) ||
-			(depth == 32)
-		);
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportType(FREE_IMAGE_TYPE type) {
-	return (type == FIT_BITMAP) ? TRUE : FALSE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsNoPixels() {
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-static void * DLL_CALLCONV
-Open(FreeImageIO *io, fi_handle handle, BOOL read) {
-	// Allocate memory for the header structure
-	ICONHEADER *lpIH = (ICONHEADER*)malloc(sizeof(ICONHEADER));
-	if(lpIH == NULL) {
-		return NULL;
-	}
-
-	if (read) {
-		// Read in the header
-		io->read_proc(lpIH, 1, sizeof(ICONHEADER), handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapIconHeader(lpIH);
-#endif
-
-		if(!(lpIH->idReserved == 0) || !(lpIH->idType == 1)) {
-			// Not an ICO file
-			free(lpIH);
-			return NULL;
-		}
-	}
-	else {
-		// Fill the header
-		lpIH->idReserved = 0;
-		lpIH->idType = 1;
-		lpIH->idCount = 0;
-	}
-
-	return lpIH;
-}
-
-static void DLL_CALLCONV
-Close(FreeImageIO *io, fi_handle handle, void *data) {
-	// free the header structure
-	ICONHEADER *lpIH = (ICONHEADER*)data;
-	free(lpIH);
-}
-
-// ----------------------------------------------------------
-
-static int DLL_CALLCONV
-PageCount(FreeImageIO *io, fi_handle handle, void *data) {
-	ICONHEADER *lpIH = (ICONHEADER*)data;
-
-	if(lpIH) {
-		return lpIH->idCount;
-	}
-	return 1;
-}
-
-// ----------------------------------------------------------
-
-static FIBITMAP*
-LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only) {
-	FIBITMAP *dib = NULL;
-
-	// load the BITMAPINFOHEADER
-	BITMAPINFOHEADER bmih;
-	io->read_proc(&bmih, sizeof(BITMAPINFOHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-	SwapInfoHeader(&bmih);
-#endif
-
-	// allocate the bitmap
-	int width  = bmih.biWidth;
-	int height = bmih.biHeight / 2; // height == xor + and mask
-	unsigned bit_count = bmih.biBitCount;
-	unsigned line   = CalculateLine(width, bit_count);
-	unsigned pitch  = CalculatePitch(line);
-
-	// allocate memory for one icon
-
-	dib = FreeImage_AllocateHeader(header_only, width, height, bit_count);
-
-	if (dib == NULL) {
-		return NULL;
-	}
-
-	if( bmih.biBitCount <= 8 ) {
-		// read the palette data
-		io->read_proc(FreeImage_GetPalette(dib), CalculateUsedPaletteEntries(bit_count) * sizeof(RGBQUAD), 1, handle);
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-		RGBQUAD *pal = FreeImage_GetPalette(dib);
-		for(unsigned i = 0; i < CalculateUsedPaletteEntries(bit_count); i++) {
-			INPLACESWAP(pal[i].rgbRed, pal[i].rgbBlue);
-		}
-#endif
-	}
-	
-	if(header_only) {
-		// header only mode
-		return dib;
-	}
-
-	// read the icon
-	io->read_proc(FreeImage_GetBits(dib), height * pitch, 1, handle);
-
-#ifdef FREEIMAGE_BIGENDIAN
-	if (bit_count == 16) {
-		for(int y = 0; y < height; y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
-			for(int x = 0; x < width; x++) {
-				SwapShort(pixel);
-				pixel++;
-			}
-		}
-	}
-#endif
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-	if (bit_count == 24 || bit_count == 32) {
-		for(int y = 0; y < height; y++) {
-			BYTE *pixel = FreeImage_GetScanLine(dib, y);
-			for(int x = 0; x < width; x++) {
-				INPLACESWAP(pixel[0], pixel[2]);
-				pixel += (bit_count>>3);
-			}
-		}
-	}
-#endif
-	// bitmap has been loaded successfully!
-
-	// convert to 32bpp and generate an alpha channel
-	// apply the AND mask only if the image is not 32 bpp
-	if(((flags & ICO_MAKEALPHA) == ICO_MAKEALPHA) && (bit_count < 32)) {
-		FIBITMAP *dib32 = FreeImage_ConvertTo32Bits(dib);
-		FreeImage_Unload(dib);
-
-		if (dib32 == NULL) {
-			return NULL;
-		}
-
-		int width_and	= WidthBytes(width);
-		BYTE *line_and	= (BYTE *)malloc(width_and);
-
-		if( line_and == NULL ) {
-			FreeImage_Unload(dib32);
-			return NULL;
-		}
-
-		//loop through each line of the AND-mask generating the alpha channel, invert XOR-mask
-		for(int y = 0; y < height; y++) {
-			RGBQUAD *quad = (RGBQUAD *)FreeImage_GetScanLine(dib32, y);
-			io->read_proc(line_and, width_and, 1, handle);
-			for(int x = 0; x < width; x++) {
-				quad->rgbReserved = (line_and[x>>3] & (0x80 >> (x & 0x07))) != 0 ? 0 : 0xFF;
-				if( quad->rgbReserved == 0 ) {
-					quad->rgbBlue ^= 0xFF;
-					quad->rgbGreen ^= 0xFF;
-					quad->rgbRed ^= 0xFF;
-				}
-				quad++;
-			}
-		}
-		free(line_and);
-
-		return dib32;
-	}
-
-	return dib;
-}
-
-static FIBITMAP * DLL_CALLCONV
-Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
-	if (page == -1) {
-		page = 0;
-	}
-
-	BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-	if (handle != NULL) {
-		FIBITMAP *dib = NULL;
-
-		// get the icon header
-		ICONHEADER *icon_header = (ICONHEADER*)data;
-
-		if (icon_header) {
-			// load the icon descriptions
-			ICONDIRENTRY *icon_list = (ICONDIRENTRY*)malloc(icon_header->idCount * sizeof(ICONDIRENTRY));
-			if(icon_list == NULL) {
-				return NULL;
-			}
-			io->seek_proc(handle, sizeof(ICONHEADER), SEEK_SET);
-			io->read_proc(icon_list, icon_header->idCount * sizeof(ICONDIRENTRY), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-			SwapIconDirEntries(icon_list, icon_header->idCount);
-#endif
-
-			// load the requested icon
-			if (page < icon_header->idCount) {
-				// seek to the start of the bitmap data for the icon
-				io->seek_proc(handle, icon_list[page].dwImageOffset, SEEK_SET);
-
-				if( IsPNG(io, handle) ) {
-					// Vista icon support
-					// see http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-					dib = FreeImage_LoadFromHandle(FIF_PNG, io, handle, header_only ? FIF_LOAD_NOPIXELS : PNG_DEFAULT);
-				}
-				else {
-					// standard icon support
-					// see http://msdn.microsoft.com/en-us/library/ms997538.aspx
-					// see http://blogs.msdn.com/b/oldnewthing/archive/2010/10/18/10077133.aspx
-					dib = LoadStandardIcon(io, handle, flags, header_only);
-				}
-
-				free(icon_list);
-
-				return dib;
-
-			} else {
-				free(icon_list);
-				FreeImage_OutputMessageProc(s_format_id, "Page doesn't exist");
-			}
-		} else {
-			FreeImage_OutputMessageProc(s_format_id, "File is not an ICO file");
-		}
-	}
-
-	return NULL;
-}
-
-// ----------------------------------------------------------
-
-static BOOL 
-SaveStandardIcon(FreeImageIO *io, FIBITMAP *dib, fi_handle handle) {
-	BITMAPINFOHEADER *bmih = NULL;
-
-	// write the BITMAPINFOHEADER
-	bmih = FreeImage_GetInfoHeader(dib);
-	bmih->biHeight *= 2;	// height == xor + and mask
-#ifdef FREEIMAGE_BIGENDIAN
-	SwapInfoHeader(bmih);
-#endif
-	io->write_proc(bmih, sizeof(BITMAPINFOHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-	SwapInfoHeader(bmih);
-#endif
-	bmih->biHeight /= 2;
-
-	// write the palette data
-	if (FreeImage_GetPalette(dib) != NULL) {
-		RGBQUAD *pal = FreeImage_GetPalette(dib);
-		FILE_BGRA bgra;
-		for(unsigned i = 0; i < FreeImage_GetColorsUsed(dib); i++) {
-			bgra.b = pal[i].rgbBlue;
-			bgra.g = pal[i].rgbGreen;
-			bgra.r = pal[i].rgbRed;
-			bgra.a = pal[i].rgbReserved;
-			io->write_proc(&bgra, sizeof(FILE_BGRA), 1, handle);
-		}
-	}
-
-	// write the bits
-	int width			= bmih->biWidth;
-	int height			= bmih->biHeight;
-	unsigned bit_count	= bmih->biBitCount;
-	unsigned line		= CalculateLine(width, bit_count);
-	unsigned pitch		= CalculatePitch(line);
-	int size_xor		= height * pitch;
-	int size_and		= height * WidthBytes(width);
-
-	// XOR mask
-#ifdef FREEIMAGE_BIGENDIAN
-	if (bit_count == 16) {
-		WORD pixel;
-		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			BYTE *line = FreeImage_GetScanLine(dib, y);
-			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				pixel = ((WORD *)line)[x];
-				SwapShort(&pixel);
-				if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1)
-					return FALSE;
-			}
-		}
-	} else
-#endif
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-	if (bit_count == 24) {
-		FILE_BGR bgr;
-		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			BYTE *line = FreeImage_GetScanLine(dib, y);
-			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				RGBTRIPLE *triple = ((RGBTRIPLE *)line)+x;
-				bgr.b = triple->rgbtBlue;
-				bgr.g = triple->rgbtGreen;
-				bgr.r = triple->rgbtRed;
-				if (io->write_proc(&bgr, sizeof(FILE_BGR), 1, handle) != 1)
-					return FALSE;
-			}
-		}
-	} else if (bit_count == 32) {
-		FILE_BGRA bgra;
-		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			BYTE *line = FreeImage_GetScanLine(dib, y);
-			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				RGBQUAD *quad = ((RGBQUAD *)line)+x;
-				bgra.b = quad->rgbBlue;
-				bgra.g = quad->rgbGreen;
-				bgra.r = quad->rgbRed;
-				bgra.a = quad->rgbReserved;
-				if (io->write_proc(&bgra, sizeof(FILE_BGRA), 1, handle) != 1)
-					return FALSE;
-			}
-		}
-	} else
-#endif
-#if defined(FREEIMAGE_BIGENDIAN) || FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-	{
-#endif
-		BYTE *xor_mask = FreeImage_GetBits(dib);
-		io->write_proc(xor_mask, size_xor, 1, handle);
-#if defined(FREEIMAGE_BIGENDIAN) || FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
-	}
-#endif
-	// AND mask
-	BYTE *and_mask = (BYTE*)malloc(size_and);
-	if(!and_mask) {
-		return FALSE;
-	}
-
-	if(FreeImage_IsTransparent(dib)) {
-
-		if(bit_count == 32) {
-			// create the AND mask from the alpha channel
-
-			int width_and  = WidthBytes(width);
-			BYTE *and_bits = and_mask;
-
-			// clear the mask
-			memset(and_mask, 0, size_and);
-
-			for(int y = 0; y < height; y++) {
-				RGBQUAD *bits = (RGBQUAD*)FreeImage_GetScanLine(dib, y);
-
-				for(int x = 0; x < width; x++) {
-					if(bits[x].rgbReserved != 0xFF) {
-						// set any transparent color to full transparency
-						and_bits[x >> 3] |= (0x80 >> (x & 0x7)); 
-					}
-				}
-
-				and_bits += width_and;
-			}
-		} 
-		else if(bit_count <= 8) {
-			// create the AND mask from the transparency table
-
-			BYTE *trns = FreeImage_GetTransparencyTable(dib);
-
-			int width_and  = WidthBytes(width);
-			BYTE *and_bits = and_mask;
-
-			// clear the mask
-			memset(and_mask, 0, size_and);
-
-			switch(FreeImage_GetBPP(dib)) {
-				case 1:
-				{
-					for(int y = 0; y < height; y++) {
-						BYTE *bits = (BYTE*)FreeImage_GetScanLine(dib, y);
-						for(int x = 0; x < width; x++) {
-							// get pixel at (x, y)
-							BYTE index = (bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
-							if(trns[index] != 0xFF) {
-								// set any transparent color to full transparency
-								and_bits[x >> 3] |= (0x80 >> (x & 0x7)); 
-							}
-						}
-						and_bits += width_and;
-					}
-				}
-				break;
-
-				case 4:
-				{
-					for(int y = 0; y < height; y++) {
-						BYTE *bits = (BYTE*)FreeImage_GetScanLine(dib, y);
-						for(int x = 0; x < width; x++) {
-							// get pixel at (x, y)
-							BYTE shift = (BYTE)((1 - x % 2) << 2);
-							BYTE index = (bits[x >> 1] & (0x0F << shift)) >> shift;
-							if(trns[index] != 0xFF) {
-								// set any transparent color to full transparency
-								and_bits[x >> 3] |= (0x80 >> (x & 0x7)); 
-							}
-						}
-						and_bits += width_and;
-					}
-				}
-				break;
-
-				case 8:
-				{
-					for(int y = 0; y < height; y++) {
-						BYTE *bits = (BYTE*)FreeImage_GetScanLine(dib, y);
-						for(int x = 0; x < width; x++) {
-							// get pixel at (x, y)
-							BYTE index = bits[x];
-							if(trns[index] != 0xFF) {
-								// set any transparent color to full transparency
-								and_bits[x >> 3] |= (0x80 >> (x & 0x7)); 
-							}
-						}
-						and_bits += width_and;
-					}
-				}
-				break;
-
-			}
-		}
-	}
-	else {
-		// empty AND mask
-		memset(and_mask, 0, size_and);
-	}
-
-	io->write_proc(and_mask, size_and, 1, handle);
-	free(and_mask);
-
-	return TRUE;
-}
-
-static BOOL DLL_CALLCONV
-Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
-	ICONHEADER *icon_header = NULL;
-	std::vector<FIBITMAP*> vPages;
-	int k;
-
-	if(!dib || !handle || !data) {
-		return FALSE;
-	}
-
-	// check format limits
-	unsigned w = FreeImage_GetWidth(dib);
-	unsigned h = FreeImage_GetHeight(dib);
-	if((w < 16) || (w > 256) || (h < 16) || (h > 256) || (w != h)) {
-		FreeImage_OutputMessageProc(s_format_id, "Unsupported icon size: width x height = %d x %d", w, h);
-		return FALSE;
-	}
-
-	if (page == -1) {
-		page = 0;
-	}
-	
-	// get the icon header
-	icon_header = (ICONHEADER*)data;
-
-	try {
-		FIBITMAP *icon_dib = NULL;
-
-		// load all icons
-		for(k = 0; k < icon_header->idCount; k++) {
-			icon_dib = Load(io, handle, k, flags, data);
-			if(!icon_dib) {
-				throw FI_MSG_ERROR_DIB_MEMORY;
-			}
-			vPages.push_back(icon_dib);
-		}
-
-		// add the page
-		icon_dib = FreeImage_Clone(dib);
-		vPages.push_back(icon_dib);
-		icon_header->idCount++;
-
-		// write the header
-		io->seek_proc(handle, 0, SEEK_SET);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapIconHeader(icon_header);
-#endif
-		io->write_proc(icon_header, sizeof(ICONHEADER), 1, handle);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapIconHeader(icon_header);
-#endif
-
-		// write all icons
-		// ...
-		
-		// save the icon descriptions
-
-		ICONDIRENTRY *icon_list = (ICONDIRENTRY *)malloc(icon_header->idCount * sizeof(ICONDIRENTRY));
-		if(!icon_list) {
-			throw FI_MSG_ERROR_MEMORY;
-		}
-		memset(icon_list, 0, icon_header->idCount * sizeof(ICONDIRENTRY));
-
-		for(k = 0; k < icon_header->idCount; k++) {
-			icon_dib = (FIBITMAP*)vPages[k];
-
-			// convert internal format to ICONDIRENTRY
-			// take into account Vista icons whose size is 256x256
-			const BITMAPINFOHEADER *bmih = FreeImage_GetInfoHeader(icon_dib);
-			icon_list[k].bWidth			= (bmih->biWidth > 255)  ? 0 : (BYTE)bmih->biWidth;
-			icon_list[k].bHeight		= (bmih->biHeight > 255) ? 0 : (BYTE)bmih->biHeight;
-			icon_list[k].bReserved		= 0;
-			icon_list[k].wPlanes		= bmih->biPlanes;
-			icon_list[k].wBitCount		= bmih->biBitCount;
-			if( (icon_list[k].wPlanes * icon_list[k].wBitCount) >= 8 ) {
-				icon_list[k].bColorCount = 0;
-			} else {
-				icon_list[k].bColorCount = (BYTE)(1 << (icon_list[k].wPlanes * icon_list[k].wBitCount));
-			}
-			// initial guess (correct only for standard icons)
-			icon_list[k].dwBytesInRes	= CalculateImageSize(icon_dib);
-			icon_list[k].dwImageOffset = CalculateImageOffset(vPages, k);
-		}
-
-		// make a room for icon dir entries, until later update
-		const long directory_start = io->tell_proc(handle);
-		io->write_proc(icon_list, sizeof(ICONDIRENTRY) * icon_header->idCount, 1, handle);
-
-		// write the image bits for each image
-		
-		DWORD dwImageOffset = (DWORD)io->tell_proc(handle);
-
-		for(k = 0; k < icon_header->idCount; k++) {
-			icon_dib = (FIBITMAP*)vPages[k];
-			
-			if((icon_list[k].bWidth == 0) && (icon_list[k].bHeight == 0)) {
-				// Vista icon support
-				FreeImage_SaveToHandle(FIF_PNG, icon_dib, io, handle, PNG_DEFAULT);
-			}
-			else {
-				// standard icon support
-				// see http://msdn.microsoft.com/en-us/library/ms997538.aspx
-				SaveStandardIcon(io, icon_dib, handle);
-			}
-
-			// update ICONDIRENTRY members			
-			DWORD dwBytesInRes = (DWORD)io->tell_proc(handle) - dwImageOffset;
-			icon_list[k].dwImageOffset = dwImageOffset;
-			icon_list[k].dwBytesInRes  = dwBytesInRes;
-			dwImageOffset += dwBytesInRes;
-		}
-
-		// update the icon descriptions
-		const long current_pos = io->tell_proc(handle);
-		io->seek_proc(handle, directory_start, SEEK_SET);
-#ifdef FREEIMAGE_BIGENDIAN
-		SwapIconDirEntries(icon_list, icon_header->idCount);
-#endif
-		io->write_proc(icon_list, sizeof(ICONDIRENTRY) * icon_header->idCount, 1, handle);
-		io->seek_proc(handle, current_pos, SEEK_SET);
-
-		free(icon_list);
-
-		// free the vector class
-		for(k = 0; k < icon_header->idCount; k++) {
-			icon_dib = (FIBITMAP*)vPages[k];
-			FreeImage_Unload(icon_dib);
-		}
-
-		return TRUE;
-
-	} catch(const char *text) {
-		// free the vector class
-		for(size_t k = 0; k < vPages.size(); k++) {
-			FIBITMAP *icon_dib = (FIBITMAP*)vPages[k];
-			FreeImage_Unload(icon_dib);
-		}
-		FreeImage_OutputMessageProc(s_format_id, text);
-		return FALSE;
-	}
-}
-
-// ==========================================================
-//   Init
-// ==========================================================
-
-void DLL_CALLCONV
-InitICO(Plugin *plugin, int format_id) {
-	s_format_id = format_id;
-
-	plugin->format_proc = Format;
-	plugin->description_proc = Description;
-	plugin->extension_proc = Extension;
-	plugin->regexpr_proc = RegExpr;
-	plugin->open_proc = Open;
-	plugin->close_proc = Close;
-	plugin->pagecount_proc = PageCount;
-	plugin->pagecapability_proc = NULL;
-	plugin->load_proc = Load;
-	plugin->save_proc = Save;
-	plugin->validate_proc = Validate;
-	plugin->mime_proc = MimeType;
-	plugin->supports_export_bpp_proc = SupportsExportDepth;
-	plugin->supports_export_type_proc = SupportsExportType;
-	plugin->supports_icc_profiles_proc = NULL;
-	plugin->supports_no_pixels_proc = SupportsNoPixels;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp b/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp
deleted file mode 100644
index 19e4a070a5..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp
+++ /dev/null
@@ -1,1706 +0,0 @@
-// ==========================================================
-// JPEG Loader and writer
-// Based on code developed by The Independent JPEG Group
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Jan L. Nauta (jln@magentammt.com)
-// - Markus Loibl (markus.loibl@epost.de)
-// - Karl-Heinz Bussian (khbussian@moss.de)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jascha Wetzel (jascha@mainia.de)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-extern "C" {
-#define XMD_H
-#undef FAR
-#include <setjmp.h>
-
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
-}
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-#include "../Metadata/FreeImageTag.h"
-
-
-// ==========================================================
-// Plugin Interface
-// ==========================================================
-
-static int s_format_id;
-
-// ----------------------------------------------------------
-//   Constant declarations
-// ----------------------------------------------------------
-
-#define INPUT_BUF_SIZE  4096	// choose an efficiently fread'able size 
-#define OUTPUT_BUF_SIZE 4096    // choose an efficiently fwrite'able size
-
-#define EXIF_MARKER		(JPEG_APP0+1)	// EXIF marker / Adobe XMP marker
-#define ICC_MARKER		(JPEG_APP0+2)	// ICC profile marker
-#define IPTC_MARKER		(JPEG_APP0+13)	// IPTC marker / BIM marker 
-
-#define ICC_HEADER_SIZE 14				// size of non-profile data in APP2
-#define MAX_BYTES_IN_MARKER 65533L		// maximum data length of a JPEG marker
-#define MAX_DATA_BYTES_IN_MARKER 65519L	// maximum data length of a JPEG APP2 marker
-
-#define MAX_JFXX_THUMB_SIZE (MAX_BYTES_IN_MARKER - 5 - 1)
-
-#define JFXX_TYPE_JPEG 	0x10	// JFIF extension marker: JPEG-compressed thumbnail image
-#define JFXX_TYPE_8bit 	0x11	// JFIF extension marker: palette thumbnail image
-#define JFXX_TYPE_24bit	0x13	// JFIF extension marker: RGB thumbnail image
-
-// ----------------------------------------------------------
-//   Typedef declarations
-// ----------------------------------------------------------
-
-typedef struct tagErrorManager {
-	/// "public" fields
-	struct jpeg_error_mgr pub;
-	/// for return to caller
-	jmp_buf setjmp_buffer;
-} ErrorManager;
-
-typedef struct tagSourceManager {
-	/// public fields
-	struct jpeg_source_mgr pub;
-	/// source stream
-	fi_handle infile;
-	FreeImageIO *m_io;
-	/// start of buffer
-	JOCTET * buffer;
-	/// have we gotten any data yet ?
-	boolean start_of_file;
-} SourceManager;
-
-typedef struct tagDestinationManager {
-	/// public fields
-	struct jpeg_destination_mgr pub;
-	/// destination stream
-	fi_handle outfile;
-	FreeImageIO *m_io;
-	/// start of buffer
-	JOCTET * buffer;
-} DestinationManager;
-
-typedef SourceManager*		freeimage_src_ptr;
-typedef DestinationManager* freeimage_dst_ptr;
-typedef ErrorManager*		freeimage_error_ptr;
-
-// ----------------------------------------------------------
-//   Error handling
-// ----------------------------------------------------------
-
-/** Fatal errors (print message and exit) */
-static inline void
-JPEG_EXIT(j_common_ptr cinfo, int code) {
-	freeimage_error_ptr error_ptr = (freeimage_error_ptr)cinfo->err;
-	error_ptr->pub.msg_code = code;
-	error_ptr->pub.error_exit(cinfo);
-}
-
-/** Nonfatal errors (we can keep going, but the data is probably corrupt) */
-static inline void
-JPEG_WARNING(j_common_ptr cinfo, int code) {
-	freeimage_error_ptr error_ptr = (freeimage_error_ptr)cinfo->err;
-	error_ptr->pub.msg_code = code;
-	error_ptr->pub.emit_message(cinfo, -1);
-}
-
-/**
-	Receives control for a fatal error.  Information sufficient to
-	generate the error message has been stored in cinfo->err; call
-	output_message to display it.  Control must NOT return to the caller;
-	generally this routine will exit() or longjmp() somewhere.
-*/
-METHODDEF(void)
-jpeg_error_exit (j_common_ptr cinfo) {
-	freeimage_error_ptr error_ptr = (freeimage_error_ptr)cinfo->err;
-
-	// always display the message
-	error_ptr->pub.output_message(cinfo);
-
-	// allow JPEG with unknown markers
-	if(error_ptr->pub.msg_code != JERR_UNKNOWN_MARKER) {
-	
-		// let the memory manager delete any temp files before we die
-		jpeg_destroy(cinfo);
-		
-		// return control to the setjmp point
-		longjmp(error_ptr->setjmp_buffer, 1);		
-	}
-}
-
-/**
-	Actual output of any JPEG message.  Note that this method does not know
-	how to generate a message, only where to send it.
-*/
-METHODDEF(void)
-jpeg_output_message (j_common_ptr cinfo) {
-	char buffer[JMSG_LENGTH_MAX];
-	freeimage_error_ptr error_ptr = (freeimage_error_ptr)cinfo->err;
-
-	// create the message
-	error_ptr->pub.format_message(cinfo, buffer);
-	// send it to user's message proc
-	FreeImage_OutputMessageProc(s_format_id, buffer);
-}
-
-// ----------------------------------------------------------
-//   Destination manager
-// ----------------------------------------------------------
-
-/**
-	Initialize destination.  This is called by jpeg_start_compress()
-	before any data is actually written. It must initialize
-	next_output_byte and free_in_buffer. free_in_buffer must be
-	initialized to a positive value.
-*/
-METHODDEF(void)
-init_destination (j_compress_ptr cinfo) {
-	freeimage_dst_ptr dest = (freeimage_dst_ptr) cinfo->dest;
-
-	dest->buffer = (JOCTET *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  OUTPUT_BUF_SIZE * sizeof(JOCTET));
-
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-}
-
-/**
-	This is called whenever the buffer has filled (free_in_buffer
-	reaches zero). In typical applications, it should write out the
-	*entire* buffer (use the saved start address and buffer length;
-	ignore the current state of next_output_byte and free_in_buffer).
-	Then reset the pointer & count to the start of the buffer, and
-	return TRUE indicating that the buffer has been dumped.
-	free_in_buffer must be set to a positive value when TRUE is
-	returned.  A FALSE return should only be used when I/O suspension is
-	desired.
-*/
-METHODDEF(boolean)
-empty_output_buffer (j_compress_ptr cinfo) {
-	freeimage_dst_ptr dest = (freeimage_dst_ptr) cinfo->dest;
-
-	if (dest->m_io->write_proc(dest->buffer, 1, OUTPUT_BUF_SIZE, dest->outfile) != OUTPUT_BUF_SIZE) {
-		// let the memory manager delete any temp files before we die
-		jpeg_destroy((j_common_ptr)cinfo);
-
-		JPEG_EXIT((j_common_ptr)cinfo, JERR_FILE_WRITE);
-	}
-
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-
-	return TRUE;
-}
-
-/**
-	Terminate destination --- called by jpeg_finish_compress() after all
-	data has been written.  In most applications, this must flush any
-	data remaining in the buffer.  Use either next_output_byte or
-	free_in_buffer to determine how much data is in the buffer.
-*/
-METHODDEF(void)
-term_destination (j_compress_ptr cinfo) {
-	freeimage_dst_ptr dest = (freeimage_dst_ptr) cinfo->dest;
-
-	size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
-
-	// write any data remaining in the buffer
-
-	if (datacount > 0) {
-		if (dest->m_io->write_proc(dest->buffer, 1, (unsigned int)datacount, dest->outfile) != datacount) {
-			// let the memory manager delete any temp files before we die
-			jpeg_destroy((j_common_ptr)cinfo);
-			
-			JPEG_EXIT((j_common_ptr)cinfo, JERR_FILE_WRITE);
-		}
-	}
-}
-
-// ----------------------------------------------------------
-//   Source manager
-// ----------------------------------------------------------
-
-/**
-	Initialize source.  This is called by jpeg_read_header() before any
-	data is actually read. Unlike init_destination(), it may leave
-	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
-	will occur immediately).
-*/
-METHODDEF(void)
-init_source (j_decompress_ptr cinfo) {
-	freeimage_src_ptr src = (freeimage_src_ptr) cinfo->src;
-
-	/* We reset the empty-input-file flag for each image,
- 	 * but we don't clear the input buffer.
-	 * This is correct behavior for reading a series of images from one source.
-	*/
-
-	src->start_of_file = TRUE;
-}
-
-/**
-	This is called whenever bytes_in_buffer has reached zero and more
-	data is wanted.  In typical applications, it should read fresh data
-	into the buffer (ignoring the current state of next_input_byte and
-	bytes_in_buffer), reset the pointer & count to the start of the
-	buffer, and return TRUE indicating that the buffer has been reloaded.
-	It is not necessary to fill the buffer entirely, only to obtain at
-	least one more byte.  bytes_in_buffer MUST be set to a positive value
-	if TRUE is returned.  A FALSE return should only be used when I/O
-	suspension is desired.
-*/
-METHODDEF(boolean)
-fill_input_buffer (j_decompress_ptr cinfo) {
-	freeimage_src_ptr src = (freeimage_src_ptr) cinfo->src;
-
-	size_t nbytes = src->m_io->read_proc(src->buffer, 1, INPUT_BUF_SIZE, src->infile);
-
-	if (nbytes <= 0) {
-		if (src->start_of_file)	{
-			// treat empty input file as fatal error
-
-			// let the memory manager delete any temp files before we die
-			jpeg_destroy((j_common_ptr)cinfo);
-
-			JPEG_EXIT((j_common_ptr)cinfo, JERR_INPUT_EMPTY);
-		}
-
-		JPEG_WARNING((j_common_ptr)cinfo, JWRN_JPEG_EOF);
-
-		/* Insert a fake EOI marker */
-
-		src->buffer[0] = (JOCTET) 0xFF;
-		src->buffer[1] = (JOCTET) JPEG_EOI;
-
-		nbytes = 2;
-	}
-
-	src->pub.next_input_byte = src->buffer;
-	src->pub.bytes_in_buffer = nbytes;
-	src->start_of_file = FALSE;
-
-	return TRUE;
-}
-
-/**
-	Skip num_bytes worth of data.  The buffer pointer and count should
-	be advanced over num_bytes input bytes, refilling the buffer as
-	needed. This is used to skip over a potentially large amount of
-	uninteresting data (such as an APPn marker). In some applications
-	it may be possible to optimize away the reading of the skipped data,
-	but it's not clear that being smart is worth much trouble; large
-	skips are uncommon.  bytes_in_buffer may be zero on return.
-	A zero or negative skip count should be treated as a no-op.
-*/
-METHODDEF(void)
-skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
-	freeimage_src_ptr src = (freeimage_src_ptr) cinfo->src;
-
-	/* Just a dumb implementation for now.  Could use fseek() except
-     * it doesn't work on pipes.  Not clear that being smart is worth
-	 * any trouble anyway --- large skips are infrequent.
-	*/
-
-	if (num_bytes > 0) {
-		while (num_bytes > (long) src->pub.bytes_in_buffer) {
-		  num_bytes -= (long) src->pub.bytes_in_buffer;
-
-		  (void) fill_input_buffer(cinfo);
-
-		  /* note we assume that fill_input_buffer will never return FALSE,
-		   * so suspension need not be handled.
-		   */
-		}
-
-		src->pub.next_input_byte += (size_t) num_bytes;
-		src->pub.bytes_in_buffer -= (size_t) num_bytes;
-	}
-}
-
-/**
-	Terminate source --- called by jpeg_finish_decompress
-	after all data has been read.  Often a no-op.
-
-	NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
-	application must deal with any cleanup that should happen even
-	for error exit.
-*/
-METHODDEF(void)
-term_source (j_decompress_ptr cinfo) {
-  // no work necessary here
-}
-
-// ----------------------------------------------------------
-//   Source manager & Destination manager setup
-// ----------------------------------------------------------
-
-/**
-	Prepare for input from a stdio stream.
-	The caller must have already opened the stream, and is responsible
-	for closing it after finishing decompression.
-*/
-GLOBAL(void)
-jpeg_freeimage_src (j_decompress_ptr cinfo, fi_handle infile, FreeImageIO *io) {
-	freeimage_src_ptr src;
-
-	// allocate memory for the buffer. is released automatically in the end
-
-	if (cinfo->src == NULL) {
-		cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small)
-			((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(SourceManager));
-
-		src = (freeimage_src_ptr) cinfo->src;
-
-		src->buffer = (JOCTET *) (*cinfo->mem->alloc_small)
-			((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
-	}
-
-	// initialize the jpeg pointer struct with pointers to functions
-
-	src = (freeimage_src_ptr) cinfo->src;
-	src->pub.init_source = init_source;
-	src->pub.fill_input_buffer = fill_input_buffer;
-	src->pub.skip_input_data = skip_input_data;
-	src->pub.resync_to_restart = jpeg_resync_to_restart; // use default method 
-	src->pub.term_source = term_source;
-	src->infile = infile;
-	src->m_io = io;
-	src->pub.bytes_in_buffer = 0;		// forces fill_input_buffer on first read 
-	src->pub.next_input_byte = NULL;	// until buffer loaded 
-}
-
-/**
-	Prepare for output to a stdio stream.
-	The caller must have already opened the stream, and is responsible
-	for closing it after finishing compression.
-*/
-GLOBAL(void)
-jpeg_freeimage_dst (j_compress_ptr cinfo, fi_handle outfile, FreeImageIO *io) {
-	freeimage_dst_ptr dest;
-
-	if (cinfo->dest == NULL) {
-		cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small)
-			((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(DestinationManager));
-	}
-
-	dest = (freeimage_dst_ptr) cinfo->dest;
-	dest->pub.init_destination = init_destination;
-	dest->pub.empty_output_buffer = empty_output_buffer;
-	dest->pub.term_destination = term_destination;
-	dest->outfile = outfile;
-	dest->m_io = io;
-}
-
-// ----------------------------------------------------------
-//   Special markers read functions
-// ----------------------------------------------------------
-
-/**
-	Read JPEG_COM marker (comment)
-*/
-static BOOL 
-jpeg_read_comment(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) {
-	size_t length = datalen;
-	BYTE *profile = (BYTE*)dataptr;
-
-	// read the comment
-	char *value = (char*)malloc((length + 1) * sizeof(char));
-	if(value == NULL) return FALSE;
-	memcpy(value, profile, length);
-	value[length] = '\0';
-
-	// create a tag
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		unsigned int count = (unsigned int)length + 1;	// includes the null value
-
-		FreeImage_SetTagID(tag, JPEG_COM);
-		FreeImage_SetTagKey(tag, "Comment");
-		FreeImage_SetTagLength(tag, count);
-		FreeImage_SetTagCount(tag, count);
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagValue(tag, value);
-		
-		// store the tag
-		FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag);
-
-		// destroy the tag
-		FreeImage_DeleteTag(tag);
-	}
-
-	free(value);
-
-	return TRUE;
-}
-
-/** 
-	Read JPEG_APP2 marker (ICC profile)
-*/
-
-/**
-Handy subroutine to test whether a saved marker is an ICC profile marker.
-*/
-static BOOL 
-marker_is_icc(jpeg_saved_marker_ptr marker) {
-    // marker identifying string "ICC_PROFILE" (null-terminated)
-	const BYTE icc_signature[12] = { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00 };
-
-	if(marker->marker == ICC_MARKER) {
-		// verify the identifying string
-		if(marker->data_length >= ICC_HEADER_SIZE) {
-			if(memcmp(icc_signature, marker->data, sizeof(icc_signature)) == 0) {
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-/**
-  See if there was an ICC profile in the JPEG file being read;
-  if so, reassemble and return the profile data.
-
-  TRUE is returned if an ICC profile was found, FALSE if not.
-  If TRUE is returned, *icc_data_ptr is set to point to the
-  returned data, and *icc_data_len is set to its length.
-  
-  IMPORTANT: the data at **icc_data_ptr has been allocated with malloc()
-  and must be freed by the caller with free() when the caller no longer
-  needs it.  (Alternatively, we could write this routine to use the
-  IJG library's memory allocator, so that the data would be freed implicitly
-  at jpeg_finish_decompress() time.  But it seems likely that many apps
-  will prefer to have the data stick around after decompression finishes.)
-  
-  NOTE: if the file contains invalid ICC APP2 markers, we just silently
-  return FALSE.  You might want to issue an error message instead.
-*/
-static BOOL 
-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
-	jpeg_saved_marker_ptr marker;
-	int num_markers = 0;
-	int seq_no;
-	JOCTET *icc_data;
-	unsigned total_length;
-
-	const int MAX_SEQ_NO = 255;			// sufficient since marker numbers are bytes
-	BYTE marker_present[MAX_SEQ_NO+1];	// 1 if marker found
-	unsigned data_length[MAX_SEQ_NO+1];	// size of profile data in marker
-	unsigned data_offset[MAX_SEQ_NO+1];	// offset for data in marker
-	
-	*icc_data_ptr = NULL;		// avoid confusion if FALSE return
-	*icc_data_len = 0;
-	
-	/**
-	this first pass over the saved markers discovers whether there are
-	any ICC markers and verifies the consistency of the marker numbering.
-	*/
-	
-	memset(marker_present, 0, (MAX_SEQ_NO + 1));
-	
-	for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
-		if (marker_is_icc(marker)) {
-			if (num_markers == 0) {
-				// number of markers
-				num_markers = GETJOCTET(marker->data[13]);
-			}
-			else if (num_markers != GETJOCTET(marker->data[13])) {
-				return FALSE;		// inconsistent num_markers fields 
-			}
-			// sequence number
-			seq_no = GETJOCTET(marker->data[12]);
-			if (seq_no <= 0 || seq_no > num_markers) {
-				return FALSE;		// bogus sequence number 
-			}
-			if (marker_present[seq_no]) {
-				return FALSE;		// duplicate sequence numbers 
-			}
-			marker_present[seq_no] = 1;
-			data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE;
-		}
-	}
-	
-	if (num_markers == 0)
-		return FALSE;
-		
-	/**
-	check for missing markers, count total space needed,
-	compute offset of each marker's part of the data.
-	*/
-	
-	total_length = 0;
-	for(seq_no = 1; seq_no <= num_markers; seq_no++) {
-		if (marker_present[seq_no] == 0) {
-			return FALSE;		// missing sequence number
-		}
-		data_offset[seq_no] = total_length;
-		total_length += data_length[seq_no];
-	}
-	
-	if (total_length <= 0)
-		return FALSE;		// found only empty markers ?
-	
-	// allocate space for assembled data 
-	icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET));
-	if (icc_data == NULL)
-		return FALSE;		// out of memory
-	
-	// and fill it in
-	for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
-		if (marker_is_icc(marker)) {
-			JOCTET FAR *src_ptr;
-			JOCTET *dst_ptr;
-			unsigned length;
-			seq_no = GETJOCTET(marker->data[12]);
-			dst_ptr = icc_data + data_offset[seq_no];
-			src_ptr = marker->data + ICC_HEADER_SIZE;
-			length = data_length[seq_no];
-			while (length--) {
-				*dst_ptr++ = *src_ptr++;
-			}
-		}
-	}
-	
-	*icc_data_ptr = icc_data;
-	*icc_data_len = total_length;
-	
-	return TRUE;
-}
-
-/**
-	Read JPEG_APPD marker (IPTC or Adobe Photoshop profile)
-*/
-static BOOL 
-jpeg_read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) {
-	return read_iptc_profile(dib, dataptr, datalen);
-}
-
-/**
-	Read JPEG_APP1 marker (XMP profile)
-	@param dib Input FIBITMAP
-	@param dataptr Pointer to the APP1 marker
-	@param datalen APP1 marker length
-	@return Returns TRUE if successful, FALSE otherwise
-*/
-static BOOL  
-jpeg_read_xmp_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) {
-	// marker identifying string for XMP (null terminated)
-	const char *xmp_signature = "http://ns.adobe.com/xap/1.0/";
-	// XMP signature is 29 bytes long
-	const size_t xmp_signature_size = strlen(xmp_signature) + 1;
-
-	size_t length = datalen;
-	BYTE *profile = (BYTE*)dataptr;
-
-	if(length <= xmp_signature_size) {
-		// avoid reading corrupted or empty data 
-		return FALSE;
-	}
-
-	// verify the identifying string
-
-	if(memcmp(xmp_signature, profile, strlen(xmp_signature)) == 0) {
-		// XMP profile
-
-		profile += xmp_signature_size;
-		length  -= xmp_signature_size;
-
-		// create a tag
-		FITAG *tag = FreeImage_CreateTag();
-		if(tag) {
-			FreeImage_SetTagID(tag, JPEG_APP0+1);	// 0xFFE1
-			FreeImage_SetTagKey(tag, g_TagLib_XMPFieldName);
-			FreeImage_SetTagLength(tag, (DWORD)length);
-			FreeImage_SetTagCount(tag, (DWORD)length);
-			FreeImage_SetTagType(tag, FIDT_ASCII);
-			FreeImage_SetTagValue(tag, profile);
-			
-			// store the tag
-			FreeImage_SetMetadata(FIMD_XMP, dib, FreeImage_GetTagKey(tag), tag);
-
-			// destroy the tag
-			FreeImage_DeleteTag(tag);
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
-	Read JFIF "JFXX" extension APP0 marker
-	@param dib Input FIBITMAP
-	@param dataptr Pointer to the APP0 marker
-	@param datalen APP0 marker length
-	@return Returns TRUE if successful, FALSE otherwise
-*/
-static BOOL 
-jpeg_read_jfxx(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) {
-	if(datalen < 6) {
-		return FALSE;
-	}
-	
-	const int id_length = 5;
-	const BYTE *data = dataptr + id_length;
-	unsigned remaining = datalen - id_length;
-		
-	const BYTE type = *data;
-	++data, --remaining;
-
-	switch(type) {
-		case JFXX_TYPE_JPEG:
-		{
-			// load the thumbnail
-			FIMEMORY* hmem = FreeImage_OpenMemory(const_cast<BYTE*>(data), remaining);
-			FIBITMAP* thumbnail = FreeImage_LoadFromMemory(FIF_JPEG, hmem);
-			FreeImage_CloseMemory(hmem);
-			// store the thumbnail
-			FreeImage_SetThumbnail(dib, thumbnail);
-			// then delete it
-			FreeImage_Unload(thumbnail);
-			break;
-		}
-		case JFXX_TYPE_8bit:
-			// colormapped uncompressed thumbnail (no supported)
-			break;
-		case JFXX_TYPE_24bit:
-			// truecolor uncompressed thumbnail (no supported)
-			break;
-		default:
-			break;
-	}
-
-	return TRUE;
-}
-
-
-/**
-	Read JPEG special markers
-*/
-static BOOL 
-read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) {
-	jpeg_saved_marker_ptr marker;
-
-	for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
-		switch(marker->marker) {
-			case JPEG_APP0:
-				// JFIF is handled by libjpeg already, handle JFXX
-				if(memcmp(marker->data, "JFIF" , 5) == 0) {
-					continue;
-				}
-				if(memcmp(marker->data, "JFXX" , 5) == 0) {
-					if(!cinfo->saw_JFIF_marker || cinfo->JFIF_minor_version < 2) {
-						FreeImage_OutputMessageProc(s_format_id, "Warning: non-standard JFXX segment");
-					}					
-					jpeg_read_jfxx(dib, marker->data, marker->data_length);
-				}
-				// other values such as 'Picasa' : ignore safely unknown APP0 marker
-				break;
-			case JPEG_COM:
-				// JPEG comment
-				jpeg_read_comment(dib, marker->data, marker->data_length);
-				break;
-			case EXIF_MARKER:
-				// Exif or Adobe XMP profile
-				jpeg_read_exif_profile(dib, marker->data, marker->data_length);
-				jpeg_read_xmp_profile(dib, marker->data, marker->data_length);
-				jpeg_read_exif_profile_raw(dib, marker->data, marker->data_length);
-				break;
-			case IPTC_MARKER:
-				// IPTC/NAA or Adobe Photoshop profile
-				jpeg_read_iptc_profile(dib, marker->data, marker->data_length);
-				break;
-		}
-	}
-
-	// ICC profile
-	BYTE *icc_profile = NULL;
-	unsigned icc_length = 0;
-
-	if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
-		// copy ICC profile data
-		FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
-		// clean up
-		free(icc_profile);
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   Special markers write functions
-// ----------------------------------------------------------
-
-/**
-	Write JPEG_COM marker (comment)
-*/
-static BOOL 
-jpeg_write_comment(j_compress_ptr cinfo, FIBITMAP *dib) {
-	FITAG *tag = NULL;
-
-	// write user comment as a JPEG_COM marker
-	FreeImage_GetMetadata(FIMD_COMMENTS, dib, "Comment", &tag);
-	if(tag) {
-		const char *tag_value = (char*)FreeImage_GetTagValue(tag);
-
-		if(NULL != tag_value) {
-			for(long i = 0; i < (long)strlen(tag_value); i+= MAX_BYTES_IN_MARKER) {
-				jpeg_write_marker(cinfo, JPEG_COM, (BYTE*)tag_value + i, MIN((long)strlen(tag_value + i), MAX_BYTES_IN_MARKER));
-			}
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-/** 
-	Write JPEG_APP2 marker (ICC profile)
-*/
-static BOOL 
-jpeg_write_icc_profile(j_compress_ptr cinfo, FIBITMAP *dib) {
-    // marker identifying string "ICC_PROFILE" (null-terminated)
-	BYTE icc_signature[12] = { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00 };
-
-	FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
-
-	if (iccProfile->size && iccProfile->data) {
-		// ICC_HEADER_SIZE: ICC signature is 'ICC_PROFILE' + 2 bytes
-
-		BYTE *profile = (BYTE*)malloc((iccProfile->size + ICC_HEADER_SIZE) * sizeof(BYTE));
-		if(profile == NULL) return FALSE;
-		memcpy(profile, icc_signature, 12);
-
-		for(long i = 0; i < (long)iccProfile->size; i += MAX_DATA_BYTES_IN_MARKER) {
-			unsigned length = MIN((long)(iccProfile->size - i), MAX_DATA_BYTES_IN_MARKER);
-			// sequence number
-			profile[12] = (BYTE) ((i / MAX_DATA_BYTES_IN_MARKER) + 1);
-			// number of markers
-			profile[13] = (BYTE) (iccProfile->size / MAX_DATA_BYTES_IN_MARKER + 1);
-
-			memcpy(profile + ICC_HEADER_SIZE, (BYTE*)iccProfile->data + i, length);
-			jpeg_write_marker(cinfo, ICC_MARKER, profile, (length + ICC_HEADER_SIZE));
-        }
-
-		free(profile);
-
-		return TRUE;		
-	}
-	
-	return FALSE;
-}
-
-/** 
-	Write JPEG_APPD marker (IPTC or Adobe Photoshop profile)
-	@return Returns TRUE if successful, FALSE otherwise
-*/
-static BOOL  
-jpeg_write_iptc_profile(j_compress_ptr cinfo, FIBITMAP *dib) {
-	//const char *ps_header = "Photoshop 3.0\x08BIM\x04\x04\x0\x0\x0\x0";
-	const unsigned tag_length = 26;
-
-	if(FreeImage_GetMetadataCount(FIMD_IPTC, dib)) {
-		BYTE *profile = NULL;
-		unsigned profile_size = 0;
-
-		// create a binary profile
-		if(write_iptc_profile(dib, &profile, &profile_size)) {
-
-			// write the profile
-			for(long i = 0; i < (long)profile_size; i += 65517L) {
-				unsigned length = MIN((long)profile_size - i, 65517L);
-				unsigned roundup = length & 0x01;	// needed for Photoshop
-				BYTE *iptc_profile = (BYTE*)malloc(length + roundup + tag_length);
-				if(iptc_profile == NULL) break;
-				// Photoshop identification string
-				memcpy(&iptc_profile[0], "Photoshop 3.0\x0", 14);
-				// 8BIM segment type
-				memcpy(&iptc_profile[14], "8BIM\x04\x04\x0\x0\x0\x0", 10);
-				// segment size
-				iptc_profile[24] = (BYTE)(length >> 8);
-				iptc_profile[25] = (BYTE)(length & 0xFF);
-				// segment data
-				memcpy(&iptc_profile[tag_length], &profile[i], length);
-				if(roundup)
-					iptc_profile[length + tag_length] = 0;
-				jpeg_write_marker(cinfo, IPTC_MARKER, iptc_profile, length + roundup + tag_length);
-				free(iptc_profile);
-			}
-
-			// release profile
-			free(profile);
-
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-/** 
-	Write JPEG_APP1 marker (XMP profile)
-	@return Returns TRUE if successful, FALSE otherwise
-*/
-static BOOL  
-jpeg_write_xmp_profile(j_compress_ptr cinfo, FIBITMAP *dib) {
-	// marker identifying string for XMP (null terminated)
-	const char *xmp_signature = "http://ns.adobe.com/xap/1.0/";
-
-	FITAG *tag_xmp = NULL;
-	FreeImage_GetMetadata(FIMD_XMP, dib, g_TagLib_XMPFieldName, &tag_xmp);
-
-	if(tag_xmp) {
-		const BYTE *tag_value = (BYTE*)FreeImage_GetTagValue(tag_xmp);
-
-		if(NULL != tag_value) {
-			// XMP signature is 29 bytes long
-			unsigned int xmp_header_size = (unsigned int)strlen(xmp_signature) + 1;
-
-			DWORD tag_length = FreeImage_GetTagLength(tag_xmp);
-
-			BYTE *profile = (BYTE*)malloc((tag_length + xmp_header_size) * sizeof(BYTE));
-			if(profile == NULL) return FALSE;
-			memcpy(profile, xmp_signature, xmp_header_size);
-
-			for(DWORD i = 0; i < tag_length; i += 65504L) {
-				unsigned length = MIN((long)(tag_length - i), 65504L);
-				
-				memcpy(profile + xmp_header_size, tag_value + i, length);
-				jpeg_write_marker(cinfo, EXIF_MARKER, profile, (length + xmp_header_size));
-			}
-
-			free(profile);
-
-			return TRUE;	
-		}
-	}
-
-	return FALSE;
-}
-
-/** 
-	Write JPEG_APP1 marker (Exif profile)
-	@return Returns TRUE if successful, FALSE otherwise
-*/
-static BOOL 
-jpeg_write_exif_profile_raw(j_compress_ptr cinfo, FIBITMAP *dib) {
-    // marker identifying string for Exif = "Exif\0\0"
-    BYTE exif_signature[6] = { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
-
-	FITAG *tag_exif = NULL;
-	FreeImage_GetMetadata(FIMD_EXIF_RAW, dib, g_TagLib_ExifRawFieldName, &tag_exif);
-
-	if(tag_exif) {
-		const BYTE *tag_value = (BYTE*)FreeImage_GetTagValue(tag_exif);
-		
-		// verify the identifying string
-		if(memcmp(exif_signature, tag_value, sizeof(exif_signature)) != 0) {
-			// not an Exif profile
-			return FALSE;
-		}
-
-		if(NULL != tag_value) {
-			DWORD tag_length = FreeImage_GetTagLength(tag_exif);
-
-			BYTE *profile = (BYTE*)malloc(tag_length * sizeof(BYTE));
-			if(profile == NULL) return FALSE;
-
-			for(DWORD i = 0; i < tag_length; i += 65504L) {
-				unsigned length = MIN((long)(tag_length - i), 65504L);
-				
-				memcpy(profile, tag_value + i, length);
-				jpeg_write_marker(cinfo, EXIF_MARKER, profile, length);
-			}
-
-			free(profile);
-
-			return TRUE;	
-		}
-	}
-
-	return FALSE;
-}
-
-/**
-	Write thumbnail (JFXX segment, JPEG compressed)
-*/
-static BOOL
-jpeg_write_jfxx(j_compress_ptr cinfo, FIBITMAP *dib) {
-	// get the thumbnail to be stored
-	FIBITMAP* thumbnail = FreeImage_GetThumbnail(dib);
-	if(!thumbnail) {
-		return TRUE;
-	}
-	// check for a compatible output format
-	if((FreeImage_GetImageType(thumbnail) != FIT_BITMAP) || (FreeImage_GetBPP(thumbnail) != 8) && (FreeImage_GetBPP(thumbnail) != 24)) {
-		FreeImage_OutputMessageProc(s_format_id, FI_MSG_WARNING_INVALID_THUMBNAIL);
-		return FALSE;
-	}
-	
-	// stores the thumbnail as a baseline JPEG into a memory block
-	// return the memory block only if its size is within JFXX marker size limit!
-	FIMEMORY *stream = FreeImage_OpenMemory();
-	
-	if(FreeImage_SaveToMemory(FIF_JPEG, thumbnail, stream, JPEG_BASELINE)) {
-		// check that the memory block size is within JFXX marker size limit
-		FreeImage_SeekMemory(stream, 0, SEEK_END);
-		const long eof = FreeImage_TellMemory(stream);
-		if(eof > MAX_JFXX_THUMB_SIZE) {
-			FreeImage_OutputMessageProc(s_format_id, "Warning: attached thumbnail is %d bytes larger than maximum supported size - Thumbnail saving aborted", eof - MAX_JFXX_THUMB_SIZE);
-			FreeImage_CloseMemory(stream);
-			return FALSE;
-		}
-	} else {
-		FreeImage_CloseMemory(stream);
-		return FALSE;
-	}
-
-	BYTE* thData = NULL;
-	DWORD thSize = 0;
-	
-	FreeImage_AcquireMemory(stream, &thData, &thSize);	
-	
-	BYTE id_length = 5; //< "JFXX"
-	BYTE type = JFXX_TYPE_JPEG;
-	
-	DWORD totalsize = id_length + sizeof(type) + thSize;
-	jpeg_write_m_header(cinfo, JPEG_APP0, totalsize);
-	
-	jpeg_write_m_byte(cinfo, 'J');
-	jpeg_write_m_byte(cinfo, 'F');
-	jpeg_write_m_byte(cinfo, 'X');
-	jpeg_write_m_byte(cinfo, 'X');
-	jpeg_write_m_byte(cinfo, '\0');
-	
-	jpeg_write_m_byte(cinfo, type);
-	
-	// write thumbnail to destination.
-	// We "cram it straight into the data destination module", because write_m_byte is slow
-	
-	freeimage_dst_ptr dest = (freeimage_dst_ptr) cinfo->dest;
-	
-	BYTE* & out = dest->pub.next_output_byte;
-	size_t & bufRemain = dest->pub.free_in_buffer;
-	
-	const BYTE *thData_end = thData + thSize;
-
-	while(thData < thData_end) {
-		*(out)++ = *(thData)++;
-		if (--bufRemain == 0) {	
-			// buffer full - flush
-			if (!dest->pub.empty_output_buffer(cinfo)) {
-				break;
-			}
-		}
-	}
-	
-	FreeImage_CloseMemory(stream);
-
-	return TRUE;
-}
-
-/**
-	Write JPEG special markers
-*/
-static BOOL 
-write_markers(j_compress_ptr cinfo, FIBITMAP *dib) {
-	// write thumbnail as a JFXX marker
-	jpeg_write_jfxx(cinfo, dib);
-
-	// write user comment as a JPEG_COM marker
-	jpeg_write_comment(cinfo, dib);
-
-	// write ICC profile
-	jpeg_write_icc_profile(cinfo, dib);
-
-	// write IPTC profile
-	jpeg_write_iptc_profile(cinfo, dib);
-
-	// write Adobe XMP profile
-	jpeg_write_xmp_profile(cinfo, dib);
-
-	// write Exif raw data
-	jpeg_write_exif_profile_raw(cinfo, dib);
-
-	return TRUE;
-}
-
-// ------------------------------------------------------------
-//   Keep original size info when using scale option on loading
-// ------------------------------------------------------------
-static void 
-store_size_info(FIBITMAP *dib, JDIMENSION width, JDIMENSION height) {
-	char buffer[256];
-	// create a tag
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		size_t length = 0;
-		// set the original width
-		sprintf(buffer, "%d", (int)width);
-		length = strlen(buffer) + 1;	// include the NULL/0 value
-		FreeImage_SetTagKey(tag, "OriginalJPEGWidth");
-		FreeImage_SetTagLength(tag, (DWORD)length);
-		FreeImage_SetTagCount(tag, (DWORD)length);
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagValue(tag, buffer);
-		FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag);
-		// set the original height
-		sprintf(buffer, "%d", (int)height);
-		length = strlen(buffer) + 1;	// include the NULL/0 value
-		FreeImage_SetTagKey(tag, "OriginalJPEGHeight");
-		FreeImage_SetTagLength(tag, (DWORD)length);
-		FreeImage_SetTagCount(tag, (DWORD)length);
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagValue(tag, buffer);
-		FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag);
-		// destroy the tag
-		FreeImage_DeleteTag(tag);
-	}
-}
-
-// ==========================================================
-// Plugin Implementation
-// ==========================================================
-
-static const char * DLL_CALLCONV
-Format() {
-	return "JPEG";
-}
-
-static const char * DLL_CALLCONV
-Description() {
-	return "JPEG - JFIF Compliant";
-}
-
-static const char * DLL_CALLCONV
-Extension() {
-	return "jpg,jif,jpeg,jpe";
-}
-
-static const char * DLL_CALLCONV
-RegExpr() {
-	return "^\377\330\377";
-}
-
-static const char * DLL_CALLCONV
-MimeType() {
-	return "image/jpeg";
-}
-
-static BOOL DLL_CALLCONV
-Validate(FreeImageIO *io, fi_handle handle) {
-	BYTE jpeg_signature[] = { 0xFF, 0xD8 };
-	BYTE signature[2] = { 0, 0 };
-
-	io->read_proc(signature, 1, sizeof(jpeg_signature), handle);
-
-	return (memcmp(jpeg_signature, signature, sizeof(jpeg_signature)) == 0);
-}
-
-static BOOL DLL_CALLCONV
-SupportsExportDepth(int depth) {
-	return (
-			(depth == 8) ||
-			(depth == 24)
-		);
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportType(FREE_IMAGE_TYPE type) {
-	return (type == FIT_BITMAP) ? TRUE : FALSE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsICCProfiles() {
-	return TRUE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsNoPixels() {
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-
-static FIBITMAP * DLL_CALLCONV
-Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
-	if (handle) {
-		FIBITMAP *dib = NULL;
-
-		BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-		// set up the jpeglib structures
-
-		struct jpeg_decompress_struct cinfo;
-		ErrorManager fi_error_mgr;
-
-		try {
-
-			// step 1: allocate and initialize JPEG decompression object
-
-			// we set up the normal JPEG error routines, then override error_exit & output_message
-			cinfo.err = jpeg_std_error(&fi_error_mgr.pub);
-			fi_error_mgr.pub.error_exit     = jpeg_error_exit;
-			fi_error_mgr.pub.output_message = jpeg_output_message;
-			
-			// establish the setjmp return context for jpeg_error_exit to use
-			if (setjmp(fi_error_mgr.setjmp_buffer)) {
-				// If we get here, the JPEG code has signaled an error.
-				// We need to clean up the JPEG object, close the input file, and return.
-				jpeg_destroy_decompress(&cinfo);
-				throw (const char*)NULL;
-			}
-
-			jpeg_create_decompress(&cinfo);
-
-			// step 2a: specify data source (eg, a handle)
-
-			jpeg_freeimage_src(&cinfo, handle, io);
-
-			// step 2b: save special markers for later reading
-			
-			jpeg_save_markers(&cinfo, JPEG_COM, 0xFFFF);
-			for(int m = 0; m < 16; m++) {
-				jpeg_save_markers(&cinfo, JPEG_APP0 + m, 0xFFFF);
-			}
-
-			// step 3: read handle parameters with jpeg_read_header()
-
-			jpeg_read_header(&cinfo, TRUE);
-
-			// step 4: set parameters for decompression
-
-			unsigned int scale_denom = 1;		// fraction by which to scale image
-			int	requested_size = flags >> 16;	// requested user size in pixels
-			if(requested_size > 0) {
-				// the JPEG codec can perform x2, x4 or x8 scaling on loading
-				// try to find the more appropriate scaling according to user's need
-				double scale = MAX((double)cinfo.image_width, (double)cinfo.image_height) / (double)requested_size;
-				if(scale >= 8) {
-					scale_denom = 8;
-				} else if(scale >= 4) {
-					scale_denom = 4;
-				} else if(scale >= 2) {
-					scale_denom = 2;
-				}
-			}
-			cinfo.scale_num = 1;
-			cinfo.scale_denom = scale_denom;
-
-			if ((flags & JPEG_ACCURATE) != JPEG_ACCURATE) {
-				cinfo.dct_method          = JDCT_IFAST;
-				cinfo.do_fancy_upsampling = FALSE;
-			}
-
-			if ((flags & JPEG_GREYSCALE) == JPEG_GREYSCALE) {
-				// force loading as a 8-bit greyscale image
-				cinfo.out_color_space = JCS_GRAYSCALE;
-			}
-
-			// step 5a: start decompressor and calculate output width and height
-
-			jpeg_start_decompress(&cinfo);
-
-			// step 5b: allocate dib and init header
-
-			if((cinfo.output_components == 4) && (cinfo.out_color_space == JCS_CMYK)) {
-				// CMYK image
-				if((flags & JPEG_CMYK) == JPEG_CMYK) {
-					// load as CMYK
-					dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					if(!dib) throw FI_MSG_ERROR_DIB_MEMORY;
-					FreeImage_GetICCProfile(dib)->flags |= FIICC_COLOR_IS_CMYK;
-				} else {
-					// load as CMYK and convert to RGB
-					dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					if(!dib) throw FI_MSG_ERROR_DIB_MEMORY;
-				}
-			} else {
-				// RGB or greyscale image
-				dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 8 * cinfo.output_components, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-				if(!dib) throw FI_MSG_ERROR_DIB_MEMORY;
-
-				if (cinfo.output_components == 1) {
-					// build a greyscale palette
-					RGBQUAD *colors = FreeImage_GetPalette(dib);
-
-					for (int i = 0; i < 256; i++) {
-						colors[i].rgbRed   = (BYTE)i;
-						colors[i].rgbGreen = (BYTE)i;
-						colors[i].rgbBlue  = (BYTE)i;
-					}
-				}
-			}
-			if(scale_denom != 1) {
-				// store original size info if a scaling was requested
-				store_size_info(dib, cinfo.image_width, cinfo.image_height);
-			}
-
-			// step 5c: handle metrices
-
-			if (cinfo.density_unit == 1) {
-				// dots/inch
-				FreeImage_SetDotsPerMeterX(dib, (unsigned) (((float)cinfo.X_density) / 0.0254000 + 0.5));
-				FreeImage_SetDotsPerMeterY(dib, (unsigned) (((float)cinfo.Y_density) / 0.0254000 + 0.5));
-			} else if (cinfo.density_unit == 2) {
-				// dots/cm
-				FreeImage_SetDotsPerMeterX(dib, (unsigned) (cinfo.X_density * 100));
-				FreeImage_SetDotsPerMeterY(dib, (unsigned) (cinfo.Y_density * 100));
-			}
-			
-			// step 6: read special markers
-			
-			read_markers(&cinfo, dib);
-
-			// --- header only mode => clean-up and return
-
-			if (header_only) {
-				// release JPEG decompression object
-				jpeg_destroy_decompress(&cinfo);
-				// return header data
-				return dib;
-			}
-
-			// step 7a: while (scan lines remain to be read) jpeg_read_scanlines(...);
-
-			if((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) != JPEG_CMYK)) {
-				// convert from CMYK to RGB
-
-				JSAMPARRAY buffer;		// output row buffer
-				unsigned row_stride;	// physical row width in output buffer
-
-				// JSAMPLEs per row in output buffer
-				row_stride = cinfo.output_width * cinfo.output_components;
-				// make a one-row-high sample array that will go away when done with image
-				buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
-
-				while (cinfo.output_scanline < cinfo.output_height) {
-					JSAMPROW src = buffer[0];
-					JSAMPROW dst = FreeImage_GetScanLine(dib, cinfo.output_height - cinfo.output_scanline - 1);
-
-					jpeg_read_scanlines(&cinfo, buffer, 1);
-
-					for(unsigned x = 0; x < cinfo.output_width; x++) {
-						WORD K = (WORD)src[3];
-						dst[FI_RGBA_RED]   = (BYTE)((K * src[0]) / 255);	// C -> R
-						dst[FI_RGBA_GREEN] = (BYTE)((K * src[1]) / 255);	// M -> G
-						dst[FI_RGBA_BLUE]  = (BYTE)((K * src[2]) / 255);	// Y -> B
-						src += 4;
-						dst += 3;
-					}
-				}
-			} else if((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) == JPEG_CMYK)) {
-				// convert from LibJPEG CMYK to standard CMYK
-
-				JSAMPARRAY buffer;		// output row buffer
-				unsigned row_stride;	// physical row width in output buffer
-
-				// JSAMPLEs per row in output buffer
-				row_stride = cinfo.output_width * cinfo.output_components;
-				// make a one-row-high sample array that will go away when done with image
-				buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
-
-				while (cinfo.output_scanline < cinfo.output_height) {
-					JSAMPROW src = buffer[0];
-					JSAMPROW dst = FreeImage_GetScanLine(dib, cinfo.output_height - cinfo.output_scanline - 1);
-
-					jpeg_read_scanlines(&cinfo, buffer, 1);
-
-					for(unsigned x = 0; x < cinfo.output_width; x++) {
-						// CMYK pixels are inverted
-						dst[0] = ~src[0];	// C
-						dst[1] = ~src[1];	// M
-						dst[2] = ~src[2];	// Y
-						dst[3] = ~src[3];	// K
-						src += 4;
-						dst += 4;
-					}
-				}
-
-			} else {
-				// normal case (RGB or greyscale image)
-
-				while (cinfo.output_scanline < cinfo.output_height) {
-					JSAMPROW dst = FreeImage_GetScanLine(dib, cinfo.output_height - cinfo.output_scanline - 1);
-
-					jpeg_read_scanlines(&cinfo, &dst, 1);
-				}
-
-				// step 7b: swap red and blue components (see LibJPEG/jmorecfg.h: #define RGB_RED, ...)
-				// The default behavior of the JPEG library is kept "as is" because LibTIFF uses 
-				// LibJPEG "as is".
-
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-				SwapRedBlue32(dib);
-#endif
-			}
-
-			// step 8: finish decompression
-
-			jpeg_finish_decompress(&cinfo);
-
-			// step 9: release JPEG decompression object
-
-			jpeg_destroy_decompress(&cinfo);
-
-			// check for automatic Exif rotation
-			if(!header_only && ((flags & JPEG_EXIFROTATE) == JPEG_EXIFROTATE)) {
-				RotateExif(&dib);
-			}
-
-			// everything went well. return the loaded dib
-
-			return dib;
-
-		} catch (const char *text) {
-			jpeg_destroy_decompress(&cinfo);
-			if(NULL != dib) {
-				FreeImage_Unload(dib);
-			}
-			if(NULL != text) {
-				FreeImage_OutputMessageProc(s_format_id, text);
-			}
-		}
-	}
-
-	return NULL;
-}
-
-// ----------------------------------------------------------
-
-static BOOL DLL_CALLCONV
-Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
-	if ((dib) && (handle)) {
-		try {
-			// Check dib format
-
-			const char *sError = "only 24-bit highcolor or 8-bit greyscale/palette bitmaps can be saved as JPEG";
-
-			FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-			WORD bpp = (WORD)FreeImage_GetBPP(dib);
-
-			if ((bpp != 24) && (bpp != 8)) {
-				throw sError;
-			}
-
-			if(bpp == 8) {
-				// allow grey, reverse grey and palette 
-				if ((color_type != FIC_MINISBLACK) && (color_type != FIC_MINISWHITE) && (color_type != FIC_PALETTE)) {
-					throw sError;
-				}
-			}
-
-
-			struct jpeg_compress_struct cinfo;
-			ErrorManager fi_error_mgr;
-
-			// Step 1: allocate and initialize JPEG compression object
-
-			// we set up the normal JPEG error routines, then override error_exit & output_message
-			cinfo.err = jpeg_std_error(&fi_error_mgr.pub);
-			fi_error_mgr.pub.error_exit     = jpeg_error_exit;
-			fi_error_mgr.pub.output_message = jpeg_output_message;
-			
-			// establish the setjmp return context for jpeg_error_exit to use
-			if (setjmp(fi_error_mgr.setjmp_buffer)) {
-				// If we get here, the JPEG code has signaled an error.
-				// We need to clean up the JPEG object, close the input file, and return.
-				jpeg_destroy_compress(&cinfo);
-				throw (const char*)NULL;
-			}
-
-			// Now we can initialize the JPEG compression object
-
-			jpeg_create_compress(&cinfo);
-
-			// Step 2: specify data destination (eg, a file)
-
-			jpeg_freeimage_dst(&cinfo, handle, io);
-
-			// Step 3: set parameters for compression 
-
-			cinfo.image_width = FreeImage_GetWidth(dib);
-			cinfo.image_height = FreeImage_GetHeight(dib);
-
-			switch(color_type) {
-				case FIC_MINISBLACK :
-				case FIC_MINISWHITE :
-					cinfo.in_color_space = JCS_GRAYSCALE;
-					cinfo.input_components = 1;
-					break;
-
-				default :
-					cinfo.in_color_space = JCS_RGB;
-					cinfo.input_components = 3;
-					break;
-			}
-
-			jpeg_set_defaults(&cinfo);
-
-		    // progressive-JPEG support
-			if((flags & JPEG_PROGRESSIVE) == JPEG_PROGRESSIVE) {
-				jpeg_simple_progression(&cinfo);
-			}
-			
-			// compute optimal Huffman coding tables for the image
-			if((flags & JPEG_OPTIMIZE) == JPEG_OPTIMIZE) {
-				cinfo.optimize_coding = TRUE;
-			}
-
-			// Set JFIF density parameters from the DIB data
-
-			cinfo.X_density = (UINT16) (0.5 + 0.0254 * FreeImage_GetDotsPerMeterX(dib));
-			cinfo.Y_density = (UINT16) (0.5 + 0.0254 * FreeImage_GetDotsPerMeterY(dib));
-			cinfo.density_unit = 1;	// dots / inch
-
-			// thumbnail support (JFIF 1.02 extension markers)
-			if(FreeImage_GetThumbnail(dib) != NULL) {
-				cinfo.write_JFIF_header = 1; //<### force it, though when color is CMYK it will be incorrect
-				cinfo.JFIF_minor_version = 2;
-			}
-
-			// baseline JPEG support
-			if ((flags & JPEG_BASELINE) ==  JPEG_BASELINE) {
-				cinfo.write_JFIF_header = 0;	// No marker for non-JFIF colorspaces
-				cinfo.write_Adobe_marker = 0;	// write no Adobe marker by default				
-			}
-
-			// set subsampling options if required
-
-			if(cinfo.in_color_space == JCS_RGB) {
-				if((flags & JPEG_SUBSAMPLING_411) == JPEG_SUBSAMPLING_411) { 
-					// 4:1:1 (4x1 1x1 1x1) - CrH 25% - CbH 25% - CrV 100% - CbV 100%
-					// the horizontal color resolution is quartered
-					cinfo.comp_info[0].h_samp_factor = 4;	// Y 
-					cinfo.comp_info[0].v_samp_factor = 1; 
-					cinfo.comp_info[1].h_samp_factor = 1;	// Cb 
-					cinfo.comp_info[1].v_samp_factor = 1; 
-					cinfo.comp_info[2].h_samp_factor = 1;	// Cr 
-					cinfo.comp_info[2].v_samp_factor = 1; 
-				} else if((flags & JPEG_SUBSAMPLING_420) == JPEG_SUBSAMPLING_420) {
-					// 4:2:0 (2x2 1x1 1x1) - CrH 50% - CbH 50% - CrV 50% - CbV 50%
-					// the chrominance resolution in both the horizontal and vertical directions is cut in half
-					cinfo.comp_info[0].h_samp_factor = 2;	// Y
-					cinfo.comp_info[0].v_samp_factor = 2; 
-					cinfo.comp_info[1].h_samp_factor = 1;	// Cb
-					cinfo.comp_info[1].v_samp_factor = 1; 
-					cinfo.comp_info[2].h_samp_factor = 1;	// Cr
-					cinfo.comp_info[2].v_samp_factor = 1; 
-				} else if((flags & JPEG_SUBSAMPLING_422) == JPEG_SUBSAMPLING_422){ //2x1 (low) 
-					// 4:2:2 (2x1 1x1 1x1) - CrH 50% - CbH 50% - CrV 100% - CbV 100%
-					// half of the horizontal resolution in the chrominance is dropped (Cb & Cr), 
-					// while the full resolution is retained in the vertical direction, with respect to the luminance
-					cinfo.comp_info[0].h_samp_factor = 2;	// Y 
-					cinfo.comp_info[0].v_samp_factor = 1; 
-					cinfo.comp_info[1].h_samp_factor = 1;	// Cb 
-					cinfo.comp_info[1].v_samp_factor = 1; 
-					cinfo.comp_info[2].h_samp_factor = 1;	// Cr 
-					cinfo.comp_info[2].v_samp_factor = 1; 
-				} 
-				else if((flags & JPEG_SUBSAMPLING_444) == JPEG_SUBSAMPLING_444){ //1x1 (no subsampling) 
-					// 4:4:4 (1x1 1x1 1x1) - CrH 100% - CbH 100% - CrV 100% - CbV 100%
-					// the resolution of chrominance information (Cb & Cr) is preserved 
-					// at the same rate as the luminance (Y) information
-					cinfo.comp_info[0].h_samp_factor = 1;	// Y 
-					cinfo.comp_info[0].v_samp_factor = 1; 
-					cinfo.comp_info[1].h_samp_factor = 1;	// Cb 
-					cinfo.comp_info[1].v_samp_factor = 1; 
-					cinfo.comp_info[2].h_samp_factor = 1;	// Cr 
-					cinfo.comp_info[2].v_samp_factor = 1;  
-				} 
-			}
-
-			// Step 4: set quality
-			// the first 7 bits are reserved for low level quality settings
-			// the other bits are high level (i.e. enum-ish)
-
-			int quality;
-
-			if ((flags & JPEG_QUALITYBAD) == JPEG_QUALITYBAD) {
-				quality = 10;
-			} else if ((flags & JPEG_QUALITYAVERAGE) == JPEG_QUALITYAVERAGE) {
-				quality = 25;
-			} else if ((flags & JPEG_QUALITYNORMAL) == JPEG_QUALITYNORMAL) {
-				quality = 50;
-			} else if ((flags & JPEG_QUALITYGOOD) == JPEG_QUALITYGOOD) {
-				quality = 75;
-			} else 	if ((flags & JPEG_QUALITYSUPERB) == JPEG_QUALITYSUPERB) {
-				quality = 100;
-			} else {
-				if ((flags & 0x7F) == 0) {
-					quality = 75;
-				} else {
-					quality = flags & 0x7F;
-				}
-			}
-
-			jpeg_set_quality(&cinfo, quality, TRUE); /* limit to baseline-JPEG values */
-
-			// Step 5: Start compressor 
-
-			jpeg_start_compress(&cinfo, TRUE);
-
-			// Step 6: Write special markers
-			
-			if ((flags & JPEG_BASELINE) !=  JPEG_BASELINE) {
-				write_markers(&cinfo, dib);
-			}
-
-			// Step 7: while (scan lines remain to be written) 
-
-			if(color_type == FIC_RGB) {
-				// 24-bit RGB image : need to swap red and blue channels
-				unsigned pitch = FreeImage_GetPitch(dib);
-				BYTE *target = (BYTE*)malloc(pitch * sizeof(BYTE));
-				if (target == NULL) {
-					throw FI_MSG_ERROR_MEMORY;
-				}
-
-				while (cinfo.next_scanline < cinfo.image_height) {
-					// get a copy of the scanline
-					memcpy(target, FreeImage_GetScanLine(dib, FreeImage_GetHeight(dib) - cinfo.next_scanline - 1), pitch);
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-					// swap R and B channels
-					BYTE *target_p = target;
-					for(unsigned x = 0; x < cinfo.image_width; x++) {
-						INPLACESWAP(target_p[0], target_p[2]);
-						target_p += 3;
-					}
-#endif
-					// write the scanline
-					jpeg_write_scanlines(&cinfo, &target, 1);
-				}
-				free(target);
-			}
-			else if(color_type == FIC_MINISBLACK) {
-				// 8-bit standard greyscale images
-				while (cinfo.next_scanline < cinfo.image_height) {
-					JSAMPROW b = FreeImage_GetScanLine(dib, FreeImage_GetHeight(dib) - cinfo.next_scanline - 1);
-
-					jpeg_write_scanlines(&cinfo, &b, 1);
-				}
-			}
-			else if(color_type == FIC_PALETTE) {
-				// 8-bit palettized images are converted to 24-bit images
-				RGBQUAD *palette = FreeImage_GetPalette(dib);
-				BYTE *target = (BYTE*)malloc(cinfo.image_width * 3);
-				if (target == NULL) {
-					throw FI_MSG_ERROR_MEMORY;
-				}
-
-				while (cinfo.next_scanline < cinfo.image_height) {
-					BYTE *source = FreeImage_GetScanLine(dib, FreeImage_GetHeight(dib) - cinfo.next_scanline - 1);
-					FreeImage_ConvertLine8To24(target, source, cinfo.image_width, palette);
-
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-					// swap R and B channels
-					BYTE *target_p = target;
-					for(unsigned x = 0; x < cinfo.image_width; x++) {
-						INPLACESWAP(target_p[0], target_p[2]);
-						target_p += 3;
-					}
-#endif
-
-
-					jpeg_write_scanlines(&cinfo, &target, 1);
-				}
-
-				free(target);
-			}
-			else if(color_type == FIC_MINISWHITE) {
-				// reverse 8-bit greyscale image, so reverse grey value on the fly
-				unsigned i;
-				BYTE reverse[256];
-				BYTE *target = (BYTE *)malloc(cinfo.image_width);
-				if (target == NULL) {
-					throw FI_MSG_ERROR_MEMORY;
-				}
-
-				for(i = 0; i < 256; i++) {
-					reverse[i] = (BYTE)(255 - i);
-				}
-
-				while(cinfo.next_scanline < cinfo.image_height) {
-					BYTE *source = FreeImage_GetScanLine(dib, FreeImage_GetHeight(dib) - cinfo.next_scanline - 1);
-					for(i = 0; i < cinfo.image_width; i++) {
-						target[i] = reverse[ source[i] ];
-					}
-					jpeg_write_scanlines(&cinfo, &target, 1);
-				}
-
-				free(target);
-			}
-
-			// Step 8: Finish compression 
-
-			jpeg_finish_compress(&cinfo);
-
-			// Step 9: release JPEG compression object 
-
-			jpeg_destroy_compress(&cinfo);
-
-			return TRUE;
-
-		} catch (const char *text) {
-			if(text) {
-				FreeImage_OutputMessageProc(s_format_id, text);
-			}
-			return FALSE;
-		} 
-	}
-
-	return FALSE;
-}
-
-// ==========================================================
-//   Init
-// ==========================================================
-
-void DLL_CALLCONV
-InitJPEG(Plugin *plugin, int format_id) {
-	s_format_id = format_id;
-
-	plugin->format_proc = Format;
-	plugin->description_proc = Description;
-	plugin->extension_proc = Extension;
-	plugin->regexpr_proc = RegExpr;
-	plugin->open_proc = NULL;
-	plugin->close_proc = NULL;
-	plugin->pagecount_proc = NULL;
-	plugin->pagecapability_proc = NULL;
-	plugin->load_proc = Load;
-	plugin->save_proc = Save;
-	plugin->validate_proc = Validate;
-	plugin->mime_proc = MimeType;
-	plugin->supports_export_bpp_proc = SupportsExportDepth;
-	plugin->supports_export_type_proc = SupportsExportType;
-	plugin->supports_icc_profiles_proc = SupportsICCProfiles;
-	plugin->supports_no_pixels_proc = SupportsNoPixels;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/PluginPNG.cpp b/plugins/AdvaImg/src/FreeImage/PluginPNG.cpp
deleted file mode 100644
index fe80a2b533..0000000000
--- a/plugins/AdvaImg/src/FreeImage/PluginPNG.cpp
+++ /dev/null
@@ -1,1115 +0,0 @@
-// ==========================================================
-// PNG Loader and Writer
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Herve Drolon (drolon@infonie.fr)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-// - Aaron Shumate (trek@startreker.com)
-// - Tanner Helland (tannerhelland@users.sf.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-#include "../Metadata/FreeImageTag.h"
-
-// ----------------------------------------------------------
-
-#define PNG_BYTES_TO_CHECK 8
-
-#undef PNG_Z_DEFAULT_COMPRESSION	// already used in ../LibPNG/pnglibconf.h
-
-// ----------------------------------------------------------
-
-#include "zlib.h"
-#include "../LibPNG/png.h"
-
-// ----------------------------------------------------------
-
-typedef struct {
-    FreeImageIO *s_io;
-    fi_handle    s_handle;
-} fi_ioStructure, *pfi_ioStructure;
-
-// ==========================================================
-// libpng interface
-// ==========================================================
-
-static void
-_ReadProc(png_structp png_ptr, unsigned char *data, png_size_t size) {
-    pfi_ioStructure pfio = (pfi_ioStructure)png_get_io_ptr(png_ptr);
-	unsigned n = pfio->s_io->read_proc(data, (unsigned int)size, 1, pfio->s_handle);
-	if(size && (n == 0)) {
-		throw "Read error: invalid or corrupted PNG file";
-	}
-}
-
-static void
-_WriteProc(png_structp png_ptr, unsigned char *data, png_size_t size) {
-    pfi_ioStructure pfio = (pfi_ioStructure)png_get_io_ptr(png_ptr);
-    pfio->s_io->write_proc(data, (unsigned int)size, 1, pfio->s_handle);
-}
-
-static void
-_FlushProc(png_structp png_ptr) {
-	(png_structp)png_ptr;
-	// empty flush implementation
-}
-
-static void
-error_handler(png_structp png_ptr, const char *error) {
-	(png_structp)png_ptr;
-	throw error;
-}
-
-// in FreeImage warnings disabled
-
-static void
-warning_handler(png_structp png_ptr, const char *warning) {
-	(png_structp)png_ptr;
-	(char*)warning;
-}
-
-// ==========================================================
-// Metadata routines
-// ==========================================================
-
-static BOOL 
-ReadMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) {
-	// XMP keyword
-	const char *g_png_xmp_keyword = "XML:com.adobe.xmp";
-
-	FITAG *tag = NULL;
-	png_textp text_ptr = NULL;
-	png_timep mod_time = NULL;
-	int num_text = 0;
-
-	// iTXt/tEXt/zTXt chuncks
-	if(png_get_text(png_ptr, info_ptr, &text_ptr, &num_text) > 0) {
-		for(int i = 0; i < num_text; i++) {
-			// create a tag
-			tag = FreeImage_CreateTag();
-			if(!tag) return FALSE;
-
-			DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length);
-
-			FreeImage_SetTagLength(tag, tag_length);
-			FreeImage_SetTagCount(tag, tag_length);
-			FreeImage_SetTagType(tag, FIDT_ASCII);
-			FreeImage_SetTagValue(tag, text_ptr[i].text);
-
-			if(strcmp(text_ptr[i].key, g_png_xmp_keyword) == 0) {
-				// store the tag as XMP
-				FreeImage_SetTagKey(tag, g_TagLib_XMPFieldName);
-				FreeImage_SetMetadata(FIMD_XMP, dib, FreeImage_GetTagKey(tag), tag);
-			} else {
-				// store the tag as a comment
-				FreeImage_SetTagKey(tag, text_ptr[i].key);
-				FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag);
-			}
-			
-			// destroy the tag
-			FreeImage_DeleteTag(tag);
-		}
-	}
-
-	// timestamp chunk
-	if(png_get_tIME(png_ptr, info_ptr, &mod_time)) {
-		char timestamp[32];
-		// create a tag
-		tag = FreeImage_CreateTag();
-		if(!tag) return FALSE;
-
-		// convert as 'yyyy:MM:dd hh:mm:ss'
-		sprintf(timestamp, "%4d:%02d:%02d %2d:%02d:%02d", mod_time->year, mod_time->month, mod_time->day, mod_time->hour, mod_time->minute, mod_time->second);
-
-		DWORD tag_length = (DWORD)strlen(timestamp) + 1;
-		FreeImage_SetTagLength(tag, tag_length);
-		FreeImage_SetTagCount(tag, tag_length);
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagID(tag, TAG_DATETIME);
-		FreeImage_SetTagValue(tag, timestamp);
-
-		// store the tag as Exif-TIFF
-		FreeImage_SetTagKey(tag, "DateTime");
-		FreeImage_SetMetadata(FIMD_EXIF_MAIN, dib, FreeImage_GetTagKey(tag), tag);
-
-		// destroy the tag
-		FreeImage_DeleteTag(tag);
-	}
-
-	return TRUE;
-}
-
-static BOOL 
-WriteMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) {
-	// XMP keyword
-	const char *g_png_xmp_keyword = "XML:com.adobe.xmp";
-
-	FITAG *tag = NULL;
-	FIMETADATA *mdhandle = NULL;
-	BOOL bResult = TRUE;
-
-	png_text text_metadata;
-	png_time mod_time;
-
-	// set the 'Comments' metadata as iTXt chuncks
-
-	mdhandle = FreeImage_FindFirstMetadata(FIMD_COMMENTS, dib, &tag);
-
-	if(mdhandle) {
-		do {
-			memset(&text_metadata, 0, sizeof(png_text));
-			text_metadata.compression = 1;							// iTXt, none
-			text_metadata.key = (char*)FreeImage_GetTagKey(tag);	// keyword, 1-79 character description of "text"
-			text_metadata.text = (char*)FreeImage_GetTagValue(tag);	// comment, may be an empty string (ie "")
-			text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string
-			text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string
-			text_metadata.lang = 0;		 // language code, 0-79 characters or a NULL pointer
-			text_metadata.lang_key = 0;	 // keyword translated UTF-8 string, 0 or more chars or a NULL pointer
-
-			// set the tag 
-			png_set_text(png_ptr, info_ptr, &text_metadata, 1);
-
-		} while(FreeImage_FindNextMetadata(mdhandle, &tag));
-
-		FreeImage_FindCloseMetadata(mdhandle);
-		bResult &= TRUE;
-	}
-
-	// set the 'XMP' metadata as iTXt chuncks
-	tag = NULL;
-	FreeImage_GetMetadata(FIMD_XMP, dib, g_TagLib_XMPFieldName, &tag);
-	if(tag && FreeImage_GetTagLength(tag)) {
-		memset(&text_metadata, 0, sizeof(png_text));
-		text_metadata.compression = 1;							// iTXt, none
-		text_metadata.key = (char*)g_png_xmp_keyword;			// keyword, 1-79 character description of "text"
-		text_metadata.text = (char*)FreeImage_GetTagValue(tag);	// comment, may be an empty string (ie "")
-		text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string
-		text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string
-		text_metadata.lang = 0;		 // language code, 0-79 characters or a NULL pointer
-		text_metadata.lang_key = 0;	 // keyword translated UTF-8 string, 0 or more chars or a NULL pointer
-
-		// set the tag 
-		png_set_text(png_ptr, info_ptr, &text_metadata, 1);
-		bResult &= TRUE;
-	}
-
-	// set the Exif-TIFF 'DateTime' metadata as a tIME chunk
-	tag = NULL;
-	FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "DateTime", &tag);
-	if(tag && FreeImage_GetTagLength(tag)) {
-		int year, month, day, hour, minute, second;
-		const char *value = (char*)FreeImage_GetTagValue(tag);
-		if(sscanf(value, "%4d:%02d:%02d %2d:%02d:%02d", &year, &month, &day, &hour, &minute, &second) == 6) {
-			mod_time.year	= (png_uint_16)year;
-			mod_time.month	= (png_byte)month;
-			mod_time.day	= (png_byte)day;
-			mod_time.hour	= (png_byte)hour;
-			mod_time.minute	= (png_byte)minute;
-			mod_time.second	= (png_byte)second;
-			png_set_tIME (png_ptr, info_ptr, &mod_time);
-		}
-	}
-
-	return bResult;
-}
-
-// ==========================================================
-// Plugin Interface
-// ==========================================================
-
-static int s_format_id;
-
-// ==========================================================
-// Plugin Implementation
-// ==========================================================
-
-static const char * DLL_CALLCONV
-Format() {
-	return "PNG";
-}
-
-static const char * DLL_CALLCONV
-Description() {
-	return "Portable Network Graphics";
-}
-
-static const char * DLL_CALLCONV
-Extension() {
-	return "png";
-}
-
-static const char * DLL_CALLCONV
-RegExpr() {
-	return "^.PNG\r";
-}
-
-static const char * DLL_CALLCONV
-MimeType() {
-	return "image/png";
-}
-
-static BOOL DLL_CALLCONV
-Validate(FreeImageIO *io, fi_handle handle) {
-	BYTE png_signature[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
-	BYTE signature[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	io->read_proc(&signature, 1, 8, handle);
-
-	return (memcmp(png_signature, signature, 8) == 0);
-}
-
-static BOOL DLL_CALLCONV
-SupportsExportDepth(int depth) {
-	return (
-			(depth == 1) ||
-			(depth == 4) ||
-			(depth == 8) ||
-			(depth == 24) ||
-			(depth == 32)
-		);
-}
-
-static BOOL DLL_CALLCONV 
-SupportsExportType(FREE_IMAGE_TYPE type) {
-	return (
-		(type == FIT_BITMAP) ||
-		(type == FIT_UINT16) ||
-		(type == FIT_RGB16) ||
-		(type == FIT_RGBA16)
-	);
-}
-
-static BOOL DLL_CALLCONV
-SupportsICCProfiles() {
-	return TRUE;
-}
-
-static BOOL DLL_CALLCONV
-SupportsNoPixels() {
-	return TRUE;
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Configure the decoder so that decoded pixels are compatible with a FREE_IMAGE_TYPE format. 
-Set conversion instructions as needed. 
-@param png_ptr PNG handle
-@param info_ptr PNG info handle
-@param flags Decoder flags
-@param output_image_type Returned FreeImage converted image type
-@return Returns TRUE if successful, returns FALSE otherwise
-@see png_read_update_info
-*/
-static BOOL 
-ConfigureDecoder(png_structp png_ptr, png_infop info_ptr, int flags, FREE_IMAGE_TYPE *output_image_type) {
-	// get original image info
-	const int color_type = png_get_color_type(png_ptr, info_ptr);
-	const int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-	const int pixel_depth = bit_depth * png_get_channels(png_ptr, info_ptr);
-
-	FREE_IMAGE_TYPE image_type = FIT_BITMAP;	// assume standard image type
-
-	// check for transparency table or single transparent color
-	BOOL bIsTransparent = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) == PNG_INFO_tRNS ? TRUE : FALSE;
-
-	// check allowed combinations of colour type and bit depth
-	// then get converted FreeImage type
-
-	switch(color_type) {
-		case PNG_COLOR_TYPE_GRAY:		// color type '0', bitdepth = 1, 2, 4, 8, 16
-			switch(bit_depth) {
-				case 1:
-				case 2:
-				case 4:
-				case 8:
-					// expand grayscale images to the full 8-bit from 2-bit/pixel
-					if (pixel_depth == 2) {
-						png_set_expand_gray_1_2_4_to_8(png_ptr);
-					}
-
-					// if a tRNS chunk is provided, we must also expand the grayscale data to 8-bits,
-					// this allows us to make use of the transparency table with existing FreeImage methods
-					if (bIsTransparent && (pixel_depth < 8)) {
-						png_set_expand_gray_1_2_4_to_8(png_ptr);
-					}
-					break;
-
-				case 16:
-					image_type = (pixel_depth == 16) ? FIT_UINT16 : FIT_UNKNOWN;
-
-					// 16-bit grayscale images can contain a transparent value (shade)
-					// if found, expand the transparent value to a full alpha channel
-					if (bIsTransparent && (image_type != FIT_UNKNOWN)) {
-						// expand tRNS to a full alpha channel
-						png_set_tRNS_to_alpha(png_ptr);
-						
-						// expand new 16-bit gray + 16-bit alpha to full 64-bit RGBA
-						png_set_gray_to_rgb(png_ptr);
-
-						image_type = FIT_RGBA16;
-					}
-					break;
-
-				default:
-					image_type = FIT_UNKNOWN;
-					break;
-			}
-			break;
-
-		case PNG_COLOR_TYPE_RGB:		// color type '2', bitdepth = 8, 16
-			switch(bit_depth) {
-				case 8:
-					image_type = (pixel_depth == 24) ? FIT_BITMAP : FIT_UNKNOWN;
-					break;
-				case 16:
-					image_type = (pixel_depth == 48) ? FIT_RGB16 : FIT_UNKNOWN;
-					break;
-				default:
-					image_type = FIT_UNKNOWN;
-					break;
-			}
-			// sometimes, 24- or 48-bit images may contain transparency information
-			// check for this use case and convert to an alpha-compatible format
-			if (bIsTransparent && (image_type != FIT_UNKNOWN)) {
-				// if the image is 24-bit RGB, mark it as 32-bit; if it is 48-bit, mark it as 64-bit
-				image_type = (pixel_depth == 24) ? FIT_BITMAP : (pixel_depth == 48) ? FIT_RGBA16 : FIT_UNKNOWN;
-				// expand tRNS chunk to alpha channel
-				png_set_tRNS_to_alpha(png_ptr);
-			}
-			break;
-
-		case PNG_COLOR_TYPE_PALETTE:	// color type '3', bitdepth = 1, 2, 4, 8
-			switch(bit_depth) {
-				case 1:
-				case 2:
-				case 4:
-				case 8:
-					// expand palette images to the full 8 bits from 2 bits/pixel
-					if (pixel_depth == 2) {
-						png_set_packing(png_ptr);
-					}
-
-					// if a tRNS chunk is provided, we must also expand the palletized data to 8-bits,
-					// this allows us to make use of the transparency table with existing FreeImage methods
-					if (bIsTransparent && (pixel_depth < 8)) {
-						png_set_packing(png_ptr);
-					}
-					break;
-
-				default:
-					image_type = FIT_UNKNOWN;
-					break;
-			}
-			break;
-
-		case PNG_COLOR_TYPE_GRAY_ALPHA:	// color type '4', bitdepth = 8, 16
-			switch(bit_depth) {
-				case 8:
-					// 8-bit grayscale + 8-bit alpha => convert to 32-bit RGBA
-					image_type = (pixel_depth == 16) ? FIT_BITMAP : FIT_UNKNOWN;
-					break;
-				case 16:
-					// 16-bit grayscale + 16-bit alpha => convert to 64-bit RGBA
-					image_type = (pixel_depth == 32) ? FIT_RGBA16 : FIT_UNKNOWN;
-					break;
-				default:
-					image_type = FIT_UNKNOWN;
-					break;
-			}
-			// expand 8-bit greyscale + 8-bit alpha to 32-bit
-			// expand 16-bit greyscale + 16-bit alpha to 64-bit
-			png_set_gray_to_rgb(png_ptr);
-			break;
-
-		case PNG_COLOR_TYPE_RGB_ALPHA:	// color type '6', bitdepth = 8, 16
-			switch(bit_depth) {
-				case 8:
-					break;
-				case 16:
-					image_type = (pixel_depth == 64) ? FIT_RGBA16 : FIT_UNKNOWN;
-					break;
-				default:
-					image_type = FIT_UNKNOWN;
-					break;
-			}
-			break;
-	}
-
-	// check for unknown or invalid formats
-	if(image_type == FIT_UNKNOWN) {
-		*output_image_type = image_type;
-		return FALSE;
-	}
-
-#ifndef FREEIMAGE_BIGENDIAN
-	if((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) {
-		// turn on 16-bit byte swapping
-		png_set_swap(png_ptr);
-	}
-#endif						
-
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-	if((image_type == FIT_BITMAP) && ((color_type == PNG_COLOR_TYPE_RGB) || (color_type == PNG_COLOR_TYPE_RGB_ALPHA))) {
-		// flip the RGB pixels to BGR (or RGBA to BGRA)
-		png_set_bgr(png_ptr);
-	}
-#endif
-
-	// gamma correction
-	// unlike the example in the libpng documentation, we have *no* idea where
-	// this file may have come from--so if it doesn't have a file gamma, don't
-	// do any correction ("do no harm")
-
-	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
-		double gamma = 0;
-		double screen_gamma = 2.2;
-
-		if (png_get_gAMA(png_ptr, info_ptr, &gamma) && ( flags & PNG_IGNOREGAMMA ) != PNG_IGNOREGAMMA) {
-			png_set_gamma(png_ptr, screen_gamma, gamma);
-		}
-	}
-
-	// all transformations have been registered; now update info_ptr data		
-	png_read_update_info(png_ptr, info_ptr);
-
-	// return the output image type
-	*output_image_type = image_type;
-
-	return TRUE;
-}
-
-static FIBITMAP * DLL_CALLCONV
-Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
-	png_structp png_ptr = NULL;
-	png_infop info_ptr = NULL;
-	png_uint_32 width, height;
-	int color_type;
-	int bit_depth;
-	int pixel_depth = 0;	// pixel_depth = bit_depth * channels
-
-	FIBITMAP *dib = NULL;
-	png_bytepp row_pointers = NULL;
-
-    fi_ioStructure fio;
-    fio.s_handle = handle;
-	fio.s_io = io;
-    
-	if (handle) {
-		BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
-
-		try {		
-			// check to see if the file is in fact a PNG file
-
-			BYTE png_check[PNG_BYTES_TO_CHECK];
-
-			io->read_proc(png_check, PNG_BYTES_TO_CHECK, 1, handle);
-
-			if (png_sig_cmp(png_check, (png_size_t)0, PNG_BYTES_TO_CHECK) != 0) {
-				return NULL;	// Bad signature
-			}
-			
-			// create the chunk manage structure
-
-			png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, error_handler, warning_handler);
-
-			if (!png_ptr) {
-				return NULL;			
-			}
-
-			// create the info structure
-
-		    info_ptr = png_create_info_struct(png_ptr);
-
-			if (!info_ptr) {
-				png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
-				return NULL;
-			}
-
-			// init the IO
-
-			png_set_read_fn(png_ptr, &fio, _ReadProc);
-
-            if (setjmp(png_jmpbuf(png_ptr))) {
-				png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-				return NULL;
-			}
-
-			// because we have already read the signature...
-
-			png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK);
-
-			// read the IHDR chunk
-
-			png_read_info(png_ptr, info_ptr);
-			png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
-
-			// configure the decoder
-
-			FREE_IMAGE_TYPE image_type = FIT_BITMAP;
-
-			if(!ConfigureDecoder(png_ptr, info_ptr, flags, &image_type)) {
-				throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
-			}
-
-			// update image info
-
-			color_type = png_get_color_type(png_ptr, info_ptr);
-			bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-			pixel_depth = bit_depth * png_get_channels(png_ptr, info_ptr);
-
-			// create a dib and write the bitmap header
-			// set up the dib palette, if needed
-
-			switch (color_type) {
-				case PNG_COLOR_TYPE_RGB:
-				case PNG_COLOR_TYPE_RGB_ALPHA:
-					dib = FreeImage_AllocateHeaderT(header_only, image_type, width, height, pixel_depth, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					break;
-
-				case PNG_COLOR_TYPE_PALETTE:
-					dib = FreeImage_AllocateHeaderT(header_only, image_type, width, height, pixel_depth, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-					if(dib) {
-						png_colorp png_palette = NULL;
-						int palette_entries = 0;
-
-						png_get_PLTE(png_ptr,info_ptr, &png_palette, &palette_entries);
-
-						palette_entries = MIN((unsigned)palette_entries, FreeImage_GetColorsUsed(dib));
-
-						// store the palette
-
-						RGBQUAD *palette = FreeImage_GetPalette(dib);
-						for(int i = 0; i < palette_entries; i++) {
-							palette[i].rgbRed   = png_palette[i].red;
-							palette[i].rgbGreen = png_palette[i].green;
-							palette[i].rgbBlue  = png_palette[i].blue;
-						}
-					}
-					break;
-
-				case PNG_COLOR_TYPE_GRAY:
-					dib = FreeImage_AllocateHeaderT(header_only, image_type, width, height, pixel_depth, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-
-					if(dib && (pixel_depth <= 8)) {
-						RGBQUAD *palette = FreeImage_GetPalette(dib);
-						const int palette_entries = 1 << pixel_depth;
-
-						for(int i = 0; i < palette_entries; i++) {
-							palette[i].rgbRed   =
-							palette[i].rgbGreen =
-							palette[i].rgbBlue  = (BYTE)((i * 255) / (palette_entries - 1));
-						}
-					}
-					break;
-
-				default:
-					throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
-			}
-
-			if(!dib) {
-				throw FI_MSG_ERROR_DIB_MEMORY;
-			}
-
-			// store the transparency table
-
-			if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-				// array of alpha (transparency) entries for palette
-				png_bytep trans_alpha = NULL;
-				// number of transparent entries
-				int num_trans = 0;						
-				// graylevel or color sample values of the single transparent color for non-paletted images
-				png_color_16p trans_color = NULL;
-
-				png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-
-				if((color_type == PNG_COLOR_TYPE_GRAY) && trans_color) {
-					// single transparent color
-					if (trans_color->gray < 256) { 
-						BYTE table[256]; 
-						memset(table, 0xFF, 256); 
-						table[trans_color->gray] = 0; 
-						FreeImage_SetTransparencyTable(dib, table, 256); 
-					}
-					// check for a full transparency table, too
-					else if ((trans_alpha) && (pixel_depth <= 8)) {
-						FreeImage_SetTransparencyTable(dib, (BYTE *)trans_alpha, num_trans);
-					}
-
-				} else if((color_type == PNG_COLOR_TYPE_PALETTE) && trans_alpha) {
-					// transparency table
-					FreeImage_SetTransparencyTable(dib, (BYTE *)trans_alpha, num_trans);
-				}
-			}
-
-			// store the background color (only supported for FIT_BITMAP types)
-
-			if ((image_type == FIT_BITMAP) && png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD)) {
-				// Get the background color to draw transparent and alpha images over.
-				// Note that even if the PNG file supplies a background, you are not required to
-				// use it - you should use the (solid) application background if it has one.
-
-				png_color_16p image_background = NULL;
-				RGBQUAD rgbBkColor;
-
-				if (png_get_bKGD(png_ptr, info_ptr, &image_background)) {
-					rgbBkColor.rgbRed      = (BYTE)image_background->red;
-					rgbBkColor.rgbGreen    = (BYTE)image_background->green;
-					rgbBkColor.rgbBlue     = (BYTE)image_background->blue;
-					rgbBkColor.rgbReserved = 0;
-
-					FreeImage_SetBackgroundColor(dib, &rgbBkColor);
-				}
-			}
-
-			// get physical resolution
-
-			if (png_get_valid(png_ptr, info_ptr, PNG_INFO_pHYs)) {
-				png_uint_32 res_x, res_y;
-				
-				// we'll overload this var and use 0 to mean no phys data,
-				// since if it's not in meters we can't use it anyway
-
-				int res_unit_type = PNG_RESOLUTION_UNKNOWN;
-
-				png_get_pHYs(png_ptr,info_ptr, &res_x, &res_y, &res_unit_type);
-
-				if (res_unit_type == PNG_RESOLUTION_METER) {
-					FreeImage_SetDotsPerMeterX(dib, res_x);
-					FreeImage_SetDotsPerMeterY(dib, res_y);
-				}
-			}
-
-			// get possible ICC profile
-
-			if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
-				png_charp profile_name = NULL;
-				png_bytep profile_data = NULL;
-				png_uint_32 profile_length = 0;
-				int  compression_type;
-
-				png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_length);
-
-				// copy ICC profile data (must be done after FreeImage_AllocateHeader)
-
-				FreeImage_CreateICCProfile(dib, profile_data, profile_length);
-			}
-
-			// --- header only mode => clean-up and return
-
-			if (header_only) {
-				// get possible metadata (it can be located both before and after the image data)
-				ReadMetadata(png_ptr, info_ptr, dib);
-				if (png_ptr) {
-					// clean up after the read, and free any memory allocated - REQUIRED
-					png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-				}
-				return dib;
-			}
-
-			// set the individual row_pointers to point at the correct offsets
-
-			row_pointers = (png_bytepp)malloc(height * sizeof(png_bytep));
-
-			if (!row_pointers) {
-				png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-				FreeImage_Unload(dib);
-				return NULL;
-			}
-
-			// read in the bitmap bits via the pointer table
-			// allow loading of PNG with minor errors (such as images with several IDAT chunks)
-
-			for (png_uint_32 k = 0; k < height; k++) {
-				row_pointers[height - 1 - k] = FreeImage_GetScanLine(dib, k);
-			}
-
-			png_set_benign_errors(png_ptr, 1);
-			png_read_image(png_ptr, row_pointers);
-
-			// check if the bitmap contains transparency, if so enable it in the header
-
-			if (FreeImage_GetBPP(dib) == 32) {
-				if (FreeImage_GetColorType(dib) == FIC_RGBALPHA) {
-					FreeImage_SetTransparent(dib, TRUE);
-				} else {
-					FreeImage_SetTransparent(dib, FALSE);
-				}
-			}
-				
-			// cleanup
-
-			if (row_pointers) {
-				free(row_pointers);
-				row_pointers = NULL;
-			}
-
-			// read the rest of the file, getting any additional chunks in info_ptr
-
-			png_read_end(png_ptr, info_ptr);
-
-			// get possible metadata (it can be located both before and after the image data)
-
-			ReadMetadata(png_ptr, info_ptr, dib);
-
-			if (png_ptr) {
-				// clean up after the read, and free any memory allocated - REQUIRED
-				png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-			}
-
-			return dib;
-
-		} catch (const char *text) {
-			if (png_ptr) {
-				png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-			}
-			if (row_pointers) {
-				free(row_pointers);
-			}
-			if (dib) {
-				FreeImage_Unload(dib);
-			}
-			FreeImage_OutputMessageProc(s_format_id, text);
-			
-			return NULL;
-		}
-	}			
-
-	return NULL;
-}
-
-// --------------------------------------------------------------------------
-
-static BOOL DLL_CALLCONV
-Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
-	png_structp png_ptr;
-	png_infop info_ptr;
-	png_colorp palette = NULL;
-	png_uint_32 width, height;
-	BOOL has_alpha_channel = FALSE;
-
-	RGBQUAD *pal;					// pointer to dib palette
-	int bit_depth, pixel_depth;		// pixel_depth = bit_depth * channels
-	int palette_entries;
-	int	interlace_type;
-
-	fi_ioStructure fio;
-    fio.s_handle = handle;
-	fio.s_io = io;
-
-	if ((dib) && (handle)) {
-		try {
-			// create the chunk manage structure
-
-			png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, error_handler, warning_handler);
-
-			if (!png_ptr)  {
-				return FALSE;
-			}
-
-			// allocate/initialize the image information data.
-
-			info_ptr = png_create_info_struct(png_ptr);
-
-			if (!info_ptr)  {
-				png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
-				return FALSE;
-			}
-
-			// Set error handling.  REQUIRED if you aren't supplying your own
-			// error handling functions in the png_create_write_struct() call.
-
-			if (setjmp(png_jmpbuf(png_ptr)))  {
-				// if we get here, we had a problem reading the file
-
-				png_destroy_write_struct(&png_ptr, &info_ptr);
-
-				return FALSE;
-			}
-
-			// init the IO
-            
-			png_set_write_fn(png_ptr, &fio, _WriteProc, _FlushProc);
-
-			// set physical resolution
-
-			png_uint_32 res_x = (png_uint_32)FreeImage_GetDotsPerMeterX(dib);
-			png_uint_32 res_y = (png_uint_32)FreeImage_GetDotsPerMeterY(dib);
-
-			if ((res_x > 0) && (res_y > 0))  {
-				png_set_pHYs(png_ptr, info_ptr, res_x, res_y, PNG_RESOLUTION_METER);
-			}
-	
-			// Set the image information here.  Width and height are up to 2^31,
-			// bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
-			// the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
-			// PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
-			// or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
-			// PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
-			// currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
-
-			width = FreeImage_GetWidth(dib);
-			height = FreeImage_GetHeight(dib);
-			pixel_depth = FreeImage_GetBPP(dib);
-
-			BOOL bInterlaced = FALSE;
-			if( (flags & PNG_INTERLACED) == PNG_INTERLACED) {
-				interlace_type = PNG_INTERLACE_ADAM7;
-				bInterlaced = TRUE;
-			} else {
-				interlace_type = PNG_INTERLACE_NONE;
-			}
-
-			// set the ZLIB compression level or default to PNG default compression level (ZLIB level = 6)
-			int zlib_level = flags & 0x0F;
-			if((zlib_level >= 1) && (zlib_level <= 9)) {
-				png_set_compression_level(png_ptr, zlib_level);
-			} else if((flags & PNG_Z_NO_COMPRESSION) == PNG_Z_NO_COMPRESSION) {
-				png_set_compression_level(png_ptr, Z_NO_COMPRESSION);
-			}
-
-			// filtered strategy works better for high color images
-			if(pixel_depth >= 16){
-				png_set_compression_strategy(png_ptr, Z_FILTERED);
-				png_set_filter(png_ptr, 0, PNG_FILTER_NONE|PNG_FILTER_SUB|PNG_FILTER_PAETH);
-			} else {
-				png_set_compression_strategy(png_ptr, Z_DEFAULT_STRATEGY);
-			}
-
-			FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-			if(image_type == FIT_BITMAP) {
-				// standard image type
-				bit_depth = (pixel_depth > 8) ? 8 : pixel_depth;
-			} else {
-				// 16-bit greyscale or 16-bit RGB(A)
-				bit_depth = 16;
-			}
-
-			// check for transparent images
-			BOOL bIsTransparent = 
-				(image_type == FIT_BITMAP) && FreeImage_IsTransparent(dib) && (FreeImage_GetTransparencyCount(dib) > 0) ? TRUE : FALSE;
-
-			switch (FreeImage_GetColorType(dib)) {
-				case FIC_MINISWHITE:
-					if(!bIsTransparent) {
-						// Invert monochrome files to have 0 as black and 1 as white (no break here)
-						png_set_invert_mono(png_ptr);
-					}
-					// (fall through)
-
-				case FIC_MINISBLACK:
-					if(!bIsTransparent) {
-						png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, 
-							PNG_COLOR_TYPE_GRAY, interlace_type, 
-							PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-						break;
-					}
-					// If a monochrome image is transparent, save it with a palette
-					// (fall through)
-
-				case FIC_PALETTE:
-				{
-					png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, 
-						PNG_COLOR_TYPE_PALETTE, interlace_type, 
-						PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-					// set the palette
-
-					palette_entries = 1 << bit_depth;
-					palette = (png_colorp)png_malloc(png_ptr, palette_entries * sizeof (png_color));
-					pal = FreeImage_GetPalette(dib);
-
-					for (int i = 0; i < palette_entries; i++) {
-						palette[i].red   = pal[i].rgbRed;
-						palette[i].green = pal[i].rgbGreen;
-						palette[i].blue  = pal[i].rgbBlue;
-					}
-					
-					png_set_PLTE(png_ptr, info_ptr, palette, palette_entries);
-
-					// You must not free palette here, because png_set_PLTE only makes a link to
-					// the palette that you malloced.  Wait until you are about to destroy
-					// the png structure.
-
-					break;
-				}
-
-				case FIC_RGBALPHA :
-					has_alpha_channel = TRUE;
-
-					png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, 
-						PNG_COLOR_TYPE_RGBA, interlace_type, 
-						PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-					// flip BGR pixels to RGB
-					if(image_type == FIT_BITMAP) {
-						png_set_bgr(png_ptr);
-					}
-#endif
-					break;
-	
-				case FIC_RGB:
-					png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, 
-						PNG_COLOR_TYPE_RGB, interlace_type, 
-						PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR
-					// flip BGR pixels to RGB
-					if(image_type == FIT_BITMAP) {
-						png_set_bgr(png_ptr);
-					}
-#endif
-					break;
-					
-				case FIC_CMYK:
-					break;
-			}
-
-			// write possible ICC profile
-
-			FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
-			if (iccProfile->size && iccProfile->data) {
-				png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size);
-			}
-
-			// write metadata
-
-			WriteMetadata(png_ptr, info_ptr, dib);
-
-			// Optional gamma chunk is strongly suggested if you have any guess
-			// as to the correct gamma of the image.
-			// png_set_gAMA(png_ptr, info_ptr, gamma);
-
-			// set the transparency table
-
-			if (bIsTransparent) {
-				png_set_tRNS(png_ptr, info_ptr, FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib), NULL);
-			}
-
-			// set the background color
-
-			if(FreeImage_HasBackgroundColor(dib)) {
-				png_color_16 image_background;
-				RGBQUAD rgbBkColor;
-
-				FreeImage_GetBackgroundColor(dib, &rgbBkColor);
-				memset(&image_background, 0, sizeof(png_color_16));
-				image_background.blue  = rgbBkColor.rgbBlue;
-				image_background.green = rgbBkColor.rgbGreen;
-				image_background.red   = rgbBkColor.rgbRed;
-				image_background.index = rgbBkColor.rgbReserved;
-
-				png_set_bKGD(png_ptr, info_ptr, &image_background);
-			}
-			
-			// Write the file header information.
-
-			png_write_info(png_ptr, info_ptr);
-
-			// write out the image data
-
-#ifndef FREEIMAGE_BIGENDIAN
-			if (bit_depth == 16) {
-				// turn on 16 bit byte swapping
-				png_set_swap(png_ptr);
-			}
-#endif
-
-			int number_passes = 1;
-			if (bInterlaced) {
-				number_passes = png_set_interlace_handling(png_ptr);
-			}
-
-			if ((pixel_depth == 32) && (!has_alpha_channel)) {
-				BYTE *buffer = (BYTE *)malloc(width * 3);
-
-				// transparent conversion to 24-bit
-				// the number of passes is either 1 for non-interlaced images, or 7 for interlaced images
-				for (int pass = 0; pass < number_passes; pass++) {
-					for (png_uint_32 k = 0; k < height; k++) {
-						FreeImage_ConvertLine32To24(buffer, FreeImage_GetScanLine(dib, height - k - 1), width);
-						png_write_row(png_ptr, buffer);
-					}
-				}
-				free(buffer);
-			} else {
-				// the number of passes is either 1 for non-interlaced images, or 7 for interlaced images
-				for (int pass = 0; pass < number_passes; pass++) {
-					for (png_uint_32 k = 0; k < height; k++) {
-						png_write_row(png_ptr, FreeImage_GetScanLine(dib, height - k - 1));
-					}
-				}
-			}
-
-			// It is REQUIRED to call this to finish writing the rest of the file
-			// Bug with png_flush
-
-			png_write_end(png_ptr, info_ptr);
-
-			// clean up after the write, and free any memory allocated
-			if (palette) {
-				png_free(png_ptr, palette);
-			}
-
-			png_destroy_write_struct(&png_ptr, &info_ptr);
-
-			return TRUE;
-
-		} catch (const char *text) {
-			if(png_ptr) {
-				png_destroy_write_struct(&png_ptr, &info_ptr);
-			}
-			FreeImage_OutputMessageProc(s_format_id, text);
-		}
-	}
-
-	return FALSE;
-}
-
-// ==========================================================
-//   Init
-// ==========================================================
-
-void DLL_CALLCONV
-InitPNG(Plugin *plugin, int format_id) {
-	s_format_id = format_id;
-
-	plugin->format_proc = Format;
-	plugin->description_proc = Description;
-	plugin->extension_proc = Extension;
-	plugin->regexpr_proc = RegExpr;
-	plugin->open_proc = NULL;
-	plugin->close_proc = NULL;
-	plugin->pagecount_proc = NULL;
-	plugin->pagecapability_proc = NULL;
-	plugin->load_proc = Load;
-	plugin->save_proc = Save;
-	plugin->validate_proc = Validate;
-	plugin->mime_proc = MimeType;
-	plugin->supports_export_bpp_proc = SupportsExportDepth;
-	plugin->supports_export_type_proc = SupportsExportType;
-	plugin->supports_icc_profiles_proc = SupportsICCProfiles;
-	plugin->supports_no_pixels_proc = SupportsNoPixels;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp b/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp
deleted file mode 100644
index 3f313232c4..0000000000
--- a/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// ==========================================================
-// XYZ to RGB TIFF conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-void tiff_ConvertLineXYZToRGB(BYTE *target, BYTE *source, double stonits, int width_in_pixels) {
-	FIRGBF *rgbf = (FIRGBF*)target;
-	float *xyz = (float*)source;
-	
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		// assume CCIR-709 primaries (matrix from tif_luv.c)
-		// LOG Luv XYZ (D65) -> sRGB (CIE Illuminant E)
-		rgbf->red	= (float)( 2.690*xyz[0] + -1.276*xyz[1] + -0.414*xyz[2]);
-		rgbf->green	= (float)(-1.022*xyz[0] +  1.978*xyz[1] +  0.044*xyz[2]);
-		rgbf->blue	= (float)( 0.061*xyz[0] + -0.224*xyz[1] +  1.163*xyz[2]);
-		
-		/*
-		if (stonits != 0.0) {
-			rgbf->red	= (float)(rgbf->red   * stonits);
-			rgbf->green	= (float)(rgbf->green * stonits);
-			rgbf->blue	= (float)(rgbf->blue  * stonits);
-		} 
-		*/
-
-		rgbf++;
-		xyz += 3;
-	}
-}
-
-void tiff_ConvertLineRGBToXYZ(BYTE *target, BYTE *source, int width_in_pixels) {
-	FIRGBF *rgbf = (FIRGBF*)source;
-	float *xyz = (float*)target;
-	
-	for (int cols = 0; cols < width_in_pixels; cols++) {
-		// assume CCIR-709 primaries, whitepoint x = 1/3 y = 1/3 (D_E)
-		// "The LogLuv Encoding for Full Gamut, High Dynamic Range Images" <G.Ward>
-		// sRGB ( CIE Illuminant E ) -> LOG Luv XYZ (D65)
-		xyz[0] =  (float)(0.497*rgbf->red +  0.339*rgbf->green +  0.164*rgbf->blue);
-		xyz[1] =  (float)(0.256*rgbf->red +  0.678*rgbf->green +  0.066*rgbf->blue);
-		xyz[2] =  (float)(0.023*rgbf->red +  0.113*rgbf->green +  0.864*rgbf->blue);
-
-		rgbf++;
-		xyz += 3;
-	}
-}
-
diff --git a/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp b/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp
deleted file mode 100644
index aca7961647..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// ==========================================================
-// Tone mapping operators
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-/**
-Performs a tone mapping on a 48-bit RGB or a 96-bit RGBF image and returns a 24-bit image. 
-The meaning of the parameters depends on the choosen algorithm. 
-When both parameters are set to zero, a default set of parameters is used. 
-@param dib Input RGB/RGBF image
-@param tmo Tone mapping operator
-@param first_param First parameter of the algorithm
-@param second_param Second parameter of the algorithm
-return Returns a 24-bit tone mapped image if successful, returns NULL otherwise
-*/ 
-FIBITMAP * DLL_CALLCONV
-FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param, double second_param) {
-	if(FreeImage_HasPixels(dib)) {
-		switch(tmo) {
-			// Adaptive logarithmic mapping (F. Drago, 2003)
-			case FITMO_DRAGO03:
-				if((first_param == 0) && (second_param == 0)) {
-					// use default values (gamma = 2.2, exposure = 0)
-					return FreeImage_TmoDrago03(dib, 2.2, 0);
-				} else {
-					// use user's value
-					return FreeImage_TmoDrago03(dib, first_param, second_param);
-				}
-				break;
-			// Dynamic range reduction inspired by photoreceptor phhysiology (E. Reinhard, 2005)
-			case FITMO_REINHARD05:
-				if((first_param == 0) && (second_param == 0)) {
-					// use default values by setting intensity to 0 and contrast to 0
-					return FreeImage_TmoReinhard05(dib, 0, 0);
-				} else {
-					// use user's value
-					return FreeImage_TmoReinhard05(dib, first_param, second_param);
-				}
-				break;
-			// Gradient Domain HDR Compression (R. Fattal, 2002)
-			case FITMO_FATTAL02:
-				if((first_param == 0) && (second_param == 0)) {
-					// use default values by setting color saturation to 0.5 and attenuation to 0.85
-					return FreeImage_TmoFattal02(dib, 0.5, 0.85);
-				} else {
-					// use user's value
-					return FreeImage_TmoFattal02(dib, first_param, second_param);
-				}
-				break;
-		}
-	}
-
-	return NULL;
-}
-
-
diff --git a/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp b/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp
deleted file mode 100644
index e092f228cc..0000000000
--- a/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-///////////////////////////////////////////////////////////////////////
-//	    C Implementation of Wu's Color Quantizer (v. 2)
-//	    (see Graphics Gems vol. II, pp. 126-133)
-//
-// Author:	Xiaolin Wu
-// Dept. of Computer Science
-// Univ. of Western Ontario
-// London, Ontario N6A 5B7
-// wu@csd.uwo.ca
-// 
-// Algorithm: Greedy orthogonal bipartition of RGB space for variance
-// 	   minimization aided by inclusion-exclusion tricks.
-// 	   For speed no nearest neighbor search is done. Slightly
-// 	   better performance can be expected by more sophisticated
-// 	   but more expensive versions.
-// 
-// The author thanks Tom Lane at Tom_Lane@G.GP.CS.CMU.EDU for much of
-// additional documentation and a cure to a previous bug.
-// 
-// Free to distribute, comments and suggestions are appreciated.
-///////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////
-// History
-// -------
-// July 2000:  C++ Implementation of Wu's Color Quantizer
-//             and adaptation for the FreeImage 2 Library
-//             Author: Hervé Drolon (drolon@infonie.fr)
-// March 2004: Adaptation for the FreeImage 3 library (port to big endian processors)
-//             Author: Hervé Drolon (drolon@infonie.fr)
-///////////////////////////////////////////////////////////////////////
-
-#include "Quantizers.h"
-#include "FreeImage.h"
-#include "Utilities.h"
-
-///////////////////////////////////////////////////////////////////////
-
-// Size of a 3D array : 33 x 33 x 33
-#define SIZE_3D	35937
-
-// 3D array indexation
-#define INDEX(r, g, b)	((r << 10) + (r << 6) + r + (g << 5) + g + b)
-
-#define MAXCOLOR	256
-
-// Constructor / Destructor
-
-WuQuantizer::WuQuantizer(FIBITMAP *dib) {
-	width = FreeImage_GetWidth(dib);
-	height = FreeImage_GetHeight(dib);
-	pitch = FreeImage_GetPitch(dib);
-	m_dib = dib;
-
-	gm2 = NULL;
-	wt = mr = mg = mb = NULL;
-	Qadd = NULL;
-
-	// Allocate 3D arrays
-	gm2 = (float*)malloc(SIZE_3D * sizeof(float));
-	wt = (LONG*)malloc(SIZE_3D * sizeof(LONG));
-	mr = (LONG*)malloc(SIZE_3D * sizeof(LONG));
-	mg = (LONG*)malloc(SIZE_3D * sizeof(LONG));
-	mb = (LONG*)malloc(SIZE_3D * sizeof(LONG));
-
-	// Allocate Qadd
-	Qadd = (WORD *)malloc(sizeof(WORD) * width * height);
-
-	if(!gm2 || !wt || !mr || !mg || !mb || !Qadd) {
-		if(gm2)	free(gm2);
-		if(wt)	free(wt);
-		if(mr)	free(mr);
-		if(mg)	free(mg);
-		if(mb)	free(mb);
-		if(Qadd)  free(Qadd);
-		throw FI_MSG_ERROR_MEMORY;
-	}
-	memset(gm2, 0, SIZE_3D * sizeof(float));
-	memset(wt, 0, SIZE_3D * sizeof(LONG));
-	memset(mr, 0, SIZE_3D * sizeof(LONG));
-	memset(mg, 0, SIZE_3D * sizeof(LONG));
-	memset(mb, 0, SIZE_3D * sizeof(LONG));
-	memset(Qadd, 0, sizeof(WORD) * width * height);
-}
-
-WuQuantizer::~WuQuantizer() {
-	if(gm2)	free(gm2);
-	if(wt)	free(wt);
-	if(mr)	free(mr);
-	if(mg)	free(mg);
-	if(mb)	free(mb);
-	if(Qadd)  free(Qadd);
-}
-
-
-// Histogram is in elements 1..HISTSIZE along each axis,
-// element 0 is for base or marginal value
-// NB: these must start out 0!
-
-// Build 3-D color histogram of counts, r/g/b, c^2
-void 
-WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int ReserveSize, RGBQUAD *ReservePalette) {
-	int ind = 0;
-	int inr, ing, inb, table[256];
-	int i;
-	unsigned y, x;
-
-	for(i = 0; i < 256; i++)
-		table[i] = i * i;
-
-	if (FreeImage_GetBPP(m_dib) == 24) {
-		for(y = 0; y < height; y++) {
-			BYTE *bits = FreeImage_GetScanLine(m_dib, y);
-
-			for(x = 0; x < width; x++)	{
-				inr = (bits[FI_RGBA_RED] >> 3) + 1;
-				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
-				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
-				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
-				// [inr][ing][inb]
-				vwt[ind]++;
-				vmr[ind] += bits[FI_RGBA_RED];
-				vmg[ind] += bits[FI_RGBA_GREEN];
-				vmb[ind] += bits[FI_RGBA_BLUE];
-				m2[ind] += (float)(table[bits[FI_RGBA_RED]] + table[bits[FI_RGBA_GREEN]] + table[bits[FI_RGBA_BLUE]]);
-				bits += 3;
-			}
-		}
-	} else {
-		for(y = 0; y < height; y++) {
-			BYTE *bits = FreeImage_GetScanLine(m_dib, y);
-
-			for(x = 0; x < width; x++)	{
-				inr = (bits[FI_RGBA_RED] >> 3) + 1;
-				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
-				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
-				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
-				// [inr][ing][inb]
-				vwt[ind]++;
-				vmr[ind] += bits[FI_RGBA_RED];
-				vmg[ind] += bits[FI_RGBA_GREEN];
-				vmb[ind] += bits[FI_RGBA_BLUE];
-				m2[ind] += (float)(table[bits[FI_RGBA_RED]] + table[bits[FI_RGBA_GREEN]] + table[bits[FI_RGBA_BLUE]]);
-				bits += 4;
-			}
-		}
-	}
-
-	if( ReserveSize > 0 ) {
-		int max = 0;
-		for(i = 0; i < SIZE_3D; i++) {
-			if( vwt[i] > max ) max = vwt[i];
-		}
-		max++;
-		for(i = 0; i < ReserveSize; i++) {
-			inr = (ReservePalette[i].rgbRed >> 3) + 1;
-			ing = (ReservePalette[i].rgbGreen >> 3) + 1;
-			inb = (ReservePalette[i].rgbBlue >> 3) + 1;
-			ind = INDEX(inr, ing, inb);
-			wt[ind] = max;
-			mr[ind] = max * ReservePalette[i].rgbRed;
-			mg[ind] = max * ReservePalette[i].rgbGreen;
-			mb[ind] = max * ReservePalette[i].rgbBlue;
-			gm2[ind] = (float)max * (float)(table[ReservePalette[i].rgbRed] + table[ReservePalette[i].rgbGreen] + table[ReservePalette[i].rgbBlue]);
-		}
-	}
-}
-
-
-// At conclusion of the histogram step, we can interpret
-// wt[r][g][b] = sum over voxel of P(c)
-// mr[r][g][b] = sum over voxel of r*P(c)  ,  similarly for mg, mb
-// m2[r][g][b] = sum over voxel of c^2*P(c)
-// Actually each of these should be divided by 'ImageSize' to give the usual
-// interpretation of P() as ranging from 0 to 1, but we needn't do that here.
-
-
-// We now convert histogram into moments so that we can rapidly calculate
-// the sums of the above quantities over any desired box.
-
-// Compute cumulative moments
-void 
-WuQuantizer::M3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2) {
-	unsigned ind1, ind2;
-	BYTE i, r, g, b;
-	LONG line, line_r, line_g, line_b;
-	LONG area[33], area_r[33], area_g[33], area_b[33];
-	float line2, area2[33];
-
-    for(r = 1; r <= 32; r++) {
-		for(i = 0; i <= 32; i++) {
-			area2[i] = 0;
-			area[i] = area_r[i] = area_g[i] = area_b[i] = 0;
-		}
-		for(g = 1; g <= 32; g++) {
-			line2 = 0;
-			line = line_r = line_g = line_b = 0;
-			for(b = 1; b <= 32; b++) {			 
-				ind1 = INDEX(r, g, b); // [r][g][b]
-				line += vwt[ind1];
-				line_r += vmr[ind1]; 
-				line_g += vmg[ind1]; 
-				line_b += vmb[ind1];
-				line2 += m2[ind1];
-				area[b] += line;
-				area_r[b] += line_r;
-				area_g[b] += line_g;
-				area_b[b] += line_b;
-				area2[b] += line2;
-				ind2 = ind1 - 1089; // [r-1][g][b]
-				vwt[ind1] = vwt[ind2] + area[b];
-				vmr[ind1] = vmr[ind2] + area_r[b];
-				vmg[ind1] = vmg[ind2] + area_g[b];
-				vmb[ind1] = vmb[ind2] + area_b[b];
-				m2[ind1] = m2[ind2] + area2[b];
-			}
-		}
-	}
-}
-
-// Compute sum over a box of any given statistic
-LONG 
-WuQuantizer::Vol( Box *cube, LONG *mmt ) {
-    return( mmt[INDEX(cube->r1, cube->g1, cube->b1)] 
-		  - mmt[INDEX(cube->r1, cube->g1, cube->b0)]
-		  - mmt[INDEX(cube->r1, cube->g0, cube->b1)]
-		  + mmt[INDEX(cube->r1, cube->g0, cube->b0)]
-		  - mmt[INDEX(cube->r0, cube->g1, cube->b1)]
-		  + mmt[INDEX(cube->r0, cube->g1, cube->b0)]
-		  + mmt[INDEX(cube->r0, cube->g0, cube->b1)]
-		  - mmt[INDEX(cube->r0, cube->g0, cube->b0)] );
-}
-
-// The next two routines allow a slightly more efficient calculation
-// of Vol() for a proposed subbox of a given box.  The sum of Top()
-// and Bottom() is the Vol() of a subbox split in the given direction
-// and with the specified new upper bound.
-
-
-// Compute part of Vol(cube, mmt) that doesn't depend on r1, g1, or b1
-// (depending on dir)
-
-LONG 
-WuQuantizer::Bottom(Box *cube, BYTE dir, LONG *mmt) {
-    switch(dir)
-	{
-		case FI_RGBA_RED:
-			return( - mmt[INDEX(cube->r0, cube->g1, cube->b1)]
-				    + mmt[INDEX(cube->r0, cube->g1, cube->b0)]
-					+ mmt[INDEX(cube->r0, cube->g0, cube->b1)]
-					- mmt[INDEX(cube->r0, cube->g0, cube->b0)] );
-			break;
-		case FI_RGBA_GREEN:
-			return( - mmt[INDEX(cube->r1, cube->g0, cube->b1)]
-				    + mmt[INDEX(cube->r1, cube->g0, cube->b0)]
-					+ mmt[INDEX(cube->r0, cube->g0, cube->b1)]
-					- mmt[INDEX(cube->r0, cube->g0, cube->b0)] );
-			break;
-		case FI_RGBA_BLUE:
-			return( - mmt[INDEX(cube->r1, cube->g1, cube->b0)]
-				    + mmt[INDEX(cube->r1, cube->g0, cube->b0)]
-					+ mmt[INDEX(cube->r0, cube->g1, cube->b0)]
-					- mmt[INDEX(cube->r0, cube->g0, cube->b0)] );
-			break;
-	}
-
-	return 0;
-}
-
-
-// Compute remainder of Vol(cube, mmt), substituting pos for
-// r1, g1, or b1 (depending on dir)
-
-LONG 
-WuQuantizer::Top(Box *cube, BYTE dir, int pos, LONG *mmt) {
-    switch(dir)
-	{
-		case FI_RGBA_RED:
-			return( mmt[INDEX(pos, cube->g1, cube->b1)] 
-				   -mmt[INDEX(pos, cube->g1, cube->b0)]
-				   -mmt[INDEX(pos, cube->g0, cube->b1)]
-				   +mmt[INDEX(pos, cube->g0, cube->b0)] );
-			break;
-		case FI_RGBA_GREEN:
-			return( mmt[INDEX(cube->r1, pos, cube->b1)] 
-				   -mmt[INDEX(cube->r1, pos, cube->b0)]
-				   -mmt[INDEX(cube->r0, pos, cube->b1)]
-				   +mmt[INDEX(cube->r0, pos, cube->b0)] );
-			break;
-		case FI_RGBA_BLUE:
-			return( mmt[INDEX(cube->r1, cube->g1, pos)]
-				   -mmt[INDEX(cube->r1, cube->g0, pos)]
-				   -mmt[INDEX(cube->r0, cube->g1, pos)]
-				   +mmt[INDEX(cube->r0, cube->g0, pos)] );
-			break;
-	}
-
-	return 0;
-}
-
-// Compute the weighted variance of a box 
-// NB: as with the raw statistics, this is really the variance * ImageSize 
-
-float
-WuQuantizer::Var(Box *cube) {
-    float dr = (float) Vol(cube, mr); 
-    float dg = (float) Vol(cube, mg); 
-    float db = (float) Vol(cube, mb);
-    float xx =  gm2[INDEX(cube->r1, cube->g1, cube->b1)] 
-			-gm2[INDEX(cube->r1, cube->g1, cube->b0)]
-			 -gm2[INDEX(cube->r1, cube->g0, cube->b1)]
-			 +gm2[INDEX(cube->r1, cube->g0, cube->b0)]
-			 -gm2[INDEX(cube->r0, cube->g1, cube->b1)]
-			 +gm2[INDEX(cube->r0, cube->g1, cube->b0)]
-			 +gm2[INDEX(cube->r0, cube->g0, cube->b1)]
-			 -gm2[INDEX(cube->r0, cube->g0, cube->b0)];
-
-    return (xx - (dr*dr+dg*dg+db*db)/(float)Vol(cube,wt));    
-}
-
-// We want to minimize the sum of the variances of two subboxes.
-// The sum(c^2) terms can be ignored since their sum over both subboxes
-// is the same (the sum for the whole box) no matter where we split.
-// The remaining terms have a minus sign in the variance formula,
-// so we drop the minus sign and MAXIMIZE the sum of the two terms.
-
-float
-WuQuantizer::Maximize(Box *cube, BYTE dir, int first, int last , int *cut, LONG whole_r, LONG whole_g, LONG whole_b, LONG whole_w) {
-	LONG half_r, half_g, half_b, half_w;
-	int i;
-	float temp;
-
-    LONG base_r = Bottom(cube, dir, mr);
-    LONG base_g = Bottom(cube, dir, mg);
-    LONG base_b = Bottom(cube, dir, mb);
-    LONG base_w = Bottom(cube, dir, wt);
-
-    float max = 0.0;
-
-    *cut = -1;
-
-    for (i = first; i < last; i++) {
-		half_r = base_r + Top(cube, dir, i, mr);
-		half_g = base_g + Top(cube, dir, i, mg);
-		half_b = base_b + Top(cube, dir, i, mb);
-		half_w = base_w + Top(cube, dir, i, wt);
-
-        // now half_x is sum over lower half of box, if split at i
-
-		if (half_w == 0) {		// subbox could be empty of pixels!
-			continue;			// never split into an empty box
-		} else {
-			temp = ((float)half_r*half_r + (float)half_g*half_g + (float)half_b*half_b)/half_w;
-		}
-
-		half_r = whole_r - half_r;
-		half_g = whole_g - half_g;
-		half_b = whole_b - half_b;
-		half_w = whole_w - half_w;
-
-        if (half_w == 0) {		// subbox could be empty of pixels!
-			continue;			// never split into an empty box
-		} else {
-			temp += ((float)half_r*half_r + (float)half_g*half_g + (float)half_b*half_b)/half_w;
-		}
-
-    	if (temp > max) {
-			max=temp;
-			*cut=i;
-		}
-    }
-
-    return max;
-}
-
-bool
-WuQuantizer::Cut(Box *set1, Box *set2) {
-	BYTE dir;
-	int cutr, cutg, cutb;
-
-    LONG whole_r = Vol(set1, mr);
-    LONG whole_g = Vol(set1, mg);
-    LONG whole_b = Vol(set1, mb);
-    LONG whole_w = Vol(set1, wt);
-
-    float maxr = Maximize(set1, FI_RGBA_RED, set1->r0+1, set1->r1, &cutr, whole_r, whole_g, whole_b, whole_w);    
-	float maxg = Maximize(set1, FI_RGBA_GREEN, set1->g0+1, set1->g1, &cutg, whole_r, whole_g, whole_b, whole_w);    
-	float maxb = Maximize(set1, FI_RGBA_BLUE, set1->b0+1, set1->b1, &cutb, whole_r, whole_g, whole_b, whole_w);
-
-    if ((maxr >= maxg) && (maxr >= maxb)) {
-		dir = FI_RGBA_RED;
-
-		if (cutr < 0) {
-			return false; // can't split the box
-		}
-    } else if ((maxg >= maxr) && (maxg>=maxb)) {
-		dir = FI_RGBA_GREEN;
-	} else {
-		dir = FI_RGBA_BLUE;
-	}
-
-	set2->r1 = set1->r1;
-    set2->g1 = set1->g1;
-    set2->b1 = set1->b1;
-
-    switch (dir) {
-		case FI_RGBA_RED:
-			set2->r0 = set1->r1 = cutr;
-			set2->g0 = set1->g0;
-			set2->b0 = set1->b0;
-			break;
-
-		case FI_RGBA_GREEN:
-			set2->g0 = set1->g1 = cutg;
-			set2->r0 = set1->r0;
-			set2->b0 = set1->b0;
-			break;
-
-		case FI_RGBA_BLUE:
-			set2->b0 = set1->b1 = cutb;
-			set2->r0 = set1->r0;
-			set2->g0 = set1->g0;
-			break;
-    }
-
-    set1->vol = (set1->r1-set1->r0)*(set1->g1-set1->g0)*(set1->b1-set1->b0);
-    set2->vol = (set2->r1-set2->r0)*(set2->g1-set2->g0)*(set2->b1-set2->b0);
-
-    return true;
-}
-
-
-void
-WuQuantizer::Mark(Box *cube, int label, BYTE *tag) {
-    for (int r = cube->r0 + 1; r <= cube->r1; r++) {
-		for (int g = cube->g0 + 1; g <= cube->g1; g++) {
-			for (int b = cube->b0 + 1; b <= cube->b1; b++) {
-				tag[INDEX(r, g, b)] = (BYTE)label;
-			}
-		}
-	}
-}
-
-// Wu Quantization algorithm
-FIBITMAP *
-WuQuantizer::Quantize(int PaletteSize, int ReserveSize, RGBQUAD *ReservePalette) {
-	BYTE *tag = NULL;
-
-	try {
-		Box	cube[MAXCOLOR];
-		int	next;
-		LONG i, weight;
-		int k;
-		float vv[MAXCOLOR], temp;
-		
-		// Compute 3D histogram
-
-		Hist3D(wt, mr, mg, mb, gm2, ReserveSize, ReservePalette);
-
-		// Compute moments
-
-		M3D(wt, mr, mg, mb, gm2);
-
-		cube[0].r0 = cube[0].g0 = cube[0].b0 = 0;
-		cube[0].r1 = cube[0].g1 = cube[0].b1 = 32;
-		next = 0;
-
-		for (i = 1; i < PaletteSize; i++) {
-			if(Cut(&cube[next], &cube[i])) {
-				// volume test ensures we won't try to cut one-cell box
-				vv[next] = (cube[next].vol > 1) ? Var(&cube[next]) : 0;
-				vv[i] = (cube[i].vol > 1) ? Var(&cube[i]) : 0;
-			} else {
-				  vv[next] = 0.0;   // don't try to split this box again
-				  i--;              // didn't create box i
-			}
-
-			next = 0; temp = vv[0];
-
-			for (k = 1; k <= i; k++) {
-				if (vv[k] > temp) {
-					temp = vv[k]; next = k;
-				}
-			}
-
-			if (temp <= 0.0) {
-				  PaletteSize = i + 1;
-
-				  // Error: "Only got 'PaletteSize' boxes"
-
-				  break;
-			}
-		}
-
-		// Partition done
-
-		// the space for array gm2 can be freed now
-
-		free(gm2);
-
-		gm2 = NULL;
-
-		// Allocate a new dib
-
-		FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
-
-		if (new_dib == NULL) {
-			throw FI_MSG_ERROR_MEMORY;
-		}
-
-		// create an optimized palette
-
-		RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
-
-		tag = (BYTE*) malloc(SIZE_3D * sizeof(BYTE));
-		if (tag == NULL) {
-			throw FI_MSG_ERROR_MEMORY;
-		}
-		memset(tag, 0, SIZE_3D * sizeof(BYTE));
-
-		for (k = 0; k < PaletteSize ; k++) {
-			Mark(&cube[k], k, tag);
-			weight = Vol(&cube[k], wt);
-
-			if (weight) {
-				new_pal[k].rgbRed	= (BYTE)(((float)Vol(&cube[k], mr) / (float)weight) + 0.5f);
-				new_pal[k].rgbGreen = (BYTE)(((float)Vol(&cube[k], mg) / (float)weight) + 0.5f);
-				new_pal[k].rgbBlue	= (BYTE)(((float)Vol(&cube[k], mb) / (float)weight) + 0.5f);
-			} else {
-				// Error: bogus box 'k'
-
-				new_pal[k].rgbRed = new_pal[k].rgbGreen = new_pal[k].rgbBlue = 0;		
-			}
-		}
-
-		int npitch = FreeImage_GetPitch(new_dib);
-
-		for (unsigned y = 0; y < height; y++) {
-			BYTE *new_bits = FreeImage_GetBits(new_dib) + (y * npitch);
-
-			for (unsigned x = 0; x < width; x++) {
-				new_bits[x] = tag[Qadd[y*width + x]];
-			}
-		}
-
-		// output 'new_pal' as color look-up table contents,
-		// 'new_bits' as the quantized image (array of table addresses).
-
-		free(tag);
-
-		return (FIBITMAP*) new_dib;
-	} catch(...) {
-		free(tag);
-	}
-
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/ZLibInterface.cpp b/plugins/AdvaImg/src/FreeImage/ZLibInterface.cpp
deleted file mode 100644
index 39c7ac0ecc..0000000000
--- a/plugins/AdvaImg/src/FreeImage/ZLibInterface.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// ==========================================================
-// ZLib library interface
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "zlib.h"
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
-
-/**
-Compresses a source buffer into a target buffer, using the ZLib library. 
-Upon entry, target_size is the total size of the destination buffer, 
-which must be at least 0.1% larger than source_size plus 12 bytes. 
-
-@param target Destination buffer
-@param target_size Size of the destination buffer, in bytes
-@param source Source buffer
-@param source_size Size of the source buffer, in bytes
-@return Returns the actual size of the compressed buffer, returns 0 if an error occured
-@see FreeImage_ZLibUncompress
-*/
-DWORD DLL_CALLCONV 
-FreeImage_ZLibCompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size) {
-	uLongf dest_len = (uLongf)target_size;
-
-	int zerr = compress(target, &dest_len, source, source_size);
-	switch(zerr) {
-		case Z_MEM_ERROR:	// not enough memory
-		case Z_BUF_ERROR:	// not enough room in the output buffer
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Zlib error : %s", zError(zerr));
-			return 0;
-		case Z_OK:
-			return dest_len;
-	}
-
-	return 0;
-}
-
-/**
-Decompresses a source buffer into a target buffer, using the ZLib library. 
-Upon entry, target_size is the total size of the destination buffer, 
-which must be large enough to hold the entire uncompressed data. 
-The size of the uncompressed data must have been saved previously by the compressor 
-and transmitted to the decompressor by some mechanism outside the scope of this 
-compression library.
-
-@param target Destination buffer
-@param target_size Size of the destination buffer, in bytes
-@param source Source buffer
-@param source_size Size of the source buffer, in bytes
-@return Returns the actual size of the uncompressed buffer, returns 0 if an error occured
-@see FreeImage_ZLibCompress
-*/
-DWORD DLL_CALLCONV 
-FreeImage_ZLibUncompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size) {
-	uLongf dest_len = (uLongf)target_size;
-
-	int zerr = uncompress(target, &dest_len, source, source_size);
-	switch(zerr) {
-		case Z_MEM_ERROR:	// not enough memory
-		case Z_BUF_ERROR:	// not enough room in the output buffer
-		case Z_DATA_ERROR:	// input data was corrupted
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Zlib error : %s", zError(zerr));
-			return 0;
-		case Z_OK:
-			return dest_len;
-	}
-
-	return 0;
-}
-
-/**
-Compresses a source buffer into a target buffer, using the ZLib library. 
-On success, the target buffer contains a GZIP compatible layout.
-Upon entry, target_size is the total size of the destination buffer, 
-which must be at least 0.1% larger than source_size plus 24 bytes. 
-
-@param target Destination buffer
-@param target_size Size of the destination buffer, in bytes
-@param source Source buffer
-@param source_size Size of the source buffer, in bytes
-@return Returns the actual size of the compressed buffer, returns 0 if an error occured
-@see FreeImage_ZLibCompress
-*/
-DWORD DLL_CALLCONV 
-FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size) {
-	uLongf dest_len = (uLongf)target_size - 12;
-	DWORD crc = crc32(0L, NULL, 0);
-
-    // set up header (stolen from zlib/gzio.c)
-    sprintf((char *)target, "%c%c%c%c%c%c%c%c", 0x1f, 0x8b,
-         Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/);
-    int zerr = compress2(target + 8, &dest_len, source, source_size, Z_BEST_COMPRESSION);
-	switch(zerr) {
-		case Z_MEM_ERROR:	// not enough memory
-		case Z_BUF_ERROR:	// not enough room in the output buffer
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Zlib error : %s", zError(zerr));
-			return 0;
-        case Z_OK: {
-            // patch header, setup crc and length (stolen from mod_trace_output)
-            BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
- 	        crc = crc32(crc, source, source_size);
-	        memcpy(target + 4 + dest_len, &crc, 4);
-	        memcpy(target + 8 + dest_len, &source_size, 4);
-            return dest_len + 12;
-        }
-	}
-	return 0;
-}
-
-/**
-Decompresses a gzipped source buffer into a target buffer, using the ZLib library. 
-Upon entry, target_size is the total size of the destination buffer, 
-which must be large enough to hold the entire uncompressed data. 
-The size of the uncompressed data must have been saved previously by the compressor 
-and transmitted to the decompressor by some mechanism outside the scope of this 
-compression library.
-
-@param target Destination buffer
-@param target_size Size of the destination buffer, in bytes
-@param source Source buffer
-@param source_size Size of the source buffer, in bytes
-@return Returns the actual size of the uncompressed buffer, returns 0 if an error occured
-@see FreeImage_ZLibGZip
-*/
-
-static int get_byte(z_stream *stream) {
-    if (stream->avail_in <= 0) return EOF;
-    stream->avail_in--;
-    return *(stream->next_in)++;
-}
-
-static int checkheader(z_stream *stream) {
-    int flags, c;
-    DWORD len;
-
-    if (get_byte(stream) != 0x1f || get_byte(stream) != 0x8b)
-        return Z_DATA_ERROR;
-    if (get_byte(stream) != Z_DEFLATED || ((flags = get_byte(stream)) & 0xE0) != 0)
-        return Z_DATA_ERROR;
-    for (len = 0; len < 6; len++) (void)get_byte(stream);
-
-    if ((flags & 0x04) != 0) { /* skip the extra field */
-        len  =  (DWORD)get_byte(stream);
-        len += ((DWORD)get_byte(stream)) << 8;
-        /* len is garbage if EOF but the loop below will quit anyway */
-        while (len-- != 0 && get_byte(stream) != EOF) ;
-    }
-    if ((flags & 0x08) != 0) { /* skip the original file name */
-        while ((c = get_byte(stream)) != 0 && c != EOF) ;
-    }
-    if ((flags & 0x10) != 0) {   /* skip the .gz file comment */
-        while ((c = get_byte(stream)) != 0 && c != EOF) ;
-    }
-    if ((flags & 0x02) != 0) {  /* skip the header crc */
-        for (len = 0; len < 2; len++) (void)get_byte(stream);
-    }
-    return Z_OK;
-}
-
-DWORD DLL_CALLCONV 
-FreeImage_ZLibGUnzip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size) {
-    DWORD src_len  = source_size;
-    DWORD dest_len = target_size;
-    int   zerr     = Z_DATA_ERROR;
-
-    if (src_len > 0) {
-        z_stream stream;
-        memset(&stream, 0, sizeof (stream));
-        if ((zerr = inflateInit2(&stream, -MAX_WBITS)) == Z_OK) {
-            stream.next_in  = source;
-            stream.avail_in = source_size;
-
-            stream.next_out  = target;
-            stream.avail_out = target_size;
-
-            if ((zerr = checkheader(&stream)) == Z_OK) {
-                zerr = inflate (&stream, Z_NO_FLUSH);
-                dest_len = target_size - stream.avail_out;
-
-                if (zerr == Z_OK || zerr == Z_STREAM_END)
-                    inflateEnd(&stream);
-            } 
-        }
-    }
-    if (zerr != Z_OK && zerr != Z_STREAM_END) {
-        FreeImage_OutputMessageProc(FIF_UNKNOWN, "Zlib error : %s", zError(zerr));
-        return 0;
-    }
-    return dest_len;
-}
-
-/**
-Update a running crc from source and return the updated crc, using the ZLib library.
-If source is NULL, this function returns the required initial value for the crc.
-
-@param crc Running crc value
-@param source Source buffer
-@param source_size Size of the source buffer, in bytes
-@return Returns the new crc value
-*/
-DWORD DLL_CALLCONV 
-FreeImage_ZLibCRC32(DWORD crc, BYTE *source, DWORD source_size) {
-
-    return crc32(crc, source, source_size);
-}
diff --git a/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp b/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp
deleted file mode 100644
index 8770c6f4bf..0000000000
--- a/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-// ==========================================================
-// High Dynamic Range bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "ToneMapping.h"
-
-// ----------------------------------------------------------
-// Convert RGB to and from Yxy, same as in Reinhard et al. SIGGRAPH 2002
-// References : 
-// [1] Radiance Home Page [Online] http://radsite.lbl.gov/radiance/HOME.html
-// [2] E. Reinhard, M. Stark, P. Shirley, and J. Ferwerda,  
-//     Photographic Tone Reproduction for Digital Images, ACM Transactions on Graphics, 
-//     21(3):267-276, 2002 (Proceedings of SIGGRAPH 2002). 
-// [3] J. Tumblin and H.E. Rushmeier, 
-//     Tone Reproduction for Realistic Images. IEEE Computer Graphics and Applications, 
-//     13(6):42-48, 1993.
-// ----------------------------------------------------------
-
-/**
-nominal CRT primaries 
-*/
-/*
-static const float CIE_x_r = 0.640F;
-static const float CIE_y_r = 0.330F;
-static const float CIE_x_g = 0.290F;
-static const float CIE_y_g = 0.600F;
-static const float CIE_x_b = 0.150F;
-static const float CIE_y_b = 0.060F;
-static const float CIE_x_w = 0.3333F;	// use true white
-static const float CIE_y_w = 0.3333F;
-*/
-/**
-sRGB primaries
-*/
-static const float CIE_x_r = 0.640F;
-static const float CIE_y_r = 0.330F;
-static const float CIE_x_g = 0.300F;
-static const float CIE_y_g = 0.600F;
-static const float CIE_x_b = 0.150F;
-static const float CIE_y_b = 0.060F;
-static const float CIE_x_w = 0.3127F;	// Illuminant D65
-static const float CIE_y_w = 0.3290F;
-
-static const float CIE_D = ( CIE_x_r*(CIE_y_g - CIE_y_b) + CIE_x_g*(CIE_y_b - CIE_y_r) + CIE_x_b*(CIE_y_r - CIE_y_g) );
-static const float CIE_C_rD = ( (1/CIE_y_w) * ( CIE_x_w*(CIE_y_g - CIE_y_b) - CIE_y_w*(CIE_x_g - CIE_x_b) + CIE_x_g*CIE_y_b - CIE_x_b*CIE_y_g) );
-static const float CIE_C_gD = ( (1/CIE_y_w) * ( CIE_x_w*(CIE_y_b - CIE_y_r) - CIE_y_w*(CIE_x_b - CIE_x_r) - CIE_x_r*CIE_y_b + CIE_x_b*CIE_y_r) );
-static const float CIE_C_bD = ( (1/CIE_y_w) * ( CIE_x_w*(CIE_y_r - CIE_y_g) - CIE_y_w*(CIE_x_r - CIE_x_g) + CIE_x_r*CIE_y_g - CIE_x_g*CIE_y_r) );
-
-/**
-RGB to XYZ (no white balance)
-*/
-static const float  RGB2XYZ[3][3] = {
-	{ CIE_x_r*CIE_C_rD / CIE_D, 
-	  CIE_x_g*CIE_C_gD / CIE_D, 
-	  CIE_x_b*CIE_C_bD / CIE_D 
-	},
-	{ CIE_y_r*CIE_C_rD / CIE_D, 
-	  CIE_y_g*CIE_C_gD / CIE_D, 
-	  CIE_y_b*CIE_C_bD / CIE_D 
-	},
-	{ (1 - CIE_x_r-CIE_y_r)*CIE_C_rD / CIE_D,
-	  (1 - CIE_x_g-CIE_y_g)*CIE_C_gD / CIE_D,
-	  (1 - CIE_x_b-CIE_y_b)*CIE_C_bD / CIE_D
-	}
-};
-
-/**
-XYZ to RGB (no white balance)
-*/
-static const float  XYZ2RGB[3][3] = {
-	{(CIE_y_g - CIE_y_b - CIE_x_b*CIE_y_g + CIE_y_b*CIE_x_g) / CIE_C_rD,
-	 (CIE_x_b - CIE_x_g - CIE_x_b*CIE_y_g + CIE_x_g*CIE_y_b) / CIE_C_rD,
-	 (CIE_x_g*CIE_y_b - CIE_x_b*CIE_y_g) / CIE_C_rD
-	},
-	{(CIE_y_b - CIE_y_r - CIE_y_b*CIE_x_r + CIE_y_r*CIE_x_b) / CIE_C_gD,
-	 (CIE_x_r - CIE_x_b - CIE_x_r*CIE_y_b + CIE_x_b*CIE_y_r) / CIE_C_gD,
-	 (CIE_x_b*CIE_y_r - CIE_x_r*CIE_y_b) / CIE_C_gD
-	},
-	{(CIE_y_r - CIE_y_g - CIE_y_r*CIE_x_g + CIE_y_g*CIE_x_r) / CIE_C_bD,
-	 (CIE_x_g - CIE_x_r - CIE_x_g*CIE_y_r + CIE_x_r*CIE_y_g) / CIE_C_bD,
-	 (CIE_x_r*CIE_y_g - CIE_x_g*CIE_y_r) / CIE_C_bD
-	}
-};
-
-/**
-This gives approximately the following matrices : 
-
-static const float RGB2XYZ[3][3] = { 
-	{ 0.41239083F, 0.35758433F, 0.18048081F },
-	{ 0.21263903F, 0.71516865F, 0.072192319F },
-	{ 0.019330820F, 0.11919473F, 0.95053220F }
-};
-static const float XYZ2RGB[3][3] = { 
-	{ 3.2409699F, -1.5373832F, -0.49861079F },
-	{ -0.96924376F, 1.8759676F, 0.041555084F },
-	{ 0.055630036F, -0.20397687F, 1.0569715F }
-};
-*/
-
-// ----------------------------------------------------------
-
-static const float EPSILON = 1e-06F;
-static const float INF = 1e+10F;
-
-/**
-Convert in-place floating point RGB data to Yxy.<br>
-On output, pixel->red == Y, pixel->green == x, pixel->blue == y
-@param dib Input RGBF / Output Yxy image
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-ConvertInPlaceRGBFToYxy(FIBITMAP *dib) {
-	float result[3];
-
-	if(FreeImage_GetImageType(dib) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	const unsigned pitch  = FreeImage_GetPitch(dib);
-	
-	BYTE *bits = (BYTE*)FreeImage_GetBits(dib);
-	for(unsigned y = 0; y < height; y++) {
-		FIRGBF *pixel = (FIRGBF*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			result[0] = result[1] = result[2] = 0;
-			for (int i = 0; i < 3; i++) {
-				result[i] += RGB2XYZ[i][0] * pixel[x].red;
-				result[i] += RGB2XYZ[i][1] * pixel[x].green;
-				result[i] += RGB2XYZ[i][2] * pixel[x].blue;
-			}
-			const float W = result[0] + result[1] + result[2];
-			const float Y = result[1];
-			if(W > 0) { 
-				pixel[x].red   = Y;			    // Y 
-				pixel[x].green = result[0] / W;	// x 
-				pixel[x].blue  = result[1] / W;	// y 	
-			} else {
-				pixel[x].red = pixel[x].green = pixel[x].blue = 0;
-			}
-		}
-		// next line
-		bits += pitch;
-	}
-
-	return TRUE;
-}
-
-/**
-Convert in-place Yxy image to floating point RGB data.<br>
-On input, pixel->red == Y, pixel->green == x, pixel->blue == y
-@param dib Input Yxy / Output RGBF image
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-ConvertInPlaceYxyToRGBF(FIBITMAP *dib) {
-	float result[3];
-	float X, Y, Z;
-
-	if(FreeImage_GetImageType(dib) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	const unsigned pitch  = FreeImage_GetPitch(dib);
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(dib);
-	for(unsigned y = 0; y < height; y++) {
-		FIRGBF *pixel = (FIRGBF*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			Y = pixel[x].red;	        // Y 
-			result[1] = pixel[x].green;	// x 
-			result[2] = pixel[x].blue;	// y 
-			if ((Y > EPSILON) && (result[1] > EPSILON) && (result[2] > EPSILON)) {
-				X = (result[1] * Y) / result[2];
-				Z = (X / result[1]) - X - Y;
-			} else {
-				X = Z = EPSILON;
-			}
-			pixel[x].red   = X;
-			pixel[x].green = Y;
-			pixel[x].blue  = Z;
-			result[0] = result[1] = result[2] = 0;
-			for (int i = 0; i < 3; i++) {
-				result[i] += XYZ2RGB[i][0] * pixel[x].red;
-				result[i] += XYZ2RGB[i][1] * pixel[x].green;
-				result[i] += XYZ2RGB[i][2] * pixel[x].blue;
-			}
-			pixel[x].red   = result[0];	// R
-			pixel[x].green = result[1];	// G
-			pixel[x].blue  = result[2];	// B
-		}
-		// next line
-		bits += pitch;
-	}
-
-	return TRUE;
-}
-
-/**
-Get the maximum, minimum and average luminance.<br>
-On input, pixel->red == Y, pixel->green == x, pixel->blue == y
-@param Yxy Source Yxy image to analyze
-@param maxLum Maximum luminance
-@param minLum Minimum luminance
-@param worldLum Average luminance (world adaptation luminance)
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-LuminanceFromYxy(FIBITMAP *Yxy, float *maxLum, float *minLum, float *worldLum) {
-	if(FreeImage_GetImageType(Yxy) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(Yxy);
-	const unsigned height = FreeImage_GetHeight(Yxy);
-	const unsigned pitch  = FreeImage_GetPitch(Yxy);
-
-	float max_lum = 0, min_lum = 0;
-	double sum = 0;
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(Yxy);
-	for(unsigned y = 0; y < height; y++) {
-		const FIRGBF *pixel = (FIRGBF*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			const float Y = MAX(0.0F, pixel[x].red);// avoid negative values
-			max_lum = (max_lum < Y) ? Y : max_lum;	// max Luminance in the scene
-			min_lum = (min_lum < Y) ? min_lum : Y;	// min Luminance in the scene
-			sum += log(2.3e-5F + Y);				// contrast constant in Tumblin paper
-		}
-		// next line
-		bits += pitch;
-	}
-	// maximum luminance
-	*maxLum = max_lum;
-	// minimum luminance
-	*minLum = min_lum;
-	// average log luminance
-	double avgLogLum = (sum / (width * height));
-	// world adaptation luminance
-	*worldLum = (float)exp(avgLogLum);
-
-	return TRUE;
-}
-
-/**
-Clamp RGBF image highest values to display white, 
-then convert to 24-bit RGB
-*/
-FIBITMAP* 
-ClampConvertRGBFTo24(FIBITMAP *src) {
-	if(FreeImage_GetImageType(src) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	FIBITMAP *dst = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-	if(!dst) return NULL;
-
-	const unsigned src_pitch  = FreeImage_GetPitch(src);
-	const unsigned dst_pitch  = FreeImage_GetPitch(dst);
-
-	BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-	BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-	for(unsigned y = 0; y < height; y++) {
-		const FIRGBF *src_pixel = (FIRGBF*)src_bits;
-		BYTE *dst_pixel = (BYTE*)dst_bits;
-		for(unsigned x = 0; x < width; x++) {
-			const float red   = (src_pixel[x].red > 1)   ? 1 : src_pixel[x].red;
-			const float green = (src_pixel[x].green > 1) ? 1 : src_pixel[x].green;
-			const float blue  = (src_pixel[x].blue > 1)  ? 1 : src_pixel[x].blue;
-			
-			dst_pixel[FI_RGBA_RED]   = (BYTE)(255.0F * red   + 0.5F);
-			dst_pixel[FI_RGBA_GREEN] = (BYTE)(255.0F * green + 0.5F);
-			dst_pixel[FI_RGBA_BLUE]  = (BYTE)(255.0F * blue  + 0.5F);
-			dst_pixel += 3;
-		}
-		src_bits += src_pitch;
-		dst_bits += dst_pitch;
-	}
-
-	return dst;
-}
-
-/**
-Extract the luminance channel L from a RGBF image. 
-Luminance is calculated from the sRGB model (RGB2XYZ matrix) 
-using a D65 white point : 
-L = ( 0.2126 * r ) + ( 0.7152 * g ) + ( 0.0722 * b )
-Reference : 
-A Standard Default Color Space for the Internet - sRGB. 
-[online] http://www.w3.org/Graphics/Color/sRGB
-*/
-FIBITMAP*  
-ConvertRGBFToY(FIBITMAP *src) {
-	if(FreeImage_GetImageType(src) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-
-	FIBITMAP *dst = FreeImage_AllocateT(FIT_FLOAT, width, height);
-	if(!dst) return NULL;
-
-	const unsigned src_pitch  = FreeImage_GetPitch(src);
-	const unsigned dst_pitch  = FreeImage_GetPitch(dst);
-
-	
-	BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
-	BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
-
-	for(unsigned y = 0; y < height; y++) {
-		const FIRGBF *src_pixel = (FIRGBF*)src_bits;
-		float  *dst_pixel = (float*)dst_bits;
-		for(unsigned x = 0; x < width; x++) {
-			const float L = LUMA_REC709(src_pixel[x].red, src_pixel[x].green, src_pixel[x].blue);
-			dst_pixel[x] = (L > 0) ? L : 0;
-		}
-		// next line
-		src_bits += src_pitch;
-		dst_bits += dst_pitch;
-	}
-
-	return dst;
-}
-
-/**
-Get the maximum, minimum, average luminance and log average luminance from a Y image
-@param dib Source Y image to analyze
-@param maxLum Maximum luminance
-@param minLum Minimum luminance
-@param Lav Average luminance
-@param Llav Log average luminance (also known as 'world adaptation luminance')
-@return Returns TRUE if successful, returns FALSE otherwise
-@see ConvertRGBFToY, FreeImage_TmoReinhard05Ex
-*/
-BOOL 
-LuminanceFromY(FIBITMAP *dib, float *maxLum, float *minLum, float *Lav, float *Llav) {
-	if(FreeImage_GetImageType(dib) != FIT_FLOAT)
-		return FALSE;
-
-	unsigned width  = FreeImage_GetWidth(dib);
-	unsigned height = FreeImage_GetHeight(dib);
-	unsigned pitch  = FreeImage_GetPitch(dib);
-
-	float max_lum = -1e20F, min_lum = 1e20F;
-	double sumLum = 0, sumLogLum = 0;
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(dib);
-	for(unsigned y = 0; y < height; y++) {
-		const float *pixel = (float*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			const float Y = pixel[x];
-			max_lum = (max_lum < Y) ? Y : max_lum;				// max Luminance in the scene
-			min_lum = ((Y > 0) && (min_lum < Y)) ? min_lum : Y;	// min Luminance in the scene
-			sumLum += Y;										// average luminance
-			sumLogLum += log(2.3e-5F + Y);						// contrast constant in Tumblin paper
-		}
-		// next line
-		bits += pitch;
-	}
-
-	// maximum luminance
-	*maxLum = max_lum;
-	// minimum luminance
-	*minLum = min_lum;
-	// average luminance
-	*Lav = (float)(sumLum / (width * height));
-	// average log luminance, a.k.a. world adaptation luminance
-	*Llav = (float)exp(sumLogLum / (width * height));
-
-	return TRUE;
-}
-// --------------------------------------------------------------------------
-
-static void findMaxMinPercentile(FIBITMAP *Y, float minPrct, float *minLum, float maxPrct, float *maxLum) {
-	int x, y;
-	int width = FreeImage_GetWidth(Y);
-	int height = FreeImage_GetHeight(Y);
-	int pitch = FreeImage_GetPitch(Y);
-
-	std::vector<float> vY(width * height);
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(Y);
-	for(y = 0; y < height; y++) {
-		float *pixel = (float*)bits;
-		for(x = 0; x < width; x++) {
-			if(pixel[x] != 0) {
-				vY.push_back(pixel[x]);
-			}
-		}
-		bits += pitch;
-	}
-
-	std::sort(vY.begin(), vY.end());
-	
-	*minLum = vY.at( int(minPrct * vY.size()) );
-	*maxLum = vY.at( int(maxPrct * vY.size()) );
-}
-
-/**
-Clipping function<br>
-Remove any extremely bright and/or extremely dark pixels 
-and normalize between 0 and 1. 
-@param Y Input/Output image
-@param minPrct Minimum percentile
-@param maxPrct Maximum percentile
-*/
-void 
-NormalizeY(FIBITMAP *Y, float minPrct, float maxPrct) {
-	int x, y;
-	float maxLum, minLum;
-
-	if(minPrct > maxPrct) {
-		// swap values
-		float t = minPrct; minPrct = maxPrct; maxPrct = t;
-	}
-	if(minPrct < 0) minPrct = 0;
-	if(maxPrct > 1) maxPrct = 1;
-
-	int width = FreeImage_GetWidth(Y);
-	int height = FreeImage_GetHeight(Y);
-	int pitch = FreeImage_GetPitch(Y);
-
-	// find max & min luminance values
-	if((minPrct > 0) || (maxPrct < 1)) {
-		maxLum = 0, minLum = 0;
-		findMaxMinPercentile(Y, minPrct, &minLum, maxPrct, &maxLum);
-	} else {
-		maxLum = -1e20F, minLum = 1e20F;
-		BYTE *bits = (BYTE*)FreeImage_GetBits(Y);
-		for(y = 0; y < height; y++) {
-			const float *pixel = (float*)bits;
-			for(x = 0; x < width; x++) {
-				const float value = pixel[x];
-				maxLum = (maxLum < value) ? value : maxLum;	// max Luminance in the scene
-				minLum = (minLum < value) ? minLum : value;	// min Luminance in the scene
-			}
-			// next line
-			bits += pitch;
-		}
-	}
-	if(maxLum == minLum) return;
-
-	// normalize to range 0..1 
-	const float divider = maxLum - minLum;
-	BYTE *bits = (BYTE*)FreeImage_GetBits(Y);
-	for(y = 0; y < height; y++) {
-		float *pixel = (float*)bits;
-		for(x = 0; x < width; x++) {
-			pixel[x] = (pixel[x] - minLum) / divider;
-			if(pixel[x] <= 0) pixel[x] = EPSILON;
-			if(pixel[x] > 1) pixel[x] = 1;
-		}
-		// next line
-		bits += pitch;
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp b/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp
deleted file mode 100644
index d1efe9486b..0000000000
--- a/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-// ==========================================================
-// Tone mapping operator (Drago, 2003)
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "ToneMapping.h"
-
-// ----------------------------------------------------------
-// Logarithmic mapping operator
-// Reference: 
-// [1] F. Drago, K. Myszkowski, T. Annen, and N. Chiba, 
-// Adaptive Logarithmic Mapping for Displaying High Contrast Scenes, 
-// Eurographics 2003.
-// ----------------------------------------------------------
-
-/**
-Bias function
-*/
-static inline double 
-biasFunction(const double b, const double x) {
-	return pow (x, b);		// pow(x, log(bias)/log(0.5)
-}
-
-/**
-Padé approximation of log(x + 1)
-x(6+x)/(6+4x) good if x < 1
-x*(6 + 0.7662x)/(5.9897 + 3.7658x) between 1 and 2
-See http://www.nezumi.demon.co.uk/consult/logx.htm
-*/
-static inline double 
-pade_log(const double x) {
-	if(x < 1) {
-		return (x * (6 + x) / (6 + 4 * x));
-	} else if(x < 2) {
-		return (x * (6 + 0.7662 * x) / (5.9897 + 3.7658 * x));
-	}
-	return log(x + 1);
-}
-
-/**
-Log mapping operator
-@param dib Input / Output Yxy image
-@param maxLum Maximum luminance
-@param avgLum Average luminance (world adaptation luminance)
-@param biasParam Bias parameter (a zero value default to 0.85)
-@param exposure Exposure parameter (default to 0)
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-ToneMappingDrago03(FIBITMAP *dib, const float maxLum, const float avgLum, float biasParam, const float exposure) {
-	const float LOG05 = -0.693147F;	// log(0.5) 
-
-	double Lmax, divider, interpol, biasP;
-	unsigned x, y;
-	double L;
-
-	if(FreeImage_GetImageType(dib) != FIT_RGBF)
-		return FALSE;
-
-	const unsigned width  = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	const unsigned pitch  = FreeImage_GetPitch(dib);
-
-
-	// arbitrary Bias Parameter 
-	if(biasParam == 0) 
-		biasParam = 0.85F;
-
-	// normalize maximum luminance by average luminance
-	Lmax = maxLum / avgLum;
-	
-	divider = log10(Lmax+1);
-	biasP = log(biasParam)/LOG05;
-
-#if !defined(DRAGO03_FAST)
-
-	/**
-	Normal tone mapping of every pixel
-	further acceleration is obtained by a Padé approximation of log(x + 1)
-	*/
-	BYTE *bits = (BYTE*)FreeImage_GetBits(dib);
-	for(y = 0; y < height; y++) {
-		FIRGBF *pixel = (FIRGBF*)bits;
-		for(x = 0; x < width; x++) {
-			double Yw = pixel[x].red / avgLum;
-			Yw *= exposure;
-			interpol = log(2 + biasFunction(biasP, Yw / Lmax) * 8);
-			L = pade_log(Yw);// log(Yw + 1)
-			pixel[x].red = (float)((L / interpol) / divider);
-		}
-		// next line
-		bits += pitch;
-	}
-
-#else
-	unsigned index;
-	int i, j;
-
-	unsigned max_width  = width - (width % 3);
-	unsigned max_height = height - (height % 3); 
-	unsigned fpitch = pitch / sizeof(FIRGBF);
-
-	/**
-	fast tone mapping
-	split the image into 3x3 pixel tiles and perform the computation for each group of 9 pixels
-	further acceleration is obtained by a Padé approximation of log(x + 1)
-	=> produce artifacts and not so faster, so the code has been disabled
-	*/
-#define PIXEL(x, y)	image[y*fpitch + x].red
-
-	FIRGBF *image = (FIRGBF*)FreeImage_GetBits(dib);
-	for(y = 0; y < max_height; y += 3) {
-		for(x = 0; x < max_width; x += 3) {
-			double average = 0;
-			for(i = 0; i < 3; i++) {
-				for(j = 0; j < 3; j++) {
-					index = (y + i)*fpitch + (x + j);
-					image[index].red /= (float)avgLum;
-					image[index].red *= exposure; 
-					average += image[index].red;
-				}
-			}
-			average = average / 9 - PIXEL(x, y);
-			if(average > -1 && average < 1) {
-				interpol = log(2 + pow(PIXEL(x + 1, y + 1) / Lmax, biasP) * 8);
-				for(i = 0; i < 3; i++) {
-					for(j = 0; j < 3; j++) {
-						index = (y + i)*fpitch + (x + j);
-						L = pade_log(image[index].red);// log(image[index].red + 1)
-						image[index].red = (float)((L / interpol) / divider);
-					}
-				}
-			}
-			else {
-				for(i = 0; i < 3; i++) {
-					for(j = 0; j < 3; j++) {
-						index = (y + i)*fpitch + (x + j);
-						interpol = log(2 + pow(image[index].red / Lmax, biasP) * 8);
-						L = pade_log(image[index].red);// log(image[index].red + 1)
-						image[index].red = (float)((L / interpol) / divider);
-					}
-				}
-			}
-		} //x
-	} // y
-
-	/**
-	Normal tone mapping of every pixel for the remaining right and bottom bands
-	*/
-	BYTE *bits;
-
-	// right band
-	bits = (BYTE*)FreeImage_GetBits(dib);
-	for(y = 0; y < height; y++) {
-		FIRGBF *pixel = (FIRGBF*)bits;
-		for(x = max_width; x < width; x++) {
-			double Yw = pixel[x].red / avgLum;
-			Yw *= exposure;
-			interpol = log(2 + biasFunction(biasP, Yw / Lmax) * 8);
-			L = pade_log(Yw);// log(Yw + 1)
-			pixel[x].red = (float)((L / interpol) / divider);
-		}
-		// next line
-		bits += pitch;
-	}
-	// bottom band
-	bits = (BYTE*)FreeImage_GetBits(dib);
-	for(y = max_height; y < height; y++) {
-		FIRGBF *pixel = (FIRGBF*)bits;
-		for(x = 0; x < max_width; x++) {
-			double Yw = pixel[x].red / avgLum;
-			Yw *= exposure;
-			interpol = log(2 + biasFunction(biasP, Yw / Lmax) * 8);
-			L = pade_log(Yw);// log(Yw + 1)
-			pixel[x].red = (float)((L / interpol) / divider);
-		}
-		// next line
-		bits += pitch;
-	}
-
-#endif	// DRAGO03_FAST
-
-	return TRUE;
-}
-
-/**
-Custom gamma correction based on the ITU-R BT.709 standard
-@param dib RGBF image to be corrected
-@param gammaval Gamma value (2.2 is a good default value)
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-REC709GammaCorrection(FIBITMAP *dib, const float gammaval) {
-	if(FreeImage_GetImageType(dib) != FIT_RGBF)
-		return FALSE;
-
-	float slope = 4.5F;
-	float start = 0.018F;
-	
-	const float fgamma = (float)((0.45 / gammaval) * 2);
-	if(gammaval >= 2.1F) {
-		start = (float)(0.018 / ((gammaval - 2) * 7.5));
-		slope = (float)(4.5 * ((gammaval - 2) * 7.5));
-	} else if (gammaval <= 1.9F) {
-		start = (float)(0.018 * ((2 - gammaval) * 7.5));
-		slope = (float)(4.5 / ((2 - gammaval) * 7.5));
-	}
-
-	const unsigned width  = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-	const unsigned pitch  = FreeImage_GetPitch(dib);
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(dib);
-	for(unsigned y = 0; y < height; y++) {
-		float *pixel = (float*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			for(int i = 0; i < 3; i++) {
-				*pixel = (*pixel <= start) ? *pixel * slope : (1.099F * pow(*pixel, fgamma) - 0.099F);
-				pixel++;
-			}
-		}
-		bits += pitch;
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//  Main algorithm
-// ----------------------------------------------------------
-
-/**
-Apply the Adaptive Logarithmic Mapping operator to a HDR image and convert to 24-bit RGB
-@param src Input RGB16 or RGB[A]F image
-@param gamma Gamma correction (gamma > 0). 1 means no correction, 2.2 in the original paper.
-@param exposure Exposure parameter (0 means no correction, 0 in the original paper)
-@return Returns a 24-bit RGB image if successful, returns NULL otherwise
-*/
-FIBITMAP* DLL_CALLCONV 
-FreeImage_TmoDrago03(FIBITMAP *src, double gamma, double exposure) {
-	float maxLum, minLum, avgLum;
-
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	// working RGBF variable
-	FIBITMAP *dib = NULL;
-
-	dib = FreeImage_ConvertToRGBF(src);
-	if(!dib) return NULL;
-
-	// default algorithm parameters
-	const float biasParam = 0.85F;
-	const float expoParam = (float)pow(2.0, exposure); //default exposure is 1, 2^0
-
-	// convert to Yxy
-	ConvertInPlaceRGBFToYxy(dib);
-	// get the luminance
-	LuminanceFromYxy(dib, &maxLum, &minLum, &avgLum);
-	// perform the tone mapping
-	ToneMappingDrago03(dib, maxLum, avgLum, biasParam, expoParam);
-	// convert back to RGBF
-	ConvertInPlaceYxyToRGBF(dib);
-	if(gamma != 1) {
-		// perform gamma correction
-		REC709GammaCorrection(dib, (float)gamma);
-	}
-	// clamp image highest values to display white, then convert to 24-bit RGB
-	FIBITMAP *dst = ClampConvertRGBFTo24(dib);
-
-	// clean-up and return
-	FreeImage_Unload(dib);
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-	
-	return dst;
-}
diff --git a/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp b/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp
deleted file mode 100644
index 27448fce8a..0000000000
--- a/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp
+++ /dev/null
@@ -1,689 +0,0 @@
-// ==========================================================
-// Tone mapping operator (Fattal, 2002)
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "ToneMapping.h"
-
-// ----------------------------------------------------------
-// Gradient domain HDR compression
-// Reference:
-// [1] R. Fattal, D. Lischinski, and M.Werman, 
-// Gradient domain high dynamic range compression,
-// ACM Transactions on Graphics, special issue on Proc. of ACM SIGGRAPH 2002, 
-// San Antonio, Texas, vol. 21(3), pp. 257-266, 2002.
-// ----------------------------------------------------------
-
-static const float EPSILON = 1e-4F;
-
-/**
-Performs a 5 by 5 gaussian filtering using two 1D convolutions, 
-followed by a subsampling by 2. 
-@param dib Input image
-@return Returns a blurred image of size SIZE(dib)/2
-@see GaussianPyramid
-*/
-static FIBITMAP* GaussianLevel5x5(FIBITMAP *dib) {
-	FIBITMAP *h_dib = NULL, *v_dib = NULL, *dst = NULL;
-	float *src_pixel, *dst_pixel;
-
-	try {
-		const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-		if(image_type != FIT_FLOAT) throw(1);
-
-		const unsigned width = FreeImage_GetWidth(dib);
-		const unsigned height = FreeImage_GetHeight(dib);
-
-		h_dib = FreeImage_AllocateT(image_type, width, height);
-		v_dib = FreeImage_AllocateT(image_type, width, height);
-		if(!h_dib || !v_dib) throw(1);
-
-		const unsigned pitch = FreeImage_GetPitch(dib) / sizeof(float);
-
-		// horizontal convolution dib -> h_dib
-
-		src_pixel = (float*)FreeImage_GetBits(dib);
-		dst_pixel = (float*)FreeImage_GetBits(h_dib);
-
-		for(unsigned y = 0; y < height; y++) {
-			// work on line y
-			for(unsigned x = 2; x < width - 2; x++) {
-				dst_pixel[x] = src_pixel[x-2] + src_pixel[x+2] + 4 * (src_pixel[x-1] + src_pixel[x+1]) + 6 * src_pixel[x];
-				dst_pixel[x] /= 16;
-			}
-			// boundary mirroring
-			dst_pixel[0] = (2 * src_pixel[2] + 8 * src_pixel[1] + 6 * src_pixel[0]) / 16;
-			dst_pixel[1] = (src_pixel[3] + 4 * (src_pixel[0] + src_pixel[2]) + 7 * src_pixel[1]) / 16;
-			dst_pixel[width-2] = (src_pixel[width-4] + 5 * src_pixel[width-1] + 4 * src_pixel[width-3] + 6 * src_pixel[width-2]) / 16;
-			dst_pixel[width-1] = (src_pixel[width-3] + 5 * src_pixel[width-2] + 10 * src_pixel[width-1]) / 16;
-
-			// next line
-			src_pixel += pitch;
-			dst_pixel += pitch;
-		}
-
-		// vertical convolution h_dib -> v_dib
-
-		src_pixel = (float*)FreeImage_GetBits(h_dib);
-		dst_pixel = (float*)FreeImage_GetBits(v_dib);
-
-		for(unsigned x = 0; x < width; x++) {		
-			// work on column x
-			for(unsigned y = 2; y < height - 2; y++) {
-				const unsigned index = y*pitch + x;
-				dst_pixel[index] = src_pixel[index-2*pitch] + src_pixel[index+2*pitch] + 4 * (src_pixel[index-pitch] + src_pixel[index+pitch]) + 6 * src_pixel[index];
-				dst_pixel[index] /= 16;
-			}
-			// boundary mirroring
-			dst_pixel[x] = (2 * src_pixel[x+2*pitch] + 8 * src_pixel[x+pitch] + 6 * src_pixel[x]) / 16;
-			dst_pixel[x+pitch] = (src_pixel[x+3*pitch] + 4 * (src_pixel[x] + src_pixel[x+2*pitch]) + 7 * src_pixel[x+pitch]) / 16;
-			dst_pixel[(height-2)*pitch+x] = (src_pixel[(height-4)*pitch+x] + 5 * src_pixel[(height-1)*pitch+x] + 4 * src_pixel[(height-3)*pitch+x] + 6 * src_pixel[(height-2)*pitch+x]) / 16;
-			dst_pixel[(height-1)*pitch+x] = (src_pixel[(height-3)*pitch+x] + 5 * src_pixel[(height-2)*pitch+x] + 10 * src_pixel[(height-1)*pitch+x]) / 16;
-		}
-
-		FreeImage_Unload(h_dib); h_dib = NULL;
-
-		// perform downsampling
-
-		dst = FreeImage_Rescale(v_dib, width/2, height/2, FILTER_BILINEAR);
-
-		FreeImage_Unload(v_dib);
-
-		return dst;
-
-	} catch(int) {
-		if(h_dib) FreeImage_Unload(h_dib);
-		if(v_dib) FreeImage_Unload(v_dib);
-		if(dst) FreeImage_Unload(dst);
-		return NULL;
-	}
-}
-
-/**
-Compute a Gaussian pyramid using the specified number of levels. 
-@param H Original bitmap
-@param pyramid Resulting pyramid array 
-@param nlevels Number of resolution levels
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL GaussianPyramid(FIBITMAP *H, FIBITMAP **pyramid, int nlevels) {
-	try {
-		// first level is the original image
-		pyramid[0] = FreeImage_Clone(H);
-		if(pyramid[0] == NULL) throw(1);
-		// compute next levels
-		for(int k = 1; k < nlevels; k++) {
-			pyramid[k] = GaussianLevel5x5(pyramid[k-1]);
-			if(pyramid[k] == NULL) throw(1);
-		}
-		return TRUE;
-	} catch(int) {
-		for(int k = 0; k < nlevels; k++) {
-			if(pyramid[k] != NULL) {
-				FreeImage_Unload(pyramid[k]);
-				pyramid[k] = NULL;
-			}
-		}
-		return FALSE;
-	}
-}
-
-/**
-Compute the gradient magnitude of an input image H using central differences, 
-and returns the average gradient. 
-@param H Input image
-@param avgGrad [out] Average gradient
-@param k Level number
-@return Returns the gradient magnitude if successful, returns NULL otherwise
-@see GradientPyramid
-*/
-static FIBITMAP* GradientLevel(FIBITMAP *H, float *avgGrad, int k) {
-	FIBITMAP *G = NULL;
-
-	try {
-		const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(H);
-		if(image_type != FIT_FLOAT) throw(1);
-
-		const unsigned width = FreeImage_GetWidth(H);
-		const unsigned height = FreeImage_GetHeight(H);
-
-		G = FreeImage_AllocateT(image_type, width, height);
-		if(!G) throw(1);
-		
-		const unsigned pitch = FreeImage_GetPitch(H) / sizeof(float);
-		
-		const float divider = (float)(1 << (k + 1));
-		float average = 0;
-		
-		float *src_pixel = (float*)FreeImage_GetBits(H);
-		float *dst_pixel = (float*)FreeImage_GetBits(G);
-
-		for(unsigned y = 0; y < height; y++) {
-			const unsigned n = (y == 0 ? 0 : y-1);
-			const unsigned s = (y+1 == height ? y : y+1);
-			for(unsigned x = 0; x < width; x++) {
-				const unsigned w = (x == 0 ? 0 : x-1);
-				const unsigned e = (x+1 == width ? x : x+1);		
-				// central difference
-				const float gx = (src_pixel[y*pitch+e] - src_pixel[y*pitch+w]) / divider; // [Hk(x+1, y) - Hk(x-1, y)] / 2**(k+1)
-				const float gy = (src_pixel[s*pitch+x] - src_pixel[n*pitch+x]) / divider; // [Hk(x, y+1) - Hk(x, y-1)] / 2**(k+1)
-				// gradient
-				dst_pixel[x] = sqrt(gx*gx + gy*gy);
-				// average gradient
-				average += dst_pixel[x];
-			}
-			// next line
-			dst_pixel += pitch;
-		}
-		
-		*avgGrad = average / (width * height);
-
-		return G;
-
-	} catch(int) {
-		if(G) FreeImage_Unload(G);
-		return NULL;
-	}
-}
-
-/**
-Calculate gradient magnitude and its average value on each pyramid level
-@param pyramid Gaussian pyramid (nlevels levels)
-@param nlevels Number of levels
-@param gradients [out] Gradient pyramid (nlevels levels)
-@param avgGrad [out] Average gradient on each level (array of size nlevels)
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL GradientPyramid(FIBITMAP **pyramid, int nlevels, FIBITMAP **gradients, float *avgGrad) {
-	try {
-		for(int k = 0; k < nlevels; k++) {
-			FIBITMAP *Hk = pyramid[k];
-			gradients[k] = GradientLevel(Hk, &avgGrad[k], k);
-			if(gradients[k] == NULL) throw(1);
-		}
-		return TRUE;
-	} catch(int) {
-		for(int k = 0; k < nlevels; k++) {
-			if(gradients[k] != NULL) {
-				FreeImage_Unload(gradients[k]);
-				gradients[k] = NULL;
-			}
-		}
-		return FALSE;
-	}
-}
-
-/**
-Compute the gradient attenuation function PHI(x, y)
-@param gradients Gradient pyramid (nlevels levels)
-@param avgGrad Average gradient on each level (array of size nlevels)
-@param nlevels Number of levels
-@param alpha Parameter alpha in the paper
-@param beta Parameter beta in the paper
-@return Returns the attenuation matrix Phi if successful, returns NULL otherwise
-*/
-static FIBITMAP* PhiMatrix(FIBITMAP **gradients, float *avgGrad, int nlevels, float alpha, float beta) {
-	float *src_pixel, *dst_pixel;
-	FIBITMAP **phi = NULL;
-
-	try {
-		phi = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*));
-		if(!phi) throw(1);
-		memset(phi, 0, nlevels * sizeof(FIBITMAP*));
-
-		for(int k = nlevels-1; k >= 0; k--) {
-			// compute phi(k)
-
-			FIBITMAP *Gk = gradients[k];
-
-			const unsigned width = FreeImage_GetWidth(Gk);
-			const unsigned height = FreeImage_GetHeight(Gk);
-			const unsigned pitch = FreeImage_GetPitch(Gk) / sizeof(float);
-
-			// parameter alpha is 0.1 times the average gradient magnitude
-			// also, note the factor of 2**k in the denominator; 
-			// that is there to correct for the fact that an average gradient avgGrad(H) over 2**k pixels 
-			// in the original image will appear as a gradient grad(Hk) = 2**k*avgGrad(H) over a single pixel in Hk. 
-			float ALPHA =  alpha * avgGrad[k] * (float)((int)1 << k);
-			if(ALPHA == 0) ALPHA = EPSILON;
-
-			phi[k] = FreeImage_AllocateT(FIT_FLOAT, width, height);
-			if(!phi[k]) throw(1);
-			
-			src_pixel = (float*)FreeImage_GetBits(Gk);
-			dst_pixel = (float*)FreeImage_GetBits(phi[k]);
-			for(unsigned y = 0; y < height; y++) {
-				for(unsigned x = 0; x < width; x++) {
-					// compute (alpha / grad) * (grad / alpha) ** beta
-					const float v = src_pixel[x] / ALPHA;
-					const float value = (float)pow((float)v, (float)(beta-1));
-					dst_pixel[x] = (value > 1) ? 1 : value;
-				}
-				// next line
-				src_pixel += pitch;
-				dst_pixel += pitch;
-			}
-
-			if(k < nlevels-1) {
-				// compute PHI(k) = L( PHI(k+1) ) * phi(k)
-				FIBITMAP *L = FreeImage_Rescale(phi[k+1], width, height, FILTER_BILINEAR);
-				if(!L) throw(1);
-
-				src_pixel = (float*)FreeImage_GetBits(L);
-				dst_pixel = (float*)FreeImage_GetBits(phi[k]);
-				for(unsigned y = 0; y < height; y++) {
-					for(unsigned x = 0; x < width; x++) {
-						dst_pixel[x] *= src_pixel[x];
-					}
-					// next line
-					src_pixel += pitch;
-					dst_pixel += pitch;
-				}
-
-				FreeImage_Unload(L);
-
-				// PHI(k+1) is no longer needed
-				FreeImage_Unload(phi[k+1]);
-				phi[k+1] = NULL;
-			}
-
-			// next level
-		}
-
-		// get the final result and return
-		FIBITMAP *dst = phi[0];
-
-		free(phi);
-
-		return dst;
-
-	} catch(int) {
-		if(phi) {
-			for(int k = nlevels-1; k >= 0; k--) {
-				if(phi[k]) FreeImage_Unload(phi[k]);
-			}
-			free(phi);
-		}
-		return NULL;
-	}
-}
-
-/**
-Compute gradients in x and y directions, attenuate them with the attenuation matrix, 
-then compute the divergence div G from the attenuated gradient. 
-@param H Normalized luminance
-@param PHI Attenuation matrix
-@return Returns the divergence matrix if successful, returns NULL otherwise
-*/
-static FIBITMAP* Divergence(FIBITMAP *H, FIBITMAP *PHI) {
-	FIBITMAP *Gx = NULL, *Gy = NULL, *divG = NULL;
-	float *phi, *h, *gx, *gy, *divg;
-
-	try {
-		const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(H);
-		if(image_type != FIT_FLOAT) throw(1);
-
-		const unsigned width = FreeImage_GetWidth(H);
-		const unsigned height = FreeImage_GetHeight(H);
-
-		Gx = FreeImage_AllocateT(image_type, width, height);
-		if(!Gx) throw(1);
-		Gy = FreeImage_AllocateT(image_type, width, height);
-		if(!Gy) throw(1);
-		
-		const unsigned pitch = FreeImage_GetPitch(H) / sizeof(float);
-		
-		// perform gradient attenuation
-
-		phi = (float*)FreeImage_GetBits(PHI);
-		h   = (float*)FreeImage_GetBits(H);
-		gx  = (float*)FreeImage_GetBits(Gx);
-		gy  = (float*)FreeImage_GetBits(Gy);
-
-		for(unsigned y = 0; y < height; y++) {
-			const unsigned s = (y+1 == height ? y : y+1);
-			for(unsigned x = 0; x < width; x++) {				
-				const unsigned e = (x+1 == width ? x : x+1);
-				// forward difference
-				const unsigned index = y*pitch + x;
-				const float phi_xy = phi[index];
-				const float h_xy   = h[index];
-				gx[x] = (h[y*pitch+e] - h_xy) * phi_xy; // [H(x+1, y) - H(x, y)] * PHI(x, y)
-				gy[x] = (h[s*pitch+x] - h_xy) * phi_xy; // [H(x, y+1) - H(x, y)] * PHI(x, y)
-			}
-			// next line
-			gx += pitch;
-			gy += pitch;
-		}
-
-		// calculate the divergence
-
-		divG = FreeImage_AllocateT(image_type, width, height);
-		if(!divG) throw(1);
-		
-		gx  = (float*)FreeImage_GetBits(Gx);
-		gy  = (float*)FreeImage_GetBits(Gy);
-		divg = (float*)FreeImage_GetBits(divG);
-
-		for(unsigned y = 0; y < height; y++) {
-			for(unsigned x = 0; x < width; x++) {				
-				// backward difference approximation
-				// divG = Gx(x, y) - Gx(x-1, y) + Gy(x, y) - Gy(x, y-1)
-				const unsigned index = y*pitch + x;
-				divg[index] = gx[index] + gy[index];
-				if(x > 0) divg[index] -= gx[index-1];
-				if(y > 0) divg[index] -= gy[index-pitch];
-			}
-		}
-
-		// no longer needed ... 
-		FreeImage_Unload(Gx);
-		FreeImage_Unload(Gy);
-
-		// return the divergence
-		return divG;
-
-	} catch(int) {
-		if(Gx) FreeImage_Unload(Gx);
-		if(Gy) FreeImage_Unload(Gy);
-		if(divG) FreeImage_Unload(divG);
-		return NULL;
-	}
-}
-
-/**
-Given the luminance channel, find max & min luminance values, 
-normalize to range 0..100 and take the logarithm. 
-@param Y Image luminance
-@return Returns the normalized luminance H if successful, returns NULL otherwise
-*/
-static FIBITMAP* LogLuminance(FIBITMAP *Y) {
-	FIBITMAP *H = NULL;
-
-	try {
-		// get the luminance channel
-		FIBITMAP *H = FreeImage_Clone(Y);
-		if(!H) throw(1);
-
-		const unsigned width  = FreeImage_GetWidth(H);
-		const unsigned height = FreeImage_GetHeight(H);
-		const unsigned pitch  = FreeImage_GetPitch(H);
-
-		// find max & min luminance values
-		float maxLum = -1e20F, minLum = 1e20F;
-
-		BYTE *bits = (BYTE*)FreeImage_GetBits(H);
-		for(unsigned y = 0; y < height; y++) {
-			const float *pixel = (float*)bits;
-			for(unsigned x = 0; x < width; x++) {
-				const float value = pixel[x];
-				maxLum = (maxLum < value) ? value : maxLum;	// max Luminance in the scene
-				minLum = (minLum < value) ? minLum : value;	// min Luminance in the scene
-			}
-			// next line
-			bits += pitch;
-		}
-		if(maxLum == minLum) throw(1);
-
-		// normalize to range 0..100 and take the logarithm
-		const float scale = 100.F / (maxLum - minLum);
-		bits = (BYTE*)FreeImage_GetBits(H);
-		for(unsigned y = 0; y < height; y++) {
-			float *pixel = (float*)bits;
-			for(unsigned x = 0; x < width; x++) {
-				const float value = (pixel[x] - minLum) * scale;
-				pixel[x] = log(value + EPSILON);
-			}
-			// next line
-			bits += pitch;
-		}
-
-		return H;
-
-	} catch(int) {
-		if(H) FreeImage_Unload(H);
-		return NULL;
-	}
-}
-
-/**
-Given a normalized luminance, perform exponentiation and recover the log compressed image 
-@param Y Input/Output luminance image
-*/
-static void ExpLuminance(FIBITMAP *Y) {
-	const unsigned width = FreeImage_GetWidth(Y);
-	const unsigned height = FreeImage_GetHeight(Y);
-	const unsigned pitch = FreeImage_GetPitch(Y);
-
-	BYTE *bits = (BYTE*)FreeImage_GetBits(Y);
-	for(unsigned y = 0; y < height; y++) {
-		float *pixel = (float*)bits;
-		for(unsigned x = 0; x < width; x++) {
-			pixel[x] = exp(pixel[x]) - EPSILON;
-		}
-		bits += pitch;
-	}
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Gradient Domain HDR tone mapping operator
-@param Y Image luminance values
-@param alpha Parameter alpha of the paper (suggested value is 0.1)
-@param beta Parameter beta of the paper (suggested value is between 0.8 and 0.9)
-@return returns the tone mapped luminance
-*/
-static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) {
-	const unsigned MIN_PYRAMID_SIZE = 32;	// minimun size (width or height) of the coarsest level of the pyramid
-
-	FIBITMAP *H = NULL;
-	FIBITMAP **pyramid = NULL;
-	FIBITMAP **gradients = NULL;
-	FIBITMAP *phy = NULL;
-	FIBITMAP *divG = NULL;
-	FIBITMAP *U = NULL;
-	float *avgGrad = NULL;
-
-	int k;
-	int nlevels = 0;
-
-	try {
-		// get the normalized luminance
-		FIBITMAP *H = LogLuminance(Y);
-		if(!H) throw(1);
-		
-		// get the number of levels for the pyramid
-		const unsigned width = FreeImage_GetWidth(H);
-		const unsigned height = FreeImage_GetHeight(H);
-		unsigned minsize = MIN(width, height);
-		while(minsize >= MIN_PYRAMID_SIZE) {
-			nlevels++;
-			minsize /= 2;
-		}
-
-		// create the Gaussian pyramid
-		pyramid = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*));
-		if(!pyramid) throw(1);
-		memset(pyramid, 0, nlevels * sizeof(FIBITMAP*));
-
-		if(!GaussianPyramid(H, pyramid, nlevels)) throw(1);
-
-		// calculate gradient magnitude and its average value on each pyramid level
-		gradients = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*));
-		if(!gradients) throw(1);
-		memset(gradients, 0, nlevels * sizeof(FIBITMAP*));
-		avgGrad = (float*)malloc(nlevels * sizeof(float));
-		if(!avgGrad) throw(1);
-
-		if(!GradientPyramid(pyramid, nlevels, gradients, avgGrad)) throw(1);
-
-		// free the Gaussian pyramid
-		for(k = 0; k < nlevels; k++) {
-			if(pyramid[k]) FreeImage_Unload(pyramid[k]);
-		}
-		free(pyramid); pyramid = NULL;
-
-		// compute the gradient attenuation function PHI(x, y)
-		phy = PhiMatrix(gradients, avgGrad, nlevels, alpha, beta);
-		if(!phy) throw(1);
-
-		// free the gradient pyramid
-		for(k = 0; k < nlevels; k++) {
-			if(gradients[k]) FreeImage_Unload(gradients[k]);
-		}
-		free(gradients); gradients = NULL;
-		free(avgGrad); avgGrad = NULL;
-
-		// compute gradients in x and y directions, attenuate them with the attenuation matrix, 
-		// then compute the divergence div G from the attenuated gradient. 
-		divG = Divergence(H, phy);
-		if(!divG) throw(1);
-
-		// H & phy no longer needed
-		FreeImage_Unload(H); H = NULL;
-		FreeImage_Unload(phy); phy = NULL;
-
-		// solve the PDE (Poisson equation) using a multigrid solver and 3 cycles
-		FIBITMAP *U = FreeImage_MultigridPoissonSolver(divG, 3);
-		if(!U) throw(1);
-
-		FreeImage_Unload(divG);
-
-		// perform exponentiation and recover the log compressed image
-		ExpLuminance(U);
-
-		return U;
-
-	} catch(int) {
-		if(H) FreeImage_Unload(H);
-		if(pyramid) {
-			for(int i = 0; i < nlevels; i++) {
-				if(pyramid[i]) FreeImage_Unload(pyramid[i]);
-			}
-			free(pyramid);
-		}
-		if(gradients) {
-			for(int i = 0; i < nlevels; i++) {
-				if(gradients[i]) FreeImage_Unload(gradients[i]);
-			}
-			free(gradients);
-		}
-		if(avgGrad) free(avgGrad);
-		if(phy) FreeImage_Unload(phy);
-		if(divG) FreeImage_Unload(divG);
-		if(U) FreeImage_Unload(U);
-
-		return NULL;
-	}
-}
-
-// ----------------------------------------------------------
-//  Main algorithm
-// ----------------------------------------------------------
-
-/**
-Apply the Gradient Domain High Dynamic Range Compression to a RGBF image and convert to 24-bit RGB
-@param dib Input RGBF / RGB16 image
-@param color_saturation Color saturation (s parameter in the paper) in [0.4..0.6]
-@param attenuation Atenuation factor (beta parameter in the paper) in [0.8..0.9]
-@return Returns a 24-bit RGB image if successful, returns NULL otherwise
-*/
-FIBITMAP* DLL_CALLCONV 
-FreeImage_TmoFattal02(FIBITMAP *dib, double color_saturation, double attenuation) {	
-	const float alpha = 0.1F;									// parameter alpha = 0.1
-	const float beta = (float)MAX(0.8, MIN(0.9, attenuation));	// parameter beta = [0.8..0.9]
-	const float s = (float)MAX(0.4, MIN(0.6, color_saturation));// exponent s controls color saturation = [0.4..0.6]
-
-	FIBITMAP *src = NULL;
-	FIBITMAP *Yin = NULL;
-	FIBITMAP *Yout = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	try {
-
-		// convert to RGBF
-		src = FreeImage_ConvertToRGBF(dib);
-		if(!src) throw(1);
-
-		// get the luminance channel
-		Yin = ConvertRGBFToY(src);
-		if(!Yin) throw(1);
-
-		// perform the tone mapping
-		Yout = tmoFattal02(Yin, alpha, beta);
-		if(!Yout) throw(1);
-
-		// clip low and high values and normalize to [0..1]
-		//NormalizeY(Yout, 0.001F, 0.995F);
-		NormalizeY(Yout, 0, 1);
-
-		// compress the dynamic range
-
-		const unsigned width = FreeImage_GetWidth(src);
-		const unsigned height = FreeImage_GetHeight(src);
-
-		const unsigned rgb_pitch = FreeImage_GetPitch(src);
-		const unsigned y_pitch = FreeImage_GetPitch(Yin);
-
-		BYTE *bits      = (BYTE*)FreeImage_GetBits(src);
-		BYTE *bits_yin  = (BYTE*)FreeImage_GetBits(Yin);
-		BYTE *bits_yout = (BYTE*)FreeImage_GetBits(Yout);
-
-		for(unsigned y = 0; y < height; y++) {
-			float *Lin = (float*)bits_yin;
-			float *Lout = (float*)bits_yout;
-			float *color = (float*)bits;
-			for(unsigned x = 0; x < width; x++) {
-				for(unsigned c = 0; c < 3; c++) {
-					*color = (Lin[x] > 0) ? pow(*color/Lin[x], s) * Lout[x] : 0;
-					color++;
-				}
-			}
-			bits += rgb_pitch;
-			bits_yin += y_pitch;
-			bits_yout += y_pitch;
-		}
-
-		// not needed anymore
-		FreeImage_Unload(Yin);  Yin  = NULL;
-		FreeImage_Unload(Yout); Yout = NULL;
-
-		// clamp image highest values to display white, then convert to 24-bit RGB
-		dst = ClampConvertRGBFTo24(src);
-
-		// clean-up and return
-		FreeImage_Unload(src); src = NULL;
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, dib);
-		
-		return dst;
-
-	} catch(int) {
-		if(src) FreeImage_Unload(src);
-		if(Yin) FreeImage_Unload(Yin);
-		if(Yout) FreeImage_Unload(Yout);
-		return NULL;
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp b/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp
deleted file mode 100644
index 64607dd5aa..0000000000
--- a/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-// ==========================================================
-// Tone mapping operator (Reinhard, 2005)
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "ToneMapping.h"
-
-// ----------------------------------------------------------
-// Global and/or local tone mapping operator
-// References: 
-// [1] Erik Reinhard and Kate Devlin, 'Dynamic Range Reduction Inspired by Photoreceptor Physiology', 
-//     IEEE Transactions on Visualization and Computer Graphics, 11(1), Jan/Feb 2005. 
-// [2] Erik Reinhard, 'Parameter estimation for photographic tone reproduction',
-//     Journal of Graphics Tools, vol. 7, no. 1, pp. 45–51, 2003.
-// ----------------------------------------------------------
-
-/**
-Tone mapping operator
-@param dib Input / Output RGBF image
-@param Y Input luminance image version of dib
-@param f Overall intensity in range [-8:8] : default to 0
-@param m Contrast in range [0.3:1) : default to 0
-@param a Adaptation in range [0:1] : default to 1
-@param c Color correction in range [0:1] : default to 0
-@return Returns TRUE if successful, returns FALSE otherwise
-@see LuminanceFromY
-*/
-static BOOL 
-ToneMappingReinhard05(FIBITMAP *dib, FIBITMAP *Y, float f, float m, float a, float c) {
-	float Cav[3];		// channel average
-	float Lav = 0;		// average luminance
-	float Llav = 0;		// log average luminance
-	float minLum = 1;	// min luminance
-	float maxLum = 1;	// max luminance
-
-	float L;		// pixel luminance
-	float I_g, I_l; // global and local light adaptation
-	float I_a;		// interpolated pixel light adaptation
-	float k;		// key (low-key means overall dark image, high-key means overall light image)
-
-	// check input parameters 
-
-	if((FreeImage_GetImageType(dib) != FIT_RGBF) || (FreeImage_GetImageType(Y) != FIT_FLOAT)) {
-		return FALSE;
-	}
-
-	if(f < -8) f = -8; if(f > 8) f = 8;
-    if(m < 0)  m = 0;  if(m > 1) m = 1;
-    if(a < 0)  a = 0;  if(a > 1) a = 1;
-    if(c < 0)  c = 0;  if(c > 1) c = 1;
-
-	const unsigned width  = FreeImage_GetWidth(dib);
-	const unsigned height = FreeImage_GetHeight(dib);
-
-	const unsigned dib_pitch  = FreeImage_GetPitch(dib);
-	const unsigned y_pitch    = FreeImage_GetPitch(Y);
-
-	int i;
-	unsigned x, y;
-	BYTE *bits = NULL, *Ybits = NULL;
-
-	// get statistics about the data (but only if its really needed)
-
-	f = exp(-f);
-	if((m == 0) || (a != 1) && (c != 1)) {
-		// avoid these calculations if its not needed after ...
-		LuminanceFromY(Y, &maxLum, &minLum, &Lav, &Llav);
-		k = (log(maxLum) - Llav) / (log(maxLum) - log(minLum));
-		if(k < 0) {
-			// pow(k, 1.4F) is undefined ...
-			// there's an ambiguity about the calculation of Llav between Reinhard papers and the various implementations  ...
-			// try another world adaptation luminance formula using instead 'worldLum = log(Llav)'
-			k = (log(maxLum) - log(Llav)) / (log(maxLum) - log(minLum));
-			if(k < 0) m = 0.3F;
-		}
-	}
-	m = (m > 0) ? m : (float)(0.3 + 0.7 * pow(k, 1.4F));
-
-	float max_color = -1e6F;
-	float min_color = +1e6F;
-
-	// tone map image
-
-	bits  = (BYTE*)FreeImage_GetBits(dib);
-	Ybits = (BYTE*)FreeImage_GetBits(Y);
-
-	if((a == 1) && (c == 0)) {
-		// when using default values, use a fastest code
-
-		for(y = 0; y < height; y++) {
-			float *Y     = (float*)Ybits;
-			float *color = (float*)bits;
-
-			for(x = 0; x < width; x++) {
-				I_a = Y[x];	// luminance(x, y)
-				for (i = 0; i < 3; i++) {
-					*color /= ( *color + pow(f * I_a, m) );
-					
-					max_color = (*color > max_color) ? *color : max_color;
-					min_color = (*color < min_color) ? *color : min_color;
-
-					color++;
-				}
-			}
-			// next line
-			bits  += dib_pitch;
-			Ybits += y_pitch;
-		}
-	} else {
-		// complete algorithm
-
-		// channel averages
-
-		Cav[0] = Cav[1] = Cav[2] = 0;
-		if((a != 1) && (c != 0)) {
-			// channel averages are not needed when (a == 1) or (c == 0)
-			bits = (BYTE*)FreeImage_GetBits(dib);
-			for(y = 0; y < height; y++) {
-				float *color = (float*)bits;
-				for(x = 0; x < width; x++) {
-					for(i = 0; i < 3; i++) {
-						Cav[i] += *color;
-						color++;
-					}
-				}
-				// next line
-				bits += dib_pitch;
-			}
-			const float image_size = (float)width * height;
-			for(i = 0; i < 3; i++) {
-				Cav[i] /= image_size;
-			}
-		}
-
-		// perform tone mapping
-
-		bits = (BYTE*)FreeImage_GetBits(dib);
-		for(y = 0; y < height; y++) {
-			const float *Y     = (float*)Ybits;
-			float *color = (float*)bits;
-
-			for(x = 0; x < width; x++) {
-				L = Y[x];	// luminance(x, y)
-				for (i = 0; i < 3; i++) {
-					I_l = c * *color + (1-c) * L;
-					I_g = c * Cav[i] + (1-c) * Lav;
-					I_a = a * I_l + (1-a) * I_g;
-					*color /= ( *color + pow(f * I_a, m) );
-					
-					max_color = (*color > max_color) ? *color : max_color;
-					min_color = (*color < min_color) ? *color : min_color;
-
-					color++;
-				}
-			}
-			// next line
-			bits  += dib_pitch;
-			Ybits += y_pitch;
-		}
-	}
-
-	// normalize intensities
-
-	if(max_color != min_color) {
-		bits = (BYTE*)FreeImage_GetBits(dib);
-		const float range = max_color - min_color;
-		for(y = 0; y < height; y++) {
-			float *color = (float*)bits;
-			for(x = 0; x < width; x++) {
-				for(i = 0; i < 3; i++) {
-					*color = (*color - min_color) / range;
-					color++;
-				}
-			}
-			// next line
-			bits += dib_pitch;
-		}
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//  Main algorithm
-// ----------------------------------------------------------
-
-/**
-Apply the global/local tone mapping operator to a RGBF image and convert to 24-bit RGB<br>
-User parameters control intensity, contrast, and level of adaptation
-@param src Input RGBF image
-@param intensity Overall intensity in range [-8:8] : default to 0
-@param contrast Contrast in range [0.3:1) : default to 0
-@param adaptation Adaptation in range [0:1] : default to 1
-@param color_correction Color correction in range [0:1] : default to 0
-@return Returns a 24-bit RGB image if successful, returns NULL otherwise
-*/
-FIBITMAP* DLL_CALLCONV 
-FreeImage_TmoReinhard05Ex(FIBITMAP *src, double intensity, double contrast, double adaptation, double color_correction) {
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	// working RGBF variable
-	FIBITMAP *dib = NULL, *Y = NULL;
-
-	dib = FreeImage_ConvertToRGBF(src);
-	if(!dib) return NULL;
-
-	// get the Luminance channel
-	Y = ConvertRGBFToY(dib);
-	if(!Y) {
-		FreeImage_Unload(dib);
-		return NULL;
-	}
-
-	// perform the tone mapping
-	ToneMappingReinhard05(dib, Y, (float)intensity, (float)contrast, (float)adaptation, (float)color_correction);
-	// not needed anymore
-	FreeImage_Unload(Y);
-	// clamp image highest values to display white, then convert to 24-bit RGB
-	FIBITMAP *dst = ClampConvertRGBFTo24(dib);
-
-	// clean-up and return
-	FreeImage_Unload(dib);
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-
-	return dst;
-}
-
-/**
-Apply the global tone mapping operator to a RGBF image and convert to 24-bit RGB<br>
-User parameters control intensity and contrast
-@param src Input RGBF image
-@param intensity Overall intensity in range [-8:8] : default to 0
-@param contrast Contrast in range [0.3:1) : default to 0
-@return Returns a 24-bit RGB image if successful, returns NULL otherwise
-*/
-FIBITMAP* DLL_CALLCONV 
-FreeImage_TmoReinhard05(FIBITMAP *src, double intensity, double contrast) {
-	return FreeImage_TmoReinhard05Ex(src, intensity, contrast, 1, 0);
-}
diff --git a/plugins/AdvaImg/src/FreeImageIO.h b/plugins/AdvaImg/src/FreeImageIO.h
deleted file mode 100644
index c846b5bf0a..0000000000
--- a/plugins/AdvaImg/src/FreeImageIO.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// ==========================================================
-// Input/Output functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef FREEIMAGEIO_H
-#define FREEIMAGEIO_H
-
-#ifndef FREEIMAGE_H
-#include "FreeImage.h"
-#endif
-
-// ----------------------------------------------------------
-
-FI_STRUCT (FIMEMORYHEADER) {
-	/**
-	Flag used to remember to delete the 'data' buffer.
-	When the buffer is a wrapped buffer, it is read-only, no need to delete it. 
-	When the buffer is a read/write buffer, it is allocated dynamically and must be deleted when no longer needed.
-	*/
-	BOOL delete_me;
-	/**
-	file_length is equal to the input buffer size when the buffer is a wrapped buffer, i.e. file_length == data_length. 
-	file_length is the amount of the written bytes when the buffer is a read/write buffer.
-	*/
-	long file_length;
-	/**
-	When using read-only input buffers, data_length is equal to the input buffer size, i.e. the file_length.
-	When using read/write buffers, data_length is the size of the allocated buffer, 
-	whose size is greater than or equal to file_length.
-	*/
-	long data_length;
-	/**
-	start buffer address
-	*/
-	void *data;
-	/**
-	Current position into the memory stream
-	*/
-	long current_position;
-};
-
-void SetDefaultIO(FreeImageIO *io);
-
-void SetMemoryIO(FreeImageIO *io);
-
-#endif // !FREEIMAGEIO_H
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp b/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp
deleted file mode 100644
index 53f12b1036..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp
+++ /dev/null
@@ -1,730 +0,0 @@
-// ==========================================================
-// Bitmap rotation using B-Splines
-//
-// Design and implementation by
-// - Philippe Thévenaz (philippe.thevenaz@epfl.ch)
-// Adaptation for FreeImage by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-/* 
-==========================================================
-This code was taken and adapted from the following reference : 
-
-[1] Philippe Thévenaz, Spline interpolation, a C source code 
-implementation. http://bigwww.epfl.ch/thevenaz/
-
-It implements ideas described in the following papers : 
-
-[2] Unser M., Splines: A Perfect Fit for Signal and Image Processing. 
-IEEE Signal Processing Magazine, vol. 16, no. 6, pp. 22-38, November 1999. 
-
-[3] Unser M., Aldroubi A., Eden M., B-Spline Signal Processing: Part I--Theory.
-IEEE Transactions on Signal Processing, vol. 41, no. 2, pp. 821-832, February 1993. 
-
-[4] Unser M., Aldroubi A., Eden M., B-Spline Signal Processing: Part II--Efficient Design and Applications.
-IEEE Transactions on Signal Processing, vol. 41, no. 2, pp. 834-848, February 1993.
-
-========================================================== 
-*/
-
-
-#include <float.h>
-#include "FreeImage.h"
-#include "Utilities.h"
-
-#define PI	((double)3.14159265358979323846264338327950288419716939937510)
-
-#define ROTATE_QUADRATIC 2L	// Use B-splines of degree 2 (quadratic interpolation)
-#define ROTATE_CUBIC     3L	// Use B-splines of degree 3 (cubic interpolation)
-#define ROTATE_QUARTIC   4L	// Use B-splines of degree 4 (quartic interpolation)
-#define ROTATE_QUINTIC   5L	// Use B-splines of degree 5 (quintic interpolation)
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Prototypes definition
-
-static void ConvertToInterpolationCoefficients(double *c, long DataLength, double *z, long NbPoles,	double Tolerance);
-static double InitialCausalCoefficient(double *c, long DataLength, double z, double Tolerance);
-static void GetColumn(double *Image, long Width, long x, double *Line, long Height);
-static void	GetRow(double *Image, long y, double *Line, long Width);
-static double InitialAntiCausalCoefficient(double *c, long DataLength, double z);
-static void	PutColumn(double *Image, long Width, long x, double *Line, long Height);
-static void	PutRow(double *Image, long y, double *Line, long Width);
-static bool SamplesToCoefficients(double *Image, long Width, long Height, long spline_degree);
-static double InterpolatedValue(double *Bcoeff, long Width, long Height, double x, double y, long spline_degree);
-
-static FIBITMAP * Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, long spline_degree, BOOL use_mask);
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Coefficients routines
-
-/**
- ConvertToInterpolationCoefficients
-
- @param c Input samples --> output coefficients
- @param DataLength Number of samples or coefficients
- @param z Poles
- @param NbPoles Number of poles
- @param Tolerance Admissible relative error
-*/
-static void 
-ConvertToInterpolationCoefficients(double *c, long DataLength, double *z, long NbPoles,	double Tolerance) {
-	double	Lambda = 1;
-	long	n, k;
-
-	// special case required by mirror boundaries
-	if(DataLength == 1L) {
-		return;
-	}
-	// compute the overall gain
-	for(k = 0L; k < NbPoles; k++) {
-		Lambda = Lambda * (1.0 - z[k]) * (1.0 - 1.0 / z[k]);
-	}
-	// apply the gain 
-	for (n = 0L; n < DataLength; n++) {
-		c[n] *= Lambda;
-	}
-	// loop over all poles 
-	for (k = 0L; k < NbPoles; k++) {
-		// causal initialization 
-		c[0] = InitialCausalCoefficient(c, DataLength, z[k], Tolerance);
-		// causal recursion 
-		for (n = 1L; n < DataLength; n++) {
-			c[n] += z[k] * c[n - 1L];
-		}
-		// anticausal initialization 
-		c[DataLength - 1L] = InitialAntiCausalCoefficient(c, DataLength, z[k]);
-		// anticausal recursion 
-		for (n = DataLength - 2L; 0 <= n; n--) {
-			c[n] = z[k] * (c[n + 1L] - c[n]);
-		}
-	}
-} 
-
-/**
- InitialCausalCoefficient
-
- @param c Coefficients
- @param DataLength Number of coefficients
- @param z Actual pole
- @param Tolerance Admissible relative error
- @return
-*/
-static double 
-InitialCausalCoefficient(double	*c, long DataLength, double	z, double Tolerance) {
-	double	Sum, zn, z2n, iz;
-	long	n, Horizon;
-
-	// this initialization corresponds to mirror boundaries 
-	Horizon = DataLength;
-	if(Tolerance > 0) {
-		Horizon = (long)ceil(log(Tolerance) / log(fabs(z)));
-	}
-	if(Horizon < DataLength) {
-		// accelerated loop
-		zn = z;
-		Sum = c[0];
-		for (n = 1L; n < Horizon; n++) {
-			Sum += zn * c[n];
-			zn *= z;
-		}
-		return(Sum);
-	}
-	else {
-		// full loop 
-		zn = z;
-		iz = 1.0 / z;
-		z2n = pow(z, (double)(DataLength - 1L));
-		Sum = c[0] + z2n * c[DataLength - 1L];
-		z2n *= z2n * iz;
-		for (n = 1L; n <= DataLength - 2L; n++) {
-			Sum += (zn + z2n) * c[n];
-			zn *= z;
-			z2n *= iz;
-		}
-		return(Sum / (1.0 - zn * zn));
-	}
-}
-
-/**
- GetColumn
-
- @param Image Input image array
- @param Width Width of the image
- @param x x coordinate of the selected line
- @param Line Output linear array
- @param Height Length of the line
-*/
-static void 
-GetColumn(double *Image, long Width, long x, double *Line, long Height) {
-	long y;
-
-	Image = Image + x;
-	for(y = 0L; y < Height; y++) {
-		Line[y] = (double)*Image;
-		Image += Width;
-	}
-}
-
-/**
- GetRow
-
- @param Image Input image array
- @param y y coordinate of the selected line
- @param Line Output linear array
- @param Width Length of the line
-*/
-static void	
-GetRow(double *Image, long y, double *Line, long Width) {
-	long	x;
-
-	Image = Image + (y * Width);
-	for(x = 0L; x < Width; x++) {
-		Line[x] = (double)*Image++;
-	}
-}
-
-/**
- InitialAntiCausalCoefficient
-
- @param c Coefficients
- @param DataLength Number of samples or coefficients
- @param z Actual pole
- @return
-*/
-static double 
-InitialAntiCausalCoefficient(double	*c, long DataLength, double	z) {
-	// this initialization corresponds to mirror boundaries
-	return((z / (z * z - 1.0)) * (z * c[DataLength - 2L] + c[DataLength - 1L]));
-}
-
-/**
- PutColumn
-
- @param Image Output image array
- @param Width Width of the image
- @param x x coordinate of the selected line
- @param Line Input linear array
- @param Height Length of the line and height of the image
-*/
-static void	
-PutColumn(double *Image, long Width, long x, double *Line, long Height) {
-	long	y;
-
-	Image = Image + x;
-	for(y = 0L; y < Height; y++) {
-		*Image = (double)Line[y];
-		Image += Width;
-	}
-}
-
-/**
- PutRow
-
- @param Image Output image array
- @param y y coordinate of the selected line
- @param Line Input linear array
- @param Width length of the line and width of the image
-*/
-static void	
-PutRow(double *Image, long y, double *Line, long Width) {
-	long	x;
-
-	Image = Image + (y * Width);
-	for(x = 0L; x < Width; x++) {
-		*Image++ = (double)Line[x];
-	}
-}
-
-/**
- SamplesToCoefficients.<br>
- Implement the algorithm that converts the image samples into B-spline coefficients. 
- This efficient procedure essentially relies on the three papers cited above; 
- data are processed in-place. 
- Even though this algorithm is robust with respect to quantization, 
- we advocate the use of a floating-point format for the data. 
-
- @param Image Input / Output image (in-place processing)
- @param Width Width of the image
- @param Height Height of the image
- @param spline_degree Degree of the spline model
- @return Returns true if success, false otherwise
-*/
-static bool	
-SamplesToCoefficients(double *Image, long Width, long Height, long spline_degree) {
-	double	*Line;
-	double	Pole[2];
-	long	NbPoles;
-	long	x, y;
-
-	// recover the poles from a lookup table
-	switch (spline_degree) {
-		case 2L:
-			NbPoles = 1L;
-			Pole[0] = sqrt(8.0) - 3.0;
-			break;
-		case 3L:
-			NbPoles = 1L;
-			Pole[0] = sqrt(3.0) - 2.0;
-			break;
-		case 4L:
-			NbPoles = 2L;
-			Pole[0] = sqrt(664.0 - sqrt(438976.0)) + sqrt(304.0) - 19.0;
-			Pole[1] = sqrt(664.0 + sqrt(438976.0)) - sqrt(304.0) - 19.0;
-			break;
-		case 5L:
-			NbPoles = 2L;
-			Pole[0] = sqrt(135.0 / 2.0 - sqrt(17745.0 / 4.0)) + sqrt(105.0 / 4.0)
-				- 13.0 / 2.0;
-			Pole[1] = sqrt(135.0 / 2.0 + sqrt(17745.0 / 4.0)) - sqrt(105.0 / 4.0)
-				- 13.0 / 2.0;
-			break;
-		default:
-			// Invalid spline degree
-			return false;
-	}
-
-	// convert the image samples into interpolation coefficients 
-
-	// in-place separable process, along x 
-	Line = (double *)malloc(Width * sizeof(double));
-	if (Line == NULL) {
-		// Row allocation failed
-		return false;
-	}
-	for (y = 0L; y < Height; y++) {
-		GetRow(Image, y, Line, Width);
-		ConvertToInterpolationCoefficients(Line, Width, Pole, NbPoles, DBL_EPSILON);
-		PutRow(Image, y, Line, Width);
-	}
-	free(Line);
-
-	// in-place separable process, along y 
-	Line = (double *)malloc(Height * sizeof(double));
-	if (Line == NULL) {
-		// Column allocation failed
-		return false;
-	}
-	for (x = 0L; x < Width; x++) {
-		GetColumn(Image, Width, x, Line, Height);
-		ConvertToInterpolationCoefficients(Line, Height, Pole, NbPoles, DBL_EPSILON);
-		PutColumn(Image, Width, x, Line, Height);
-	}
-	free(Line);
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Interpolation routines
-
-/**
-Perform the bidimensional interpolation of an image.
-Given an array of spline coefficients, return the value of 
-the underlying continuous spline model, sampled at the location (x, y). 
-The model degree can be 2 (quadratic), 3 (cubic), 4 (quartic), or 5 (quintic).
-
-@param Bcoeff Input B-spline array of coefficients
-@param Width Width of the image
-@param Height Height of the image
-@param x x coordinate where to interpolate
-@param y y coordinate where to interpolate
-@param spline_degree Degree of the spline model
-@return Returns the value of the underlying continuous spline model, 
-sampled at the location (x, y)
-*/
-static double 
-InterpolatedValue(double *Bcoeff, long Width, long Height, double x, double y, long spline_degree) {
-	double	*p;
-	double	xWeight[6], yWeight[6];
-	double	interpolated;
-	double	w, w2, w4, t, t0, t1;
-	long	xIndex[6], yIndex[6];
-	long	Width2 = 2L * Width - 2L, Height2 = 2L * Height - 2L;
-	long	i, j, k;
-
-	// compute the interpolation indexes
-	if (spline_degree & 1L) {
-		i = (long)floor(x) - spline_degree / 2L;
-		j = (long)floor(y) - spline_degree / 2L;
-		for(k = 0; k <= spline_degree; k++) {
-			xIndex[k] = i++;
-			yIndex[k] = j++;
-		}
-	}
-	else {
-		i = (long)floor(x + 0.5) - spline_degree / 2L;
-		j = (long)floor(y + 0.5) - spline_degree / 2L;
-		for (k = 0; k <= spline_degree; k++) {
-			xIndex[k] = i++;
-			yIndex[k] = j++;
-		}
-	}
-
-	// compute the interpolation weights
-	switch (spline_degree) {
-		case 2L:
-			/* x */
-			w = x - (double)xIndex[1];
-			xWeight[1] = 3.0 / 4.0 - w * w;
-			xWeight[2] = (1.0 / 2.0) * (w - xWeight[1] + 1.0);
-			xWeight[0] = 1.0 - xWeight[1] - xWeight[2];
-			/* y */
-			w = y - (double)yIndex[1];
-			yWeight[1] = 3.0 / 4.0 - w * w;
-			yWeight[2] = (1.0 / 2.0) * (w - yWeight[1] + 1.0);
-			yWeight[0] = 1.0 - yWeight[1] - yWeight[2];
-			break;
-		case 3L:
-			/* x */
-			w = x - (double)xIndex[1];
-			xWeight[3] = (1.0 / 6.0) * w * w * w;
-			xWeight[0] = (1.0 / 6.0) + (1.0 / 2.0) * w * (w - 1.0) - xWeight[3];
-			xWeight[2] = w + xWeight[0] - 2.0 * xWeight[3];
-			xWeight[1] = 1.0 - xWeight[0] - xWeight[2] - xWeight[3];
-			/* y */
-			w = y - (double)yIndex[1];
-			yWeight[3] = (1.0 / 6.0) * w * w * w;
-			yWeight[0] = (1.0 / 6.0) + (1.0 / 2.0) * w * (w - 1.0) - yWeight[3];
-			yWeight[2] = w + yWeight[0] - 2.0 * yWeight[3];
-			yWeight[1] = 1.0 - yWeight[0] - yWeight[2] - yWeight[3];
-			break;
-		case 4L:
-			/* x */
-			w = x - (double)xIndex[2];
-			w2 = w * w;
-			t = (1.0 / 6.0) * w2;
-			xWeight[0] = 1.0 / 2.0 - w;
-			xWeight[0] *= xWeight[0];
-			xWeight[0] *= (1.0 / 24.0) * xWeight[0];
-			t0 = w * (t - 11.0 / 24.0);
-			t1 = 19.0 / 96.0 + w2 * (1.0 / 4.0 - t);
-			xWeight[1] = t1 + t0;
-			xWeight[3] = t1 - t0;
-			xWeight[4] = xWeight[0] + t0 + (1.0 / 2.0) * w;
-			xWeight[2] = 1.0 - xWeight[0] - xWeight[1] - xWeight[3] - xWeight[4];
-			/* y */
-			w = y - (double)yIndex[2];
-			w2 = w * w;
-			t = (1.0 / 6.0) * w2;
-			yWeight[0] = 1.0 / 2.0 - w;
-			yWeight[0] *= yWeight[0];
-			yWeight[0] *= (1.0 / 24.0) * yWeight[0];
-			t0 = w * (t - 11.0 / 24.0);
-			t1 = 19.0 / 96.0 + w2 * (1.0 / 4.0 - t);
-			yWeight[1] = t1 + t0;
-			yWeight[3] = t1 - t0;
-			yWeight[4] = yWeight[0] + t0 + (1.0 / 2.0) * w;
-			yWeight[2] = 1.0 - yWeight[0] - yWeight[1] - yWeight[3] - yWeight[4];
-			break;
-		case 5L:
-			/* x */
-			w = x - (double)xIndex[2];
-			w2 = w * w;
-			xWeight[5] = (1.0 / 120.0) * w * w2 * w2;
-			w2 -= w;
-			w4 = w2 * w2;
-			w -= 1.0 / 2.0;
-			t = w2 * (w2 - 3.0);
-			xWeight[0] = (1.0 / 24.0) * (1.0 / 5.0 + w2 + w4) - xWeight[5];
-			t0 = (1.0 / 24.0) * (w2 * (w2 - 5.0) + 46.0 / 5.0);
-			t1 = (-1.0 / 12.0) * w * (t + 4.0);
-			xWeight[2] = t0 + t1;
-			xWeight[3] = t0 - t1;
-			t0 = (1.0 / 16.0) * (9.0 / 5.0 - t);
-			t1 = (1.0 / 24.0) * w * (w4 - w2 - 5.0);
-			xWeight[1] = t0 + t1;
-			xWeight[4] = t0 - t1;
-			/* y */
-			w = y - (double)yIndex[2];
-			w2 = w * w;
-			yWeight[5] = (1.0 / 120.0) * w * w2 * w2;
-			w2 -= w;
-			w4 = w2 * w2;
-			w -= 1.0 / 2.0;
-			t = w2 * (w2 - 3.0);
-			yWeight[0] = (1.0 / 24.0) * (1.0 / 5.0 + w2 + w4) - yWeight[5];
-			t0 = (1.0 / 24.0) * (w2 * (w2 - 5.0) + 46.0 / 5.0);
-			t1 = (-1.0 / 12.0) * w * (t + 4.0);
-			yWeight[2] = t0 + t1;
-			yWeight[3] = t0 - t1;
-			t0 = (1.0 / 16.0) * (9.0 / 5.0 - t);
-			t1 = (1.0 / 24.0) * w * (w4 - w2 - 5.0);
-			yWeight[1] = t0 + t1;
-			yWeight[4] = t0 - t1;
-			break;
-		default:
-			// Invalid spline degree
-			return 0;
-	}
-
-	// apply the mirror boundary conditions
-	for(k = 0; k <= spline_degree; k++) {
-		xIndex[k] = (Width == 1L) ? (0L) : ((xIndex[k] < 0L) ?
-			(-xIndex[k] - Width2 * ((-xIndex[k]) / Width2))
-			: (xIndex[k] - Width2 * (xIndex[k] / Width2)));
-		if (Width <= xIndex[k]) {
-			xIndex[k] = Width2 - xIndex[k];
-		}
-		yIndex[k] = (Height == 1L) ? (0L) : ((yIndex[k] < 0L) ?
-			(-yIndex[k] - Height2 * ((-yIndex[k]) / Height2))
-			: (yIndex[k] - Height2 * (yIndex[k] / Height2)));
-		if (Height <= yIndex[k]) {
-			yIndex[k] = Height2 - yIndex[k];
-		}
-	}
-
-	// perform interpolation
-	interpolated = 0.0;
-	for(j = 0; j <= spline_degree; j++) {
-		p = Bcoeff + (yIndex[j] * Width);
-		w = 0.0;
-		for(i = 0; i <= spline_degree; i++) {
-			w += xWeight[i] * p[xIndex[i]];
-		}
-		interpolated += yWeight[j] * w;
-	}
-
-	return interpolated;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// FreeImage implementation
-
-
-/** 
- Image translation and rotation using B-Splines.
-
- @param dib Input 8-bit greyscale image
- @param angle Output image rotation in degree
- @param x_shift Output image horizontal shift
- @param y_shift Output image vertical shift
- @param x_origin Output origin of the x-axis
- @param y_origin Output origin of the y-axis
- @param spline_degree Output degree of the B-spline model
- @param use_mask Whether or not to mask the image
- @return Returns the translated & rotated dib if successful, returns NULL otherwise
-*/
-static FIBITMAP * 
-Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, long spline_degree, BOOL use_mask) {
-	double	*ImageRasterArray;
-	double	p;
-	double	a11, a12, a21, a22;
-	double	x0, y0, x1, y1;
-	long	x, y;
-	long	spline;
-	bool	bResult;
-
-	int bpp = FreeImage_GetBPP(dib);
-	if(bpp != 8) {
-		return NULL;
-	}
-	
-	int width = FreeImage_GetWidth(dib);
-	int height = FreeImage_GetHeight(dib);
-	switch(spline_degree) {
-		case ROTATE_QUADRATIC:
-			spline = 2L;	// Use splines of degree 2 (quadratic interpolation)
-			break;
-		case ROTATE_CUBIC:
-			spline = 3L;	// Use splines of degree 3 (cubic interpolation)
-			break;
-		case ROTATE_QUARTIC:
-			spline = 4L;	// Use splines of degree 4 (quartic interpolation)
-			break;
-		case ROTATE_QUINTIC:
-			spline = 5L;	// Use splines of degree 5 (quintic interpolation)
-			break;
-		default:
-			spline = 3L;
-	}
-
-	// allocate output image
-	FIBITMAP *dst = FreeImage_Allocate(width, height, bpp);
-	if(!dst)
-		return NULL;
-	// buid a grey scale palette
-	RGBQUAD *pal = FreeImage_GetPalette(dst);
-	for(int i = 0; i < 256; i++) {
-		pal[i].rgbRed = pal[i].rgbGreen = pal[i].rgbBlue = (BYTE)i;
-	}
-
-	// allocate a temporary array
-	ImageRasterArray = (double*)malloc(width * height * sizeof(double));
-	if(!ImageRasterArray) {
-		FreeImage_Unload(dst);
-		return NULL;
-	}
-	// copy data samples
-	for(y = 0; y < height; y++) {
-		double *pImage = &ImageRasterArray[y*width];
-		BYTE *src_bits = FreeImage_GetScanLine(dib, height-1-y);
-
-		for(x = 0; x < width; x++) {
-			pImage[x] = (double)src_bits[x];
-		}
-	}
-
-	// convert between a representation based on image samples
-	// and a representation based on image B-spline coefficients
-	bResult = SamplesToCoefficients(ImageRasterArray, width, height, spline);
-	if(!bResult) {
-		FreeImage_Unload(dst);
-		free(ImageRasterArray);
-		return NULL;
-	}
-
-	// prepare the geometry
-	angle *= PI / 180.0;
-	a11 = cos(angle);
-	a12 = -sin(angle);
-	a21 = sin(angle);
-	a22 = cos(angle);
-	x0 = a11 * (x_shift + x_origin) + a12 * (y_shift + y_origin);
-	y0 = a21 * (x_shift + x_origin) + a22 * (y_shift + y_origin);
-	x_shift = x_origin - x0;
-	y_shift = y_origin - y0;
-
-	// visit all pixels of the output image and assign their value
-	for(y = 0; y < height; y++) {
-		BYTE *dst_bits = FreeImage_GetScanLine(dst, height-1-y);
-		
-		x0 = a12 * (double)y + x_shift;
-		y0 = a22 * (double)y + y_shift;
-
-		for(x = 0; x < width; x++) {
-			x1 = x0 + a11 * (double)x;
-			y1 = y0 + a21 * (double)x;
-			if(use_mask) {
-				if((x1 <= -0.5) || (((double)width - 0.5) <= x1) || (y1 <= -0.5) || (((double)height - 0.5) <= y1)) {
-					p = 0;
-				}
-				else {
-					p = (double)InterpolatedValue(ImageRasterArray, width, height, x1, y1, spline);
-				}
-			}
-			else {
-				p = (double)InterpolatedValue(ImageRasterArray, width, height, x1, y1, spline);
-			}
-			// clamp and convert to BYTE
-			dst_bits[x] = (BYTE)MIN(MAX((int)0, (int)(p + 0.5)), (int)255);
-		}
-	}
-
-	// free working array and return
-	free(ImageRasterArray);
-
-	return dst;
-}
-
-/** 
- Image rotation using a 3rd order (cubic) B-Splines.
-
- @param dib Input dib (8, 24 or 32-bit)
- @param angle Output image rotation
- @param x_shift Output image horizontal shift
- @param y_shift Output image vertical shift
- @param x_origin Output origin of the x-axis
- @param y_origin Output origin of the y-axis
- @param use_mask Whether or not to mask the image
- @return Returns the translated & rotated dib if successful, returns NULL otherwise
-*/
-FIBITMAP * DLL_CALLCONV 
-FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask) {
-
-	int x, y, bpp;
-	int channel, nb_channels;
-	BYTE *src_bits, *dst_bits;
-	FIBITMAP *src8 = NULL, *dst8 = NULL, *dst = NULL;
-
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	try {
-
-		bpp = FreeImage_GetBPP(dib);
-
-		if(bpp == 8) {
-			FIBITMAP *dst_8 = Rotate8Bit(dib, angle, x_shift, y_shift, x_origin, y_origin, ROTATE_CUBIC, use_mask);
-			if(dst_8) {
-				// copy metadata from src to dst
-				FreeImage_CloneMetadata(dst_8, dib);
-			}
-			return dst_8;
-		}
-		if((bpp == 24) || (bpp == 32)) {
-			// allocate dst image
-			int width  = FreeImage_GetWidth(dib);
-			int height = FreeImage_GetHeight(dib);
-			if( bpp == 24 ) {
-				dst = FreeImage_Allocate(width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-			} else {
-				dst = FreeImage_Allocate(width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-			}
-			if(!dst) throw(1);
-
-			// allocate a temporary 8-bit dib (no need to build a palette)
-			src8 = FreeImage_Allocate(width, height, 8);
-			if(!src8) throw(1);
-
-			// process each channel separately
-			// -------------------------------
-			nb_channels = (bpp / 8);
-
-			for(channel = 0; channel < nb_channels; channel++) {
-				// extract channel from source dib
-				for(y = 0; y < height; y++) {
-					src_bits = FreeImage_GetScanLine(dib, y);
-					dst_bits = FreeImage_GetScanLine(src8, y);
-					for(x = 0; x < width; x++) {
-						dst_bits[x] = src_bits[channel];
-						src_bits += nb_channels;
-					}
-				}
-
-				// process channel
-				dst8 = Rotate8Bit(src8, angle, x_shift, y_shift, x_origin, y_origin, ROTATE_CUBIC, use_mask);
-				if(!dst8) throw(1);
-
-				// insert channel to destination dib
-				for(y = 0; y < height; y++) {
-					src_bits = FreeImage_GetScanLine(dst8, y);
-					dst_bits = FreeImage_GetScanLine(dst, y);
-					for(x = 0; x < width; x++) {
-						dst_bits[channel] = src_bits[x];
-						dst_bits += nb_channels;
-					}
-				}
-
-				FreeImage_Unload(dst8);
-			}
-
-			FreeImage_Unload(src8);
-
-			// copy metadata from src to dst
-			FreeImage_CloneMetadata(dst, dib);
-			
-			return dst;
-		}
-	} catch(int) {
-		if(src8) FreeImage_Unload(src8);
-		if(dst8) FreeImage_Unload(dst8);
-		if(dst)  FreeImage_Unload(dst);
-	}
-
-	return NULL;
-}
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp
deleted file mode 100644
index 0e8fd76d1f..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp
+++ /dev/null
@@ -1,895 +0,0 @@
-// ==========================================================
-// Background filling routines
-//
-// Design and implementation by
-// - Carsten Klein (c.klein@datagis.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-/** @brief Determines, whether a palletized image is visually greyscale or not.
- 
- Unlike with FreeImage_GetColorType, which returns either FIC_MINISBLACK or
- FIC_MINISWHITE for a greyscale image with a linear ramp palette, the return  
- value of this function does not depend on the palette's order, but only on the
- palette's individual colors.
- @param dib The image to be tested.
- @return Returns TRUE if the palette of the image specified contains only
- greyscales, FALSE otherwise.
- */
-static BOOL
-IsVisualGreyscaleImage(FIBITMAP *dib) {
-
-	switch (FreeImage_GetBPP(dib)) {
-		case 1:
-		case 4:
-		case 8: {
-			unsigned ncolors = FreeImage_GetColorsUsed(dib);
-			RGBQUAD *rgb = FreeImage_GetPalette(dib);
-			for (unsigned i = 0; i< ncolors; i++) {
-				if ((rgb->rgbRed != rgb->rgbGreen) || (rgb->rgbRed != rgb->rgbBlue)) {
-					return FALSE;
-				}
-			}
-			return TRUE;
-		}
-		default: {
-			return (FreeImage_GetColorType(dib) == FIC_MINISBLACK);
-		}
-	}
-}
-
-/** @brief Looks up a specified color in a FIBITMAP's palette and returns the color's
- palette index or -1 if the color was not found.
-
- Unlike with FreeImage_GetColorType, which returns either FIC_MINISBLACK or
- FIC_MINISWHITE for a greyscale image with a linear ramp palette, the return
- value of this function does not depend on the palette's order, but only on the
- palette's individual colors.
- @param dib The image, whose palette should be searched through.
- @param color The color to be searched in the palette.
- @param options Options that affect the color search process.
- @param color_type A pointer, that optionally specifies the image's color type as
- returned by FreeImage_GetColorType. If invalid or NULL, this function determines the
- color type with FreeImage_GetColorType.
- @return Returns the specified color's palette index, the color's rgbReserved member
- if option FI_COLOR_ALPHA_IS_INDEX was specified or -1, if the color was not found
- in the image's palette or if the specified image is non-palletized.
- */
-static int
-GetPaletteIndex(FIBITMAP *dib, const RGBQUAD *color, int options, FREE_IMAGE_COLOR_TYPE *color_type) {
-	
-	int result = -1;
-	
-	if ((!dib) || (!color)) {
-		return result;
-	}
-	
-	int bpp = FreeImage_GetBPP(dib);
-
-	// First check trivial case: return color->rgbReserved if only
-	// FI_COLOR_ALPHA_IS_INDEX is set.
-	if ((options & FI_COLOR_ALPHA_IS_INDEX) == FI_COLOR_ALPHA_IS_INDEX) {
-		if (bpp == 1) {
-			return color->rgbReserved & 0x01;
-		} else if (bpp == 4) {
-			return color->rgbReserved & 0x0F;
-		}
-		return color->rgbReserved;
-	}
-	
-	if (bpp == 8) {
-		FREE_IMAGE_COLOR_TYPE ct =
-			(color_type == NULL || *color_type < 0) ?
-				FreeImage_GetColorType(dib) : *color_type;
-		if (ct == FIC_MINISBLACK) {
-			return GREY(color->rgbRed, color->rgbGreen, color->rgbBlue);
-		}
-		if (ct == FIC_MINISWHITE) {
-			return 255 - GREY(color->rgbRed, color->rgbGreen, color->rgbBlue);
-		}
-	} else if (bpp > 8) {
-		// for palettized images only
-		return result;
-	}
-
-	if (options & FI_COLOR_FIND_EQUAL_COLOR) {
-		
-		// Option FI_COLOR_ALPHA_IS_INDEX is implicit here so, set
-		// index to color->rgbReserved
-		result = color->rgbReserved;
-		if (bpp == 1) {
-			result &= 0x01;
-		} else if (bpp == 4) {
-			result &= 0x0F;
-		}		
-
-		unsigned ucolor;
-		if (!IsVisualGreyscaleImage(dib)) {
-			ucolor = (*((unsigned *)color)) & 0xFFFFFF;
-		} else {
-			ucolor = GREY(color->rgbRed, color->rgbGreen, color->rgbBlue) * 0x010101;
-			//ucolor = (ucolor | (ucolor << 8) | (ucolor << 16));
-		}
-		unsigned ncolors = FreeImage_GetColorsUsed(dib);
-		unsigned *palette = (unsigned *)FreeImage_GetPalette(dib);
-		for (unsigned i = 0; i < ncolors; i++) {
-			if ((palette[i] & 0xFFFFFF) == ucolor) {
-				result = i;
-				break;
-			}
-		}
-	} else {
-		unsigned minimum = UINT_MAX;
-		unsigned ncolors = FreeImage_GetColorsUsed(dib);
-		BYTE *palette = (BYTE *)FreeImage_GetPalette(dib);
-		BYTE red, green, blue;
-		if (!IsVisualGreyscaleImage(dib)) {
-			red = color->rgbRed;
-			green = color->rgbGreen;
-			blue = color->rgbBlue;
-		} else {
-			red = GREY(color->rgbRed, color->rgbGreen, color->rgbBlue);
-			green = blue = red;
-		}
-		for (unsigned i = 0; i < ncolors; i++) {
-			unsigned m = abs(palette[FI_RGBA_BLUE] - blue)
-					+ abs(palette[FI_RGBA_GREEN] - green)
-					+ abs(palette[FI_RGBA_RED] - red);
-			if (m < minimum) {
-				minimum = m;
-				result = i;
-				if (m == 0) {
-					break;
-				}
-			}
-			palette += sizeof(RGBQUAD);
-		}		
-	}
-	return result;
-}
-
-/** @brief Blends an alpha-transparent foreground color over an opaque background
- color.
- 
- This function blends the alpha-transparent foreground color fgcolor over the
- background color bgcolor. The background color is considered fully opaque,
- whatever it's alpha value contains, whereas the foreground color is considered
- to be a real RGBA color with an alpha value, which is used for the blend
- operation. The resulting color is returned through the blended parameter.
- @param bgcolor The background color for the blend operation.
- @param fgcolor The foreground color for the blend operation. This color's alpha
- value, stored in the rgbReserved member, is the alpha value used for the blend
- operation.
- @param blended This out parameter takes the blended color and so, returns it to
- the caller. This color's alpha value will be 0xFF (255) so, the blended color
- itself has no transparency. The this argument is not changed, if the function
- fails. 
- @return Returns TRUE on success, FALSE otherwise. This function fails if any of
- the color arguments is a null pointer.
- */
-static BOOL
-GetAlphaBlendedColor(const RGBQUAD *bgcolor, const RGBQUAD *fgcolor, RGBQUAD *blended) {
-	
-	if ((!bgcolor) || (!fgcolor) || (!blended)) {
-		return FALSE;
-	}
-	
-	BYTE alpha = fgcolor->rgbReserved;
-	BYTE not_alpha = ~alpha;
-	
-	blended->rgbRed   = (BYTE)( ((WORD)fgcolor->rgbRed   * alpha + not_alpha * (WORD)bgcolor->rgbRed)   >> 8 );
-	blended->rgbGreen = (BYTE)( ((WORD)fgcolor->rgbGreen * alpha + not_alpha * (WORD)bgcolor->rgbGreen) >> 8) ;
-	blended->rgbBlue  = (BYTE)( ((WORD)fgcolor->rgbBlue   * alpha + not_alpha * (WORD)bgcolor->rgbBlue)  >> 8 );
-	blended->rgbReserved = 0xFF;
-
-	return TRUE;
-}
-
-/** @brief Fills a FIT_BITMAP image with the specified color.
-
- This function does the dirty work for FreeImage_FillBackground for FIT_BITMAP
- images.
- @param dib The image to be filled.
- @param color The color, the specified image should be filled with.
- @param options Options that affect the color search process for palletized images.
- @return Returns TRUE on success, FALSE otherwise. This function fails if any of
- the dib and color is NULL or the provided image is not a FIT_BITMAP image.
- */
-static BOOL
-FillBackgroundBitmap(FIBITMAP *dib, const RGBQUAD *color, int options) {
-
-	if ((!dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return FALSE;;
-	}
-	
-	if (!color) {
-		return FALSE;
-	}
-	
-	const RGBQUAD *color_intl = color;
-	unsigned bpp = FreeImage_GetBPP(dib);
-	unsigned width = FreeImage_GetWidth(dib);
-	unsigned height = FreeImage_GetHeight(dib);
-	
-	FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-	
-	// get a pointer to the first scanline (bottom line)
-	BYTE *src_bits = FreeImage_GetScanLine(dib, 0);
-	BYTE *dst_bits = src_bits;	
-	
-	BOOL supports_alpha = ((bpp >= 24) || ((bpp == 8) && (color_type != FIC_PALETTE)));
-	
-	// Check for RGBA case if bitmap supports alpha 
-	// blending (8-bit greyscale, 24- or 32-bit images)
-	if (supports_alpha && (options & FI_COLOR_IS_RGBA_COLOR)) {
-		
-		if (color->rgbReserved == 0) {
-			// the fill color is fully transparent; we are done
-			return TRUE;
-		}
-		
-		// Only if the fill color is NOT fully opaque, draw it with
-		// the (much) slower FreeImage_DrawLine function and return.
-		// Since we do not have the FreeImage_DrawLine function in this
-		// release, just assume to have an unicolor background and fill
-		// all with an 'alpha-blended' color.
-		if (color->rgbReserved < 255) {
-							
-			// If we will draw on an unicolor background, it's
-			// faster to draw opaque with an alpha blended color.
-			// So, first get the color from the first pixel in the
-			// image (bottom-left pixel).
-			RGBQUAD bgcolor;
-			if (bpp == 8) {
-				bgcolor = FreeImage_GetPalette(dib)[*src_bits];
-			} else {	
-				bgcolor.rgbBlue = src_bits[FI_RGBA_BLUE];
-				bgcolor.rgbGreen = src_bits[FI_RGBA_GREEN];
-				bgcolor.rgbRed = src_bits[FI_RGBA_RED];
-				bgcolor.rgbReserved = 0xFF;
-			}
-			RGBQUAD blend;
-			GetAlphaBlendedColor(&bgcolor, color_intl, &blend);
-			color_intl = &blend;
-		}
-	}
-	
-	int index = (bpp <= 8) ? GetPaletteIndex(dib, color_intl, options, &color_type) : 0;
-	if (index == -1) {
-		// No palette index found for a palletized
-		// image. This should never happen...
-		return FALSE;
-	}
-	
-	// first, build the first scanline (line 0)
-	switch (bpp) {
-		case 1: {
-			unsigned bytes = (width / 8);
-			memset(dst_bits, ((index == 1) ? 0xFF : 0x00), bytes);
-			//int n = width % 8;
-			int n = width & 7;
-			if (n) {
-				if (index == 1) {
-					// set n leftmost bits
-					dst_bits[bytes] |= (0xFF << (8 - n));
-				} else {
-					// clear n leftmost bits
-					dst_bits[bytes] &= (0xFF >> n);
-				}
-			}
-			break;
-		}
-		case 4: {
-			unsigned bytes = (width / 2);
-			memset(dst_bits, (index | (index << 4)), bytes);
-			//if (bytes % 2) {
-			if (bytes & 1) {
-				dst_bits[bytes] &= 0x0F;
-				dst_bits[bytes] |= (index << 4);
-			}
-			break;
-		}
-		case 8: {
-			memset(dst_bits, index, FreeImage_GetLine(dib));
-			break;
-		}
-		case 16: {
-			WORD wcolor = RGBQUAD_TO_WORD(dib, color_intl);
-			for (unsigned x = 0; x < width; x++) {
-				((WORD *)dst_bits)[x] = wcolor;
-			}
-			break;
-		}
-		case 24: {
-			RGBTRIPLE rgbt = *((RGBTRIPLE *)color_intl);
-			for (unsigned x = 0; x < width; x++) {
-				((RGBTRIPLE *)dst_bits)[x] = rgbt;
-			}
-			break;
-		}
-		case 32: {
-			RGBQUAD rgbq;
-			rgbq.rgbBlue = ((RGBTRIPLE *)color_intl)->rgbtBlue;
-			rgbq.rgbGreen = ((RGBTRIPLE *)color_intl)->rgbtGreen;
-			rgbq.rgbRed = ((RGBTRIPLE *)color_intl)->rgbtRed;
-			rgbq.rgbReserved = 0xFF;
-			for (unsigned x = 0; x < width; x++) {
-				((RGBQUAD *)dst_bits)[x] = rgbq;
-			}
-			break;
-		}
-		default:
-			return FALSE;
-	}
-
-	// Then, copy the first scanline into all following scanlines.
-	// 'src_bits' is a pointer to the first scanline and is already
-	// set up correctly.
-	if (src_bits) {
-		unsigned pitch = FreeImage_GetPitch(dib);
-		unsigned bytes = FreeImage_GetLine(dib);
-		dst_bits = src_bits + pitch;
-		for (unsigned y = 1; y < height; y++) {
-			memcpy(dst_bits, src_bits, bytes);
-			dst_bits += pitch;
-		}
-	}
-	return TRUE;
-}
-
-/** @brief Fills an image with the specified color.
-
- This function sets all pixels of an image to the color provided through the color
- parameter. Since this should work for all image types supported by FreeImage, the
- pointer color must point to a memory location, which is at least as large as the
- image's color value, if this size is greater than 4 bytes. As the color is specified
- by an RGBQUAD structure for all images of type FIT_BITMAP (including all palletized
- images), the smallest possible size of this memory is the size of the RGBQUAD structure,
- which uses 4 bytes.
-
- So, color must point to a double, if the image to be filled is of type FIT_DOUBLE and
- point to a RGBF structure if the image is of type FIT_RGBF and so on.
-
- However, the fill color is always specified through a RGBQUAD structure for all images
- of type FIT_BITMAP. So, for 32- and 24-bit images, the red, green and blue members of
- the RGBQUAD structure are directly used for the image's red, green and blue channel
- respectively. Although alpha transparent RGBQUAD colors are supported, the alpha channel
- of a 32-bit image never gets modified by this function. A fill color with an alpha value
- smaller than 255 gets blended with the image's actual background color, which is determined
- from the image's bottom-left pixel. So, currently using alpha enabled colors, assumes the
- image to be unicolor before the fill operation. However, the RGBQUAD's rgbReserved member is
- only taken into account, if option FI_COLOR_IS_RGBA_COLOR has been specified.
-
- For 16-bit images, the red-, green- and blue components of the specified color are
- transparently translated into either the 16-bit 555 or 565 representation. This depends
- on the image's actual red- green- and blue masks.
-
- Special attention must be payed for palletized images. Generally, the RGB color specified
- is looked up in the image's palette. The found palette index is then used to fill the image.
- There are some option flags, that affect this lookup process:
-
- no option specified       (0x00)   Uses the color, that is nearest to the specified color.
-                                    This is the default behavior and should always find a
-                                    color in the palette. However, the visual result may
-                                    far from what was expected and mainly depends on the
-                                    image's palette.
-
- FI_COLOR_FIND_EQUAL_COLOR (0x02)	Searches the image's palette for the specified color
-                                    but only uses the returned palette index, if the specified
-                                    color exactly matches the palette entry. Of course,
-                                    depending on the image's actual palette entries, this
-                                    operation may fail. In this case, the function falls back
-                                    to option FI_COLOR_ALPHA_IS_INDEX and uses the RGBQUAD's
-                                    rgbReserved member (or its low nibble for 4-bit images
-                                    or its least significant bit (LSB) for 1-bit images) as
-                                    the palette index used for the fill operation.
-
- FI_COLOR_ALPHA_IS_INDEX   (0x04)   Does not perform any color lookup from the palette, but
-                                    uses the RGBQUAD's alpha channel member rgbReserved as
-                                    the palette index to be used for the fill operation.
-                                    However, for 4-bit images, only the low nibble of the
-                                    rgbReserved member are used and for 1-bit images, only
-                                    the least significant bit (LSB) is used.
-
- This function fails if any of dib and color is NULL.
-
- @param dib The image to be filled.
- @param color A pointer to the color value to be used for filling the image. The
- memory pointed to by this pointer is always assumed to be at least as large as the
- image's color value, but never smaller than the size of an RGBQUAD structure.
- @param options Options that affect the color search process for palletized images.
- @return Returns TRUE on success, FALSE otherwise. This function fails if any of
- dib and color is NULL.
- */
-BOOL DLL_CALLCONV
-FreeImage_FillBackground(FIBITMAP *dib, const void *color, int options) {
-
-	if (!FreeImage_HasPixels(dib)) {
-		return FALSE;
-	}
-	
-	if (!color) {
-		return FALSE;
-	}
-
-	// handle FIT_BITMAP images with FreeImage_FillBackground()
-	if (FreeImage_GetImageType(dib) == FIT_BITMAP) {
-		return FillBackgroundBitmap(dib, (RGBQUAD *)color, options);
-	}
-	
-	// first, construct the first scanline (bottom line)
-	unsigned bytespp = (FreeImage_GetBPP(dib) / 8);
-	BYTE *src_bits = FreeImage_GetScanLine(dib, 0);
-	BYTE *dst_bits = src_bits;
-	for (unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-		memcpy(dst_bits, color, bytespp);
-		dst_bits += bytespp;
-	}
-
-	// then, copy the first scanline into all following scanlines
-	unsigned height = FreeImage_GetHeight(dib);
-	unsigned pitch = FreeImage_GetPitch(dib);
-	unsigned bytes = FreeImage_GetLine(dib);
-	dst_bits = src_bits + pitch;
-	for (unsigned y = 1; y < height; y++) {
-		memcpy(dst_bits, src_bits, bytes);
-		dst_bits += pitch;
-	}
-	return TRUE;
-}
-
-/** @brief Allocates a new image of the specified type, width, height and bit depth and
- optionally fills it with the specified color.
-
- This function is an extension to FreeImage_AllocateT, which additionally supports specifying
- a palette to be set for the newly create image, as well as specifying a background color,
- the newly created image should initially be filled with.
-
- Basically, this function internally relies on function FreeImage_AllocateT, followed by a
- call to FreeImage_FillBackground. This is why both parameters color and options behave the
- same as it is documented for function FreeImage_FillBackground. So, please refer to the
- documentation of FreeImage_FillBackground to learn more about parameters color and options.
-
- The palette specified through parameter palette is only copied to the newly created
- image, if its image type is FIT_BITMAP and the desired bit depth is smaller than or equal
- to 8 bits per pixel. In other words, the palette parameter is only taken into account for
- palletized images. However, if the preceding conditions match and if palette is not NULL,
- the memory pointed to by the palette pointer is assumed to be at least as large as size
- of a fully populated palette for the desired bit depth. So, for an 8-bit image, this size
- is 256 x sizeof(RGBQUAD), for an 4-bit image it is 16 x sizeof(RGBQUAD) and it is
- 2 x sizeof(RGBQUAD) for a 1-bit image. In other words, this function does not support
- partial palettes.
-
- However, specifying a palette is not necessarily needed, even for palletized images. This
- function is capable of implicitly creating a palette, if parameter palette is NULL. If the
- specified background color is a greyscale value (red = green = blue) or if option
- FI_COLOR_ALPHA_IS_INDEX is specified, a greyscale palette is created. For a 1-bit image, only
- if the specified background color is either black or white, a monochrome palette, consisting
- of black and white only is created. In any case, the darker colors are stored at the smaller
- palette indices.
-
- If the specified background color is not a greyscale value, or is neither black nor white
- for a 1-bit image, solely this single color is injected into the otherwise black-initialized
- palette. For this operation, option FI_COLOR_ALPHA_IS_INDEX is implicit, so the specified
- color is applied to the palette entry, specified by the background color's rgbReserved
- member. The image is then filled with this palette index.
-
- This function returns a newly created image as function FreeImage_AllocateT does, if both
- parameters color and palette are NULL. If only color is NULL, the palette pointed to by
- parameter palette is initially set for the new image, if a palletized image of type
- FIT_BITMAP is created. However, in the latter case, this function returns an image, whose
- pixels are all initialized with zeros so, the image will be filled with the color of the
- first palette entry.
-
- @param type Specifies the image type of the new image.
- @param width The desired width in pixels of the new image.
- @param height The desired height in pixels of the new image.
- @param bpp The desired bit depth of the new image.
- @param color A pointer to the color value to be used for filling the image. The
- memory pointed to by this pointer is always assumed to be at least as large as the
- image's color value but never smaller than the size of an RGBQUAD structure.
- @param options Options that affect the color search process for palletized images.
- @param red_mask Specifies the bits used to store the red components of a pixel.
- @param green_mask Specifies the bits used to store the green components of a pixel.
- @param blue_mask Specifies the bits used to store the blue components of a pixel.
- @return Returns a pointer to a newly allocated image on success, NULL otherwise.
- */
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateExT(FREE_IMAGE_TYPE type, int width, int height, int bpp, const void *color, int options, const RGBQUAD *palette, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-
-	FIBITMAP *bitmap = FreeImage_AllocateT(type, width, height, bpp, red_mask, green_mask, blue_mask);
-	
-	if (!color) {
-		if ((palette) && (type == FIT_BITMAP) && (bpp <= 8)) {
-			memcpy(FreeImage_GetPalette(bitmap), palette, FreeImage_GetColorsUsed(bitmap) * sizeof(RGBQUAD));
-		}
-		return bitmap;
-	}
-
-	if (bitmap != NULL) {
-		
-		// Only fill the new bitmap if the specified color
-		// differs from "black", that is not all bytes of the
-		// color are equal to zero.
-		switch (bpp) {
-			case 1: {
-				// although 1-bit implies FIT_BITMAP, better get an unsigned 
-				// color and palette
-				unsigned *urgb = (unsigned *)color;
-				unsigned *upal = (unsigned *)FreeImage_GetPalette(bitmap);
-				RGBQUAD rgbq = RGBQUAD();
-
-				if (palette != NULL) {
-					// clone the specified palette
-					memcpy(FreeImage_GetPalette(bitmap), palette, 2 * sizeof(RGBQUAD));
-				} else if (options & FI_COLOR_ALPHA_IS_INDEX) {
-					CREATE_GREYSCALE_PALETTE(upal, 2);
-				} else {
-					// check, whether the specified color is either black or white
-					if ((*urgb & 0xFFFFFF) == 0x000000) {
-						// in any case build a FIC_MINISBLACK palette
-						CREATE_GREYSCALE_PALETTE(upal, 2);
-						color = &rgbq;
-					} else if ((*urgb & 0xFFFFFF) == 0xFFFFFF) {
-						// in any case build a FIC_MINISBLACK palette
-						CREATE_GREYSCALE_PALETTE(upal, 2);
-						rgbq.rgbReserved = 1;
-						color = &rgbq;
-					} else {
-						// Otherwise inject the specified color into the so far
-						// black-only palette. We use color->rgbReserved as the
-						// desired palette index.
-						BYTE index = ((RGBQUAD *)color)->rgbReserved & 0x01;
-						upal[index] = *urgb & 0x00FFFFFF;  
-					}
-					options |= FI_COLOR_ALPHA_IS_INDEX;
-				}
-				// and defer to FreeImage_FillBackground
-				FreeImage_FillBackground(bitmap, color, options);
-				break;
-			}
-			case 4: {
-				// 4-bit implies FIT_BITMAP so, get a RGBQUAD color
-				RGBQUAD *rgb = (RGBQUAD *)color;
-				RGBQUAD *pal = FreeImage_GetPalette(bitmap);
-				RGBQUAD rgbq = RGBQUAD();
-				
-				if (palette != NULL) {
-					// clone the specified palette
-					memcpy(pal, palette, 16 * sizeof(RGBQUAD));
-				} else if (options & FI_COLOR_ALPHA_IS_INDEX) {
-					CREATE_GREYSCALE_PALETTE(pal, 16);
-				} else {
-					// check, whether the specified color is a grey one
-					if ((rgb->rgbRed == rgb->rgbGreen) && (rgb->rgbRed == rgb->rgbBlue)) {
-						// if so, build a greyscale palette
-						CREATE_GREYSCALE_PALETTE(pal, 16);
-						rgbq.rgbReserved = rgb->rgbRed >> 4;
-						color = &rgbq;
-					} else {
-						// Otherwise inject the specified color into the so far
-						// black-only palette. We use color->rgbReserved as the
-						// desired palette index.
-						BYTE index = (rgb->rgbReserved & 0x0F);
-						((unsigned *)pal)[index] = *((unsigned *)rgb) & 0x00FFFFFF;
-					}
-					options |= FI_COLOR_ALPHA_IS_INDEX;
-				}
-				// and defer to FreeImage_FillBackground
-				FreeImage_FillBackground(bitmap, color, options);
-				break;
-			}
-			case 8: {
-				// 8-bit implies FIT_BITMAP so, get a RGBQUAD color
-				RGBQUAD *rgb = (RGBQUAD *)color;
-				RGBQUAD *pal = FreeImage_GetPalette(bitmap);
-				RGBQUAD rgbq;
-
-				if (palette != NULL) {
-					// clone the specified palette
-					memcpy(pal, palette, 256 * sizeof(RGBQUAD));
-				} else if (options & FI_COLOR_ALPHA_IS_INDEX) {
-					CREATE_GREYSCALE_PALETTE(pal, 256);
-				} else {
-					// check, whether the specified color is a grey one
-					if ((rgb->rgbRed == rgb->rgbGreen) && (rgb->rgbRed == rgb->rgbBlue)) {
-						// if so, build a greyscale palette
-						CREATE_GREYSCALE_PALETTE(pal, 256);
-						rgbq.rgbReserved = rgb->rgbRed;
-						color = &rgbq;
-					} else {
-						// Otherwise inject the specified color into the so far
-						// black-only palette. We use color->rgbReserved as the
-						// desired palette index.
-						BYTE index = rgb->rgbReserved;
-						((unsigned *)pal)[index] = *((unsigned *)rgb) & 0x00FFFFFF;  
-					}
-					options |= FI_COLOR_ALPHA_IS_INDEX;
-				}
-				// and defer to FreeImage_FillBackground
-				FreeImage_FillBackground(bitmap, color, options);
-				break;
-			}
-			case 16: {
-				WORD wcolor = (type == FIT_BITMAP) ?
-					RGBQUAD_TO_WORD(bitmap, ((RGBQUAD *)color)) : *((WORD *)color);
-				if (wcolor != 0) {
-					FreeImage_FillBackground(bitmap, color, options);
-				}
-				break;
-			}
-			default: {
-				int bytespp = bpp / 8;
-				for (int i = 0; i < bytespp; i++) {
-					if (((BYTE *)color)[i] != 0) {
-						FreeImage_FillBackground(bitmap, color, options);
-						break;
-					}
-				}
-				break;
-			}
-		}
-	}
-	return bitmap;
-}
-
-/** @brief Allocates a new image of the specified width, height and bit depth and optionally
- fills it with the specified color.
-
- This function is an extension to FreeImage_Allocate, which additionally supports specifying
- a palette to be set for the newly create image, as well as specifying a background color,
- the newly created image should initially be filled with.
-
- Basically, this function internally relies on function FreeImage_Allocate, followed by a
- call to FreeImage_FillBackground. This is why both parameters color and options behave the
- same as it is documented for function FreeImage_FillBackground. So, please refer to the
- documentation of FreeImage_FillBackground to learn more about parameters color and options.
-
- The palette specified through parameter palette is only copied to the newly created
- image, if the desired bit depth is smaller than or equal to 8 bits per pixel. In other words,
- the palette parameter is only taken into account for palletized images. However, if the
- image to be created is a palletized image and if palette is not NULL, the memory pointed to
- by the palette pointer is assumed to be at least as large as size of a fully populated
- palette for the desired bit depth. So, for an 8-bit image, this size is 256 x sizeof(RGBQUAD),
- for an 4-bit image it is 16 x sizeof(RGBQUAD) and it is 2 x sizeof(RGBQUAD) for a 1-bit
- image. In other words, this function does not support partial palettes.
-
- However, specifying a palette is not necessarily needed, even for palletized images. This
- function is capable of implicitly creating a palette, if parameter palette is NULL. If the
- specified background color is a greyscale value (red = green = blue) or if option
- FI_COLOR_ALPHA_IS_INDEX is specified, a greyscale palette is created. For a 1-bit image, only
- if the specified background color is either black or white, a monochrome palette, consisting
- of black and white only is created. In any case, the darker colors are stored at the smaller
- palette indices.
-
- If the specified background color is not a greyscale value, or is neither black nor white
- for a 1-bit image, solely this single color is injected into the otherwise black-initialized
- palette. For this operation, option FI_COLOR_ALPHA_IS_INDEX is implicit, so the specified
- color is applied to the palette entry, specified by the background color's rgbReserved
- member. The image is then filled with this palette index.
-
- This function returns a newly created image as function FreeImage_Allocate does, if both
- parameters color and palette are NULL. If only color is NULL, the palette pointed to by
- parameter palette is initially set for the new image, if a palletized image of type
- FIT_BITMAP is created. However, in the latter case, this function returns an image, whose
- pixels are all initialized with zeros so, the image will be filled with the color of the
- first palette entry.
-
- @param width The desired width in pixels of the new image.
- @param height The desired height in pixels of the new image.
- @param bpp The desired bit depth of the new image.
- @param color A pointer to an RGBQUAD structure, that provides the color to be used for
- filling the image.
- @param options Options that affect the color search process for palletized images.
- @param red_mask Specifies the bits used to store the red components of a pixel.
- @param green_mask Specifies the bits used to store the green components of a pixel.
- @param blue_mask Specifies the bits used to store the blue components of a pixel.
- @return Returns a pointer to a newly allocated image on success, NULL otherwise.
- */
-FIBITMAP * DLL_CALLCONV
-FreeImage_AllocateEx(int width, int height, int bpp, const RGBQUAD *color, int options, const RGBQUAD *palette, unsigned red_mask, unsigned green_mask, unsigned blue_mask) {
-	return FreeImage_AllocateExT(FIT_BITMAP, width, height, bpp, ((void *)color), options, palette, red_mask, green_mask, blue_mask);
-}
-
-/** @brief Enlarges or shrinks an image selectively per side and fills newly added areas
- with the specified background color.
-
- This function enlarges or shrinks an image selectively per side. The main purpose of this
- function is to add borders to an image. To add a border to any of the image's sides, a
- positive integer value must be passed in any of the parameters left, top, right or bottom.
- This value represents the border's width in pixels. Newly created parts of the image (the
- border areas) are filled with the specified color. Specifying a negative integer value for
- a certain side, will shrink or crop the image on this side. Consequently, specifying zero
- for a certain side will not change the image's extension on that side.
-
- So, calling this function with all parameters left, top, right and bottom set to zero, is
- effectively the same as calling function FreeImage_Clone; setting all parameters left, top,
- right and bottom to value equal to or smaller than zero, my easily be substituted by a call
- to function FreeImage_Copy. Both these cases produce a new image, which is guaranteed not to
- be larger than the input image. Thus, since the specified color is not needed in these cases,
- the pointer color may be NULL.
-
- Both parameters color and options work according to function FreeImage_FillBackground. So,
- please refer to the documentation of FreeImage_FillBackground to learn more about parameters
- color and options. For palletized images, the palette of the input image src is
- transparently copied to the newly created enlarged or shrunken image, so any color
- look-ups are performed on this palette.
-
- Here are some examples, that illustrate, how to use the parameters left, top, right and
- bottom:
-
- // create a white color
- RGBQUAD c;
- c.rgbRed = 0xFF;
- c.rgbGreen = 0xFF;
- c.rgbBlue = 0xFF;
- c.rgbReserved = 0x00;
-
- // add a white, symmetric 10 pixel wide border to the image
- dib2 = FreeImage_EnlargeCanvas(dib, 10, 10, 10, 10, &c, FI_COLOR_IS_RGB_COLOR);
-
- // add white, 20 pixel wide stripes to the top and bottom side of the image
- dib3 = FreeImage_EnlargeCanvas(dib, 0, 20, 0, 20, &c, FI_COLOR_IS_RGB_COLOR);
-
- // add white, 30 pixel wide stripes to the right side of the image and
- // cut off the 40 leftmost pixel columns
- dib3 = FreeImage_EnlargeCanvas(dib, -40, 0, 30, 0, &c, FI_COLOR_IS_RGB_COLOR);
-
- This function fails if either the input image is NULL or the pointer to the color is
- NULL, while at least on of left, top, right and bottom is greater than zero. This
- function also returns NULL, if the new image's size will be negative in either x- or
- y-direction.
-
- @param dib The image to be enlarged or shrunken.
- @param left The number of pixels, the image should be enlarged on its left side. Negative
- values shrink the image on its left side.
- @param top The number of pixels, the image should be enlarged on its top side. Negative
- values shrink the image on its top side.
- @param right The number of pixels, the image should be enlarged on its right side. Negative
- values shrink the image on its right side.
- @param bottom The number of pixels, the image should be enlarged on its bottom side. Negative
- values shrink the image on its bottom side.
- @param color The color, the enlarged sides of the image should be filled with.
- @param options Options that affect the color search process for palletized images.
- @return Returns a pointer to a newly allocated enlarged or shrunken image on success,
- NULL otherwise. This function fails if either the input image is NULL or the pointer to the
- color is NULL, while at least on of left, top, right and bottom is greater than zero. This
- function also returns NULL, if the new image's size will be negative in either x- or
- y-direction.
- */
-FIBITMAP * DLL_CALLCONV
-FreeImage_EnlargeCanvas(FIBITMAP *src, int left, int top, int right, int bottom, const void *color, int options) {
-
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	// Just return a clone of the image, if left, top, right and bottom are
-	// all zero.
-	if ((left == 0) && (right == 0) && (top == 0) && (bottom == 0)) {
-		return FreeImage_Clone(src);
-	}
-
-	int width = FreeImage_GetWidth(src);
-	int height = FreeImage_GetHeight(src);
-
-	// Relay on FreeImage_Copy, if all parameters left, top, right and
-	// bottom are smaller than or equal zero. The color pointer may be
-	// NULL in this case.
-	if ((left <= 0) && (right <= 0) && (top <= 0) && (bottom <= 0)) {
-		return FreeImage_Copy(src, -left, -top,	width + right, height + bottom);
-	}
-
-	// From here, we need a valid color, since the image will be enlarged on
-	// at least one side. So, fail if we don't have a valid color pointer.
-	if (!color) {
-		return NULL;
-	}
-
-	if (((left < 0) && (-left >= width)) || ((right < 0) && (-right >= width)) ||
-		((top < 0) && (-top >= height)) || ((bottom < 0) && (-bottom >= height))) {
-		return NULL;
-	}
-
-	unsigned newWidth = width + left + right;
-	unsigned newHeight = height + top + bottom;
-
-	FREE_IMAGE_TYPE type = FreeImage_GetImageType(src);
-	unsigned bpp = FreeImage_GetBPP(src);
-
-	FIBITMAP *dst = FreeImage_AllocateExT(
-		type, newWidth, newHeight, bpp, color, options,
-		FreeImage_GetPalette(src),
-		FreeImage_GetRedMask(src),
-		FreeImage_GetGreenMask(src),
-		FreeImage_GetBlueMask(src));
-
-	if (!dst) {
-		return NULL;
-	}
-
-	if ((type == FIT_BITMAP) && (bpp <= 4)) {
-		FIBITMAP *copy = FreeImage_Copy(src,
-			((left >= 0) ? 0 : -left),
-			((top >= 0) ? 0 : -top),
-			((width+right)>width)?width:(width+right),
-			((height+bottom)>height)?height:(height+bottom));
-		
-		if (!copy) {
-			FreeImage_Unload(dst);
-			return NULL;
-		}
-
-		if (!FreeImage_Paste(dst, copy,
-				((left <= 0) ? 0 : left),
-				((top <= 0) ? 0 : top), 256)) {
-			FreeImage_Unload(copy);
-			FreeImage_Unload(dst);
-			return NULL;
-		}
-
-		FreeImage_Unload(copy);
-
-	} else {
-
-		int bytespp = bpp / 8;
-		BYTE *srcPtr = FreeImage_GetScanLine(src, height - 1 - ((top >= 0) ? 0 : -top));
-		BYTE *dstPtr = FreeImage_GetScanLine(dst, newHeight - 1 - ((top <= 0) ? 0 : top));
-
-		unsigned srcPitch = FreeImage_GetPitch(src);
-		unsigned dstPitch = FreeImage_GetPitch(dst);
-
-		int lineWidth = bytespp * (width + MIN(0, left) + MIN(0, right));
-		int lines = height + MIN(0, top) + MIN(0, bottom);
-
-		if (left <= 0) {
-			srcPtr += (-left * bytespp);
-		} else {
-			dstPtr += (left * bytespp);
-		}
-
-		for (int i = 0; i < lines; i++) {
-			memcpy(dstPtr, srcPtr, lineWidth);
-			srcPtr -= srcPitch;
-			dstPtr -= dstPitch;
-		}
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-	
-	// copy transparency table 
-	FreeImage_SetTransparencyTable(dst, FreeImage_GetTransparencyTable(src), FreeImage_GetTransparencyCount(src));
-	
-	// copy background color 
-	RGBQUAD bkcolor; 
-	if( FreeImage_GetBackgroundColor(src, &bkcolor) ) {
-		FreeImage_SetBackgroundColor(dst, &bkcolor); 
-	}
-	
-	// clone resolution 
-	FreeImage_SetDotsPerMeterX(dst, FreeImage_GetDotsPerMeterX(src)); 
-	FreeImage_SetDotsPerMeterY(dst, FreeImage_GetDotsPerMeterY(src)); 
-	
-	// clone ICC profile 
-	FIICCPROFILE *src_profile = FreeImage_GetICCProfile(src); 
-	FIICCPROFILE *dst_profile = FreeImage_CreateICCProfile(dst, src_profile->data, src_profile->size); 
-	dst_profile->flags = src_profile->flags; 
-
-	return dst;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp
deleted file mode 100644
index cc31a4bfe3..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// ==========================================================
-// Channel processing support
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-
-/** @brief Retrieves the red, green, blue or alpha channel of a BGR[A] image. 
-@param src Input image to be processed.
-@param channel Color channel to extract
-@return Returns the extracted channel if successful, returns NULL otherwise.
-*/
-FIBITMAP * DLL_CALLCONV 
-FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) {
-
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-	unsigned bpp = FreeImage_GetBPP(src);
-
-	// 24- or 32-bit 
-	if(image_type == FIT_BITMAP && ((bpp == 24) || (bpp == 32))) {
-		int c;
-
-		// select the channel to extract
-		switch(channel) {
-			case FICC_BLUE:
-				c = FI_RGBA_BLUE;
-				break;
-			case FICC_GREEN:
-				c = FI_RGBA_GREEN;
-				break;
-			case FICC_RED: 
-				c = FI_RGBA_RED;
-				break;
-			case FICC_ALPHA:
-				if(bpp != 32) return NULL;
-				c = FI_RGBA_ALPHA;
-				break;
-			default:
-				return NULL;
-		}
-
-		// allocate a 8-bit dib
-		unsigned width  = FreeImage_GetWidth(src);
-		unsigned height = FreeImage_GetHeight(src);
-		FIBITMAP *dst = FreeImage_Allocate(width, height, 8) ;
-		if(!dst) return NULL;
-		// build a greyscale palette
-		RGBQUAD *pal = FreeImage_GetPalette(dst);
-		for(int i = 0; i < 256; i++) {
-			pal[i].rgbBlue = pal[i].rgbGreen = pal[i].rgbRed = (BYTE)i;
-		}
-
-		// perform extraction
-
-		int bytespp = bpp / 8;	// bytes / pixel
-
-		for(unsigned y = 0; y < height; y++) {
-			BYTE *src_bits = FreeImage_GetScanLine(src, y);
-			BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < width; x++) {
-				dst_bits[x] = src_bits[c];
-				src_bits += bytespp;
-			}
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-		
-		return dst;
-	}
-
-	// 48-bit RGB or 64-bit RGBA images
-	if((image_type == FIT_RGB16) ||  (image_type == FIT_RGBA16)) {
-		int c;
-
-		// select the channel to extract (always RGB[A])
-		switch(channel) {
-			case FICC_BLUE:
-				c = 2;
-				break;
-			case FICC_GREEN:
-				c = 1;
-				break;
-			case FICC_RED: 
-				c = 0;
-				break;
-			case FICC_ALPHA:
-				if(bpp != 64) return NULL;
-				c = 3;
-				break;
-			default:
-				return NULL;
-		}
-
-		// allocate a greyscale dib
-		unsigned width  = FreeImage_GetWidth(src);
-		unsigned height = FreeImage_GetHeight(src);
-		FIBITMAP *dst = FreeImage_AllocateT(FIT_UINT16, width, height) ;
-		if(!dst) return NULL;
-
-		// perform extraction
-
-		int bytespp = bpp / 16;	// words / pixel
-
-		for(unsigned y = 0; y < height; y++) {
-			unsigned short *src_bits = (unsigned short*)FreeImage_GetScanLine(src, y);
-			unsigned short *dst_bits = (unsigned short*)FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < width; x++) {
-				dst_bits[x] = src_bits[c];
-				src_bits += bytespp;
-			}
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-		
-		return dst;
-	}
-
-	// 96-bit RGBF or 128-bit RGBAF images
-	if((image_type == FIT_RGBF) ||  (image_type == FIT_RGBAF)) {
-		int c;
-
-		// select the channel to extract (always RGB[A])
-		switch(channel) {
-			case FICC_BLUE:
-				c = 2;
-				break;
-			case FICC_GREEN:
-				c = 1;
-				break;
-			case FICC_RED: 
-				c = 0;
-				break;
-			case FICC_ALPHA:
-				if(bpp != 128) return NULL;
-				c = 3;
-				break;
-			default:
-				return NULL;
-		}
-
-		// allocate a greyscale dib
-		unsigned width  = FreeImage_GetWidth(src);
-		unsigned height = FreeImage_GetHeight(src);
-		FIBITMAP *dst = FreeImage_AllocateT(FIT_FLOAT, width, height) ;
-		if(!dst) return NULL;
-
-		// perform extraction
-
-		int bytespp = bpp / 32;	// floats / pixel
-
-		for(unsigned y = 0; y < height; y++) {
-			float *src_bits = (float*)FreeImage_GetScanLine(src, y);
-			float *dst_bits = (float*)FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < width; x++) {
-				dst_bits[x] = src_bits[c];
-				src_bits += bytespp;
-			}
-		}
-
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-		
-		return dst;
-	}
-
-	return NULL;
-}
-
-/** @brief Insert a greyscale dib into a RGB[A] image. 
-Both src and dst must have the same width and height.
-@param dst Image to modify (RGB or RGBA)
-@param src Input greyscale image to insert
-@param channel Color channel to modify
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) {
-	int c;
-
-	if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE;
-	
-	// src and dst images should have the same width and height
-	unsigned src_width  = FreeImage_GetWidth(src);
-	unsigned src_height = FreeImage_GetHeight(src);
-	unsigned dst_width  = FreeImage_GetWidth(dst);
-	unsigned dst_height = FreeImage_GetHeight(dst);
-	if((src_width != dst_width) || (src_height != dst_height))
-		return FALSE;
-
-	// src image should be grayscale, dst image should be RGB or RGBA
-	FREE_IMAGE_COLOR_TYPE src_type = FreeImage_GetColorType(src);
-	FREE_IMAGE_COLOR_TYPE dst_type = FreeImage_GetColorType(dst);
-	if((dst_type != FIC_RGB) && (dst_type != FIC_RGBALPHA) || (src_type != FIC_MINISBLACK)) {
-		return FALSE;
-	}
-
-	FREE_IMAGE_TYPE src_image_type = FreeImage_GetImageType(src);
-	FREE_IMAGE_TYPE dst_image_type = FreeImage_GetImageType(dst);
-
-	if((dst_image_type == FIT_BITMAP) && (src_image_type == FIT_BITMAP)) {
-
-		// src image should be grayscale, dst image should be 24- or 32-bit
-		unsigned src_bpp = FreeImage_GetBPP(src);
-		unsigned dst_bpp = FreeImage_GetBPP(dst);
-		if((src_bpp != 8) || (dst_bpp != 24) && (dst_bpp != 32))
-			return FALSE;
-
-
-		// select the channel to modify
-		switch(channel) {
-			case FICC_BLUE:
-				c = FI_RGBA_BLUE;
-				break;
-			case FICC_GREEN:
-				c = FI_RGBA_GREEN;
-				break;
-			case FICC_RED: 
-				c = FI_RGBA_RED;
-				break;
-			case FICC_ALPHA:
-				if(dst_bpp != 32) return FALSE;
-				c = FI_RGBA_ALPHA;
-				break;
-			default:
-				return FALSE;
-		}
-
-		// perform insertion
-
-		int bytespp = dst_bpp / 8;	// bytes / pixel
-
-		for(unsigned y = 0; y < dst_height; y++) {
-			BYTE *src_bits = FreeImage_GetScanLine(src, y);
-			BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < dst_width; x++) {
-				dst_bits[c] = src_bits[x];
-				dst_bits += bytespp;
-			}
-		}
-
-		return TRUE;
-	}
-
-	if(((dst_image_type == FIT_RGB16) || (dst_image_type == FIT_RGBA16)) && (src_image_type == FIT_UINT16)) {
-
-		// src image should be grayscale, dst image should be 48- or 64-bit
-		unsigned src_bpp = FreeImage_GetBPP(src);
-		unsigned dst_bpp = FreeImage_GetBPP(dst);
-		if((src_bpp != 16) || (dst_bpp != 48) && (dst_bpp != 64))
-			return FALSE;
-
-
-		// select the channel to modify (always RGB[A])
-		switch(channel) {
-			case FICC_BLUE:
-				c = 2;
-				break;
-			case FICC_GREEN:
-				c = 1;
-				break;
-			case FICC_RED: 
-				c = 0;
-				break;
-			case FICC_ALPHA:
-				if(dst_bpp != 64) return FALSE;
-				c = 3;
-				break;
-			default:
-				return FALSE;
-		}
-
-		// perform insertion
-
-		int bytespp = dst_bpp / 16;	// words / pixel
-
-		for(unsigned y = 0; y < dst_height; y++) {
-			unsigned short *src_bits = (unsigned short*)FreeImage_GetScanLine(src, y);
-			unsigned short *dst_bits = (unsigned short*)FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < dst_width; x++) {
-				dst_bits[c] = src_bits[x];
-				dst_bits += bytespp;
-			}
-		}
-
-		return TRUE;
-	}
-	
-	if(((dst_image_type == FIT_RGBF) || (dst_image_type == FIT_RGBAF)) && (src_image_type == FIT_FLOAT)) {
-
-		// src image should be grayscale, dst image should be 96- or 128-bit
-		unsigned src_bpp = FreeImage_GetBPP(src);
-		unsigned dst_bpp = FreeImage_GetBPP(dst);
-		if((src_bpp != 32) || (dst_bpp != 96) && (dst_bpp != 128))
-			return FALSE;
-
-
-		// select the channel to modify (always RGB[A])
-		switch(channel) {
-			case FICC_BLUE:
-				c = 2;
-				break;
-			case FICC_GREEN:
-				c = 1;
-				break;
-			case FICC_RED: 
-				c = 0;
-				break;
-			case FICC_ALPHA:
-				if(dst_bpp != 128) return FALSE;
-				c = 3;
-				break;
-			default:
-				return FALSE;
-		}
-
-		// perform insertion
-
-		int bytespp = dst_bpp / 32;	// floats / pixel
-
-		for(unsigned y = 0; y < dst_height; y++) {
-			float *src_bits = (float*)FreeImage_GetScanLine(src, y);
-			float *dst_bits = (float*)FreeImage_GetScanLine(dst, y);
-			for(unsigned x = 0; x < dst_width; x++) {
-				dst_bits[c] = src_bits[x];
-				dst_bits += bytespp;
-			}
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/** @brief Retrieves the real part, imaginary part, magnitude or phase of a complex image.
-@param src Input image to be processed.
-@param channel Channel to extract
-@return Returns the extracted channel if successful, returns NULL otherwise.
-*/
-FIBITMAP * DLL_CALLCONV 
-FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) {
-	unsigned x, y;
-	double mag, phase;
-	FICOMPLEX *src_bits = NULL;
-	double *dst_bits = NULL;
-	FIBITMAP *dst = NULL;
-
-	if(!FreeImage_HasPixels(src)) return NULL;
-
-	if(FreeImage_GetImageType(src) == FIT_COMPLEX) {
-		// allocate a dib of type FIT_DOUBLE
-		unsigned width  = FreeImage_GetWidth(src);
-		unsigned height = FreeImage_GetHeight(src);
-		dst = FreeImage_AllocateT(FIT_DOUBLE, width, height) ;
-		if(!dst) return NULL;
-
-		// perform extraction
-
-		switch(channel) {
-			case FICC_REAL: // real part
-				for(y = 0; y < height; y++) {
-					src_bits = (FICOMPLEX *)FreeImage_GetScanLine(src, y);
-					dst_bits = (double *)FreeImage_GetScanLine(dst, y);
-					for(x = 0; x < width; x++) {
-						dst_bits[x] = src_bits[x].r;
-					}
-				}
-				break;
-
-			case FICC_IMAG: // imaginary part
-				for(y = 0; y < height; y++) {
-					src_bits = (FICOMPLEX *)FreeImage_GetScanLine(src, y);
-					dst_bits = (double *)FreeImage_GetScanLine(dst, y);
-					for(x = 0; x < width; x++) {
-						dst_bits[x] = src_bits[x].i;
-					}
-				}
-				break;
-
-			case FICC_MAG: // magnitude
-				for(y = 0; y < height; y++) {
-					src_bits = (FICOMPLEX *)FreeImage_GetScanLine(src, y);
-					dst_bits = (double *)FreeImage_GetScanLine(dst, y);
-					for(x = 0; x < width; x++) {
-						mag = src_bits[x].r * src_bits[x].r + src_bits[x].i * src_bits[x].i;
-						dst_bits[x] = sqrt(mag);
-					}
-				}
-				break;
-
-			case FICC_PHASE: // phase
-				for(y = 0; y < height; y++) {
-					src_bits = (FICOMPLEX *)FreeImage_GetScanLine(src, y);
-					dst_bits = (double *)FreeImage_GetScanLine(dst, y);
-					for(x = 0; x < width; x++) {
-						if((src_bits[x].r == 0) && (src_bits[x].i == 0)) {
-							phase = 0;
-						} else {
-							phase = atan2(src_bits[x].i, src_bits[x].r);
-						}
-						dst_bits[x] = phase;
-					}
-				}
-				break;
-		}
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-	
-	return dst;
-}
-
-/** @brief Set the real or imaginary part of a complex image.
-Both src and dst must have the same width and height.
-@param dst Image to modify (image of type FIT_COMPLEX)
-@param src Input image of type FIT_DOUBLE
-@param channel Channel to modify
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) {
-	unsigned x, y;
-	double *src_bits = NULL;
-	FICOMPLEX *dst_bits = NULL;
-
-	if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE;
-
-	// src image should be of type FIT_DOUBLE, dst image should be of type FIT_COMPLEX
-	const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(src);
-	const FREE_IMAGE_TYPE dst_type = FreeImage_GetImageType(dst);
-	if((src_type != FIT_DOUBLE) || (dst_type != FIT_COMPLEX))
-		return FALSE;
-
-	// src and dst images should have the same width and height
-	unsigned src_width  = FreeImage_GetWidth(src);
-	unsigned src_height = FreeImage_GetHeight(src);
-	unsigned dst_width  = FreeImage_GetWidth(dst);
-	unsigned dst_height = FreeImage_GetHeight(dst);
-	if((src_width != dst_width) || (src_height != dst_height))
-		return FALSE;
-
-	// select the channel to modify
-	switch(channel) {
-		case FICC_REAL: // real part
-			for(y = 0; y < dst_height; y++) {
-				src_bits = (double *)FreeImage_GetScanLine(src, y);
-				dst_bits = (FICOMPLEX *)FreeImage_GetScanLine(dst, y);
-				for(x = 0; x < dst_width; x++) {
-					dst_bits[x].r = src_bits[x];
-				}
-			}
-			break;
-		case FICC_IMAG: // imaginary part
-			for(y = 0; y < dst_height; y++) {
-				src_bits = (double *)FreeImage_GetScanLine(src, y);
-				dst_bits = (FICOMPLEX *)FreeImage_GetScanLine(dst, y);
-				for(x = 0; x < dst_width; x++) {
-					dst_bits[x].i = src_bits[x];
-				}
-			}
-			break;
-	}
-
-	return TRUE;
-}
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp b/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp
deleted file mode 100644
index 2e561d4877..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-// ==========================================================
-// Bitmap rotation by means of 3 shears.
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Thorsten Radde (support@IdealSoftware.com)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-/* 
- ============================================================
- References : 
- [1] Paeth A., A Fast Algorithm for General Raster Rotation. 
- Graphics Gems, p. 179, Andrew Glassner editor, Academic Press, 1990. 
- [2] Yariv E., High quality image rotation (rotate by shear). 
- [Online] http://www.codeproject.com/bitmap/rotatebyshear.asp
- [3] Treskunov A., Fast and high quality true-color bitmap rotation function.
- [Online] http://anton.treskunov.net/Software/doc/fast_and_high_quality_true_color_bitmap_rotation_function.html
- ============================================================
-*/
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-#define RBLOCK		64	// image blocks of RBLOCK*RBLOCK pixels
-
-// --------------------------------------------------------------------------
-
-/**
-Skews a row horizontally (with filtered weights). 
-Limited to 45 degree skewing only. Filters two adjacent pixels.
-Parameter T can be BYTE, WORD of float. 
-@param src Pointer to source image to rotate
-@param dst Pointer to destination image
-@param row Row index
-@param iOffset Skew offset
-@param dWeight Relative weight of right pixel
-@param bkcolor Background color
-*/
-template <class T> void 
-HorizontalSkewT(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double weight, const void *bkcolor = NULL) {
-	int iXPos;
-
-	const unsigned src_width  = FreeImage_GetWidth(src);
-	const unsigned dst_width  = FreeImage_GetWidth(dst);
-
-	T pxlSrc[4], pxlLeft[4], pxlOldLeft[4];	// 4 = 4*sizeof(T) max
-	
-	// background
-	const T pxlBlack[4] = {0, 0, 0, 0 };
-	const T *pxlBkg = static_cast<const T*>(bkcolor); // assume at least bytespp and 4*sizeof(T) max
-	if(!pxlBkg) {
-		// default background color is black
-		pxlBkg = pxlBlack;
-	}
-
-	// calculate the number of bytes per pixel
-	const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-	// calculate the number of samples per pixel
-	const unsigned samples = bytespp / sizeof(T);
-
-	BYTE *src_bits = FreeImage_GetScanLine(src, row);
-	BYTE *dst_bits = FreeImage_GetScanLine(dst, row);
-
-	// fill gap left of skew with background
-	if(bkcolor) {
-		for(int k = 0; k < iOffset; k++) {
-			memcpy(&dst_bits[k * bytespp], bkcolor, bytespp);
-		}
-		AssignPixel((BYTE*)&pxlOldLeft[0], (BYTE*)bkcolor, bytespp);
-	} else {
-		if(iOffset > 0) {
-			memset(dst_bits, 0, iOffset * bytespp);
-		}		
-		memset(&pxlOldLeft[0], 0, bytespp);
-	}
-
-	for(unsigned i = 0; i < src_width; i++) {
-		// loop through row pixels
-		AssignPixel((BYTE*)&pxlSrc[0], (BYTE*)src_bits, bytespp);
-		// calculate weights
-		for(unsigned j = 0; j < samples; j++) {
-			pxlLeft[j] = static_cast<T>(pxlBkg[j] + (pxlSrc[j] - pxlBkg[j]) * weight + 0.5);
-		}
-		// check boundaries 
-		iXPos = i + iOffset;
-		if((iXPos >= 0) && (iXPos < (int)dst_width)) {
-			// update left over on source
-			for(unsigned j = 0; j < samples; j++) {
-				pxlSrc[j] = pxlSrc[j] - (pxlLeft[j] - pxlOldLeft[j]);
-			}
-			AssignPixel((BYTE*)&dst_bits[iXPos*bytespp], (BYTE*)&pxlSrc[0], bytespp);
-		}
-		// save leftover for next pixel in scan
-		AssignPixel((BYTE*)&pxlOldLeft[0], (BYTE*)&pxlLeft[0], bytespp);
-
-		// next pixel in scan
-		src_bits += bytespp;
-	}			
-
-	// go to rightmost point of skew
-	iXPos = src_width + iOffset; 
-
-	if((iXPos >= 0) && (iXPos < (int)dst_width)) {
-		dst_bits = FreeImage_GetScanLine(dst, row) + iXPos * bytespp;
-
-		// If still in image bounds, put leftovers there
-		AssignPixel((BYTE*)dst_bits, (BYTE*)&pxlOldLeft[0], bytespp);
-
-		// clear to the right of the skewed line with background
-		dst_bits += bytespp;
-		if(bkcolor) {
-			for(unsigned i = 0; i < dst_width - iXPos - 1; i++) {
-				memcpy(&dst_bits[i * bytespp], bkcolor, bytespp);
-			}
-		} else {
-			memset(dst_bits, 0, bytespp * (dst_width - iXPos - 1));
-		}
-
-	}
-}
-
-/**
-Skews a row horizontally (with filtered weights). 
-Limited to 45 degree skewing only. Filters two adjacent pixels.
-@param src Pointer to source image to rotate
-@param dst Pointer to destination image
-@param row Row index
-@param iOffset Skew offset
-@param dWeight Relative weight of right pixel
-@param bkcolor Background color
-*/
-static void 
-HorizontalSkew(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double dWeight, const void *bkcolor) {
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	switch(image_type) {
-		case FIT_BITMAP:
-			switch(FreeImage_GetBPP(src)) {
-				case 8:
-				case 24:
-				case 32:
-					HorizontalSkewT<BYTE>(src, dst, row, iOffset, dWeight, bkcolor);
-				break;
-			}
-			break;
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-			HorizontalSkewT<WORD>(src, dst, row, iOffset, dWeight, bkcolor);
-			break;
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-			HorizontalSkewT<float>(src, dst, row, iOffset, dWeight, bkcolor);
-			break;
-	}
-}
-
-/**
-Skews a column vertically (with filtered weights). 
-Limited to 45 degree skewing only. Filters two adjacent pixels.
-Parameter T can be BYTE, WORD of float. 
-@param src Pointer to source image to rotate
-@param dst Pointer to destination image
-@param col Column index
-@param iOffset Skew offset
-@param dWeight Relative weight of upper pixel
-@param bkcolor Background color
-*/
-template <class T> void 
-VerticalSkewT(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double weight, const void *bkcolor = NULL) {
-	int iYPos;
-
-	unsigned src_height = FreeImage_GetHeight(src);
-	unsigned dst_height = FreeImage_GetHeight(dst);
-
-	T pxlSrc[4], pxlLeft[4], pxlOldLeft[4];	// 4 = 4*sizeof(T) max
-
-	// background
-	const T pxlBlack[4] = {0, 0, 0, 0 };
-	const T *pxlBkg = static_cast<const T*>(bkcolor); // assume at least bytespp and 4*sizeof(T) max
-	if(!pxlBkg) {
-		// default background color is black
-		pxlBkg = pxlBlack;
-	}
-
-	// calculate the number of bytes per pixel
-	const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-	// calculate the number of samples per pixel
-	const unsigned samples = bytespp / sizeof(T);
-
-	const unsigned src_pitch = FreeImage_GetPitch(src);
-	const unsigned dst_pitch = FreeImage_GetPitch(dst);
-	const unsigned index = col * bytespp;
-
-	BYTE *src_bits = FreeImage_GetBits(src) + index;
-	BYTE *dst_bits = FreeImage_GetBits(dst) + index;
-
-	// fill gap above skew with background
-	if(bkcolor) {
-		for(int k = 0; k < iOffset; k++) {
-			memcpy(dst_bits, bkcolor, bytespp);
-			dst_bits += dst_pitch;
-		}
-		memcpy(&pxlOldLeft[0], bkcolor, bytespp);
-	} else {
-		for(int k = 0; k < iOffset; k++) {
-			memset(dst_bits, 0, bytespp);
-			dst_bits += dst_pitch;
-		}
-		memset(&pxlOldLeft[0], 0, bytespp);
-	}
-
-	for(unsigned i = 0; i < src_height; i++) {
-		// loop through column pixels
-		AssignPixel((BYTE*)(&pxlSrc[0]), src_bits, bytespp);
-		// calculate weights
-		for(unsigned j = 0; j < samples; j++) {
-			pxlLeft[j] = static_cast<T>(pxlBkg[j] + (pxlSrc[j] - pxlBkg[j]) * weight + 0.5);
-		}
-		// check boundaries
-		iYPos = i + iOffset;
-		if((iYPos >= 0) && (iYPos < (int)dst_height)) {
-			// update left over on source
-			for(unsigned j = 0; j < samples; j++) {
-				pxlSrc[j] = pxlSrc[j] - (pxlLeft[j] - pxlOldLeft[j]);
-			}
-			dst_bits = FreeImage_GetScanLine(dst, iYPos) + index;
-			AssignPixel(dst_bits, (BYTE*)(&pxlSrc[0]), bytespp);
-		}
-		// save leftover for next pixel in scan
-		AssignPixel((BYTE*)(&pxlOldLeft[0]), (BYTE*)(&pxlLeft[0]), bytespp);
-
-		// next pixel in scan
-		src_bits += src_pitch;
-	}
-	// go to bottom point of skew
-	iYPos = src_height + iOffset;
-
-	if((iYPos >= 0) && (iYPos < (int)dst_height)) {
-		dst_bits = FreeImage_GetScanLine(dst, iYPos) + index;
-
-		// if still in image bounds, put leftovers there				
-		AssignPixel((BYTE*)(dst_bits), (BYTE*)(&pxlOldLeft[0]), bytespp);
-
-		// clear below skewed line with background
-		if(bkcolor) {
-			while(++iYPos < (int)dst_height) {					
-				dst_bits += dst_pitch;
-				AssignPixel((BYTE*)(dst_bits), (BYTE*)(bkcolor), bytespp);
-			}
-		} else {
-			while(++iYPos < (int)dst_height) {					
-				dst_bits += dst_pitch;
-				memset(dst_bits, 0, bytespp);
-			}
-		}
-	}
-}
-
-/**
-Skews a column vertically (with filtered weights). 
-Limited to 45 degree skewing only. Filters two adjacent pixels.
-@param src Pointer to source image to rotate
-@param dst Pointer to destination image
-@param col Column index
-@param iOffset Skew offset
-@param dWeight Relative weight of upper pixel
-@param bkcolor Background color
-*/
-static void 
-VerticalSkew(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double dWeight, const void *bkcolor) {
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	switch(image_type) {
-		case FIT_BITMAP:
-			switch(FreeImage_GetBPP(src)) {
-				case 8:
-				case 24:
-				case 32:
-					VerticalSkewT<BYTE>(src, dst, col, iOffset, dWeight, bkcolor);
-					break;
-			}
-			break;
-			case FIT_UINT16:
-			case FIT_RGB16:
-			case FIT_RGBA16:
-				VerticalSkewT<WORD>(src, dst, col, iOffset, dWeight, bkcolor);
-				break;
-			case FIT_FLOAT:
-			case FIT_RGBF:
-			case FIT_RGBAF:
-				VerticalSkewT<float>(src, dst, col, iOffset, dWeight, bkcolor);
-				break;
-	}
-} 
-
-/**
-Rotates an image by 90 degrees (counter clockwise). 
-Precise rotation, no filters required.<br>
-Code adapted from CxImage (http://www.xdp.it/cximage.htm)
-@param src Pointer to source image to rotate
-@return Returns a pointer to a newly allocated rotated image if successful, returns NULL otherwise
-*/
-static FIBITMAP* 
-Rotate90(FIBITMAP *src) {
-
-	const unsigned bpp = FreeImage_GetBPP(src);
-
-	const unsigned src_width  = FreeImage_GetWidth(src);
-	const unsigned src_height = FreeImage_GetHeight(src);	
-	const unsigned dst_width  = src_height;
-	const unsigned dst_height = src_width;
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	// allocate and clear dst image
-	FIBITMAP *dst = FreeImage_AllocateT(image_type, dst_width, dst_height, bpp);
-	if(NULL == dst) return NULL;
-
-	// get src and dst scan width
-	const unsigned src_pitch  = FreeImage_GetPitch(src);
-	const unsigned dst_pitch  = FreeImage_GetPitch(dst);
-
-	switch(image_type) {
-		case FIT_BITMAP:
-			if(bpp == 1) {
-				// speedy rotate for BW images
-
-				BYTE *bsrc  = FreeImage_GetBits(src); 
-				BYTE *bdest = FreeImage_GetBits(dst);
-
-				BYTE *dbitsmax = bdest + dst_height * dst_pitch - 1;
-
-				for(unsigned y = 0; y < src_height; y++) {
-					// figure out the column we are going to be copying to
-					const div_t div_r = div(y, 8);
-					// set bit pos of src column byte
-					const BYTE bitpos = (BYTE)(128 >> div_r.rem);
-					BYTE *srcdisp = bsrc + y * src_pitch;
-					for(unsigned x = 0; x < src_pitch; x++) {
-						// get source bits
-						BYTE *sbits = srcdisp + x;
-						// get destination column
-						BYTE *nrow = bdest + (dst_height - 1 - (x * 8)) * dst_pitch + div_r.quot;
-						for (int z = 0; z < 8; z++) {
-						   // get destination byte
-							BYTE *dbits = nrow - z * dst_pitch;
-							if ((dbits < bdest) || (dbits > dbitsmax)) break;
-							if (*sbits & (128 >> z)) *dbits |= bitpos;
-						}
-					}
-				}
-			}
-			else if((bpp == 8) || (bpp == 24) || (bpp == 32)) {
-				// anything other than BW :
-				// This optimized version of rotation rotates image by smaller blocks. It is quite
-				// a bit faster than obvious algorithm, because it produces much less CPU cache misses.
-				// This optimization can be tuned by changing block size (RBLOCK). 96 is good value for current
-				// CPUs (tested on Athlon XP and Celeron D). Larger value (if CPU has enough cache) will increase
-				// speed somehow, but once you drop out of CPU's cache, things will slow down drastically.
-				// For older CPUs with less cache, lower value would yield better results.
-
-				BYTE *bsrc  = FreeImage_GetBits(src);  // source pixels
-				BYTE *bdest = FreeImage_GetBits(dst);  // destination pixels
-
-				// calculate the number of bytes per pixel (1 for 8-bit, 3 for 24-bit or 4 for 32-bit)
-				const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-				
-				// for all image blocks of RBLOCK*RBLOCK pixels
-				
-				// x-segment
-				for(unsigned xs = 0; xs < dst_width; xs += RBLOCK) {
-					// y-segment
-					for(unsigned ys = 0; ys < dst_height; ys += RBLOCK) {
-						for(unsigned y = ys; y < MIN(dst_height, ys + RBLOCK); y++) {    // do rotation
-							const unsigned y2 = dst_height - y - 1;
-							// point to src pixel at (y2, xs)
-							BYTE *src_bits = bsrc + (xs * src_pitch) + (y2 * bytespp);
-							// point to dst pixel at (xs, y)
-							BYTE *dst_bits = bdest + (y * dst_pitch) + (xs * bytespp);
-							for(unsigned x = xs; x < MIN(dst_width, xs + RBLOCK); x++) {
-								// dst.SetPixel(x, y, src.GetPixel(y2, x));
-								AssignPixel(dst_bits, src_bits, bytespp);
-								dst_bits += bytespp;
-								src_bits += src_pitch;
-							}
-						}
-					}
-				}
-			}
-			break;
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			BYTE *bsrc  = FreeImage_GetBits(src);  // source pixels
-			BYTE *bdest = FreeImage_GetBits(dst);  // destination pixels
-
-			// calculate the number of bytes per pixel
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			for(unsigned y = 0; y < dst_height; y++) {
-				BYTE *src_bits = bsrc + (src_width - 1 - y) * bytespp;
-				BYTE *dst_bits = bdest + (y * dst_pitch);
-				for(unsigned x = 0; x < dst_width; x++) {
-					AssignPixel(dst_bits, src_bits, bytespp);
-					src_bits += src_pitch;
-					dst_bits += bytespp;
-				}
-			}
-		}
-		break;
-	}
-
-	return dst;
-}
-
-/**
-Rotates an image by 180 degrees (counter clockwise). 
-Precise rotation, no filters required.
-@param src Pointer to source image to rotate
-@return Returns a pointer to a newly allocated rotated image if successful, returns NULL otherwise
-*/
-static FIBITMAP* 
-Rotate180(FIBITMAP *src) {
-	int x, y, k, pos;
-
-	const int bpp = FreeImage_GetBPP(src);
-
-	const int src_width  = FreeImage_GetWidth(src);
-	const int src_height = FreeImage_GetHeight(src);
-	const int dst_width  = src_width;
-	const int dst_height = src_height;
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	FIBITMAP *dst = FreeImage_AllocateT(image_type, dst_width, dst_height, bpp);
-	if(NULL == dst) return NULL;
-
-	switch(image_type) {
-		case FIT_BITMAP:
-			if(bpp == 1) {
-				for(int y = 0; y < src_height; y++) {
-					BYTE *src_bits = FreeImage_GetScanLine(src, y);
-					BYTE *dst_bits = FreeImage_GetScanLine(dst, dst_height - y - 1);
-					for(int x = 0; x < src_width; x++) {
-						// get bit at (x, y)
-						k = (src_bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
-						// set bit at (dst_width - x - 1, dst_height - y - 1)
-						pos = dst_width - x - 1;
-						k ? dst_bits[pos >> 3] |= (0x80 >> (pos & 0x7)) : dst_bits[pos >> 3] &= (0xFF7F >> (pos & 0x7));
-					}			
-				}
-				break;
-			}
-			// else if((bpp == 8) || (bpp == 24) || (bpp == 32)) FALL TROUGH
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			 // Calculate the number of bytes per pixel
-			const int bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			for(y = 0; y < src_height; y++) {
-				BYTE *src_bits = FreeImage_GetScanLine(src, y);
-				BYTE *dst_bits = FreeImage_GetScanLine(dst, dst_height - y - 1) + (dst_width - 1) * bytespp;
-				for(x = 0; x < src_width; x++) {
-					// get pixel at (x, y)
-					// set pixel at (dst_width - x - 1, dst_height - y - 1)
-					AssignPixel(dst_bits, src_bits, bytespp);
-					src_bits += bytespp;
-					dst_bits -= bytespp;					
-				}				
-			}
-		}
-		break;
-	}
-
-	return dst;
-}
-
-/**
-Rotates an image by 270 degrees (counter clockwise). 
-Precise rotation, no filters required.<br>
-Code adapted from CxImage (http://www.xdp.it/cximage.htm)
-@param src Pointer to source image to rotate
-@return Returns a pointer to a newly allocated rotated image if successful, returns NULL otherwise
-*/
-static FIBITMAP* 
-Rotate270(FIBITMAP *src) {
-	int x2, dlineup;
-
-	const unsigned bpp = FreeImage_GetBPP(src);
-
-	const unsigned src_width  = FreeImage_GetWidth(src);
-	const unsigned src_height = FreeImage_GetHeight(src);	
-	const unsigned dst_width  = src_height;
-	const unsigned dst_height = src_width;
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	// allocate and clear dst image
-	FIBITMAP *dst = FreeImage_AllocateT(image_type, dst_width, dst_height, bpp);
-	if(NULL == dst) return NULL;
-
-	// get src and dst scan width
-	const unsigned src_pitch  = FreeImage_GetPitch(src);
-	const unsigned dst_pitch  = FreeImage_GetPitch(dst);
-	
-	switch(image_type) {
-		case FIT_BITMAP:
-			if(bpp == 1) {
-				// speedy rotate for BW images
-				
-				BYTE *bsrc  = FreeImage_GetBits(src); 
-				BYTE *bdest = FreeImage_GetBits(dst);
-				BYTE *dbitsmax = bdest + dst_height * dst_pitch - 1;
-				dlineup = 8 * dst_pitch - dst_width;
-
-				for(unsigned y = 0; y < src_height; y++) {
-					// figure out the column we are going to be copying to
-					const div_t div_r = div(y + dlineup, 8);
-					// set bit pos of src column byte
-					const BYTE bitpos = (BYTE)(1 << div_r.rem);
-					const BYTE *srcdisp = bsrc + y * src_pitch;
-					for(unsigned x = 0; x < src_pitch; x++) {
-						// get source bits
-						const BYTE *sbits = srcdisp + x;
-						// get destination column
-						BYTE *nrow = bdest + (x * 8) * dst_pitch + dst_pitch - 1 - div_r.quot;
-						for(unsigned z = 0; z < 8; z++) {
-						   // get destination byte
-							BYTE *dbits = nrow + z * dst_pitch;
-							if ((dbits < bdest) || (dbits > dbitsmax)) break;
-							if (*sbits & (128 >> z)) *dbits |= bitpos;
-						}
-					}
-				}
-			} 
-			else if((bpp == 8) || (bpp == 24) || (bpp == 32)) {
-				// anything other than BW :
-				// This optimized version of rotation rotates image by smaller blocks. It is quite
-				// a bit faster than obvious algorithm, because it produces much less CPU cache misses.
-				// This optimization can be tuned by changing block size (RBLOCK). 96 is good value for current
-				// CPUs (tested on Athlon XP and Celeron D). Larger value (if CPU has enough cache) will increase
-				// speed somehow, but once you drop out of CPU's cache, things will slow down drastically.
-				// For older CPUs with less cache, lower value would yield better results.
-
-				BYTE *bsrc  = FreeImage_GetBits(src);  // source pixels
-				BYTE *bdest = FreeImage_GetBits(dst);  // destination pixels
-
-				// Calculate the number of bytes per pixel (1 for 8-bit, 3 for 24-bit or 4 for 32-bit)
-				const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-				// for all image blocks of RBLOCK*RBLOCK pixels
-
-				// x-segment
-				for(unsigned xs = 0; xs < dst_width; xs += RBLOCK) {
-					// y-segment
-					for(unsigned ys = 0; ys < dst_height; ys += RBLOCK) {
-						for(unsigned x = xs; x < MIN(dst_width, xs + RBLOCK); x++) {    // do rotation
-							x2 = dst_width - x - 1;
-							// point to src pixel at (ys, x2)
-							BYTE *src_bits = bsrc + (x2 * src_pitch) + (ys * bytespp);
-							// point to dst pixel at (x, ys)
-							BYTE *dst_bits = bdest + (ys * dst_pitch) + (x * bytespp);
-							for(unsigned y = ys; y < MIN(dst_height, ys + RBLOCK); y++) {
-								// dst.SetPixel(x, y, src.GetPixel(y, x2));
-								AssignPixel(dst_bits, src_bits, bytespp);
-								src_bits += bytespp;
-								dst_bits += dst_pitch;
-							}
-						}
-					}
-				}
-			}
-			break;
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			BYTE *bsrc  = FreeImage_GetBits(src);  // source pixels
-			BYTE *bdest = FreeImage_GetBits(dst);  // destination pixels
-
-			// calculate the number of bytes per pixel
-			const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			for(unsigned y = 0; y < dst_height; y++) {
-				BYTE *src_bits = bsrc + (src_height - 1) * src_pitch + y * bytespp;
-				BYTE *dst_bits = bdest + (y * dst_pitch);
-				for(unsigned x = 0; x < dst_width; x++) {
-					AssignPixel(dst_bits, src_bits, bytespp);
-					src_bits -= src_pitch;
-					dst_bits += bytespp;
-				}
-			}
-		}
-		break;
-	}
-
-	return dst;
-}
-
-/**
-Rotates an image by a given degree in range [-45 .. +45] (counter clockwise) 
-using the 3-shear technique.
-@param src Pointer to source image to rotate
-@param dAngle Rotation angle
-@return Returns a pointer to a newly allocated rotated image if successful, returns NULL otherwise
-*/
-static FIBITMAP* 
-Rotate45(FIBITMAP *src, double dAngle, const void *bkcolor) {
-	const double ROTATE_PI = double(3.1415926535897932384626433832795);
-
-	unsigned u;
-
-	const unsigned bpp = FreeImage_GetBPP(src);
-
-	const double dRadAngle = dAngle * ROTATE_PI / double(180); // Angle in radians
-	const double dSinE = sin(dRadAngle);
-	const double dTan = tan(dRadAngle / 2);
-
-	const unsigned src_width  = FreeImage_GetWidth(src);
-	const unsigned src_height = FreeImage_GetHeight(src);
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	// Calc first shear (horizontal) destination image dimensions 
-	const unsigned width_1  = src_width + unsigned((double)src_height * fabs(dTan) + 0.5);
-	const unsigned height_1 = src_height; 
-
-	// Perform 1st shear (horizontal)
-	// ----------------------------------------------------------------------
-
-	// Allocate image for 1st shear
-	FIBITMAP *dst1 = FreeImage_AllocateT(image_type, width_1, height_1, bpp);
-	if(NULL == dst1) {
-		return NULL;
-	}
-	
-	for(u = 0; u < height_1; u++) {  
-		double dShear;
-
-		if(dTan >= 0)	{
-			// Positive angle
-			dShear = (u + 0.5) * dTan;
-		}
-		else {
-			// Negative angle
-			dShear = (double(u) - height_1 + 0.5) * dTan;
-		}
-		int iShear = int(floor(dShear));
-		HorizontalSkew(src, dst1, u, iShear, dShear - double(iShear), bkcolor);
-	}
-
-	// Perform 2nd shear  (vertical)
-	// ----------------------------------------------------------------------
-
-	// Calc 2nd shear (vertical) destination image dimensions
-	const unsigned width_2  = width_1;
-	unsigned height_2 = unsigned((double)src_width * fabs(dSinE) + (double)src_height * cos(dRadAngle) + 0.5) + 1;
-
-	// Allocate image for 2nd shear
-	FIBITMAP *dst2 = FreeImage_AllocateT(image_type, width_2, height_2, bpp);
-	if(NULL == dst2) {
-		FreeImage_Unload(dst1);
-		return NULL;
-	}
-
-	double dOffset;     // Variable skew offset
-	if(dSinE > 0)	{   
-		// Positive angle
-		dOffset = (src_width - 1.0) * dSinE;
-	}
-	else {
-		// Negative angle
-		dOffset = -dSinE * (double(src_width) - width_2);
-	}
-
-	for(u = 0; u < width_2; u++, dOffset -= dSinE) {
-		int iShear = int(floor(dOffset));
-		VerticalSkew(dst1, dst2, u, iShear, dOffset - double(iShear), bkcolor);
-	}
-
-	// Perform 3rd shear (horizontal)
-	// ----------------------------------------------------------------------
-
-	// Free result of 1st shear
-	FreeImage_Unload(dst1);
-
-	// Calc 3rd shear (horizontal) destination image dimensions
-	const unsigned width_3  = unsigned(double(src_height) * fabs(dSinE) + double(src_width) * cos(dRadAngle) + 0.5) + 1;
-	const unsigned height_3 = height_2;
-
-	// Allocate image for 3rd shear
-	FIBITMAP *dst3 = FreeImage_AllocateT(image_type, width_3, height_3, bpp);
-	if(NULL == dst3) {
-		FreeImage_Unload(dst2);
-		return NULL;
-	}
-
-	if(dSinE >= 0) {
-		// Positive angle
-		dOffset = (src_width - 1.0) * dSinE * -dTan;
-	}
-	else {
-		// Negative angle
-		dOffset = dTan * ( (src_width - 1.0) * -dSinE + (1.0 - height_3) );
-	}
-	for(u = 0; u < height_3; u++, dOffset += dTan) {
-		int iShear = int(floor(dOffset));
-		HorizontalSkew(dst2, dst3, u, iShear, dOffset - double(iShear), bkcolor);
-	}
-	// Free result of 2nd shear    
-	FreeImage_Unload(dst2);
-
-	// Return result of 3rd shear
-	return dst3;      
-}
-
-/**
-Rotates a 1-, 8-, 24- or 32-bit image by a given angle (given in degree). 
-Angle is unlimited, except for 1-bit images (limited to integer multiples of 90 degree). 
-3-shears technique is used.
-@param src Pointer to source image to rotate
-@param dAngle Rotation angle
-@return Returns a pointer to a newly allocated rotated image if successful, returns NULL otherwise
-*/
-static FIBITMAP* 
-RotateAny(FIBITMAP *src, double dAngle, const void *bkcolor) {
-	if(NULL == src) {
-		return NULL;
-	}
-
-	FIBITMAP *image = src;
-
-	while(dAngle >= 360) {
-		// Bring angle to range of (-INF .. 360)
-		dAngle -= 360;
-	}
-	while(dAngle < 0) {
-		// Bring angle to range of [0 .. 360) 
-		dAngle += 360;
-	}
-	if((dAngle > 45) && (dAngle <= 135)) {
-		// Angle in (45 .. 135] 
-		// Rotate image by 90 degrees into temporary image,
-		// so it requires only an extra rotation angle 
-		// of -45 .. +45 to complete rotation.
-		image = Rotate90(src);
-		dAngle -= 90;
-	}
-	else if((dAngle > 135) && (dAngle <= 225)) { 
-		// Angle in (135 .. 225] 
-		// Rotate image by 180 degrees into temporary image,
-		// so it requires only an extra rotation angle 
-		// of -45 .. +45 to complete rotation.
-		image = Rotate180(src);
-		dAngle -= 180;
-	}
-	else if((dAngle > 225) && (dAngle <= 315)) { 
-		// Angle in (225 .. 315] 
-		// Rotate image by 270 degrees into temporary image,
-		// so it requires only an extra rotation angle 
-		// of -45 .. +45 to complete rotation.
-		image = Rotate270(src);
-		dAngle -= 270;
-	}
-
-	// If we got here, angle is in (-45 .. +45]
-
-	if(NULL == image)	{
-		// Failed to allocate middle image
-		return NULL;
-	}
-
-	if(0 == dAngle) {
-		if(image == src) {
-			// Nothing to do ...
-			return FreeImage_Clone(src);
-		} else {
-			// No more rotation needed
-			return image;
-		}
-	}
-	else {
-		// Perform last rotation
-		FIBITMAP *dst = Rotate45(image, dAngle, bkcolor);
-
-		if(src != image) {
-			// Middle image was required, free it now.
-			FreeImage_Unload(image);
-		}
-
-		return dst;
-	}
-}
-
-// ==========================================================
-
-FIBITMAP *DLL_CALLCONV 
-FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) {
-	if(!FreeImage_HasPixels(dib)) return NULL;
-
-	if(0 == angle) {
-		return FreeImage_Clone(dib);
-	}
-	// DIB are stored upside down ...
-	angle *= -1;
-
-	try {
-		unsigned bpp = FreeImage_GetBPP(dib);
-		FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-		
-		switch(image_type) {
-			case FIT_BITMAP:
-				if(bpp == 1) {
-					// only rotate for integer multiples of 90 degree
-					if(fmod(angle, 90) != 0)
-						return NULL;
-
-					// perform the rotation
-					FIBITMAP *dst = RotateAny(dib, angle, bkcolor);
-					if(!dst) throw(1);
-
-					// build a greyscale palette
-					RGBQUAD *dst_pal = FreeImage_GetPalette(dst);
-					if(FreeImage_GetColorType(dib) == FIC_MINISBLACK) {
-						dst_pal[0].rgbRed = dst_pal[0].rgbGreen = dst_pal[0].rgbBlue = 0;
-						dst_pal[1].rgbRed = dst_pal[1].rgbGreen = dst_pal[1].rgbBlue = 255;			
-					} else {
-						dst_pal[0].rgbRed = dst_pal[0].rgbGreen = dst_pal[0].rgbBlue = 255;
-						dst_pal[1].rgbRed = dst_pal[1].rgbGreen = dst_pal[1].rgbBlue = 0;			
-					}
-
-					// copy metadata from src to dst
-					FreeImage_CloneMetadata(dst, dib);
-
-					return dst;
-				}
-				else if((bpp == 8) || (bpp == 24) || (bpp == 32)) {
-					FIBITMAP *dst = RotateAny(dib, angle, bkcolor);
-					if(!dst) throw(1);
-					
-					if(bpp == 8) {
-						// copy original palette to rotated bitmap
-						RGBQUAD *src_pal = FreeImage_GetPalette(dib);
-						RGBQUAD *dst_pal = FreeImage_GetPalette(dst);
-						memcpy(&dst_pal[0], &src_pal[0], 256 * sizeof(RGBQUAD));
-
-						// copy transparency table 
-						FreeImage_SetTransparencyTable(dst, FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib));
-
-						// copy background color 
-						RGBQUAD bkcolor; 
-						if( FreeImage_GetBackgroundColor(dib, &bkcolor) ) {
-							FreeImage_SetBackgroundColor(dst, &bkcolor); 
-						}
-
-					}
-
-					// copy metadata from src to dst
-					FreeImage_CloneMetadata(dst, dib);
-
-					return dst;
-				}
-				break;
-			case FIT_UINT16:
-			case FIT_RGB16:
-			case FIT_RGBA16:
-			case FIT_FLOAT:
-			case FIT_RGBF:
-			case FIT_RGBAF:
-			{
-				FIBITMAP *dst = RotateAny(dib, angle, bkcolor);
-				if(!dst) throw(1);
-
-				// copy metadata from src to dst
-				FreeImage_CloneMetadata(dst, dib);
-
-				return dst;
-			}
-			break;
-		}
-
-	} catch(int) {
-		return NULL;
-	}
-
-	return NULL;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp
deleted file mode 100644
index 71868074b1..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp
+++ /dev/null
@@ -1,967 +0,0 @@
-// ==========================================================
-// Color manipulation routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Carsten Klein (c.klein@datagis.com)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   Macros + structures
-// ----------------------------------------------------------
-
-#define GET_HI_NIBBLE(byte)     ((byte) >> 4)
-#define SET_HI_NIBBLE(byte, n)  byte &= 0x0F, byte |= ((n) << 4)
-#define GET_LO_NIBBLE(byte)     ((byte) & 0x0F)
-#define SET_LO_NIBBLE(byte, n)  byte &= 0xF0, byte |= ((n) & 0x0F)
-#define GET_NIBBLE(cn, byte)    ((cn) ? (GET_HI_NIBBLE(byte)) : (GET_LO_NIBBLE(byte))) 
-#define SET_NIBBLE(cn, byte, n) if (cn) SET_HI_NIBBLE(byte, n); else SET_LO_NIBBLE(byte, n) 
-
-// ----------------------------------------------------------
-
-
-/** @brief Inverts each pixel data.
-
-@param src Input image to be processed.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_Invert(FIBITMAP *src) {
-
-	if (!FreeImage_HasPixels(src)) return FALSE;
-	
-	unsigned i, x, y, k;
-	
-	const unsigned width = FreeImage_GetWidth(src);
-	const unsigned height = FreeImage_GetHeight(src);
-	const unsigned bpp = FreeImage_GetBPP(src);
-
-	FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-
-	if(image_type == FIT_BITMAP) {
-		switch(bpp) {
-			case 1 :
-			case 4 :
-			case 8 :
-			{
-				// if the dib has a colormap, just invert it
-				// else, keep the linear grayscale
-
-				if (FreeImage_GetColorType(src) == FIC_PALETTE) {
-					RGBQUAD *pal = FreeImage_GetPalette(src);
-
-					for(i = 0; i < FreeImage_GetColorsUsed(src); i++) {
-						pal[i].rgbRed	= 255 - pal[i].rgbRed;
-						pal[i].rgbGreen = 255 - pal[i].rgbGreen;
-						pal[i].rgbBlue	= 255 - pal[i].rgbBlue;
-					}
-				} else {
-					for(y = 0; y < height; y++) {
-						BYTE *bits = FreeImage_GetScanLine(src, y);
-
-						for (x = 0; x < FreeImage_GetLine(src); x++) {
-							bits[x] = ~bits[x];
-						}
-					}
-				}
-
-				break;
-			}		
-
-			case 24 :
-			case 32 :
-			{
-				// Calculate the number of bytes per pixel (3 for 24-bit or 4 for 32-bit)
-				const unsigned bytespp = FreeImage_GetLine(src) / width;
-
-				for(y = 0; y < height; y++) {
-					BYTE *bits = FreeImage_GetScanLine(src, y);
-					for(x = 0; x < width; x++) {
-						for(k = 0; k < bytespp; k++) {
-							bits[k] = ~bits[k];
-						}
-						bits += bytespp;
-					}
-				}
-
-				break;
-			}
-			default:
-				return FALSE;
-		}
-	}
-	else if((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) {
-		// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-		const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
-
-		for(y = 0; y < height; y++) {
-			WORD *bits = (WORD*)FreeImage_GetScanLine(src, y);
-			for(x = 0; x < width; x++) {
-				for(k = 0; k < wordspp; k++) {
-					bits[k] = ~bits[k];
-				}
-				bits += wordspp;
-			}
-		}
-	}
-	else {
-		// anything else ... 
-		return FALSE;
-	}
-		
-	return TRUE;
-}
-
-/** @brief Perfoms an histogram transformation on a 8, 24 or 32-bit image 
-according to the values of a lookup table (LUT).
-
-The transformation is done as follows.<br>
-Image 8-bit : if the image has a color palette, the LUT is applied to this palette, 
-otherwise, it is applied to the grey values.<br>
-Image 24-bit & 32-bit : if channel == FICC_RGB, the same LUT is applied to each color
-plane (R,G, and B). Otherwise, the LUT is applied to the specified channel only.
-@param src Input image to be processed.
-@param LUT Lookup table. <b>The size of 'LUT' is assumed to be 256.</b>
-@param channel The color channel to be processed (only used with 24 & 32-bit DIB).
-@return Returns TRUE if successful, FALSE otherwise.
-@see FREE_IMAGE_COLOR_CHANNEL
-*/
-BOOL DLL_CALLCONV 
-FreeImage_AdjustCurve(FIBITMAP *src, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel) {
-	unsigned x, y;
-	BYTE *bits = NULL;
-
-	if(!FreeImage_HasPixels(src) || !LUT || (FreeImage_GetImageType(src) != FIT_BITMAP))
-		return FALSE;
-
-	int bpp = FreeImage_GetBPP(src);
-	if((bpp != 8) && (bpp != 24) && (bpp != 32))
-		return FALSE;
-
-	// apply the LUT
-	switch(bpp) {
-
-		case 8 :
-		{
-			// if the dib has a colormap, apply the LUT to it
-			// else, apply the LUT to pixel values
-
-			if(FreeImage_GetColorType(src) == FIC_PALETTE) {
-				RGBQUAD *rgb = FreeImage_GetPalette(src);
-				for (unsigned pal = 0; pal < FreeImage_GetColorsUsed(src); pal++) {
-					rgb->rgbRed   = LUT[rgb->rgbRed];
-					rgb->rgbGreen = LUT[rgb->rgbGreen];
-					rgb->rgbBlue  = LUT[rgb->rgbBlue];
-					rgb++;
-				}
-			}
-			else {
-				for(y = 0; y < FreeImage_GetHeight(src); y++) {
-					bits =  FreeImage_GetScanLine(src, y);
-					for(x = 0; x < FreeImage_GetWidth(src); x++) {
-						bits[x] = LUT[ bits[x] ];
-					}
-				}
-			}
-
-			break;
-		}
-
-		case 24 :
-		case 32 :
-		{
-			int bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-			switch(channel) {
-				case FICC_RGB :
-					for(y = 0; y < FreeImage_GetHeight(src); y++) {
-						bits =  FreeImage_GetScanLine(src, y);
-						for(x = 0; x < FreeImage_GetWidth(src); x++) {
-							bits[FI_RGBA_BLUE]	= LUT[ bits[FI_RGBA_BLUE] ];	// B
-							bits[FI_RGBA_GREEN] = LUT[ bits[FI_RGBA_GREEN] ];	// G
-							bits[FI_RGBA_RED]	= LUT[ bits[FI_RGBA_RED] ];		// R
-							
-							bits += bytespp;
-						}
-					}
-					break;
-
-				case FICC_BLUE :
-					for(y = 0; y < FreeImage_GetHeight(src); y++) {
-						bits =  FreeImage_GetScanLine(src, y);
-						for(x = 0; x < FreeImage_GetWidth(src); x++) {
-							bits[FI_RGBA_BLUE] = LUT[ bits[FI_RGBA_BLUE] ];		// B
-							
-							bits += bytespp;
-						}
-					}
-					break;
-
-				case FICC_GREEN :
-					for(y = 0; y < FreeImage_GetHeight(src); y++) {
-						bits =  FreeImage_GetScanLine(src, y);
-						for(x = 0; x < FreeImage_GetWidth(src); x++) {
-							bits[FI_RGBA_GREEN] = LUT[ bits[FI_RGBA_GREEN] ];	// G
-							
-							bits += bytespp;
-						}
-					}
-					break;
-
-				case FICC_RED :
-					for(y = 0; y < FreeImage_GetHeight(src); y++) {
-						bits =  FreeImage_GetScanLine(src, y);
-						for(x = 0; x < FreeImage_GetWidth(src); x++) {
-							bits[FI_RGBA_RED] = LUT[ bits[FI_RGBA_RED] ];		// R
-							
-							bits += bytespp;
-						}
-					}
-					break;
-					
-				case FICC_ALPHA :
-					if(32 == bpp) {
-						for(y = 0; y < FreeImage_GetHeight(src); y++) {
-							bits =  FreeImage_GetScanLine(src, y);
-							for(x = 0; x < FreeImage_GetWidth(src); x++) {
-								bits[FI_RGBA_ALPHA] = LUT[ bits[FI_RGBA_ALPHA] ];	// A
-								
-								bits += bytespp;
-							}
-						}
-					}
-					break;
-
-				default:
-					break;
-			}
-			break;
-		}
-	}
-
-	return TRUE;
-}
-
-/** @brief Performs gamma correction on a 8, 24 or 32-bit image.
-
-@param src Input image to be processed.
-@param gamma Gamma value to use. A value of 1.0 leaves the image alone, 
-less than one darkens it, and greater than one lightens it.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_AdjustGamma(FIBITMAP *src, double gamma) {
-	BYTE LUT[256];		// Lookup table
-
-	if(!FreeImage_HasPixels(src) || (gamma <= 0))
-		return FALSE;
-	
-	// Build the lookup table
-
-	double exponent = 1 / gamma;
-	double v = 255.0 * (double)pow((double)255, -exponent);
-	for(int i = 0; i < 256; i++) {
-		double color = (double)pow((double)i, exponent) * v;
-		if(color > 255)
-			color = 255;
-		LUT[i] = (BYTE)floor(color + 0.5);
-	}
-
-	// Apply the gamma correction
-	return FreeImage_AdjustCurve(src, LUT, FICC_RGB);
-}
-
-/** @brief Adjusts the brightness of a 8, 24 or 32-bit image by a certain amount.
-
-@param src Input image to be processed.
-@param percentage Where -100 <= percentage <= 100<br>
-A value 0 means no change, less than 0 will make the image darker 
-and greater than 0 will make the image brighter.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_AdjustBrightness(FIBITMAP *src, double percentage) {
-	BYTE LUT[256];		// Lookup table
-	double value;
-
-	if(!FreeImage_HasPixels(src))
-		return FALSE;
-	
-	// Build the lookup table
-	const double scale = (100 + percentage) / 100;
-	for(int i = 0; i < 256; i++) {
-		value = i * scale;
-		value = MAX(0.0, MIN(value, 255.0));
-		LUT[i] = (BYTE)floor(value + 0.5);
-	}
-	return FreeImage_AdjustCurve(src, LUT, FICC_RGB);
-}
-
-/** @brief Adjusts the contrast of a 8, 24 or 32-bit image by a certain amount.
-
-@param src Input image to be processed.
-@param percentage Where -100 <= percentage <= 100<br>
-A value 0 means no change, less than 0 will decrease the contrast 
-and greater than 0 will increase the contrast of the image.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_AdjustContrast(FIBITMAP *src, double percentage) {
-	BYTE LUT[256];		// Lookup table
-	double value;
-
-	if(!FreeImage_HasPixels(src))
-		return FALSE;
-	
-	// Build the lookup table
-	const double scale = (100 + percentage) / 100;
-	for(int i = 0; i < 256; i++) {
-		value = 128 + (i - 128) * scale;
-		value = MAX(0.0, MIN(value, 255.0));
-		LUT[i] = (BYTE)floor(value + 0.5);
-	}
-	return FreeImage_AdjustCurve(src, LUT, FICC_RGB);
-}
-
-/** @brief Computes image histogram
-
-For 24-bit and 32-bit images, histogram can be computed from red, green, blue and 
-black channels. For 8-bit images, histogram is computed from the black channel. Other 
-bit depth is not supported (nothing is done).
-@param src Input image to be processed.
-@param histo Histogram array to fill. <b>The size of 'histo' is assumed to be 256.</b>
-@param channel Color channel to use
-@return Returns TRUE if succesful, returns FALSE if the image bit depth isn't supported.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel) {
-	BYTE pixel;
-	BYTE *bits = NULL;
-	unsigned x, y;
-
-	if(!FreeImage_HasPixels(src) || !histo) return FALSE;
-
-	unsigned width  = FreeImage_GetWidth(src);
-	unsigned height = FreeImage_GetHeight(src);
-	unsigned bpp    = FreeImage_GetBPP(src);
-
-	if(bpp == 8) {
-		// clear histogram array
-		memset(histo, 0, 256 * sizeof(DWORD));
-		// compute histogram for black channel
-		for(y = 0; y < height; y++) {
-			bits = FreeImage_GetScanLine(src, y);
-			for(x = 0; x < width; x++) {
-				// get pixel value
-				pixel = bits[x];
-				histo[pixel]++;
-			}
-		}
-		return TRUE;
-	}
-	else if((bpp == 24) || (bpp == 32)) {
-		int bytespp = bpp / 8;	// bytes / pixel
-
-		// clear histogram array
-		memset(histo, 0, 256 * sizeof(DWORD));
-
-		switch(channel) {
-			case FICC_RED:
-				// compute histogram for red channel
-				for(y = 0; y < height; y++) {
-					bits =  FreeImage_GetScanLine(src, y);
-					for(x = 0; x < width; x++) {
-						pixel = bits[FI_RGBA_RED];	// R
-						histo[pixel]++;
-						bits += bytespp;
-					}
-				}
-				return TRUE;
-
-			case FICC_GREEN:
-				// compute histogram for green channel
-				for(y = 0; y < height; y++) {
-					bits =  FreeImage_GetScanLine(src, y);
-					for(x = 0; x < width; x++) {
-						pixel = bits[FI_RGBA_GREEN];	// G
-						histo[pixel]++;
-						bits += bytespp;
-					}
-				}
-				return TRUE;
-
-			case FICC_BLUE:
-				// compute histogram for blue channel
-				for(y = 0; y < height; y++) {
-					bits =  FreeImage_GetScanLine(src, y);
-					for(x = 0; x < width; x++) {
-						pixel = bits[FI_RGBA_BLUE];	// B
-						histo[pixel]++;
-						bits += bytespp;
-					}
-				}
-				return TRUE;
-
-			case FICC_BLACK:
-			case FICC_RGB:
-				// compute histogram for black channel
-				for(y = 0; y < height; y++) {
-					bits =  FreeImage_GetScanLine(src, y);
-					for(x = 0; x < width; x++) {
-						// RGB to GREY conversion
-						pixel = GREY(bits[FI_RGBA_RED], bits[FI_RGBA_GREEN], bits[FI_RGBA_BLUE]);
-						histo[pixel]++;
-						bits += bytespp;
-					}
-				}
-				return TRUE;
-				
-			default:
-				return FALSE;
-		}
-	}
-
-	return FALSE;
-}
-
-// ----------------------------------------------------------
-
-
-/** @brief Creates a lookup table to be used with FreeImage_AdjustCurve() which
- may adjust brightness and contrast, correct gamma and invert the image with a
- single call to FreeImage_AdjustCurve().
- 
- This function creates a lookup table to be used with FreeImage_AdjustCurve()
- which may adjust brightness and contrast, correct gamma and invert the image
- with a single call to FreeImage_AdjustCurve(). If more than one of these image
- display properties need to be adjusted, using a combined lookup table should be
- preferred over calling each adjustment function separately. That's particularly
- true for huge images or if performance is an issue. Then, the expensive process
- of iterating over all pixels of an image is performed only once and not up to
- four times.
- 
- Furthermore, the lookup table created does not depend on the order, in which
- each single adjustment operation is performed. Due to rounding and byte casting
- issues, it actually matters in which order individual adjustment operations
- are performed. Both of the following snippets most likely produce different
- results:
- 
- // snippet 1: contrast, brightness
- FreeImage_AdjustContrast(dib, 15.0);
- FreeImage_AdjustBrightness(dib, 50.0); 
- 
- // snippet 2: brightness, contrast
- FreeImage_AdjustBrightness(dib, 50.0);
- FreeImage_AdjustContrast(dib, 15.0);
- 
- Better and even faster would be snippet 3:
- 
- // snippet 3:
- BYTE LUT[256];
- FreeImage_GetAdjustColorsLookupTable(LUT, 50.0, 15.0, 1.0, FALSE); 
- FreeImage_AdjustCurve(dib, LUT, FICC_RGB);
- 
- This function is also used internally by FreeImage_AdjustColors(), which does
- not return the lookup table, but uses it to call FreeImage_AdjustCurve() on the
- passed image.
- 
- @param LUT Output lookup table to be used with FreeImage_AdjustCurve(). <b>The
- size of 'LUT' is assumed to be 256.</b>
- @param brightness Percentage brightness value where -100 <= brightness <= 100<br>
- A value of 0 means no change, less than 0 will make the image darker and greater
- than 0 will make the image brighter.
- @param contrast Percentage contrast value where -100 <= contrast <= 100<br>
- A value of 0 means no change, less than 0 will decrease the contrast
- and greater than 0 will increase the contrast of the image.
- @param gamma Gamma value to be used for gamma correction. A value of 1.0 leaves
- the image alone, less than one darkens it, and greater than one lightens it.
- This parameter must not be zero or smaller than zero. If so, it will be ignored
- and no gamma correction will be performed using the lookup table created.
- @param invert If set to TRUE, the image will be inverted.
- @return Returns the number of adjustments applied to the resulting lookup table
- compared to a blind lookup table.
- */
-int DLL_CALLCONV
-FreeImage_GetAdjustColorsLookupTable(BYTE *LUT, double brightness, double contrast, double gamma, BOOL invert) {
-	double dblLUT[256];
-	double value;
-	int result = 0;
-
-	if ((brightness == 0.0) && (contrast == 0.0) && (gamma == 1.0) && (!invert)) {
-		// nothing to do, if all arguments have their default values
-		// return a blind LUT
-		for (int i = 0; i < 256; i++) {
-			LUT[i] = (BYTE)i;
-		}
-		return 0;
-	}
-
-	// first, create a blind LUT, which does nothing to the image
-	for (int i = 0; i < 256; i++) {
-		dblLUT[i] = i;
-	}
-
-	if (contrast != 0.0) {
-		// modify lookup table with contrast adjustment data
-		const double v = (100.0 + contrast) / 100.0;
-		for (int i = 0; i < 256; i++) {
-			value = 128 + (dblLUT[i] - 128) * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
-		}
-		result++;
-	}
-
-	if (brightness != 0.0) {
-		// modify lookup table with brightness adjustment data
-		const double v = (100.0 + brightness) / 100.0;
-		for (int i = 0; i < 256; i++) {
-			value = dblLUT[i] * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
-		}
-		result++;
-	}
-
-	if ((gamma > 0) && (gamma != 1.0)) {
-		// modify lookup table with gamma adjustment data
-		double exponent = 1 / gamma;
-		const double v = 255.0 * (double)pow((double)255, -exponent);
-		for (int i = 0; i < 256; i++) {
-			value = pow(dblLUT[i], exponent) * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
-		}
-		result++;
-	}
-
-	if (!invert) {
-		for (int i = 0; i < 256; i++) {
-			LUT[i] = (BYTE)floor(dblLUT[i] + 0.5);
-		}
-	} else {
-		for (int i = 0; i < 256; i++) {
-			LUT[i] = 255 - (BYTE)floor(dblLUT[i] + 0.5);
-		}
-		result++;
-	}
-	// return the number of adjustments made
-	return result;
-}
-
-/** @brief Adjusts an image's brightness, contrast and gamma as well as it may
- optionally invert the image within a single operation.
- 
- This function adjusts an image's brightness, contrast and gamma as well as it
- may optionally invert the image within a single operation. If more than one of
- these image display properties need to be adjusted, using this function should
- be preferred over calling each adjustment function separately. That's
- particularly true for huge images or if performance is an issue.
- 
- This function relies on FreeImage_GetAdjustColorsLookupTable(), which creates a
- single lookup table, that combines all adjustment operations requested.
- 
- Furthermore, the lookup table created by FreeImage_GetAdjustColorsLookupTable()
- does not depend on the order, in which each single adjustment operation is
- performed. Due to rounding and byte casting issues, it actually matters in which
- order individual adjustment operations are performed. Both of the following
- snippets most likely produce different results:
- 
- // snippet 1: contrast, brightness
- FreeImage_AdjustContrast(dib, 15.0);
- FreeImage_AdjustBrightness(dib, 50.0); 
- 
- // snippet 2: brightness, contrast
- FreeImage_AdjustBrightness(dib, 50.0);
- FreeImage_AdjustContrast(dib, 15.0);
- 
- Better and even faster would be snippet 3:
- 
- // snippet 3:
- FreeImage_AdjustColors(dib, 50.0, 15.0, 1.0, FALSE);
- 
- @param dib Input/output image to be processed.
- @param brightness Percentage brightness value where -100 <= brightness <= 100<br>
- A value of 0 means no change, less than 0 will make the image darker and greater
- than 0 will make the image brighter.
- @param contrast Percentage contrast value where -100 <= contrast <= 100<br>
- A value of 0 means no change, less than 0 will decrease the contrast
- and greater than 0 will increase the contrast of the image.
- @param gamma Gamma value to be used for gamma correction. A value of 1.0 leaves
- the image alone, less than one darkens it, and greater than one lightens it.<br>
- This parameter must not be zero or smaller than zero. If so, it will be ignored
- and no gamma correction will be performed on the image.
- @param invert If set to TRUE, the image will be inverted.
- @return Returns TRUE on success, FALSE otherwise (e.g. when the bitdeph of the
- source dib cannot be handled).
- */
-BOOL DLL_CALLCONV
-FreeImage_AdjustColors(FIBITMAP *dib, double brightness, double contrast, double gamma, BOOL invert) {
-	BYTE LUT[256];
-
-	if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return FALSE;
-	}
-
-	int bpp = FreeImage_GetBPP(dib);
-	if ((bpp != 8) && (bpp != 24) && (bpp != 32)) {
-		return FALSE;
-	}
-
-	if (FreeImage_GetAdjustColorsLookupTable(LUT, brightness, contrast, gamma, invert)) {
-		return FreeImage_AdjustCurve(dib, LUT, FICC_RGB);
-	}
-	return FALSE;
-}
-
-/** @brief Applies color mapping for one or several colors on a 1-, 4- or 8-bit
- palletized or a 16-, 24- or 32-bit high color image.
-
- This function maps up to <i>count</i> colors specified in <i>srccolors</i> to
- these specified in <i>dstcolors</i>. Thereby, color <i>srccolors[N]</i>,
- if found in the image, will be replaced by color <i>dstcolors[N]</i>. If
- parameter <i>swap</i> is TRUE, additionally all colors specified in
- <i>dstcolors</i> are also mapped to these specified in <i>srccolors</i>. For
- high color images, the actual image data will be modified whereas, for
- palletized images only the palette will be changed.<br>
-
- The function returns the number of pixels changed or zero, if no pixels were
- changed. 
-
- Both arrays <i>srccolors</i> and <i>dstcolors</i> are assumed not to hold less
- than <i>count</i> colors.<br>
-
- For 16-bit images, all colors specified are transparently converted to their 
- proper 16-bit representation (either in RGB555 or RGB565 format, which is
- determined by the image's red- green- and blue-mask).<br>
-
- <b>Note, that this behaviour is different from what FreeImage_ApplyPaletteIndexMapping()
- does, which modifies the actual image data on palletized images.</b>
-
- @param dib Input/output image to be processed.
- @param srccolors Array of colors to be used as the mapping source.
- @param dstcolors Array of colors to be used as the mapping destination.
- @param count The number of colors to be mapped. This is the size of both
- <i>srccolors</i> and <i>dstcolors</i>.  
- @param ignore_alpha If TRUE, 32-bit images and colors are treated as 24-bit.
- @param swap If TRUE, source and destination colors are swapped, that is,
- each destination color is also mapped to the corresponding source color.  
- @return Returns the total number of pixels changed. 
- */
-unsigned DLL_CALLCONV
-FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolors, unsigned count, BOOL ignore_alpha, BOOL swap) {
-	unsigned result = 0;
-
-	if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return 0;
-	}
-
-	// validate parameters
-	if ((!srccolors) || (!dstcolors)|| (count < 1)) {
-		return 0;
-	}
-
-	int bpp = FreeImage_GetBPP(dib);
-	switch (bpp) {
-		case 1:
-		case 4:
-		case 8: {
-			unsigned size = FreeImage_GetColorsUsed(dib);
-			RGBQUAD *pal = FreeImage_GetPalette(dib);
-			RGBQUAD *a, *b;
-			for (unsigned x = 0; x < size; x++) {
-				for (unsigned j = 0; j < count; j++) {
-					a = srccolors;
-					b = dstcolors;
-					for (int i = (swap ? 0 : 1); i < 2; i++) {
-						if ((pal[x].rgbBlue == a[j].rgbBlue)&&(pal[x].rgbGreen == a[j].rgbGreen) &&(pal[x].rgbRed== a[j].rgbRed)) {
-							pal[x].rgbBlue = b[j].rgbBlue;
-							pal[x].rgbGreen = b[j].rgbGreen;
-							pal[x].rgbRed = b[j].rgbRed;
-							result++;
-							j = count;
-							break;
-						}
-						a = dstcolors;
-						b = srccolors;
-					}
-				}
-			}
-			return result;
-		}
-		case 16: {
-			WORD *src16 = (WORD *)malloc(sizeof(WORD) * count);
-			if (NULL == src16) {
-				return 0;
-			}
-
-			WORD *dst16 = (WORD *)malloc(sizeof(WORD) * count);
-			if (NULL == dst16) {
-				free(src16);
-				return 0;
-			}
-
-			for (unsigned j = 0; j < count; j++) {
-				src16[j] = RGBQUAD_TO_WORD(dib, (srccolors + j));
-				dst16[j] = RGBQUAD_TO_WORD(dib, (dstcolors + j));
-			}
-
-			unsigned height = FreeImage_GetHeight(dib);
-			unsigned width = FreeImage_GetWidth(dib);
-			WORD *a, *b;
-			for (unsigned y = 0; y < height; y++) {
-				WORD *bits = (WORD *)FreeImage_GetScanLine(dib, y);
-				for (unsigned x = 0; x < width; x++, bits++) {
-					for (unsigned j = 0; j < count; j++) {
-						a = src16;
-						b = dst16;
-						for (int i = (swap ? 0 : 1); i < 2; i++) {
-							if (*bits == a[j]) {
-								*bits = b[j];
-								result++;
-								j = count;
-								break;
-							}
-							a = dst16;
-							b = src16;
-						}
-					}
-				}
-			}
-			free(src16);
-			free(dst16);
-			return result;
-		}
-		case 24: {
-			unsigned height = FreeImage_GetHeight(dib);
-			unsigned width = FreeImage_GetWidth(dib);
-			RGBQUAD *a, *b;
-			for (unsigned y = 0; y < height; y++) {
-				BYTE *bits = FreeImage_GetScanLine(dib, y);
-				for (unsigned x = 0; x < width; x++, bits += 3) {
-					for (unsigned j = 0; j < count; j++) {
-						a = srccolors;
-						b = dstcolors;
-						for (int i = (swap ? 0 : 1); i < 2; i++) {
-							if ((bits[FI_RGBA_BLUE] == a[j].rgbBlue) && (bits[FI_RGBA_GREEN] == a[j].rgbGreen) &&(bits[FI_RGBA_RED] == a[j].rgbRed)) {
-								bits[FI_RGBA_BLUE] = b[j].rgbBlue;
-								bits[FI_RGBA_GREEN] = b[j].rgbGreen;
-								bits[FI_RGBA_RED] = b[j].rgbRed;
-								result++;
-								j = count;
-								break;
-							}
-							a = dstcolors;
-							b = srccolors;
-						}
-					}
-				}
-			}
-			return result;
-		}
-		case 32: {
-			unsigned height = FreeImage_GetHeight(dib);
-			unsigned width = FreeImage_GetWidth(dib);
-			RGBQUAD *a, *b;
-			for (unsigned y = 0; y < height; y++) {
-				BYTE *bits = FreeImage_GetScanLine(dib, y);
-				for (unsigned x = 0; x < width; x++, bits += 4) {
-					for (unsigned j = 0; j < count; j++) {
-						a = srccolors;
-						b = dstcolors;
-						for (int i = (swap ? 0 : 1); i < 2; i++) {
-							if ((bits[FI_RGBA_BLUE] == a[j].rgbBlue) &&(bits[FI_RGBA_GREEN] == a[j].rgbGreen) &&(bits[FI_RGBA_RED] == a[j].rgbRed)
-								&&((ignore_alpha) || (bits[FI_RGBA_ALPHA] == a[j].rgbReserved))) {
-								bits[FI_RGBA_BLUE] = b[j].rgbBlue;
-								bits[FI_RGBA_GREEN] = b[j].rgbGreen;
-								bits[FI_RGBA_RED] = b[j].rgbRed;
-								if (!ignore_alpha) {
-									bits[FI_RGBA_ALPHA] = b[j].rgbReserved;
-								}
-								result++;
-								j = count;
-								break;
-							}
-							a = dstcolors;
-							b = srccolors;
-						}
-					}
-				}
-			}
-			return result;
-		}
-		default: {
-			return 0;
-		}
-	}
-}
-
-/** @brief Swaps two specified colors on a 1-, 4- or 8-bit palletized
- or a 16-, 24- or 32-bit high color image.
-
- This function swaps the two specified colors <i>color_a</i> and <i>color_b</i>
- on a palletized or high color image. For high color images, the actual image
- data will be modified whereas, for palletized images only the palette will be
- changed.<br>
-
- <b>Note, that this behaviour is different from what FreeImage_SwapPaletteIndices()
- does, which modifies the actual image data on palletized images.</b><br>
-
- This is just a thin wrapper for FreeImage_ApplyColorMapping() and resolves to:<br>
- <i>return FreeImage_ApplyColorMapping(dib, color_a, color_b, 1, ignore_alpha, TRUE);</i>
-
- @param dib Input/output image to be processed.
- @param color_a On of the two colors to be swapped.
- @param color_b The other of the two colors to be swapped.
- @param ignore_alpha If TRUE, 32-bit images and colors are treated as 24-bit. 
- @return Returns the total number of pixels changed. 
- */
-unsigned DLL_CALLCONV
-FreeImage_SwapColors(FIBITMAP *dib, RGBQUAD *color_a, RGBQUAD *color_b, BOOL ignore_alpha) {
-	return FreeImage_ApplyColorMapping(dib, color_a, color_b, 1, ignore_alpha, TRUE);
-}
-
-/** @brief Applies palette index mapping for one or several indices on a 1-, 4- 
- or 8-bit palletized image.
-
- This function maps up to <i>count</i> palette indices specified in
- <i>srcindices</i> to these specified in <i>dstindices</i>. Thereby, index 
- <i>srcindices[N]</i>, if present in the image, will be replaced by index
- <i>dstindices[N]</i>. If parameter <i>swap</i> is TRUE, additionally all indices
- specified in <i>dstindices</i> are also mapped to these specified in 
- <i>srcindices</i>.<br>
-
- The function returns the number of pixels changed or zero, if no pixels were
- changed. 
-
- Both arrays <i>srcindices</i> and <i>dstindices</i> are assumed not to hold less
- than <i>count</i> indices.<br>
-
- <b>Note, that this behaviour is different from what FreeImage_ApplyColorMapping()
- does, which modifies the actual image data on palletized images.</b>
-
- @param dib Input/output image to be processed.
- @param srcindices Array of palette indices to be used as the mapping source.
- @param dstindices Array of palette indices to be used as the mapping destination.
- @param count The number of palette indices to be mapped. This is the size of both
- <i>srcindices</i> and <i>dstindices</i>.  
- @param swap If TRUE, source and destination palette indices are swapped, that is,
- each destination index is also mapped to the corresponding source index.  
- @return Returns the total number of pixels changed. 
- */
-unsigned DLL_CALLCONV
-FreeImage_ApplyPaletteIndexMapping(FIBITMAP *dib, BYTE *srcindices,	BYTE *dstindices, unsigned count, BOOL swap) {
-	unsigned result = 0;
-
-	if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return 0;
-	}
-
-	// validate parameters
-	if ((!srcindices) || (!dstindices)|| (count < 1)) {
-		return 0;
-	}
-
-	unsigned height = FreeImage_GetHeight(dib);
-	unsigned width = FreeImage_GetLine(dib);
-	BYTE *a, *b;
-
-	int bpp = FreeImage_GetBPP(dib);
-	switch (bpp) {
-		case 1: {
-
-			return result;
-		}
-		case 4: {
-			int skip_last = (FreeImage_GetWidth(dib) & 0x01);
-			unsigned max_x = width - 1;
-			for (unsigned y = 0; y < height; y++) {
-				BYTE *bits = FreeImage_GetScanLine(dib, y);
-				for (unsigned x = 0; x < width; x++) {
-					int start = ((skip_last) && (x == max_x)) ? 1 : 0;
-					for (int cn = start; cn < 2; cn++) {
-						for (unsigned j = 0; j < count; j++) {
-							a = srcindices;
-							b = dstindices;
-							for (int i = ((swap) ? 0 : 1); i < 2; i++) {
-								if (GET_NIBBLE(cn, bits[x]) == (a[j] & 0x0F)) {
-									SET_NIBBLE(cn, bits[x], b[j]);
-									result++;
-									j = count;
-									break;
-								}
-								a = dstindices;
-								b = srcindices;
-							}
-						}
-					}
-				}
-			}
-			return result;
-		}
-		case 8: {
-			for (unsigned y = 0; y < height; y++) {
-				BYTE *bits = FreeImage_GetScanLine(dib, y);
-				for (unsigned x = 0; x < width; x++) {
-					for (unsigned j = 0; j < count; j++) {
-						a = srcindices;
-						b = dstindices;
-						for (int i = ((swap) ? 0 : 1); i < 2; i++) {
-							if (bits[x] == a[j]) {
-								bits[x] = b[j];
-								result++;
-								j = count;
-								break;
-							}
-							a = dstindices;
-							b = srcindices;
-						}
-					}
-				}
-			}
-			return result;
-		}
-		default: {
-			return 0;
-		}
-	}
-}
-
-/** @brief Swaps two specified palette indices on a 1-, 4- or 8-bit palletized
- image.
-
- This function swaps the two specified palette indices <i>index_a</i> and
- <i>index_b</i> on a palletized image. Therefore, not the palette, but the
- actual image data will be modified.<br>
-
- <b>Note, that this behaviour is different from what FreeImage_SwapColors() does
- on palletized images, which only swaps the colors in the palette.</b><br>
-
- This is just a thin wrapper for FreeImage_ApplyColorMapping() and resolves to:<br>
- <i>return FreeImage_ApplyPaletteIndexMapping(dib, index_a, index_b, 1, TRUE);</i>
-
- @param dib Input/output image to be processed.
- @param index_a On of the two palette indices to be swapped.
- @param index_b The other of the two palette indices to be swapped.
- @return Returns the total number of pixels changed. 
- */
-unsigned DLL_CALLCONV 
-FreeImage_SwapPaletteIndices(FIBITMAP *dib, BYTE *index_a, BYTE *index_b) {
-	return FreeImage_ApplyPaletteIndexMapping(dib, index_a, index_b, 1, TRUE);
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp b/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp
deleted file mode 100644
index c2a44c8345..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-// ==========================================================
-// Copy / paste routines
-//
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Alexander Dymerets (sashad@te.net.ua)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Manfred Tausch (manfred.tausch@t-online.de)
-// - Riley McNiff (rmcniff@marexgroup.com)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ----------------------------------------------------------
-//   Helpers
-// ----------------------------------------------------------
-
-/////////////////////////////////////////////////////////////
-// Alpha blending / combine functions
-
-// ----------------------------------------------------------
-/// 1-bit
-static BOOL Combine1(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 4-bit
-static BOOL Combine4(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 8-bit
-static BOOL Combine8(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 16-bit 555
-static BOOL Combine16_555(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 16-bit 565
-static BOOL Combine16_565(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 24-bit
-static BOOL Combine24(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-/// 32- bit
-static BOOL Combine32(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha);
-// ----------------------------------------------------------
-
-// ----------------------------------------------------------
-//   1-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine1(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	BOOL value;
-
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 1) || (FreeImage_GetBPP(src_dib) != 1)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib));
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	// combine images
-	for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-		for(unsigned cols = 0; cols < FreeImage_GetWidth(src_dib); cols++) {
-			// get bit at (rows, cols) in src image
-			value = (src_bits[cols >> 3] & (0x80 >> (cols & 0x07))) != 0;
-			// set bit at (rows, x+cols) in dst image	
-			value ? dst_bits[(x + cols) >> 3] |= (0x80 >> ((x + cols) & 0x7)) : dst_bits[(x + cols) >> 3] &= (0xFF7F >> ((x + cols) & 0x7));
-		}
-
-		dst_bits += FreeImage_GetPitch(dst_dib);
-		src_bits += FreeImage_GetPitch(src_dib);
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   4-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine4(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	int swapTable[16];
-	BOOL bOddStart, bOddEnd;
-
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 4) || (FreeImage_GetBPP(src_dib) != 4)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	// get src and dst palettes
-	RGBQUAD *src_pal = FreeImage_GetPalette(src_dib);
-	RGBQUAD *dst_pal = FreeImage_GetPalette(dst_dib);
-	if (src_pal == NULL || dst_pal == NULL) {
-		return FALSE;
-	}
-
-	// build a swap table for the closest color match from the source palette to the destination palette
-
-	for (int i = 0; i < 16; i++)	{
-		WORD min_diff = (WORD)-1;
-
-		for (int j = 0; j < 16; j++)	{
-			// calculates the color difference using a Manhattan distance
-			WORD abs_diff = (WORD)(
-				abs(src_pal[i].rgbBlue - dst_pal[j].rgbBlue)
-				+ abs(src_pal[i].rgbGreen - dst_pal[j].rgbGreen)
-				+ abs(src_pal[i].rgbRed - dst_pal[j].rgbRed)
-				);
-
-			if (abs_diff < min_diff)	{
-				swapTable[i] = j;
-				min_diff = abs_diff;
-				if (abs_diff == 0) {
-					break;
-				}
-			}
-		}
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) *	FreeImage_GetPitch(dst_dib)) + (x >> 1);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);    
-
-	// combine images
-
-	// allocate space for our temporary row
-	unsigned src_line   = FreeImage_GetLine(src_dib);
-	unsigned src_width  = FreeImage_GetWidth(src_dib);
-	unsigned src_height = FreeImage_GetHeight(src_dib);
-
-	BYTE *buffer = (BYTE *)malloc(src_line * sizeof(BYTE));
-	if (buffer == NULL) {
-		return FALSE;
-	}
-
-	bOddStart = (x & 0x01) ? TRUE : FALSE;
-
-	if ((bOddStart && !(src_width & 0x01)) || (!bOddStart && (src_width & 0x01)))	{
-		bOddEnd = TRUE;
-	}
-	else {
-		bOddEnd = FALSE;
-	}
-
-	for(unsigned rows = 0; rows < src_height; rows++) {
-		memcpy(buffer, src_bits, src_line);
-		
-		// change the values in the temp row to be those from the swap table
-		
-		for (unsigned cols = 0; cols < src_line; cols++) {
-			buffer[cols] = (BYTE)((swapTable[HINIBBLE(buffer[cols]) >> 4] << 4) + swapTable[LOWNIBBLE(buffer[cols])]);
-		}
-
-		if (bOddStart) {	
-			buffer[0] = HINIBBLE(dst_bits[0]) + LOWNIBBLE(buffer[0]);
-		}
-		
-		if (bOddEnd)	{
-			buffer[src_line - 1] = HINIBBLE(buffer[src_line - 1]) + LOWNIBBLE(dst_bits[src_line - 1]);
-		}
-
-		memcpy(dst_bits, buffer, src_line);
-		
-		dst_bits += FreeImage_GetPitch(dst_dib);
-		src_bits += FreeImage_GetPitch(src_dib);
-	}
-
-	free(buffer);
-
-	return TRUE;
-
-}
-
-// ----------------------------------------------------------
-//   8-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine8(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 8) || (FreeImage_GetBPP(src_dib) != 8)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib)) + (x);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	if(alpha > 255) {
-		// combine images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			memcpy(dst_bits, src_bits, FreeImage_GetLine(src_dib));
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	} else {
-		// alpha blend images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			for (unsigned cols = 0; cols < FreeImage_GetLine(src_dib); cols++) {							
-				dst_bits[cols] = (BYTE)(((src_bits[cols] - dst_bits[cols]) * alpha + (dst_bits[cols] << 8)) >> 8);
-			}
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   16-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine16_555(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib)) + (x * 2);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	if (alpha > 255) {
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			memcpy(dst_bits, src_bits, FreeImage_GetLine(src_dib));
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	} else {
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			for(unsigned cols = 0; cols < FreeImage_GetLine(src_dib); cols += 2) {
-				RGBTRIPLE color_s;
-				RGBTRIPLE color_t;
-				
-				WORD *tmp1 = (WORD *)&dst_bits[cols];
-				WORD *tmp2 = (WORD *)&src_bits[cols];
-
-				// convert 16-bit colors to 24-bit
-
-				color_s.rgbtRed = (BYTE)(((*tmp1 & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) << 3);
-				color_s.rgbtGreen = (BYTE)(((*tmp1 & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) << 3);
-				color_s.rgbtBlue = (BYTE)(((*tmp1 & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) << 3);
-
-				color_t.rgbtRed = (BYTE)(((*tmp2 & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) << 3);
-				color_t.rgbtGreen = (BYTE)(((*tmp2 & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) << 3);
-				color_t.rgbtBlue = (BYTE)(((*tmp2 & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) << 3);
-
-				// alpha blend
-
-				color_s.rgbtRed = (BYTE)(((color_t.rgbtRed - color_s.rgbtRed) * alpha + (color_s.rgbtRed << 8)) >> 8);
-				color_s.rgbtGreen = (BYTE)(((color_t.rgbtGreen - color_s.rgbtGreen) * alpha + (color_s.rgbtGreen << 8)) >> 8);
-				color_s.rgbtBlue = (BYTE)(((color_t.rgbtBlue - color_s.rgbtBlue) * alpha + (color_s.rgbtBlue << 8)) >> 8);
-
-				// convert 24-bit color back to 16-bit
-
-				*tmp1 = RGB555(color_s.rgbtRed, color_s.rgbtGreen, color_s.rgbtBlue);
-			}
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	}
-
-	return TRUE;
-}
-
-static BOOL 
-Combine16_565(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib)) + (x * 2);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	if (alpha > 255) {
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			memcpy(dst_bits, src_bits, FreeImage_GetLine(src_dib));
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	} else {
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			for(unsigned cols = 0; cols < FreeImage_GetLine(src_dib); cols += 2) {
-				RGBTRIPLE color_s;
-				RGBTRIPLE color_t;
-				
-				WORD *tmp1 = (WORD *)&dst_bits[cols];
-				WORD *tmp2 = (WORD *)&src_bits[cols];
-
-				// convert 16-bit colors to 24-bit
-
-				color_s.rgbtRed = (BYTE)(((*tmp1 & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) << 3);
-				color_s.rgbtGreen = (BYTE)(((*tmp1 & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) << 2);
-				color_s.rgbtBlue = (BYTE)(((*tmp1 & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) << 3);
-
-				color_t.rgbtRed = (BYTE)(((*tmp2 & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) << 3);
-				color_t.rgbtGreen = (BYTE)(((*tmp2 & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) << 2);
-				color_t.rgbtBlue = (BYTE)(((*tmp2 & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) << 3);
-
-				// alpha blend
-
-				color_s.rgbtRed = (BYTE)(((color_t.rgbtRed - color_s.rgbtRed) * alpha + (color_s.rgbtRed << 8)) >> 8);
-				color_s.rgbtGreen = (BYTE)(((color_t.rgbtGreen - color_s.rgbtGreen) * alpha + (color_s.rgbtGreen << 8)) >> 8);
-				color_s.rgbtBlue = (BYTE)(((color_t.rgbtBlue - color_s.rgbtBlue) * alpha + (color_s.rgbtBlue << 8)) >> 8);
-
-				// convert 24-bit color back to 16-bit
-
-				*tmp1 = RGB565(color_s.rgbtRed, color_s.rgbtGreen, color_s.rgbtBlue);
-			}
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	}
-	
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   24-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine24(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 24) || (FreeImage_GetBPP(src_dib) != 24)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib)) + (x * 3);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	if(alpha > 255) {
-		// combine images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			memcpy(dst_bits, src_bits, FreeImage_GetLine(src_dib));
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	} else {
-		// alpha blend images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			for (unsigned cols = 0; cols < FreeImage_GetLine(src_dib); cols++) {							
-				dst_bits[cols] = (BYTE)(((src_bits[cols] - dst_bits[cols]) * alpha + (dst_bits[cols] << 8)) >> 8);
-			}
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   32-bit
-// ----------------------------------------------------------
-
-static BOOL 
-Combine32(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) {
-	// check the bit depth of src and dst images
-	if((FreeImage_GetBPP(dst_dib) != 32) || (FreeImage_GetBPP(src_dib) != 32)) {
-		return FALSE;
-	}
-
-	// check the size of src image
-	if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) {
-		return FALSE;
-	}
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((FreeImage_GetHeight(dst_dib) - FreeImage_GetHeight(src_dib) - y) * FreeImage_GetPitch(dst_dib)) + (x * 4);
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	if (alpha > 255) {
-		// combine images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			memcpy(dst_bits, src_bits, FreeImage_GetLine(src_dib));
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	} else {
-		// alpha blend images
-		for(unsigned rows = 0; rows < FreeImage_GetHeight(src_dib); rows++) {
-			for(unsigned cols = 0; cols < FreeImage_GetLine(src_dib); cols++) {
-				dst_bits[cols] = (BYTE)(((src_bits[cols] - dst_bits[cols]) * alpha + (dst_bits[cols] << 8)) >> 8);
-			}
-
-			dst_bits += FreeImage_GetPitch(dst_dib);
-			src_bits += FreeImage_GetPitch(src_dib);
-		}
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   Any type other than FIBITMAP
-// ----------------------------------------------------------
-
-static BOOL 
-CombineSameType(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y) {
-	// check the bit depth of src and dst images
-	if(FreeImage_GetImageType(dst_dib) != FreeImage_GetImageType(src_dib)) {
-		return FALSE;
-	}
-
-	unsigned src_width  = FreeImage_GetWidth(src_dib);
-	unsigned src_height = FreeImage_GetHeight(src_dib);
-	unsigned src_pitch  = FreeImage_GetPitch(src_dib);
-	unsigned src_line   = FreeImage_GetLine(src_dib);
-	unsigned dst_width  = FreeImage_GetWidth(dst_dib);
-	unsigned dst_height = FreeImage_GetHeight(dst_dib);
-	unsigned dst_pitch  = FreeImage_GetPitch(dst_dib);
-	
-	// check the size of src image
-	if((x + src_width > dst_width) || (y + src_height > dst_height)) {
-		return FALSE;
-	}	
-
-	BYTE *dst_bits = FreeImage_GetBits(dst_dib) + ((dst_height - src_height - y) * dst_pitch) + (x * (src_line / src_width));
-	BYTE *src_bits = FreeImage_GetBits(src_dib);	
-
-	// combine images	
-	for(unsigned rows = 0; rows < src_height; rows++) {
-		memcpy(dst_bits, src_bits, src_line);
-
-		dst_bits += dst_pitch;
-		src_bits += src_pitch;
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   FreeImage interface
-// ----------------------------------------------------------
-
-/**
-Copy a sub part of the current image and returns it as a FIBITMAP*.
-Works with any bitmap type.
-@param left Specifies the left position of the cropped rectangle. 
-@param top Specifies the top position of the cropped rectangle. 
-@param right Specifies the right position of the cropped rectangle. 
-@param bottom Specifies the bottom position of the cropped rectangle. 
-@return Returns the subimage if successful, NULL otherwise.
-*/
-FIBITMAP * DLL_CALLCONV 
-FreeImage_Copy(FIBITMAP *src, int left, int top, int right, int bottom) {
-
-	if(!FreeImage_HasPixels(src)) 
-		return NULL;
-
-	// normalize the rectangle
-	if(right < left) {
-		INPLACESWAP(left, right);
-	}
-	if(bottom < top) {
-		INPLACESWAP(top, bottom);
-	}
-	// check the size of the sub image
-	int src_width  = FreeImage_GetWidth(src);
-	int src_height = FreeImage_GetHeight(src);
-	if((left < 0) || (right > src_width) || (top < 0) || (bottom > src_height)) {
-		return NULL;
-	}
-
-	// allocate the sub image
-	unsigned bpp = FreeImage_GetBPP(src);
-	int dst_width = (right - left);
-	int dst_height = (bottom - top);
-
-	FIBITMAP *dst = 
-		FreeImage_AllocateT(FreeImage_GetImageType(src), 
-							dst_width, 
-							dst_height, 
-							bpp, 
-							FreeImage_GetRedMask(src), FreeImage_GetGreenMask(src), FreeImage_GetBlueMask(src));
-
-	if(NULL == dst) return NULL;
-
-	// get the dimensions
-	int dst_line = FreeImage_GetLine(dst);
-	int dst_pitch = FreeImage_GetPitch(dst);
-	int src_pitch = FreeImage_GetPitch(src);
-
-	// get the pointers to the bits and such
-
-	BYTE *src_bits = FreeImage_GetScanLine(src, src_height - top - dst_height);
-	switch(bpp) {
-		case 1:
-			// point to x = 0
-			break;
-
-		case 4:
-			// point to x = 0
-			break;
-
-		default:
-		{
-			// calculate the number of bytes per pixel
-			unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-			// point to x = left
-			src_bits += left * bytespp;
-		}
-		break;
-	}
-
-	// point to x = 0
-	BYTE *dst_bits = FreeImage_GetBits(dst);
-
-	// copy the palette
-
-	memcpy(FreeImage_GetPalette(dst), FreeImage_GetPalette(src), FreeImage_GetColorsUsed(src) * sizeof(RGBQUAD));
-
-	// copy the bits
-	if(bpp == 1) {
-		BOOL value;
-		unsigned y_src, y_dst;
-
-		for(int y = 0; y < dst_height; y++) {
-			y_src = y * src_pitch;
-			y_dst = y * dst_pitch;
-			for(int x = 0; x < dst_width; x++) {
-				// get bit at (y, x) in src image
-				value = (src_bits[y_src + ((left+x) >> 3)] & (0x80 >> ((left+x) & 0x07))) != 0;
-				// set bit at (y, x) in dst image
-				value ? dst_bits[y_dst + (x >> 3)] |= (0x80 >> (x & 0x7)) : dst_bits[y_dst + (x >> 3)] &= (0xff7f >> (x & 0x7));
-			}
-		}
-	}
-
-	else if(bpp == 4) {
-		BYTE shift, value;
-		unsigned y_src, y_dst;
-
-		for(int y = 0; y < dst_height; y++) {
-			y_src = y * src_pitch;
-			y_dst = y * dst_pitch;
-			for(int x = 0; x < dst_width; x++) {
-				// get nibble at (y, x) in src image
-				shift = (BYTE)((1 - (left+x) % 2) << 2);
-				value = (src_bits[y_src + ((left+x) >> 1)] & (0x0F << shift)) >> shift;
-				// set nibble at (y, x) in dst image
-				shift = (BYTE)((1 - x % 2) << 2);
-				dst_bits[y_dst + (x >> 1)] &= ~(0x0F << shift);
-				dst_bits[y_dst + (x >> 1)] |= ((value & 0x0F) << shift);
-			}
-		}
-	}
-
-	else if(bpp >= 8) {
-		for(int y = 0; y < dst_height; y++) {
-			memcpy(dst_bits + (y * dst_pitch), src_bits + (y * src_pitch), dst_line);
-		}
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(dst, src);
-	
-	// copy transparency table 
-	FreeImage_SetTransparencyTable(dst, FreeImage_GetTransparencyTable(src), FreeImage_GetTransparencyCount(src));
-	
-	// copy background color 
-	RGBQUAD bkcolor; 
-	if( FreeImage_GetBackgroundColor(src, &bkcolor) ) {
-		FreeImage_SetBackgroundColor(dst, &bkcolor); 
-	}
-	
-	// clone resolution 
-	FreeImage_SetDotsPerMeterX(dst, FreeImage_GetDotsPerMeterX(src)); 
-	FreeImage_SetDotsPerMeterY(dst, FreeImage_GetDotsPerMeterY(src)); 
-	
-	// clone ICC profile 
-	FIICCPROFILE *src_profile = FreeImage_GetICCProfile(src); 
-	FIICCPROFILE *dst_profile = FreeImage_CreateICCProfile(dst, src_profile->data, src_profile->size); 
-	dst_profile->flags = src_profile->flags; 
-	
-	return dst;
-}
-
-/**
-Alpha blend or combine a sub part image with the current image.
-The bit depth of dst bitmap must be greater than or equal to the bit depth of src. 
-Upper promotion of src is done internally. Supported bit depth equals to 1, 4, 8, 16, 24 or 32.
-@param src Source subimage
-@param left Specifies the left position of the sub image. 
-@param top Specifies the top position of the sub image. 
-@param alpha Alpha blend factor. The source and destination images are alpha blended if 
-alpha = 0..255. If alpha > 255, then the source image is combined to the destination image.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha) {
-	BOOL bResult = FALSE;
-
-	if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE;
-
-	// check the size of src image
-	if((left < 0) || (top < 0)) {
-		return FALSE;
-	}
-	if((left + FreeImage_GetWidth(src) > FreeImage_GetWidth(dst)) || (top + FreeImage_GetHeight(src) > FreeImage_GetHeight(dst))) {
-		return FALSE;
-	}
-
-	// check data type
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dst);
-	if(image_type != FreeImage_GetImageType(src)) {
-		// no conversion between data type is done
-		return FALSE;
-	}
-
-	if(image_type == FIT_BITMAP) {
-		FIBITMAP *clone = NULL;
-
-		// check the bit depth of src and dst images
-		unsigned bpp_src = FreeImage_GetBPP(src);
-		unsigned bpp_dst = FreeImage_GetBPP(dst);
-		BOOL isRGB565 = FALSE;
-
-		if ((FreeImage_GetRedMask(dst) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dst) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dst) == FI16_565_BLUE_MASK)) {
-			isRGB565 = TRUE;
-		} else {
-			// includes case where all the masks are 0
-			isRGB565 = FALSE;
-		}
-
-		// perform promotion if needed
-		if(bpp_dst == bpp_src) {
-			clone = src;
-		} else if(bpp_dst > bpp_src) {
-			// perform promotion
-			switch(bpp_dst) {
-				case 4:
-					clone = FreeImage_ConvertTo4Bits(src);
-					break;
-				case 8:
-					clone = FreeImage_ConvertTo8Bits(src);
-					break;
-				case 16:
-					if (isRGB565) {
-						clone = FreeImage_ConvertTo16Bits565(src);
-					} else {
-						// includes case where all the masks are 0
-						clone = FreeImage_ConvertTo16Bits555(src);
-					}
-					break;
-				case 24:
-					clone = FreeImage_ConvertTo24Bits(src);
-					break;
-				case 32:
-					clone = FreeImage_ConvertTo32Bits(src);
-					break;
-				default:
-					return FALSE;
-			}
-		} else {
-			return FALSE;
-		}
-
-		if(!clone) return FALSE;
-
-		// paste src to dst
-		switch(FreeImage_GetBPP(dst)) {
-			case 1:
-				bResult = Combine1(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				break;
-			case 4:
-				bResult = Combine4(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				break;
-			case 8:
-				bResult = Combine8(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				break;
-			case 16:
-				if (isRGB565) {
-					bResult = Combine16_565(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				} else {
-					// includes case where all the masks are 0
-					bResult = Combine16_555(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				}
-				break;
-			case 24:
-				bResult = Combine24(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				break;
-			case 32:
-				bResult = Combine32(dst, clone, (unsigned)left, (unsigned)top, (unsigned)alpha);
-				break;
-		}
-
-		if(clone != src)
-			FreeImage_Unload(clone);
-
-		}
-	else {	// any type other than FITBITMAP
-		bResult = CombineSameType(dst, src, (unsigned)left, (unsigned)top);
-	}
-
-	return bResult;
-}
-
-// ----------------------------------------------------------
-
-/** @brief Creates a dynamic read/write view into a FreeImage bitmap.
-
- A dynamic view is a FreeImage bitmap with its own width and height, that,
- however, shares its bits with another FreeImage bitmap. Typically, views
- are used to define one or more rectangular sub-images of an existing
- bitmap. All FreeImage operations, like saving, displaying and all the
- toolkit functions, when applied to the view, only affect the view's
- rectangular area.
-
- Although the view's backing image's bits not need to be copied around,
- which makes the view much faster than similar solutions using
- FreeImage_Copy, a view uses some private memory that needs to be freed by
- calling FreeImage_Unload on the view's handle to prevent memory leaks.
-
- Only the backing image's pixels are shared by the view. For all other image
- data, notably for the resolution, background color, color palette,
- transparency table and for the ICC profile, the view gets a private copy
- of the data. By default, the backing image's metadata is NOT copied to
- the view.
-
- As with all FreeImage functions that take a rectangle region, top and left
- positions are included, whereas right and bottom positions are excluded
- from the rectangle area.
-
- Since the memory block shared by the backing image and the view must start
- at a byte boundary, the value of parameter left must be a multiple of 8
- for 1-bit images and a multiple of 2 for 4-bit images.
-
- @param dib The FreeImage bitmap on which to create the view.
- @param left The left position of the view's area.
- @param top The top position of the view's area.
- @param right The right position of the view's area.
- @param bottom The bottom position of the view's area.
- @return Returns a handle to the newly created view or NULL if the view
- was not created.
- */
-FIBITMAP * DLL_CALLCONV
-FreeImage_CreateView(FIBITMAP *dib, unsigned left, unsigned top, unsigned right, unsigned bottom) {
-	if (!FreeImage_HasPixels(dib)) {
-		return NULL;
-	}
-
-	// normalize the rectangle
-	if (right < left) {
-		INPLACESWAP(left, right);
-	}
-	if (bottom < top) {
-		INPLACESWAP(top, bottom);
-	}
-
-	// check the size of the sub image
-	unsigned width = FreeImage_GetWidth(dib);
-	unsigned height = FreeImage_GetHeight(dib);
-	if (left < 0 || right > width || top < 0 || bottom > height) {
-		return NULL;
-	}
-
-	unsigned bpp = FreeImage_GetBPP(dib);
-	BYTE *bits = FreeImage_GetScanLine(dib, height - bottom);
-	switch (bpp) {
-		case 1:
-			if (left % 8 != 0) {
-				// view can only start at a byte boundary
-				return NULL;
-			}
-			bits += (left / 8);
-			break;
-		case 4:
-			if (left % 2 != 0) {
-				// view can only start at a byte boundary
-				return NULL;
-				}
-			bits += (left / 2);
-			break;
-		default:
-			bits += left * (bpp / 8);
-			break;
-	}
-
-	FIBITMAP *dst = FreeImage_AllocateHeaderForBits(bits, FreeImage_GetPitch(dib), FreeImage_GetImageType(dib), 
-		right - left, bottom - top, 
-		bpp, 
-		FreeImage_GetRedMask(dib), FreeImage_GetGreenMask(dib), FreeImage_GetBlueMask(dib));
-
-	if (dst == NULL) {
-		return NULL;
-	}
-
-	// copy some basic image properties needed for displaying and saving
-
-	// resolution
-	FreeImage_SetDotsPerMeterX(dst, FreeImage_GetDotsPerMeterX(dib));
-	FreeImage_SetDotsPerMeterY(dst, FreeImage_GetDotsPerMeterY(dib));
-
-	// background color
-	RGBQUAD bkcolor;
-	if (FreeImage_GetBackgroundColor(dib, &bkcolor)) {
-		FreeImage_SetBackgroundColor(dst, &bkcolor);
-	}
-
-	// palette
-	memcpy(FreeImage_GetPalette(dst), FreeImage_GetPalette(dib), FreeImage_GetColorsUsed(dib) * sizeof(RGBQUAD));
-
-	// transparency table
-	FreeImage_SetTransparencyTable(dst, FreeImage_GetTransparencyTable(dib), FreeImage_GetTransparencyCount(dib));
-
-	// ICC profile
-	FIICCPROFILE *src_profile = FreeImage_GetICCProfile(dib);
-	FIICCPROFILE *dst_profile = FreeImage_CreateICCProfile(dst, src_profile->data, src_profile->size);
-	dst_profile->flags = src_profile->flags;
-
-	return dst;
-}
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp
deleted file mode 100644
index 82885dcf34..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// ==========================================================
-// Display routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-
-/**
-@brief Composite a foreground image against a background color or a background image.
-
-The equation for computing a composited sample value is:<br>
-output = alpha * foreground + (1-alpha) * background<br>
-where alpha and the input and output sample values are expressed as fractions in the range 0 to 1. 
-For colour images, the computation is done separately for R, G, and B samples.
-
-@param fg Foreground image
-@param useFileBkg If TRUE and a file background is present, use it as the background color
-@param appBkColor If not equal to NULL, and useFileBkg is FALSE, use this color as the background color
-@param bg If not equal to NULL and useFileBkg is FALSE and appBkColor is NULL, use this as the background image
-@return Returns the composite image if successful, returns NULL otherwise
-@see FreeImage_IsTransparent, FreeImage_HasBackgroundColor
-*/
-FIBITMAP * DLL_CALLCONV
-FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP *bg) {
-	if(!FreeImage_HasPixels(fg)) return NULL;
-
-	int width  = FreeImage_GetWidth(fg);
-	int height = FreeImage_GetHeight(fg);
-	int bpp    = FreeImage_GetBPP(fg);
-
-	if((bpp != 8) && (bpp != 32))
-		return NULL;
-
-	if(bg) {
-		int bg_width  = FreeImage_GetWidth(bg);
-		int bg_height = FreeImage_GetHeight(bg);
-		int bg_bpp    = FreeImage_GetBPP(bg);
-		if((bg_width != width) || (bg_height != height) || (bg_bpp != 24))
-			return NULL;
-	}
-
-	int bytespp = (bpp == 8) ? 1 : 4;
-
-	
-	int x, y, c;
-	BYTE alpha = 0, not_alpha;
-	BYTE index;
-	RGBQUAD fgc;	// foreground color
-	RGBQUAD bkc;	// background color
-
-	memset(&fgc, 0, sizeof(RGBQUAD));
-	memset(&bkc, 0, sizeof(RGBQUAD));
-
-	// allocate the composite image
-	FIBITMAP *composite = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-	if(!composite) return NULL;
-
-	// get the palette
-	RGBQUAD *pal = FreeImage_GetPalette(fg);
-
-	// retrieve the alpha table from the foreground image
-	BOOL bIsTransparent = FreeImage_IsTransparent(fg);
-	BYTE *trns = FreeImage_GetTransparencyTable(fg);
-
-	// retrieve the background color from the foreground image
-	BOOL bHasBkColor = FALSE;
-
-	if(useFileBkg && FreeImage_HasBackgroundColor(fg)) {
-		FreeImage_GetBackgroundColor(fg, &bkc);
-		bHasBkColor = TRUE;
-	} else {
-		// no file background color
-		// use application background color ?
-		if(appBkColor) {
-			memcpy(&bkc, appBkColor, sizeof(RGBQUAD));
-			bHasBkColor = TRUE;
-		}
-		// use background image ?
-		else if(bg) {
-			bHasBkColor = FALSE;
-		}
-	}
-
-	for(y = 0; y < height; y++) {
-		// foreground
-		BYTE *fg_bits = FreeImage_GetScanLine(fg, y);
-		// background
-		BYTE *bg_bits = FreeImage_GetScanLine(bg, y);
-		// composite image
-		BYTE *cp_bits = FreeImage_GetScanLine(composite, y);
-
-		for(x = 0; x < width; x++) {
-
-			// foreground color + alpha
-
-			if(bpp == 8) {
-				// get the foreground color
-				index = fg_bits[0];
-				memcpy(&fgc, &pal[index], sizeof(RGBQUAD));
-				// get the alpha
-				if(bIsTransparent) {
-					alpha = trns[index];
-				} else {
-					alpha = 255;
-				}
-			}
-			else if(bpp == 32) {
-				// get the foreground color
-				fgc.rgbBlue  = fg_bits[FI_RGBA_BLUE];
-				fgc.rgbGreen = fg_bits[FI_RGBA_GREEN];
-				fgc.rgbRed   = fg_bits[FI_RGBA_RED];
-				// get the alpha
-				alpha = fg_bits[FI_RGBA_ALPHA];
-			}
-
-			// background color
-
-			if(!bHasBkColor) {
-				if(bg) {
-					// get the background color from the background image
-					bkc.rgbBlue  = bg_bits[FI_RGBA_BLUE];
-					bkc.rgbGreen = bg_bits[FI_RGBA_GREEN];
-					bkc.rgbRed   = bg_bits[FI_RGBA_RED];
-				}
-				else {
-					// use a checkerboard pattern
-					c = (((y & 0x8) == 0) ^ ((x & 0x8) == 0)) * 192;
-					c = c ? c : 255;
-					bkc.rgbBlue  = (BYTE)c;
-					bkc.rgbGreen = (BYTE)c;
-					bkc.rgbRed   = (BYTE)c;
-				}
-			}
-
-			// composition
-
-			if(alpha == 0) {
-				// output = background
-				cp_bits[FI_RGBA_BLUE] = bkc.rgbBlue;
-				cp_bits[FI_RGBA_GREEN] = bkc.rgbGreen;
-				cp_bits[FI_RGBA_RED] = bkc.rgbRed;
-			}
-			else if(alpha == 255) {
-				// output = foreground
-				cp_bits[FI_RGBA_BLUE] = fgc.rgbBlue;
-				cp_bits[FI_RGBA_GREEN] = fgc.rgbGreen;
-				cp_bits[FI_RGBA_RED] = fgc.rgbRed;
-			}
-			else {
-				// output = alpha * foreground + (1-alpha) * background
-				not_alpha = (BYTE)~alpha;
-				cp_bits[FI_RGBA_BLUE] = (BYTE)((alpha * (WORD)fgc.rgbBlue  + not_alpha * (WORD)bkc.rgbBlue) >> 8);
-				cp_bits[FI_RGBA_GREEN] = (BYTE)((alpha * (WORD)fgc.rgbGreen + not_alpha * (WORD)bkc.rgbGreen) >> 8);
-				cp_bits[FI_RGBA_RED] = (BYTE)((alpha * (WORD)fgc.rgbRed   + not_alpha * (WORD)bkc.rgbRed) >> 8);
-			}
-
-			fg_bits += bytespp;
-			bg_bits += 3;
-			cp_bits += 3;
-		}
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(composite, fg);
-	
-	return composite;	
-}
-
-/**
-Pre-multiplies a 32-bit image's red-, green- and blue channels with it's alpha channel 
-for to be used with e.g. the Windows GDI function AlphaBlend(). 
-The transformation changes the red-, green- and blue channels according to the following equation:  
-channel(x, y) = channel(x, y) * alpha_channel(x, y) / 255  
-@param dib Input/Output dib to be premultiplied
-@return Returns TRUE on success, FALSE otherwise (e.g. when the bitdepth of the source dib cannot be handled). 
-*/
-BOOL DLL_CALLCONV 
-FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib) {
-	if (!FreeImage_HasPixels(dib)) return FALSE;
-	
-	if ((FreeImage_GetBPP(dib) != 32) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) {
-		return FALSE;
-	}
-
-	int width = FreeImage_GetWidth(dib);
-	int height = FreeImage_GetHeight(dib);
-
-	for(int y = 0; y < height; y++) {
-		BYTE *bits = FreeImage_GetScanLine(dib, y);
-		for (int x = 0; x < width; x++, bits += 4) {
-			const BYTE alpha = bits[FI_RGBA_ALPHA];
-			// slightly faster: care for two special cases
-			if(alpha == 0x00) {
-				// special case for alpha == 0x00
-				// color * 0x00 / 0xFF = 0x00
-				bits[FI_RGBA_BLUE] = 0x00;
-				bits[FI_RGBA_GREEN] = 0x00;
-				bits[FI_RGBA_RED] = 0x00;
-			} else if(alpha == 0xFF) {
-				// nothing to do for alpha == 0xFF
-				// color * 0xFF / 0xFF = color
-				continue;
-			} else {
-				bits[FI_RGBA_BLUE] = (BYTE)( (alpha * (WORD)bits[FI_RGBA_BLUE] + 127) / 255 );
-				bits[FI_RGBA_GREEN] = (BYTE)( (alpha * (WORD)bits[FI_RGBA_GREEN] + 127) / 255 );
-				bits[FI_RGBA_RED] = (BYTE)( (alpha * (WORD)bits[FI_RGBA_RED] + 127) / 255 );
-			}
-		}
-	}
-	return TRUE;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Filters.h b/plugins/AdvaImg/src/FreeImageToolkit/Filters.h
deleted file mode 100644
index 970e5604ec..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Filters.h
+++ /dev/null
@@ -1,287 +0,0 @@
-// ==========================================================
-// Upsampling / downsampling filters
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef _FILTERS_H_
-#define _FILTERS_H_
-
-/**
- CGenericFilter is a generic abstract filter class used to access to the filter library.<br>
- Filters used in this library have been mainly taken from the following references : <br>
-<b>Main reference</b> : <br>
-Paul Heckbert, C code to zoom raster images up or down, with nice filtering. 
-UC Berkeley, August 1989. [online] http://www-2.cs.cmu.edu/afs/cs.cmu.edu/Web/People/ph/heckbert.html
-
-<b>Heckbert references</b> : <br>
-<ul>
-<li>Oppenheim A.V., Schafer R.W., Digital Signal Processing, Prentice-Hall, 1975
-<li>Hamming R.W., Digital Filters, Prentice-Hall, Englewood Cliffs, NJ, 1983
-<li>Pratt W.K., Digital Image Processing, John Wiley and Sons, 1978
-<li>Hou H.S., Andrews H.C., "Cubic Splines for Image Interpolation and Digital Filtering", 
-IEEE Trans. Acoustics, Speech, and Signal Proc., vol. ASSP-26, no. 6, pp. 508-517, Dec. 1978.
-</ul>
-
-*/
-class CGenericFilter
-{
-protected:
-
-    #define FILTER_PI  double (3.1415926535897932384626433832795)
-    #define FILTER_2PI double (2.0 * 3.1415926535897932384626433832795)
-    #define FILTER_4PI double (4.0 * 3.1415926535897932384626433832795)
-
-    /// Filter support
-	double  m_dWidth;
-
-public:
-    
-    /// Constructor
-	CGenericFilter (double dWidth) : m_dWidth (dWidth) {}
-	/// Destructor
-    virtual ~CGenericFilter() {}
-
-    /// Returns the filter support
-	double GetWidth()                   { return m_dWidth; }
-	/// Change the filter suport
-    void   SetWidth (double dWidth)     { m_dWidth = dWidth; }
-
-    /// Returns F(dVal) where F is the filter's impulse response
-	virtual double Filter (double dVal) = 0;
-};
-
-// -----------------------------------------------------------------------------------
-// Filters library
-// All filters are centered on 0
-// -----------------------------------------------------------------------------------
-
-/**
- Box filter<br>
- Box, pulse, Fourier window, 1st order (constant) b-spline.<br><br>
-
- <b>Reference</b> : <br>
- Glassner A.S., Principles of digital image synthesis. Morgan Kaufmann Publishers, Inc, San Francisco, Vol. 2, 1995
-*/
-class CBoxFilter : public CGenericFilter
-{
-public:
-    /**
-	Constructor<br>
-	Default fixed width = 0.5
-	*/
-    CBoxFilter() : CGenericFilter(0.5) {}
-    virtual ~CBoxFilter() {}
-
-    double Filter (double dVal) { return (fabs(dVal) <= m_dWidth ? 1.0 : 0.0); }
-};
-
-/** Bilinear filter
-*/
-class CBilinearFilter : public CGenericFilter
-{
-public:
-
-    CBilinearFilter () : CGenericFilter(1) {}
-    virtual ~CBilinearFilter() {}
-
-    double Filter (double dVal) {
-		dVal = fabs(dVal); 
-		return (dVal < m_dWidth ? m_dWidth - dVal : 0.0); 
-	}
-};
-
-
-/**
- Mitchell & Netravali's two-param cubic filter<br>
-
- The parameters b and c can be used to adjust the properties of the cubic. 
- They are sometimes referred to as "blurring" and "ringing" respectively. 
- The default is b = 1/3 and c = 1/3, which were the values recommended by 
- Mitchell and Netravali as yielding the most visually pleasing results in subjective tests of human beings. 
- Larger values of b and c can produce interesting op-art effects--for example, try b = 0 and c = -5. <br><br>
-
- <b>Reference</b> : <br>
- Don P. Mitchell and Arun N. Netravali, Reconstruction filters in computer graphics. 
- In John Dill, editor, Computer Graphics (SIGGRAPH '88 Proceedings), Vol. 22, No. 4, August 1988, pp. 221-228.
-*/
-class CBicubicFilter : public CGenericFilter
-{
-protected:
-	// data for parameterized Mitchell filter
-    double p0, p2, p3;
-    double q0, q1, q2, q3;
-
-public:
-    /**
-	Constructor<br>
-	Default fixed width = 2
-	@param b Filter parameter (default value is 1/3)
-	@param c Filter parameter (default value is 1/3)
-	*/
-    CBicubicFilter (double b = (1/(double)3), double c = (1/(double)3)) : CGenericFilter(2) {
-		p0 = (6 - 2*b) / 6;
-		p2 = (-18 + 12*b + 6*c) / 6;
-		p3 = (12 - 9*b - 6*c) / 6;
-		q0 = (8*b + 24*c) / 6;
-		q1 = (-12*b - 48*c) / 6;
-		q2 = (6*b + 30*c) / 6;
-		q3 = (-b - 6*c) / 6;
-	}
-    virtual ~CBicubicFilter() {}
-
-    double Filter(double dVal) { 
-		dVal = fabs(dVal);
-		if(dVal < 1)
-			return (p0 + dVal*dVal*(p2 + dVal*p3));
-		if(dVal < 2)
-			return (q0 + dVal*(q1 + dVal*(q2 + dVal*q3)));
-		return 0;
-	}
-};
-
-/**
- Catmull-Rom spline, Overhauser spline<br>
-
- When using CBicubicFilter filters, you have to set parameters b and c such that <br>
- b + 2 * c = 1<br>
- in order to use the numerically most accurate filter.<br>
- This gives for b = 0 the maximum value for c = 0.5, which is the Catmull-Rom 
- spline and a good suggestion for sharpness.<br><br>
-
-
- <b>References</b> : <br>
- <ul>
- <li>Mitchell Don P., Netravali Arun N., Reconstruction filters in computer graphics. 
- In John Dill, editor, Computer Graphics (SIGGRAPH '88 Proceedings), Vol. 22, No. 4, August 1988, pp. 221-228.
- <li>Keys R.G., Cubic Convolution Interpolation for Digital Image Processing. 
- IEEE Trans. Acoustics, Speech, and Signal Processing, vol. 29, no. 6, pp. 1153-1160, Dec. 1981.
- </ul>
-
-*/
-class CCatmullRomFilter : public CGenericFilter
-{
-public:
-
-    /**
-	Constructor<br>
-	Default fixed width = 2
-	*/
-	CCatmullRomFilter() : CGenericFilter(2) {}
-    virtual ~CCatmullRomFilter() {}
-
-    double Filter(double dVal) { 
-		if(dVal < -2) return 0;
-		if(dVal < -1) return (0.5*(4 + dVal*(8 + dVal*(5 + dVal))));
-		if(dVal < 0)  return (0.5*(2 + dVal*dVal*(-5 - 3*dVal)));
-		if(dVal < 1)  return (0.5*(2 + dVal*dVal*(-5 + 3*dVal)));
-		if(dVal < 2)  return (0.5*(4 + dVal*(-8 + dVal*(5 - dVal))));
-		return 0;
-	}
-};
-
-/**
- Lanczos-windowed sinc filter<br>
- 
- Lanczos3 filter is an alternative to CBicubicFilter with high values of c about 0.6 ... 0.75 
- which produces quite strong sharpening. It usually offers better quality (fewer artifacts) and a sharp image.<br><br>
-
-*/
-class CLanczos3Filter : public CGenericFilter
-{
-public:
-    /**
-	Constructor<br>
-	Default fixed width = 3
-	*/
-	CLanczos3Filter() : CGenericFilter(3) {}
-    virtual ~CLanczos3Filter() {}
-
-    double Filter(double dVal) { 
-		dVal = fabs(dVal); 
-		if(dVal < m_dWidth)	{
-			return (sinc(dVal) * sinc(dVal / m_dWidth));
-		}
-		return 0;
-	}
-
-private:
-	double sinc(double value) {
-		if(value != 0) {
-			value *= FILTER_PI;
-			return (sin(value) / value);
-		} 
-		return 1;
-	}
-};
-
-/**
- 4th order (cubic) b-spline<br>
-
-*/
-class CBSplineFilter : public CGenericFilter
-{
-public:
-
-    /**
-	Constructor<br>
-	Default fixed width = 2
-	*/
-	CBSplineFilter() : CGenericFilter(2) {}
-    virtual ~CBSplineFilter() {}
-
-    double Filter(double dVal) { 
-
-		dVal = fabs(dVal);
-		if(dVal < 1) return (4 + dVal*dVal*(-6 + 3*dVal)) / 6;
-		if(dVal < 2) {
-			double t = 2 - dVal;
-			return (t*t*t / 6);
-		}
-		return 0;
-	}
-};
-
-// -----------------------------------------------------------------------------------
-// Window function library
-// -----------------------------------------------------------------------------------
-
-/** 
- Blackman window
-*/
-class CBlackmanFilter : public CGenericFilter
-{
-public:
-    /**
-	Constructor<br>
-	Default width = 0.5
-	*/
-    CBlackmanFilter (double dWidth = double(0.5)) : CGenericFilter(dWidth) {}
-    virtual ~CBlackmanFilter() {}
-
-    double Filter (double dVal) {
-		if(fabs (dVal) > m_dWidth) {
-			return 0; 
-        }
-        double dN = 2 * m_dWidth + 1; 
-		dVal /= (dN - 1);
-        return 0.42 + 0.5*cos(FILTER_2PI*dVal) + 0.08*cos(FILTER_4PI*dVal); 
-    }
-};
-
-#endif  // _FILTERS_H_
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp
deleted file mode 100644
index 907d75d902..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// ==========================================================
-// Flipping routines
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Jim Keir (jimkeir@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-/**
-Flip the image horizontally along the vertical axis.
-@param src Input image to be processed.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-BOOL DLL_CALLCONV 
-FreeImage_FlipHorizontal(FIBITMAP *src) {
-	if (!FreeImage_HasPixels(src)) return FALSE;
-
-	unsigned line   = FreeImage_GetLine(src);
-	unsigned width	= FreeImage_GetWidth(src);
-	unsigned height = FreeImage_GetHeight(src);
-
-	unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
-
-	// copy between aligned memories
-	BYTE *new_bits = (BYTE*)FreeImage_Aligned_Malloc(line * sizeof(BYTE), FIBITMAP_ALIGNMENT);
-	if (!new_bits) return FALSE;
-
-	// mirror the buffer
-
-	for (unsigned y = 0; y < height; y++) {
-		BYTE *bits = FreeImage_GetScanLine(src, y);
-		memcpy(new_bits, bits, line);
-
-		switch (FreeImage_GetBPP(src)) {
-			case 1 :
-			{				
-				for(unsigned x = 0; x < width; x++) {
-					// get pixel at (x, y)
-					BOOL value = (new_bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
-					// set pixel at (new_x, y)
-					unsigned new_x = width - 1 - x;
-					value ? bits[new_x >> 3] |= (0x80 >> (new_x & 0x7)) : bits[new_x >> 3] &= (0xff7f >> (new_x & 0x7));
-				}
-			}
-			break;
-
-			case 4 :
-			{
-				for(unsigned c = 0; c < line; c++) {
-					bits[c] = new_bits[line - c - 1];
-
-					BYTE nibble = (bits[c] & 0xF0) >> 4;
-
-					bits[c] = bits[c] << 4;
-					bits[c] |= nibble;
-				}
-			}
-			break;
-
-			case 8:
-			{				
-				BYTE *dst_data = (BYTE*) bits; 				
-				BYTE *src_data = (BYTE*) (new_bits + line - bytespp); 				
-				for(unsigned c = 0; c < width; c++) { 			
-					*dst_data++ = *src_data--;  
-				} 
-			}
-			break;
-
-			case 16:
-			{				
-				WORD *dst_data = (WORD*) bits; 				
-				WORD *src_data = (WORD*) (new_bits + line - bytespp); 				
-				for(unsigned c = 0; c < width; c++) { 			
-					*dst_data++ = *src_data--;  
-				} 
-			}
-			break;
-
-			case 24 :
-			case 32 :
-			case 48:
-			case 64:
-			case 96:
-			case 128:
-			{				
-				BYTE *dst_data = (BYTE*) bits; 				
-				BYTE *src_data = (BYTE*) (new_bits + line - bytespp); 				
-				for(unsigned c = 0; c < width; c++) { 		
-					for(unsigned k = 0; k < bytespp; k++) {
-						*dst_data++ = src_data[k];  
-					}
-					src_data -= bytespp;
-				} 
-			}
-			break;
-
-		}
-	}
-
-	FreeImage_Aligned_Free(new_bits);
-
-	return TRUE;
-}
-
-
-/**
-Flip the image vertically along the horizontal axis.
-@param src Input image to be processed.
-@return Returns TRUE if successful, FALSE otherwise.
-*/
-
-BOOL DLL_CALLCONV 
-FreeImage_FlipVertical(FIBITMAP *src) {
-	BYTE *From, *Mid;
-
-	if (!FreeImage_HasPixels(src)) return FALSE;
-
-	// swap the buffer
-
-	unsigned pitch  = FreeImage_GetPitch(src);
-	unsigned height = FreeImage_GetHeight(src);
-
-	// copy between aligned memories
-	Mid = (BYTE*)FreeImage_Aligned_Malloc(pitch * sizeof(BYTE), FIBITMAP_ALIGNMENT);
-	if (!Mid) return FALSE;
-
-	From = FreeImage_GetBits(src);
-	
-	unsigned line_s = 0;
-	unsigned line_t = (height-1) * pitch;
-
-	for(unsigned y = 0; y < height/2; y++) {
-
-		memcpy(Mid, From + line_s, pitch);
-		memcpy(From + line_s, From + line_t, pitch);
-		memcpy(From + line_t, Mid, pitch);
-
-		line_s += pitch;
-		line_t -= pitch;
-
-	}
-
-	FreeImage_Aligned_Free(Mid);
-
-	return TRUE;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/JPEGTransform.cpp b/plugins/AdvaImg/src/FreeImageToolkit/JPEGTransform.cpp
deleted file mode 100644
index 6f9ba8e1f2..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/JPEGTransform.cpp
+++ /dev/null
@@ -1,623 +0,0 @@
-// ==========================================================
-// JPEG lossless transformations
-//
-// Design and implementation by
-// - Petr Pytelka (pyta@lightcomp.com)
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-extern "C" {
-#define XMD_H
-#undef FAR
-#include <setjmp.h>
-
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
-#include "../LibJPEG/transupp.h"
-}
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageIO.h"
-
-// ----------------------------------------------------------
-//   Source manager & Destination manager setup
-//   (see PluginJPEG.cpp)
-// ----------------------------------------------------------
-
-void jpeg_freeimage_src(j_decompress_ptr cinfo, fi_handle infile, FreeImageIO *io);
-void jpeg_freeimage_dst(j_compress_ptr cinfo, fi_handle outfile, FreeImageIO *io);
-
-// ----------------------------------------------------------
-//   Error handling
-//   (see also PluginJPEG.cpp)
-// ----------------------------------------------------------
-
-/**
-	Receives control for a fatal error.  Information sufficient to
-	generate the error message has been stored in cinfo->err; call
-	output_message to display it.  Control must NOT return to the caller;
-	generally this routine will exit() or longjmp() somewhere.
-*/
-METHODDEF(void)
-ls_jpeg_error_exit (j_common_ptr cinfo) {
-	// always display the message
-	(*cinfo->err->output_message)(cinfo);
-
-	// allow JPEG with a premature end of file
-	if((cinfo)->err->msg_parm.i[0] != 13) {
-
-		// let the memory manager delete any temp files before we die
-		jpeg_destroy(cinfo);
-
-		throw FIF_JPEG;
-	}
-}
-
-/**
-	Actual output of any JPEG message.  Note that this method does not know
-	how to generate a message, only where to send it.
-*/
-METHODDEF(void)
-ls_jpeg_output_message (j_common_ptr cinfo) {
-	char buffer[JMSG_LENGTH_MAX];
-
-	// create the message
-	(*cinfo->err->format_message)(cinfo, buffer);
-	// send it to user's message proc
-	FreeImage_OutputMessageProc(FIF_JPEG, buffer);
-}
-
-// ----------------------------------------------------------
-//   Main program
-// ----------------------------------------------------------
-
-/**
-Build a crop string. 
-
-@param crop Output crop string
-@param left Specifies the left position of the cropped rectangle
-@param top Specifies the top position of the cropped rectangle
-@param right Specifies the right position of the cropped rectangle
-@param bottom Specifies the bottom position of the cropped rectangle
-@param width Image width
-@param height Image height
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL
-getCropString(char* crop, int* left, int* top, int* right, int* bottom, int width, int height) {
-	if(!left || !top || !right || !bottom) {
-		return FALSE;
-	}
-
-	*left = CLAMP(*left, 0, width);
-	*top = CLAMP(*top, 0, height);
-
-	// negative/zero right and bottom count from the edges inwards
-
-	if(*right <= 0) {
-		*right = width + *right;
-	}
-	if(*bottom <= 0) {
-		*bottom = height + *bottom;
-	}
-
-	*right = CLAMP(*right, 0, width);
-	*bottom = CLAMP(*bottom, 0, height);
-
-	// test for empty rect
-
-	if(((*left - *right) == 0) || ((*top - *bottom) == 0)) {
-		return FALSE;
-	}
-
-	// normalize the rectangle
-
-	if(*right < *left) {
-		INPLACESWAP(*left, *right);
-	}
-	if(*bottom < *top) {
-		INPLACESWAP(*top, *bottom);
-	}
-
-	// test for "noop" rect
-
-	if(*left == 0 && *right == width && *top == 0 && *bottom == height) {
-		return FALSE;
-	}
-
-	// build the crop option
-	sprintf(crop, "%dx%d+%d+%d", *right - *left, *bottom - *top, *left, *top);
-
-	return TRUE;
-}
-
-static BOOL
-JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
-	const BOOL onlyReturnCropRect = (dst_io == NULL) || (dst_handle == NULL);
-	const long stream_start = onlyReturnCropRect ? 0 : dst_io->tell_proc(dst_handle);
-	BOOL swappedDim = FALSE;
-	BOOL trimH = FALSE;
-	BOOL trimV = FALSE;
-
-	// Set up the jpeglib structures
-	jpeg_decompress_struct srcinfo;
-	jpeg_compress_struct dstinfo;
-	jpeg_error_mgr jsrcerr, jdsterr;
-	jvirt_barray_ptr *src_coef_arrays = NULL;
-	jvirt_barray_ptr *dst_coef_arrays = NULL;
-	// Support for copying optional markers from source to destination file
-	JCOPY_OPTION copyoption;
-	// Image transformation options
-	jpeg_transform_info transfoptions;
-
-	// Initialize structures
-	memset(&srcinfo, 0, sizeof(srcinfo));
-	memset(&jsrcerr, 0, sizeof(jsrcerr));
-	memset(&jdsterr, 0, sizeof(jdsterr));
-	memset(&dstinfo, 0, sizeof(dstinfo));
-	memset(&transfoptions, 0, sizeof(transfoptions));
-
-	// Copy all extra markers from source file
-	copyoption = JCOPYOPT_ALL;
-
-	// Set up default JPEG parameters
-	transfoptions.force_grayscale = FALSE;
-	transfoptions.crop = FALSE;
-
-	// Select the transform option
-	switch(operation) {
-		case FIJPEG_OP_FLIP_H:		// horizontal flip
-			transfoptions.transform = JXFORM_FLIP_H;
-			trimH = TRUE;
-			break;
-		case FIJPEG_OP_FLIP_V:		// vertical flip
-			transfoptions.transform = JXFORM_FLIP_V;
-			trimV = TRUE;
-			break;
-		case FIJPEG_OP_TRANSPOSE:	// transpose across UL-to-LR axis
-			transfoptions.transform = JXFORM_TRANSPOSE;
-			swappedDim = TRUE;
-			break;
-		case FIJPEG_OP_TRANSVERSE:	// transpose across UR-to-LL axis
-			transfoptions.transform = JXFORM_TRANSVERSE;
-			trimH = TRUE;
-			trimV = TRUE;
-			swappedDim = TRUE;
-			break;
-		case FIJPEG_OP_ROTATE_90:	// 90-degree clockwise rotation
-			transfoptions.transform = JXFORM_ROT_90;
-			trimH = TRUE;
-			swappedDim = TRUE;
-			break;
-		case FIJPEG_OP_ROTATE_180:	// 180-degree rotation
-			trimH = TRUE;
-			trimV = TRUE;
-			transfoptions.transform = JXFORM_ROT_180;
-			break;
-		case FIJPEG_OP_ROTATE_270:	// 270-degree clockwise (or 90 ccw)
-			transfoptions.transform = JXFORM_ROT_270;
-			trimV = TRUE;
-			swappedDim = TRUE;
-			break;
-		default:
-		case FIJPEG_OP_NONE:		// no transformation
-			transfoptions.transform = JXFORM_NONE;
-			break;
-	}
-	// (perfect == TRUE) ==> fail if there is non-transformable edge blocks
-	transfoptions.perfect = (perfect == TRUE) ? TRUE : FALSE;
-	// Drop non-transformable edge blocks: trim off any partial edge MCUs that the transform can't handle.
-	transfoptions.trim = TRUE;
-
-	try {
-
-		// Initialize the JPEG decompression object with default error handling
-		srcinfo.err = jpeg_std_error(&jsrcerr);
-		srcinfo.err->error_exit = ls_jpeg_error_exit;
-		srcinfo.err->output_message = ls_jpeg_output_message;
-		jpeg_create_decompress(&srcinfo);
-
-		// Initialize the JPEG compression object with default error handling
-		dstinfo.err = jpeg_std_error(&jdsterr);
-		dstinfo.err->error_exit = ls_jpeg_error_exit;
-		dstinfo.err->output_message = ls_jpeg_output_message;
-		jpeg_create_compress(&dstinfo);
-
-		// Specify data source for decompression
-		jpeg_freeimage_src(&srcinfo, src_handle, src_io);
-
-		// Enable saving of extra markers that we want to copy
-		jcopy_markers_setup(&srcinfo, copyoption);
-
-		// Read the file header
-		jpeg_read_header(&srcinfo, TRUE);
-
-		// crop option
-		char crop[64];
-		const BOOL hasCrop = getCropString(crop, left, top, right, bottom, swappedDim ? srcinfo.image_height : srcinfo.image_width, swappedDim ? srcinfo.image_width : srcinfo.image_height);
-
-		if(hasCrop) {
-			if(!jtransform_parse_crop_spec(&transfoptions, crop)) {
-				FreeImage_OutputMessageProc(FIF_JPEG, "Bogus crop argument %s", crop);
-				throw(1);
-			}
-		}
-
-		// Any space needed by a transform option must be requested before
-		// jpeg_read_coefficients so that memory allocation will be done right
-
-		// Prepare transformation workspace
-		// Fails right away if perfect flag is TRUE and transformation is not perfect
-		if( !jtransform_request_workspace(&srcinfo, &transfoptions) ) {
-			FreeImage_OutputMessageProc(FIF_JPEG, "Transformation is not perfect");
-			throw(1);
-		}
-
-		if(left || top) {
-			// compute left and top offsets, it's a bit tricky, taking into account both
-			// transform, which might have trimed the image,
-			// and crop itself, which is adjusted to lie on a iMCU boundary
-
-			const int fullWidth = swappedDim ? srcinfo.image_height : srcinfo.image_width;
-			const int fullHeight = swappedDim ? srcinfo.image_width : srcinfo.image_height;
-
-			int transformedFullWidth = fullWidth;
-			int transformedFullHeight = fullHeight;
-
-			if(trimH && transformedFullWidth/transfoptions.iMCU_sample_width > 0) {
-				transformedFullWidth = (transformedFullWidth/transfoptions.iMCU_sample_width) * transfoptions.iMCU_sample_width;
-			}
-			if(trimV && transformedFullHeight/transfoptions.iMCU_sample_height > 0) {
-				transformedFullHeight = (transformedFullHeight/transfoptions.iMCU_sample_height) * transfoptions.iMCU_sample_height;
-			}
-
-			const int trimmedWidth = fullWidth - transformedFullWidth;
-			const int trimmedHeight = fullHeight - transformedFullHeight;
-
-			if(left) {
-				*left = trimmedWidth + transfoptions.x_crop_offset * transfoptions.iMCU_sample_width;
-			}
-			if(top) {
-				*top = trimmedHeight + transfoptions.y_crop_offset * transfoptions.iMCU_sample_height;
-			}
-		}
-
-		if(right) {
-			*right = (left ? *left : 0) + transfoptions.output_width;
-		}
-		if(bottom) {
-			*bottom = (top ? *top : 0) + transfoptions.output_height;
-		}
-
-		// if only the crop rect is requested, we are done
-
-		if(onlyReturnCropRect) {
-			jpeg_destroy_compress(&dstinfo);
-			jpeg_destroy_decompress(&srcinfo);
-			return TRUE;
-		}
-
-		// Read source file as DCT coefficients
-		src_coef_arrays = jpeg_read_coefficients(&srcinfo);
-
-		// Initialize destination compression parameters from source values
-		jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
-
-		// Adjust destination parameters if required by transform options;
-		// also find out which set of coefficient arrays will hold the output
-		dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);
-
-		// Note: we assume that jpeg_read_coefficients consumed all input
-		// until JPEG_REACHED_EOI, and that jpeg_finish_decompress will
-		// only consume more while (! cinfo->inputctl->eoi_reached).
-		// We cannot call jpeg_finish_decompress here since we still need the
-		// virtual arrays allocated from the source object for processing.
-
-		if(src_handle == dst_handle) {
-			dst_io->seek_proc(dst_handle, stream_start, SEEK_SET);
-		}
-
-		// Specify data destination for compression
-		jpeg_freeimage_dst(&dstinfo, dst_handle, dst_io);
-
-		// Start compressor (note no image data is actually written here)
-		jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
-
-		// Copy to the output file any extra markers that we want to preserve
-		jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
-
-		// Execute image transformation, if any
-		jtransform_execute_transformation(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);
-
-		// Finish compression and release memory
-		jpeg_finish_compress(&dstinfo);
-		jpeg_destroy_compress(&dstinfo);
-		jpeg_finish_decompress(&srcinfo);
-		jpeg_destroy_decompress(&srcinfo);
-
-	}
-	catch(...) {
-		jpeg_destroy_compress(&dstinfo);
-		jpeg_destroy_decompress(&srcinfo);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   FreeImage interface
-// ----------------------------------------------------------
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
-	return JPEGTransformFromHandle(src_io, src_handle, dst_io, dst_handle, operation, left, top, right, bottom, perfect);
-}
-
-static void
-closeStdIO(fi_handle src_handle, fi_handle dst_handle) {
-	if(src_handle) {
-		fclose((FILE*)src_handle);
-	}
-	if(dst_handle && (dst_handle != src_handle)) {
-		fclose((FILE*)dst_handle);
-	}
-}
-
-static BOOL
-openStdIO(const char* src_file, const char* dst_file, FreeImageIO* dst_io, fi_handle* src_handle, fi_handle* dst_handle) {
-	*src_handle = NULL;
-	*dst_handle = NULL;
-	
-	FreeImageIO io;
-	SetDefaultIO (&io);
-	
-	const BOOL isSameFile = (dst_file && (strcmp(src_file, dst_file) == 0)) ? TRUE : FALSE;
-	
-	FILE* srcp = NULL;
-	FILE* dstp = NULL;
-	
-	if(isSameFile) {
-		srcp = fopen(src_file, "r+b");
-		dstp = srcp;
-	}
-	else {
-		srcp = fopen(src_file, "rb");
-		if(dst_file) {
-			dstp = fopen(dst_file, "wb");
-		}
-	}
-	
-	if(!srcp || (dst_file && !dstp)) {
-		if(!srcp) {
-			FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open \"%s\" for reading", src_file);
-		} else {
-			FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open \"%s\" for writing", dst_file);
-		}
-		closeStdIO(srcp, dstp);
-		return FALSE;
-	}
-
-	if(FreeImage_GetFileTypeFromHandle(&io, srcp) != FIF_JPEG) {
-		FreeImage_OutputMessageProc(FIF_JPEG, " Source file \"%s\" is not jpeg", src_file);
-		closeStdIO(srcp, dstp);
-		return FALSE;
-	}
-
-	*dst_io = io;
-	*src_handle = srcp;
-	*dst_handle = dstp;
-
-	return TRUE;
-}
-
-static BOOL
-openStdIOU(const wchar_t* src_file, const wchar_t* dst_file, FreeImageIO* dst_io, fi_handle* src_handle, fi_handle* dst_handle) {
-#ifdef _WIN32
-
-	*src_handle = NULL;
-	*dst_handle = NULL;
-
-	FreeImageIO io;
-	SetDefaultIO (&io);
-	
-	const BOOL isSameFile = (dst_file && (wcscmp(src_file, dst_file) == 0)) ? TRUE : FALSE;
-
-	FILE* srcp = NULL;
-	FILE* dstp = NULL;
-
-	if(isSameFile) {
-		srcp = _wfopen(src_file, L"r+b");
-		dstp = srcp;
-	} else {
-		srcp = _wfopen(src_file, L"rb");
-		if(dst_file) {
-			dstp = _wfopen(dst_file, L"wb");
-		}
-	}
-
-	if(!srcp || (dst_file && !dstp)) {
-		if(!srcp) {
-			FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open source file for reading");
-		} else {
-			FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open destination file for writing");
-		}
-		closeStdIO(srcp, dstp);
-		return FALSE;
-	}
-
-	if(FreeImage_GetFileTypeFromHandle(&io, srcp) != FIF_JPEG) {
-		FreeImage_OutputMessageProc(FIF_JPEG, " Source file is not jpeg");
-		closeStdIO(srcp, dstp);
-		return FALSE;
-	}
-
-	*dst_io = io;
-	*src_handle = srcp;
-	*dst_handle = dstp;
-
-	return TRUE;
-
-#else
-	return FALSE;
-#endif // _WIN32
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIO(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = JPEGTransformFromHandle(&io, src, &io, dst, operation, NULL, NULL, NULL, NULL, perfect);
-
-	closeStdIO(src, dst);
-
-	return ret;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIO(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = FreeImage_JPEGTransformFromHandle(&io, src, &io, dst, FIJPEG_OP_NONE, &left, &top, &right, &bottom, FALSE);
-	
-	closeStdIO(src, dst);
-	
-	return ret;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIOU(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = JPEGTransformFromHandle(&io, src, &io, dst, operation, NULL, NULL, NULL, NULL, perfect);
-	
-	closeStdIO(src, dst);
-
-	return ret;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGCropU(const wchar_t *src_file, const wchar_t *dst_file, int left, int top, int right, int bottom) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIOU(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = FreeImage_JPEGTransformFromHandle(&io, src, &io, dst, FIJPEG_OP_NONE, &left, &top, &right, &bottom, FALSE);
-
-	closeStdIO(src, dst);
-
-	return ret;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIO(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = FreeImage_JPEGTransformFromHandle(&io, src, &io, dst, operation, left, top, right, bottom, perfect);
-
-	closeStdIO(src, dst);
-
-	return ret;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!openStdIOU(src_file, dst_file, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	BOOL ret = FreeImage_JPEGTransformFromHandle(&io, src, &io, dst, operation, left, top, right, bottom, perfect);
-
-	closeStdIO(src, dst);
-
-	return ret;
-}
-
-// --------------------------------------------------------------------------
-
-static BOOL
-getMemIO(FIMEMORY* src_stream, FIMEMORY* dst_stream, FreeImageIO* dst_io, fi_handle* src_handle, fi_handle* dst_handle) {
-	*src_handle = NULL;
-	*dst_handle = NULL;
-
-	FreeImageIO io;
-	SetMemoryIO (&io);
-
-	if(dst_stream) {
-		FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(dst_stream->data);
-		if(mem_header->delete_me != TRUE) {
-			// do not save in a user buffer
-			FreeImage_OutputMessageProc(FIF_JPEG, "Destination memory buffer is read only");
-			return FALSE;
-		}
-	}
-
-	*dst_io = io;
-	*src_handle = src_stream;
-	*dst_handle = dst_stream;
-
-	return TRUE;
-}
-
-BOOL DLL_CALLCONV
-FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
-	FreeImageIO io;
-	fi_handle src;
-	fi_handle dst;
-	
-	if(!getMemIO(src_stream, dst_stream, &io, &src, &dst)) {
-		return FALSE;
-	}
-	
-	return FreeImage_JPEGTransformFromHandle(&io, src, &io, dst, operation, left, top, right, bottom, perfect);
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp b/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp
deleted file mode 100644
index 7c36e1c0cd..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-// ==========================================================
-// Poisson solver based on a full multigrid algorithm
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// Reference:
-// PRESS, W. H., TEUKOLSKY, S. A., VETTERLING, W. T., AND FLANNERY, B. P.
-// 1992. Numerical Recipes in C: The Art of Scientific Computing, 2nd ed. Cambridge University Press.
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "ToneMapping.h"
-
-static const int NPRE	= 1;		// Number of relaxation sweeps before ...
-static const int NPOST	= 1;		// ... and after the coarse-grid correction is computed
-static const int NGMAX	= 15;		// Maximum number of grids
-
-/**
-Copy src into dst
-*/
-static inline void fmg_copyArray(FIBITMAP *dst, FIBITMAP *src) {
-	memcpy(FreeImage_GetBits(dst), FreeImage_GetBits(src), FreeImage_GetHeight(dst) * FreeImage_GetPitch(dst));
-}
-
-/**
-Fills src with zeros
-*/
-static inline void fmg_fillArrayWithZeros(FIBITMAP *src) {
-	memset(FreeImage_GetBits(src), 0, FreeImage_GetHeight(src) * FreeImage_GetPitch(src));
-}
-
-/**
-Half-weighting restriction. nc is the coarse-grid dimension. The fine-grid solution is input in
-uf[0..2*nc-2][0..2*nc-2], the coarse-grid solution is returned in uc[0..nc-1][0..nc-1].
-*/
-static void fmg_restrict(FIBITMAP *UC, FIBITMAP *UF, int nc) {
-	int row_uc, row_uf, col_uc, col_uf;
-
-	const int uc_pitch  = FreeImage_GetPitch(UC) / sizeof(float);
-	const int uf_pitch  = FreeImage_GetPitch(UF) / sizeof(float);
-	
-	float *uc_bits = (float*)FreeImage_GetBits(UC);
-	const float *uf_bits = (float*)FreeImage_GetBits(UF);
-
-	// interior points
-	{
-		float *uc_scan = uc_bits + uc_pitch;
-		for (row_uc = 1, row_uf = 2; row_uc < nc-1; row_uc++, row_uf += 2) {
-			const float *uf_scan = uf_bits + row_uf * uf_pitch;
-			for (col_uc = 1, col_uf = 2; col_uc < nc-1; col_uc++, col_uf += 2) { 
-				// calculate 
-				// UC(row_uc, col_uc) = 
-				// 0.5 * UF(row_uf, col_uf) + 0.125 * [ UF(row_uf+1, col_uf) + UF(row_uf-1, col_uf) + UF(row_uf, col_uf+1) + UF(row_uf, col_uf-1) ]
-				float *uc_pixel = uc_scan + col_uc;
-				const float *uf_center = uf_scan + col_uf;
-				*uc_pixel = 0.5F * *uf_center + 0.125F * ( *(uf_center + uf_pitch) + *(uf_center - uf_pitch) + *(uf_center + 1) + *(uf_center - 1) );
-			}
-			uc_scan += uc_pitch;
-		}
-	}
-	// boundary points
-	const int ncc = 2*nc-1;
-	{
-		/*
-		calculate the following: 
-		for (row_uc = 0, row_uf = 0; row_uc < nc; row_uc++, row_uf += 2) { 
-			UC(row_uc, 0) = UF(row_uf, 0);		
-			UC(row_uc, nc-1) = UF(row_uf, ncc-1);
-		}
-		*/
-		float *uc_scan = uc_bits;
-		for (row_uc = 0, row_uf = 0; row_uc < nc; row_uc++, row_uf += 2) { 
-			const float *uf_scan = uf_bits + row_uf * uf_pitch;
-			uc_scan[0] = uf_scan[0];
-			uc_scan[nc-1] = uf_scan[ncc-1];
-			uc_scan += uc_pitch;
-		}
-	}
-	{
-		/*
-		calculate the following: 
-		for (col_uc = 0, col_uf = 0; col_uc < nc; col_uc++, col_uf += 2) {
-			UC(0, col_uc) = UF(0, col_uf);
-			UC(nc-1, col_uc) = UF(ncc-1, col_uf);
-		}
-		*/
-		float *uc_scan_top = uc_bits;
-		float *uc_scan_bottom = uc_bits + (nc-1)*uc_pitch;
-		const float *uf_scan_top = uf_bits + (ncc-1)*uf_pitch;
-		const float *uf_scan_bottom = uf_bits;
-		for (col_uc = 0, col_uf = 0; col_uc < nc; col_uc++, col_uf += 2) {
-			uc_scan_top[col_uc] = uf_scan_top[col_uf];
-			uc_scan_bottom[col_uc] = uf_scan_bottom[col_uf];
-		}
-	}
-}
-
-/**
-Solution of the model problem on the coarsest grid, where h = 1/2 . 
-The right-hand side is input
-in rhs[0..2][0..2] and the solution is returned in u[0..2][0..2].
-*/
-static void fmg_solve(FIBITMAP *U, FIBITMAP *RHS) {
-	// fill U with zeros
-	fmg_fillArrayWithZeros(U);
-	// calculate U(1, 1) = -h*h*RHS(1, 1)/4.0 where h = 1/2
-	float *u_scan = (float*)FreeImage_GetScanLine(U, 1);
-	const float *rhs_scan = (float*)FreeImage_GetScanLine(RHS, 1);
-	u_scan[1] = -rhs_scan[1] / 16;
-}
-
-/**
-Coarse-to-fine prolongation by bilinear interpolation. nf is the fine-grid dimension. The coarsegrid
-solution is input as uc[0..nc-1][0..nc-1], where nc = nf/2 + 1. The fine-grid solution is
-returned in uf[0..nf-1][0..nf-1].
-*/
-static void fmg_prolongate(FIBITMAP *UF, FIBITMAP *UC, int nf) {
-	int row_uc, row_uf, col_uc, col_uf;
-
-	const int uf_pitch  = FreeImage_GetPitch(UF) / sizeof(float);
-	const int uc_pitch  = FreeImage_GetPitch(UC) / sizeof(float);
-	
-	float *uf_bits = (float*)FreeImage_GetBits(UF);
-	const float *uc_bits = (float*)FreeImage_GetBits(UC);
-	
-	// do elements that are copies
-	{
-		const int nc = nf/2 + 1;
-
-		float *uf_scan = uf_bits;
-		const float *uc_scan = uc_bits;		
-		for (row_uc = 0; row_uc < nc; row_uc++) {
-			for (col_uc = 0, col_uf = 0; col_uc < nc; col_uc++, col_uf += 2) {
-				// calculate UF(2*row_uc, col_uf) = UC(row_uc, col_uc);
-				uf_scan[col_uf] = uc_scan[col_uc];
-			}
-			uc_scan += uc_pitch;
-			uf_scan += 2 * uf_pitch;
-		}
-	}
-	// do odd-numbered columns, interpolating vertically
-	{		
-		for(row_uf = 1; row_uf < nf-1; row_uf += 2) {
-			float *uf_scan = uf_bits + row_uf * uf_pitch;
-			for (col_uf = 0; col_uf < nf; col_uf += 2) {
-				// calculate UF(row_uf, col_uf) = 0.5 * ( UF(row_uf+1, col_uf) + UF(row_uf-1, col_uf) )
-				uf_scan[col_uf] = 0.5F * ( *(uf_scan + uf_pitch + col_uf) + *(uf_scan - uf_pitch + col_uf) );
-			}
-		}
-	}
-	// do even-numbered columns, interpolating horizontally
-	{
-		float *uf_scan = uf_bits;
-		for(row_uf = 0; row_uf < nf; row_uf++) {
-			for (col_uf = 1; col_uf < nf-1; col_uf += 2) {
-				// calculate UF(row_uf, col_uf) = 0.5 * ( UF(row_uf, col_uf+1) + UF(row_uf, col_uf-1) )
-				uf_scan[col_uf] = 0.5F * ( uf_scan[col_uf + 1] + uf_scan[col_uf - 1] );
-			}
-			uf_scan += uf_pitch;
-		}
-	}
-}
-
-/**
-Red-black Gauss-Seidel relaxation for model problem. Updates the current value of the solution
-u[0..n-1][0..n-1], using the right-hand side function rhs[0..n-1][0..n-1].
-*/
-static void fmg_relaxation(FIBITMAP *U, FIBITMAP *RHS, int n) {
-	int row, col, ipass, isw, jsw;
-	const float h = 1.0F / (n - 1);
-	const float h2 = h*h;
-
-	const int u_pitch  = FreeImage_GetPitch(U) / sizeof(float);
-	const int rhs_pitch  = FreeImage_GetPitch(RHS) / sizeof(float);
-	
-	float *u_bits = (float*)FreeImage_GetBits(U);
-	const float *rhs_bits = (float*)FreeImage_GetBits(RHS);
-
-	for (ipass = 0, jsw = 1; ipass < 2; ipass++, jsw = 3-jsw) { // Red and black sweeps
-		float *u_scan = u_bits + u_pitch;
-		const float *rhs_scan = rhs_bits + rhs_pitch;
-		for (row = 1, isw = jsw; row < n-1; row++, isw = 3-isw) {
-			for (col = isw; col < n-1; col += 2) { 
-				// Gauss-Seidel formula
-				// calculate U(row, col) = 
-				// 0.25 * [ U(row+1, col) + U(row-1, col) + U(row, col+1) + U(row, col-1) - h2 * RHS(row, col) ]		 
-				float *u_center = u_scan + col;
-				const float *rhs_center = rhs_scan + col;
-				*u_center = *(u_center + u_pitch) + *(u_center - u_pitch) + *(u_center + 1) + *(u_center - 1);
-				*u_center -= h2 * *rhs_center;
-				*u_center *= 0.25F;
-			}
-			u_scan += u_pitch;
-			rhs_scan += rhs_pitch;
-		}
-	}
-}
-
-/**
-Returns minus the residual for the model problem. Input quantities are u[0..n-1][0..n-1] and
-rhs[0..n-1][0..n-1], while res[0..n-1][0..n-1] is returned.
-*/
-static void fmg_residual(FIBITMAP *RES, FIBITMAP *U, FIBITMAP *RHS, int n) {
-	int row, col;
-
-	const float h = 1.0F / (n-1);	
-	const float h2i = 1.0F / (h*h);
-
-	const int res_pitch  = FreeImage_GetPitch(RES) / sizeof(float);
-	const int u_pitch  = FreeImage_GetPitch(U) / sizeof(float);
-	const int rhs_pitch  = FreeImage_GetPitch(RHS) / sizeof(float);
-	
-	float *res_bits = (float*)FreeImage_GetBits(RES);
-	const float *u_bits = (float*)FreeImage_GetBits(U);
-	const float *rhs_bits = (float*)FreeImage_GetBits(RHS);
-
-	// interior points
-	{
-		float *res_scan = res_bits + res_pitch;
-		const float *u_scan = u_bits + u_pitch;
-		const float *rhs_scan = rhs_bits + rhs_pitch;
-		for (row = 1; row < n-1; row++) {
-			for (col = 1; col < n-1; col++) {
-				// calculate RES(row, col) = 
-				// -h2i * [ U(row+1, col) + U(row-1, col) + U(row, col+1) + U(row, col-1) - 4 * U(row, col) ] + RHS(row, col);
-				float *res_center = res_scan + col;
-				const float *u_center = u_scan + col;
-				const float *rhs_center = rhs_scan + col;
-				*res_center = *(u_center + u_pitch) + *(u_center - u_pitch) + *(u_center + 1) + *(u_center - 1) - 4 * *u_center;
-				*res_center *= -h2i;
-				*res_center += *rhs_center;
-			}
-			res_scan += res_pitch;
-			u_scan += u_pitch;
-			rhs_scan += rhs_pitch;
-		}
-	}
-
-	// boundary points
-	{
-		memset(FreeImage_GetScanLine(RES, 0), 0, FreeImage_GetPitch(RES));
-		memset(FreeImage_GetScanLine(RES, n-1), 0, FreeImage_GetPitch(RES));
-		float *left = res_bits;
-		float *right = res_bits + (n-1);
-		for(int k = 0; k < n; k++) {
-			*left = 0;
-			*right = 0;
-			left += res_pitch;
-			right += res_pitch;
-		}
-	}
-}
-
-/**
-Does coarse-to-fine interpolation and adds result to uf. nf is the fine-grid dimension. The
-coarse-grid solution is input as uc[0..nc-1][0..nc-1], where nc = nf/2+1. The fine-grid solution
-is returned in uf[0..nf-1][0..nf-1]. res[0..nf-1][0..nf-1] is used for temporary storage.
-*/
-static void fmg_addint(FIBITMAP *UF, FIBITMAP *UC, FIBITMAP *RES, int nf) {
-	fmg_prolongate(RES, UC, nf);
-
-	const int uf_pitch  = FreeImage_GetPitch(UF) / sizeof(float);
-	const int res_pitch  = FreeImage_GetPitch(RES) / sizeof(float);	
-
-	float *uf_bits = (float*)FreeImage_GetBits(UF);
-	const float *res_bits = (float*)FreeImage_GetBits(RES);
-
-	for(int row = 0; row < nf; row++) {
-		for(int col = 0; col < nf; col++) {
-			// calculate UF(row, col) = UF(row, col) + RES(row, col);
-			uf_bits[col] += res_bits[col];
-		}
-		uf_bits += uf_pitch;
-		res_bits += res_pitch;
-	}
-}
-
-/**
-Full Multigrid Algorithm for solution of linear elliptic equation, here the model problem (19.0.6).
-On input u[0..n-1][0..n-1] contains the right-hand side c, while on output it returns the solution.
-The dimension n must be of the form 2^j + 1 for some integer j. (j is actually the number of
-grid levels used in the solution, called ng below.) ncycle is the number of V-cycles to be
-used at each level.
-*/
-static BOOL fmg_mglin(FIBITMAP *U, int n, int ncycle) {
-	int j, jcycle, jj, jpost, jpre, nf, ngrid;
-
-	FIBITMAP **IRHO = NULL;
-	FIBITMAP **IU   = NULL;
-	FIBITMAP **IRHS = NULL;
-	FIBITMAP **IRES = NULL;
-	
-	int ng = 0;		// number of allocated grids
-
-// --------------------------------------------------------------------------
-
-#define _CREATE_ARRAY_GRID_(array, array_size) \
-	array = (FIBITMAP**)malloc(array_size * sizeof(FIBITMAP*));\
-	if(!array) throw(1);\
-	memset(array, 0, array_size * sizeof(FIBITMAP*))
-
-#define _FREE_ARRAY_GRID_(array, array_size) \
-	if(NULL != array) {\
-		for(int k = 0; k < array_size; k++) {\
-			if(NULL != array[k]) {\
-				FreeImage_Unload(array[k]); array[k] = NULL;\
-			}\
-		}\
-		free(array);\
-	}
-
-// --------------------------------------------------------------------------
-
-	try {
-		int nn = n;
-		// check grid size and grid levels
-		while (nn >>= 1) ng++;
-		if (n != 1 + (1L << ng)) {
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Multigrid algorithm: n = %d, while n-1 must be a power of 2.", n);
-			throw(1);
-		}
-		if (ng > NGMAX) {
-			FreeImage_OutputMessageProc(FIF_UNKNOWN, "Multigrid algorithm: ng = %d while NGMAX = %d, increase NGMAX.", ng, NGMAX);
-			throw(1);
-		}
-		// allocate grid arrays
-		{
-			_CREATE_ARRAY_GRID_(IRHO, ng);
-			_CREATE_ARRAY_GRID_(IU, ng);
-			_CREATE_ARRAY_GRID_(IRHS, ng);
-			_CREATE_ARRAY_GRID_(IRES, ng);
-		}
-
-		nn = n/2 + 1;
-		ngrid = ng - 2;
-
-		// allocate storage for r.h.s. on grid (ng - 2) ...
-		IRHO[ngrid] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-		if(!IRHO[ngrid]) throw(1);
-
-		// ... and fill it by restricting from the fine grid
-		fmg_restrict(IRHO[ngrid], U, nn);	
-
-		// similarly allocate storage and fill r.h.s. on all coarse grids.
-		while (nn > 3) {
-			nn = nn/2 + 1; 
-			ngrid--;
-			IRHO[ngrid] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-			if(!IRHO[ngrid]) throw(1);
-			fmg_restrict(IRHO[ngrid], IRHO[ngrid+1], nn);
-		}
-
-		nn = 3;
-
-		IU[0] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-		if(!IU[0]) throw(1);
-		IRHS[0] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-		if(!IRHS[0]) throw(1);
-
-		// initial solution on coarsest grid
-		fmg_solve(IU[0], IRHO[0]);
-		// irho[0] no longer needed ...
-		FreeImage_Unload(IRHO[0]); IRHO[0] = NULL;
-
-		ngrid = ng;
-
-		// nested iteration loop
-		for (j = 1; j < ngrid; j++) {
-			nn = 2*nn - 1;
-
-			IU[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-			if(!IU[j]) throw(1);
-			IRHS[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-			if(!IRHS[j]) throw(1);
-			IRES[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn);
-			if(!IRES[j]) throw(1);
-
-			fmg_prolongate(IU[j], IU[j-1], nn);
-			
-			// interpolate from coarse grid to next finer grid
-
-			// set up r.h.s.
-			fmg_copyArray(IRHS[j], j != (ngrid - 1) ? IRHO[j] : U);
-			
-			// V-cycle loop
-			for (jcycle = 0; jcycle < ncycle; jcycle++) {
-				nf = nn;
-				// downward stoke of the V
-				for (jj = j; jj >= 1; jj--) {
-					// pre-smoothing
-					for (jpre = 0; jpre < NPRE; jpre++) {
-						fmg_relaxation(IU[jj], IRHS[jj], nf);
-					}
-					fmg_residual(IRES[jj], IU[jj], IRHS[jj], nf);
-					nf = nf/2 + 1;
-					// restriction of the residual is the next r.h.s.
-					fmg_restrict(IRHS[jj-1], IRES[jj], nf);				
-					// zero for initial guess in next relaxation
-					fmg_fillArrayWithZeros(IU[jj-1]);
-				}
-				// bottom of V: solve on coarsest grid
-				fmg_solve(IU[0], IRHS[0]); 
-				nf = 3; 
-				// upward stroke of V.
-				for (jj = 1; jj <= j; jj++) { 
-					nf = 2*nf - 1;
-					// use res for temporary storage inside addint
-					fmg_addint(IU[jj], IU[jj-1], IRES[jj], nf);				
-					// post-smoothing
-					for (jpost = 0; jpost < NPOST; jpost++) {
-						fmg_relaxation(IU[jj], IRHS[jj], nf);
-					}
-				}
-			}
-		}
-
-		// return solution in U
-		fmg_copyArray(U, IU[ngrid-1]);
-
-		// delete allocated arrays
-		_FREE_ARRAY_GRID_(IRES, ng);
-		_FREE_ARRAY_GRID_(IRHS, ng);
-		_FREE_ARRAY_GRID_(IU, ng);
-		_FREE_ARRAY_GRID_(IRHO, ng);
-
-		return TRUE;
-
-	} catch(int) {
-		// delete allocated arrays
-		_FREE_ARRAY_GRID_(IRES, ng);
-		_FREE_ARRAY_GRID_(IRHS, ng);
-		_FREE_ARRAY_GRID_(IU, ng);
-		_FREE_ARRAY_GRID_(IRHO, ng);
-
-		return FALSE;
-	}
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Poisson solver based on a multigrid algorithm. 
-This routine solves a Poisson equation, remap result pixels to [0..1] and returns the solution. 
-NB: The input image is first stored inside a square image whose size is (2^j + 1)x(2^j + 1) for some integer j, 
-where j is such that 2^j is the nearest larger dimension corresponding to MAX(image width, image height). 
-@param Laplacian Laplacian image
-@param ncycle Number of cycles in the multigrid algorithm (usually 2 or 3)
-@return Returns the solved PDE equations if successful, returns NULL otherwise
-*/
-FIBITMAP* DLL_CALLCONV 
-FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle) {
-	if(!FreeImage_HasPixels(Laplacian)) return NULL;
-
-	int width = FreeImage_GetWidth(Laplacian);
-	int height = FreeImage_GetHeight(Laplacian);
-
-	// get nearest larger dimension length that is acceptable by the algorithm
-	int n = MAX(width, height);
-	int size = 0;
-	while((n >>= 1) > 0) size++;
-	if((1 << size) < MAX(width, height)) {
-		size++;
-	}
-	// size must be of the form 2^j + 1 for some integer j
-	size = 1 + (1 << size);
-
-	// allocate a temporary square image I
-	FIBITMAP *I = FreeImage_AllocateT(FIT_FLOAT, size, size);
-	if(!I) return NULL;
-
-	// copy Laplacian into I and shift pixels to create a boundary
-	FreeImage_Paste(I, Laplacian, 1, 1, 255);
-
-	// solve the PDE equation
-	fmg_mglin(I, size, ncycle);
-
-	// shift pixels back
-	FIBITMAP *U = FreeImage_Copy(I, 1, 1, width + 1, height + 1);
-	FreeImage_Unload(I);
-
-	// remap pixels to [0..1]
-	NormalizeY(U, 0, 1);
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(U, Laplacian);
-
-	// return the integrated image
-	return U;
-}
-
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp
deleted file mode 100644
index 3fdc3e3d6b..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// ==========================================================
-// Upsampling / downsampling routine
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "Resize.h"
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_RescaleRect(FIBITMAP *src, int dst_width, int dst_height, int src_left, int src_top, int src_right, int src_bottom, FREE_IMAGE_FILTER filter, unsigned flags) {
-	FIBITMAP *dst = NULL;
-
-	const int src_width = FreeImage_GetWidth(src);
-	const int src_height = FreeImage_GetHeight(src);
-
-	if (!FreeImage_HasPixels(src) || (dst_width <= 0) || (dst_height <= 0) || (src_width <= 0) || (src_height <= 0)) {
-		return NULL;
-	}
-
-	// normalize the rectangle
-	if (src_right < src_left) {
-		INPLACESWAP(src_left, src_right);
-	}
-	if (src_bottom < src_top) {
-		INPLACESWAP(src_top, src_bottom);
-	}
-
-	// check the size of the sub image
-	if((src_left < 0) || (src_right > src_width) || (src_top < 0) || (src_bottom > src_height)) {
-		return NULL;
-	}
-
-	// select the filter
-	CGenericFilter *pFilter = NULL;
-	switch (filter) {
-		case FILTER_BOX:
-			pFilter = new(std::nothrow) CBoxFilter();
-			break;
-		case FILTER_BICUBIC:
-			pFilter = new(std::nothrow) CBicubicFilter();
-			break;
-		case FILTER_BILINEAR:
-			pFilter = new(std::nothrow) CBilinearFilter();
-			break;
-		case FILTER_BSPLINE:
-			pFilter = new(std::nothrow) CBSplineFilter();
-			break;
-		case FILTER_CATMULLROM:
-			pFilter = new(std::nothrow) CCatmullRomFilter();
-			break;
-		case FILTER_LANCZOS3:
-			pFilter = new(std::nothrow) CLanczos3Filter();
-			break;
-	}
-
-	if (!pFilter) {
-		return NULL;
-	}
-
-	CResizeEngine Engine(pFilter);
-
-	dst = Engine.scale(src, dst_width, dst_height, src_left, src_top,
-			src_right - src_left, src_bottom - src_top, flags);
-
-	delete pFilter;
-
-	if ((flags & FI_RESCALE_OMIT_METADATA) != FI_RESCALE_OMIT_METADATA) {
-		// copy metadata from src to dst
-		FreeImage_CloneMetadata(dst, src);
-	}
-
-	return dst;
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTER filter) {
-	return FreeImage_RescaleRect(src, dst_width, dst_height, 0, 0, FreeImage_GetWidth(src), FreeImage_GetHeight(src), filter, FI_RESCALE_DEFAULT);
-}
-
-FIBITMAP * DLL_CALLCONV
-FreeImage_MakeThumbnail(FIBITMAP *dib, int max_pixel_size, BOOL convert) {
-	FIBITMAP *thumbnail = NULL;
-	int new_width, new_height;
-
-	if(!FreeImage_HasPixels(dib) || (max_pixel_size <= 0)) return NULL;
-
-	int width	= FreeImage_GetWidth(dib);
-	int height = FreeImage_GetHeight(dib);
-
-	if(max_pixel_size == 0) max_pixel_size = 1;
-
-	if((width < max_pixel_size) && (height < max_pixel_size)) {
-		// image is smaller than the requested thumbnail
-		return FreeImage_Clone(dib);
-	}
-
-	if(width > height) {
-		new_width = max_pixel_size;
-		// change image height with the same ratio
-		double ratio = ((double)new_width / (double)width);
-		new_height = (int)(height * ratio + 0.5);
-		if(new_height == 0) new_height = 1;
-	} else {
-		new_height = max_pixel_size;
-		// change image width with the same ratio
-		double ratio = ((double)new_height / (double)height);
-		new_width = (int)(width * ratio + 0.5);
-		if(new_width == 0) new_width = 1;
-	}
-
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
-
-	// perform downsampling using a bilinear interpolation
-
-	switch(image_type) {
-		case FIT_BITMAP:
-		case FIT_UINT16:
-		case FIT_RGB16:
-		case FIT_RGBA16:
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			FREE_IMAGE_FILTER filter = FILTER_BILINEAR;
-			thumbnail = FreeImage_Rescale(dib, new_width, new_height, filter);
-		}
-		break;
-
-		case FIT_INT16:
-		case FIT_UINT32:
-		case FIT_INT32:
-		case FIT_DOUBLE:
-		case FIT_COMPLEX:
-		default:
-			// cannot rescale this kind of image
-			thumbnail = NULL;
-			break;
-	}
-
-	if((thumbnail != NULL) && (image_type != FIT_BITMAP) && convert) {
-		// convert to a standard bitmap
-		FIBITMAP *bitmap = NULL;
-		switch(image_type) {
-			case FIT_UINT16:
-				bitmap = FreeImage_ConvertTo8Bits(thumbnail);
-				break;
-			case FIT_RGB16:
-				bitmap = FreeImage_ConvertTo24Bits(thumbnail);
-				break;
-			case FIT_RGBA16:
-				bitmap = FreeImage_ConvertTo32Bits(thumbnail);
-				break;
-			case FIT_FLOAT:
-				bitmap = FreeImage_ConvertToStandardType(thumbnail, TRUE);
-				break;
-			case FIT_RGBF:
-				bitmap = FreeImage_ToneMapping(thumbnail, FITMO_DRAGO03);
-				break;
-			case FIT_RGBAF:
-				// no way to keep the transparency yet ...
-				FIBITMAP *rgbf = FreeImage_ConvertToRGBF(thumbnail);
-				bitmap = FreeImage_ToneMapping(rgbf, FITMO_DRAGO03);
-				FreeImage_Unload(rgbf);
-				break;
-		}
-		if(bitmap != NULL) {
-			FreeImage_Unload(thumbnail);
-			thumbnail = bitmap;
-		}
-	}
-
-	// copy metadata from src to dst
-	FreeImage_CloneMetadata(thumbnail, dib);
-
-	return thumbnail;
-}
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp
deleted file mode 100644
index 7427986703..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp
+++ /dev/null
@@ -1,2116 +0,0 @@
-// ==========================================================
-// Upsampling / downsampling classes
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "Resize.h"
-
-/**
-Returns the color type of a bitmap. In contrast to FreeImage_GetColorType,
-this function optionally supports a boolean OUT parameter, that receives TRUE,
-if the specified bitmap is greyscale, that is, it consists of grey colors only.
-Although it returns the same value as returned by FreeImage_GetColorType for all
-image types, this extended function primarily is intended for palletized images,
-since the boolean pointed to by 'bIsGreyscale' remains unchanged for RGB(A/F)
-images. However, the outgoing boolean is properly maintained for palletized images,
-as well as for any non-RGB image type, like FIT_UINTxx and FIT_DOUBLE, for example.
-@param dib A pointer to a FreeImage bitmap to calculate the extended color type for
-@param bIsGreyscale A pointer to a boolean, that receives TRUE, if the specified bitmap
-is greyscale, that is, it consists of grey colors only. This parameter can be NULL.
-@return the color type of the specified bitmap
-*/
-static FREE_IMAGE_COLOR_TYPE
-GetExtendedColorType(FIBITMAP *dib, BOOL *bIsGreyscale) {
-	const unsigned bpp = FreeImage_GetBPP(dib);
-	const unsigned size = CalculateUsedPaletteEntries(bpp);
-	const RGBQUAD * const pal = FreeImage_GetPalette(dib);
-	FREE_IMAGE_COLOR_TYPE color_type = FIC_MINISBLACK;
-	BOOL bIsGrey = TRUE;
-
-	switch (bpp) {
-		case 1:
-		{
-			for (unsigned i = 0; i < size; i++) {
-				if ((pal[i].rgbRed != pal[i].rgbGreen) || (pal[i].rgbRed != pal[i].rgbBlue)) {
-					color_type = FIC_PALETTE;
-					bIsGrey = FALSE;
-					break;
-				}
-			}
-			if (bIsGrey) {
-				if (pal[0].rgbBlue == 255 && pal[1].rgbBlue == 0) {
-					color_type = FIC_MINISWHITE;
-				} else if (pal[0].rgbBlue != 0 || pal[1].rgbBlue != 255) {
-					color_type = FIC_PALETTE;
-				}
-			}
-			break;
-		}
-
-		case 4:
-		case 8:
-		{
-			for (unsigned i = 0; i < size; i++) {
-				if ((pal[i].rgbRed != pal[i].rgbGreen) || (pal[i].rgbRed != pal[i].rgbBlue)) {
-					color_type = FIC_PALETTE;
-					bIsGrey = FALSE;
-					break;
-				}
-				if (color_type != FIC_PALETTE && pal[i].rgbBlue != i) {
-					if ((size - i - 1) != pal[i].rgbBlue) {
-						color_type = FIC_PALETTE;
-						if (!bIsGreyscale) {
-							// exit loop if we're not setting
-							// bIsGreyscale parameter
-							break;
-						}
-					} else {
-						color_type = FIC_MINISWHITE;
-					}
-				}
-			}
-			break;
-		}
-
-		default:
-		{
-			color_type = FreeImage_GetColorType(dib);
-			bIsGrey = (color_type == FIC_MINISBLACK) ? TRUE : FALSE;
-			break;
-		}
-
-	}
-	if (bIsGreyscale) {
-		*bIsGreyscale = bIsGrey;
-	}
-
-	return color_type;
-}
-
-/**
-Returns a pointer to an RGBA palette, created from the specified bitmap.
-The RGBA palette is a copy of the specified bitmap's palette, that, additionally
-contains the bitmap's transparency information in the rgbReserved member
-of the palette's RGBQUAD elements.
-@param dib A pointer to a FreeImage bitmap to create the RGBA palette from.
-@param buffer A pointer to the buffer to store the RGBA palette.
-@return A pointer to the newly created RGBA palette or NULL, if the specified
-bitmap is no palletized standard bitmap. If non-NULL, the returned value is
-actually the pointer passed in parameter 'buffer'.
-*/
-static inline RGBQUAD *
-GetRGBAPalette(FIBITMAP *dib, RGBQUAD * const buffer) {
-	// clone the palette
-	const unsigned ncolors = FreeImage_GetColorsUsed(dib);
-	if (ncolors == 0) {
-		return NULL;
-	}
-	memcpy(buffer, FreeImage_GetPalette(dib), ncolors * sizeof(RGBQUAD));
-	// merge the transparency table
-	const unsigned ntransp = MIN(ncolors, FreeImage_GetTransparencyCount(dib));
-	const BYTE * const tt = FreeImage_GetTransparencyTable(dib);
-	for (unsigned i = 0; i < ntransp; i++) {
-		buffer[i].rgbReserved = tt[i];
-	}
-	for (unsigned i = ntransp; i < ncolors; i++) {
-		buffer[i].rgbReserved = 255;
-	}
-	return buffer;
-}
-
-// --------------------------------------------------------------------------
-
-CWeightsTable::CWeightsTable(CGenericFilter *pFilter, unsigned uDstSize, unsigned uSrcSize) {
-	double dWidth;
-	double dFScale;
-	const double dFilterWidth = pFilter->GetWidth();
-
-	// scale factor
-	const double dScale = double(uDstSize) / double(uSrcSize);
-
-	if(dScale < 1.0) {
-		// minification
-		dWidth = dFilterWidth / dScale; 
-		dFScale = dScale; 
-	} else {
-		// magnification
-		dWidth = dFilterWidth; 
-		dFScale = 1.0; 
-	}
-
-	// allocate a new line contributions structure
-	//
-	// window size is the number of sampled pixels
-	m_WindowSize = 2 * (int)ceil(dWidth) + 1; 
-	// length of dst line (no. of rows / cols) 
-	m_LineLength = uDstSize; 
-
-	 // allocate list of contributions 
-	m_WeightTable = (Contribution*)malloc(m_LineLength * sizeof(Contribution));
-	for(unsigned u = 0; u < m_LineLength; u++) {
-		// allocate contributions for every pixel
-		m_WeightTable[u].Weights = (double*)malloc(m_WindowSize * sizeof(double));
-	}
-
-	// offset for discrete to continuous coordinate conversion
-	const double dOffset = (0.5 / dScale);
-
-	for(unsigned u = 0; u < m_LineLength; u++) {
-		// scan through line of contributions
-
-		// inverse mapping (discrete dst 'u' to continous src 'dCenter')
-		const double dCenter = (double)u / dScale + dOffset;
-
-		// find the significant edge points that affect the pixel
-		const int iLeft = MAX(0, (int)(dCenter - dWidth + 0.5));
-		const int iRight = MIN((int)(dCenter + dWidth + 0.5), int(uSrcSize));
-
-		m_WeightTable[u].Left = iLeft; 
-		m_WeightTable[u].Right = iRight;
-
-		double dTotalWeight = 0;  // sum of weights (initialized to zero)
-		for(int iSrc = iLeft; iSrc < iRight; iSrc++) {
-			// calculate weights
-			const double weight = dFScale * pFilter->Filter(dFScale * ((double)iSrc + 0.5 - dCenter));
-			// assert((iSrc-iLeft) < m_WindowSize);
-			m_WeightTable[u].Weights[iSrc-iLeft] = weight;
-			dTotalWeight += weight;
-		}
-		if((dTotalWeight > 0) && (dTotalWeight != 1)) {
-			// normalize weight of neighbouring points
-			for(int iSrc = iLeft; iSrc < iRight; iSrc++) {
-				// normalize point
-				m_WeightTable[u].Weights[iSrc-iLeft] /= dTotalWeight; 
-			}
-		}
-
-		// simplify the filter, discarding null weights at the right
-		{			
-			int iTrailing = iRight - iLeft - 1;
-			while(m_WeightTable[u].Weights[iTrailing] == 0) {
-				m_WeightTable[u].Right--;
-				iTrailing--;
-				if(m_WeightTable[u].Right == m_WeightTable[u].Left) {
-					break;
-				}
-			}
-			
-		}
-
-	} // next dst pixel
-}
-
-CWeightsTable::~CWeightsTable() {
-	for(unsigned u = 0; u < m_LineLength; u++) {
-		// free contributions for every pixel
-		free(m_WeightTable[u].Weights);
-	}
-	// free list of pixels contributions
-	free(m_WeightTable);
-}
-
-// --------------------------------------------------------------------------
-
-FIBITMAP* CResizeEngine::scale(FIBITMAP *src, unsigned dst_width, unsigned dst_height, unsigned src_left, unsigned src_top, unsigned src_width, unsigned src_height, unsigned flags) {
-
-	const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src);
-	const unsigned src_bpp = FreeImage_GetBPP(src);
-
-	// determine the image's color type
-	BOOL bIsGreyscale = FALSE;
-	FREE_IMAGE_COLOR_TYPE color_type;
-	if (src_bpp <= 8) {
-		color_type = GetExtendedColorType(src, &bIsGreyscale);
-	} else {
-		color_type = FIC_RGB;
-	}
-
-	// determine the required bit depth of the destination image
-	unsigned dst_bpp;
-	unsigned dst_bpp_s1 = 0;
-	if (color_type == FIC_PALETTE && !bIsGreyscale) {
-		// non greyscale FIC_PALETTE images require a high-color destination
-		// image (24- or 32-bits depending on the image's transparent state)
-		dst_bpp = FreeImage_IsTransparent(src) ? 32 : 24;
-	} else if (src_bpp <= 8) {
-		// greyscale images require an 8-bit destination image
-		// (or a 32-bit image if the image is transparent);
-		// however, if flag FI_RESCALE_TRUE_COLOR is set, we will return
-		// a true color (24 bpp) image
-		if (FreeImage_IsTransparent(src)) {
-			dst_bpp = 32;
-			// additionally, for transparent images we always need a
-			// palette including transparency information (an RGBA palette)
-			// so, set color_type accordingly
-			color_type = FIC_PALETTE;
-		} else {
-			dst_bpp = ((flags & FI_RESCALE_TRUE_COLOR) == FI_RESCALE_TRUE_COLOR) ? 24 : 8;
-			// in any case, we use a fast 8-bit temporary image for the
-			// first filter operation (stage 1, either horizontal or
-			// vertical) and implicitly convert to 24 bpp (if requested
-			// by flag FI_RESCALE_TRUE_COLOR) during the second filter
-			// operation
-			dst_bpp_s1 = 8;
-		}
-	} else if (src_bpp == 16 && image_type == FIT_BITMAP) {
-		// 16-bit 555 and 565 RGB images require a high-color destination
-		// image (fixed to 24 bits, since 16-bit RGBs don't support
-		// transparency in FreeImage)
-		dst_bpp = 24;
-	} else {
-		// bit depth remains unchanged for all other images
-		dst_bpp = src_bpp;
-	}
-
-	// make 'stage 1' bpp a copy of the destination bpp if it
-	// was not explicitly set
-	if (dst_bpp_s1 == 0) {
-		dst_bpp_s1 = dst_bpp;
-	}
-
-	// early exit if destination size is equal to source size
-	if ((src_width == dst_width) && (src_height == dst_height)) {
-		FIBITMAP *out = src;
-		FIBITMAP *tmp = src;
-		if ((src_width != FreeImage_GetWidth(src)) || (src_height != FreeImage_GetHeight(src))) {
-			out = FreeImage_Copy(tmp, src_left, src_top, src_left + src_width, src_top + src_height);
-			tmp = out;
-		}
-		if (src_bpp != dst_bpp) {
-			switch (dst_bpp) {
-				case 8:
-					out = FreeImage_ConvertToGreyscale(tmp);
-					break;
-				case 24:
-					out = FreeImage_ConvertTo24Bits(tmp);
-					break;
-				case 32:
-					out = FreeImage_ConvertTo32Bits(tmp);
-					break;
-				default:
-					break;
-			}
-			if (tmp != src) {
-				FreeImage_Unload(tmp);
-				tmp = NULL;
-			}
-		}
-
-		return (out != src) ? out : FreeImage_Clone(src);
-	}
-
-	RGBQUAD pal_buffer[256];
-	RGBQUAD *src_pal = NULL;
-
-	// provide the source image's palette to the rescaler for
-	// FIC_PALETTE type images (this includes palletized greyscale
-	// images with an unordered palette as well as transparent images)
-	if (color_type == FIC_PALETTE) {
-		if (dst_bpp == 32) {
-			// a 32-bit destination image signals transparency, so
-			// create an RGBA palette from the source palette
-			src_pal = GetRGBAPalette(src, pal_buffer);
-		} else {
-			src_pal = FreeImage_GetPalette(src);
-		}
-	}
-
-	// allocate the dst image
-	FIBITMAP *dst = FreeImage_AllocateT(image_type, dst_width, dst_height, dst_bpp, 0, 0, 0);
-	if (!dst) {
-		return NULL;
-	}
-	
-	if (dst_bpp == 8) {
-		RGBQUAD * const dst_pal = FreeImage_GetPalette(dst);
-		if (color_type == FIC_MINISWHITE) {
-			// build an inverted greyscale palette
-			CREATE_GREYSCALE_PALETTE_REVERSE(dst_pal, 256);
-		} 
-		/*
-		else {
-			// build a default greyscale palette
-			// Currently, FreeImage_AllocateT already creates a default
-			// greyscale palette for 8 bpp images, so we can skip this here.
-			CREATE_GREYSCALE_PALETTE(dst_pal, 256);
-		}
-		*/
-	}
-
-	// calculate x and y offsets; since FreeImage uses bottom-up bitmaps, the
-	// value of src_offset_y is measured from the bottom of the image
-	unsigned src_offset_x = src_left;
-	unsigned src_offset_y = FreeImage_GetHeight(src) - src_height - src_top;
-
-	/*
-	Decide which filtering order (xy or yx) is faster for this mapping. 
-	--- The theory ---
-	Try to minimize calculations by counting the number of convolution multiplies
-	if(dst_width*src_height <= src_width*dst_height) {
-		// xy filtering
-	} else {
-		// yx filtering
-	}
-	--- The practice ---
-	Try to minimize calculations by counting the number of vertical convolutions (the most time consuming task)
-	if(dst_width*dst_height <= src_width*dst_height) {
-		// xy filtering
-	} else {
-		// yx filtering
-	}
-	*/
-
-	if (dst_width <= src_width) {
-		// xy filtering
-		// -------------
-
-		FIBITMAP *tmp = NULL;
-
-		if (src_width != dst_width) {
-			// source and destination widths are different so, we must
-			// filter horizontally
-			if (src_height != dst_height) {
-				// source and destination heights are also different so, we need
-				// a temporary image
-				tmp = FreeImage_AllocateT(image_type, dst_width, src_height, dst_bpp_s1, 0, 0, 0);
-				if (!tmp) {
-					FreeImage_Unload(dst);
-					return NULL;
-				}
-			} else {
-				// source and destination heights are equal so, we can directly
-				// scale into destination image (second filter method will not
-				// be invoked)
-				tmp = dst;
-			}
-
-			// scale source image horizontally into temporary (or destination) image
-			horizontalFilter(src, src_height, src_width, src_offset_x, src_offset_y, src_pal, tmp, dst_width);
-
-			// set x and y offsets to zero for the second filter method
-			// invocation (the temporary image only contains the portion of
-			// the image to be rescaled with no offsets)
-			src_offset_x = 0;
-			src_offset_y = 0;
-
-			// also ensure, that the second filter method gets no source
-			// palette (the temporary image is palletized only, if it is
-			// greyscale; in that case, it is an 8-bit image with a linear
-			// palette so, the source palette is not needed or will even be
-			// mismatching, if the source palette is unordered)
-			src_pal = NULL;
-		} else {
-			// source and destination widths are equal so, just copy the
-			// image pointer
-			tmp = src;
-		}
-
-		if (src_height != dst_height) {
-			// source and destination heights are different so, scale
-			// temporary (or source) image vertically into destination image
-			verticalFilter(tmp, dst_width, src_height, src_offset_x, src_offset_y, src_pal, dst, dst_height);
-		}
-
-		// free temporary image, if not pointing to either src or dst
-		if (tmp != src && tmp != dst) {
-			FreeImage_Unload(tmp);
-		}
-
-	} else {
-		// yx filtering
-		// -------------
-
-		// Remark:
-		// The yx filtering branch could be more optimized by taking into,
-		// account that (src_width != dst_width) is always true, which
-		// follows from the above condition, which selects filtering order.
-		// Since (dst_width <= src_width) == TRUE selects xy filtering,
-		// both widths must be different when performing yx filtering.
-		// However, to make the code more robust, not depending on that
-		// condition and more symmetric to the xy filtering case, these
-		// (src_width != dst_width) conditions are still in place.
-
-		FIBITMAP *tmp = NULL;
-
-		if (src_height != dst_height) {
-			// source and destination heights are different so, we must
-			// filter vertically
-			if (src_width != dst_width) {
-				// source and destination widths are also different so, we need
-				// a temporary image
-				tmp = FreeImage_AllocateT(image_type, src_width, dst_height, dst_bpp_s1, 0, 0, 0);
-				if (!tmp) {
-					FreeImage_Unload(dst);
-					return NULL;
-				}
-			} else {
-				// source and destination widths are equal so, we can directly
-				// scale into destination image (second filter method will not
-				// be invoked)
-				tmp = dst;
-			}
-
-			// scale source image vertically into temporary (or destination) image
-			verticalFilter(src, src_width, src_height, src_offset_x, src_offset_y, src_pal, tmp, dst_height);
-
-			// set x and y offsets to zero for the second filter method
-			// invocation (the temporary image only contains the portion of
-			// the image to be rescaled with no offsets)
-			src_offset_x = 0;
-			src_offset_y = 0;
-
-			// also ensure, that the second filter method gets no source
-			// palette (the temporary image is palletized only, if it is
-			// greyscale; in that case, it is an 8-bit image with a linear
-			// palette so, the source palette is not needed or will even be
-			// mismatching, if the source palette is unordered)
-			src_pal = NULL;
-
-		} else {
-			// source and destination heights are equal so, just copy the
-			// image pointer
-			tmp = src;
-		}
-
-		if (src_width != dst_width) {
-			// source and destination heights are different so, scale
-			// temporary (or source) image horizontally into destination image
-			horizontalFilter(tmp, dst_height, src_width, src_offset_x, src_offset_y, src_pal, dst, dst_width);
-		}
-
-		// free temporary image, if not pointing to either src or dst
-		if (tmp != src && tmp != dst) {
-			FreeImage_Unload(tmp);
-		}
-	}
-
-	return dst;
-} 
-
-void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsigned src_width, unsigned src_offset_x, unsigned src_offset_y, const RGBQUAD *const src_pal, FIBITMAP *const dst, unsigned dst_width) {
-
-	// allocate and calculate the contributions
-	CWeightsTable weightsTable(m_pFilter, dst_width, src_width);
-
-	// step through rows
-	switch(FreeImage_GetImageType(src)) {
-		case FIT_BITMAP:
-		{
-			switch(FreeImage_GetBPP(src)) {
-				case 1:
-				{
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// transparently convert the 1-bit non-transparent greyscale image to 8 bpp
-							src_offset_x >>= 3;
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE * const dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);		// retrieve left boundary
-										const unsigned iRight = weightsTable.getRightBoundary(x);	// retrieve right boundary
-										double value = 0;
-
-										for (unsigned i = iLeft; i < iRight; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const unsigned pixel = (src_bits[i >> 3] & (0x80 >> (i & 0x07))) != 0;
-											value += (weightsTable.getWeight(x, i - iLeft) * (double)*(BYTE *)&src_pal[pixel]);
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[x] = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE * const dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);		// retrieve left boundary
-										const unsigned iRight = weightsTable.getRightBoundary(x);	// retrieve right boundary
-										double value = 0;
-
-										for (unsigned i = iLeft; i < iRight; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const unsigned pixel = (src_bits[i >> 3] & (0x80 >> (i & 0x07))) != 0;
-											value += (weightsTable.getWeight(x, i - iLeft) * (double)pixel);
-										}
-										value *= 0xFF;
-
-										// clamp and place result in destination pixel
-										dst_bits[x] = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-									}
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 1-bit image to 24 bpp
-							src_offset_x >>= 3;
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-										const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-										double r = 0, g = 0, b = 0;
-
-										for (unsigned i = iLeft; i < iRight; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const double weight = weightsTable.getWeight(x, i - iLeft);
-											const unsigned pixel = (src_bits[i >> 3] & (0x80 >> (i & 0x07))) != 0;
-											const BYTE * const entry = (BYTE *)&src_pal[pixel];
-											r += (weight * (double)entry[FI_RGBA_RED]);
-											g += (weight * (double)entry[FI_RGBA_GREEN]);
-											b += (weight * (double)entry[FI_RGBA_BLUE]);
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-										dst_bits += 3;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-										const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-										double value = 0;
-
-										for (unsigned i = iLeft; i < iRight; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const unsigned pixel = (src_bits[i >> 3] & (0x80 >> (i & 0x07))) != 0;
-											value += (weightsTable.getWeight(x, i - iLeft) * (double)pixel);
-										}
-										value *= 0xFF;
-
-										// clamp and place result in destination pixel
-										const BYTE bval = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_RED]	= bval;
-										dst_bits[FI_RGBA_GREEN]	= bval;
-										dst_bits[FI_RGBA_BLUE]	= bval;
-										dst_bits += 3;
-									}
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 1-bit image to 32 bpp; 
-							// we always have got a palette here
-							src_offset_x >>= 3;
-
-							for (unsigned y = 0; y < height; y++) {
-								// scale each row
-								const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-								BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-								for (unsigned x = 0; x < dst_width; x++) {
-									// loop through row
-									const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-									const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-									double r = 0, g = 0, b = 0, a = 0;
-
-									for (unsigned i = iLeft; i < iRight; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(x, i - iLeft);
-										const unsigned pixel = (src_bits[i >> 3] & (0x80 >> (i & 0x07))) != 0;
-										const BYTE * const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += 4;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 4:
-				{
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// transparently convert the non-transparent 4-bit greyscale image to 8 bpp; 
-							// we always have got a palette for 4-bit images
-							src_offset_x >>= 1;
-
-							for (unsigned y = 0; y < height; y++) {
-								// scale each row
-								const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-								BYTE * const dst_bits = FreeImage_GetScanLine(dst, y);
-
-								for (unsigned x = 0; x < dst_width; x++) {
-									// loop through row
-									const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-									const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-									double value = 0;
-
-									for (unsigned i = iLeft; i < iRight; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const unsigned pixel = i & 0x01 ? src_bits[i >> 1] & 0x0F : src_bits[i >> 1] >> 4;
-										value += (weightsTable.getWeight(x, i - iLeft) * (double)*(BYTE *)&src_pal[pixel]);
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[x] = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 4-bit image to 24 bpp; 
-							// we always have got a palette for 4-bit images
-							src_offset_x >>= 1;
-
-							for (unsigned y = 0; y < height; y++) {
-								// scale each row
-								const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-								BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-								for (unsigned x = 0; x < dst_width; x++) {
-									// loop through row
-									const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-									const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-									double r = 0, g = 0, b = 0;
-
-									for (unsigned i = iLeft; i < iRight; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(x, i - iLeft);
-										const unsigned pixel = i & 0x01 ? src_bits[i >> 1] & 0x0F : src_bits[i >> 1] >> 4;
-										const BYTE * const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits += 3;
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 4-bit image to 32 bpp; 
-							// we always have got a palette for 4-bit images
-							src_offset_x >>= 1;
-
-							for (unsigned y = 0; y < height; y++) {
-								// scale each row
-								const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-								BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-								for (unsigned x = 0; x < dst_width; x++) {
-									// loop through row
-									const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-									const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-									double r = 0, g = 0, b = 0, a = 0;
-
-									for (unsigned i = iLeft; i < iRight; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(x, i - iLeft);
-										const unsigned pixel = i & 0x01 ? src_bits[i >> 1] & 0x0F : src_bits[i >> 1] >> 4;
-										const BYTE * const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += 4;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 8:
-				{
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// scale the 8-bit non-transparent greyscale image
-							// into an 8 bpp destination image
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE * const dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-										const BYTE * const pixel = src_bits + iLeft;
-										double value = 0;
-
-										// for(i = iLeft to iRight)
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(x, i) * (double)*(BYTE *)&src_pal[pixel[i]]);
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[x] = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE * const dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-										const BYTE * const pixel = src_bits + iLeft;
-										double value = 0;
-
-										// for(i = iLeft to iRight)
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(x, i) * (double)pixel[i]);
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[x] = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-									}
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 8-bit image to 24 bpp
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-										const BYTE * const pixel = src_bits + iLeft;
-										double r = 0, g = 0, b = 0;
-
-										// for(i = iLeft to iRight)
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const double weight = weightsTable.getWeight(x, i);
-											const BYTE *const entry = (BYTE *)&src_pal[pixel[i]];
-											r += (weight * (double)entry[FI_RGBA_RED]);
-											g += (weight * (double)entry[FI_RGBA_GREEN]);
-											b += (weight * (double)entry[FI_RGBA_BLUE]);
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-										dst_bits += 3;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned y = 0; y < height; y++) {
-									// scale each row
-									const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-									BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-									for (unsigned x = 0; x < dst_width; x++) {
-										// loop through row
-										const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-										const BYTE * const pixel = src_bits + iLeft;
-										double value = 0;
-
-										// for(i = iLeft to iRight)
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const double weight = weightsTable.getWeight(x, i);
-											value += (weight * (double)pixel[i]);
-										}
-
-										// clamp and place result in destination pixel
-										const BYTE bval = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_RED]	= bval;
-										dst_bits[FI_RGBA_GREEN]	= bval;
-										dst_bits[FI_RGBA_BLUE]	= bval;
-										dst_bits += 3;
-									}
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 8-bit image to 32 bpp; 
-							// we always have got a palette here
-							for (unsigned y = 0; y < height; y++) {
-								// scale each row
-								const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-								BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-								for (unsigned x = 0; x < dst_width; x++) {
-									// loop through row
-									const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-									const BYTE * const pixel = src_bits + iLeft;
-									double r = 0, g = 0, b = 0, a = 0;
-
-									// for(i = iLeft to iRight)
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(x, i);
-										const BYTE * const entry = (BYTE *)&src_pal[pixel[i]];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += 4;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 16:
-				{
-					// transparently convert the 16-bit non-transparent image to 24 bpp
-					if (IS_FORMAT_RGB565(src)) {
-						// image has 565 format
-						for (unsigned y = 0; y < height; y++) {
-							// scale each row
-							const WORD * const src_bits = (WORD *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-							BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-							for (unsigned x = 0; x < dst_width; x++) {
-								// loop through row
-								const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-								const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-								const WORD *pixel = src_bits + iLeft;
-								double r = 0, g = 0, b = 0;
-
-								// for(i = iLeft to iRight)
-								for (unsigned i = 0; i < iLimit; i++) {
-									// scan between boundaries
-									// accumulate weighted effect of each neighboring pixel
-									const double weight = weightsTable.getWeight(x, i);
-									r += (weight * (double)((*pixel & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT));
-									g += (weight * (double)((*pixel & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT));
-									b += (weight * (double)((*pixel & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT));
-									pixel++;
-								}
-
-								// clamp and place result in destination pixel
-								dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(((r * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(((g * 0xFF) / 0x3F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(((b * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits += 3;
-							}
-						}
-					} else {
-						// image has 555 format
-						for (unsigned y = 0; y < height; y++) {
-							// scale each row
-							const WORD * const src_bits = (WORD *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
-							BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-							for (unsigned x = 0; x < dst_width; x++) {
-								// loop through row
-								const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-								const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-								const WORD *pixel = src_bits + iLeft;
-								double r = 0, g = 0, b = 0;
-
-								// for(i = iLeft to iRight)
-								for (unsigned i = 0; i < iLimit; i++) {
-									// scan between boundaries
-									// accumulate weighted effect of each neighboring pixel
-									const double weight = weightsTable.getWeight(x, i);
-									r += (weight * (double)((*pixel & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT));
-									g += (weight * (double)((*pixel & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT));
-									b += (weight * (double)((*pixel & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT));
-									pixel++;
-								}
-
-								// clamp and place result in destination pixel
-								dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(((r * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(((g * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(((b * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits += 3;
-							}
-						}
-					}
-				}
-				break;
-
-				case 24:
-				{
-					// scale the 24-bit non-transparent image into a 24 bpp destination image
-					for (unsigned y = 0; y < height; y++) {
-						// scale each row
-						const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x * 3;
-						BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-						for (unsigned x = 0; x < dst_width; x++) {
-							// loop through row
-							const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-							const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-							const BYTE * pixel = src_bits + iLeft * 3;
-							double r = 0, g = 0, b = 0;
-
-							// for(i = iLeft to iRight)
-							for (unsigned i = 0; i < iLimit; i++) {
-								// scan between boundaries
-								// accumulate weighted effect of each neighboring pixel
-								const double weight = weightsTable.getWeight(x, i);
-								r += (weight * (double)pixel[FI_RGBA_RED]);
-								g += (weight * (double)pixel[FI_RGBA_GREEN]);
-								b += (weight * (double)pixel[FI_RGBA_BLUE]);
-								pixel += 3;
-							}
-
-							// clamp and place result in destination pixel
-							dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-							dst_bits += 3;
-						}
-					}
-				}
-				break;
-
-				case 32:
-				{
-					// scale the 32-bit transparent image into a 32 bpp destination image
-					for (unsigned y = 0; y < height; y++) {
-						// scale each row
-						const BYTE * const src_bits = FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x * 4;
-						BYTE *dst_bits = FreeImage_GetScanLine(dst, y);
-
-						for (unsigned x = 0; x < dst_width; x++) {
-							// loop through row
-							const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-							const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-							const BYTE *pixel = src_bits + iLeft * 4;
-							double r = 0, g = 0, b = 0, a = 0;
-
-							// for(i = iLeft to iRight)
-							for (unsigned i = 0; i < iLimit; i++) {
-								// scan between boundaries
-								// accumulate weighted effect of each neighboring pixel
-								const double weight = weightsTable.getWeight(x, i);
-								r += (weight * (double)pixel[FI_RGBA_RED]);
-								g += (weight * (double)pixel[FI_RGBA_GREEN]);
-								b += (weight * (double)pixel[FI_RGBA_BLUE]);
-								a += (weight * (double)pixel[FI_RGBA_ALPHA]);
-								pixel += 4;
-							}
-
-							// clamp and place result in destination pixel
-							dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-							dst_bits += 4;
-						}
-					}
-				}
-				break;
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
-
-			for (unsigned y = 0; y < height; y++) {
-				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-
-				for (unsigned x = 0; x < dst_width; x++) {
-					// loop through row
-					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
-					double value = 0;
-
-					// for(i = iLeft to iRight)
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(x, i);						
-						value += (weight * (double)pixel[0]);
-						pixel++;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
-					dst_bits += wordspp;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
-
-			for (unsigned y = 0; y < height; y++) {
-				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-
-				for (unsigned x = 0; x < dst_width; x++) {
-					// loop through row
-					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
-					double r = 0, g = 0, b = 0;
-
-					// for(i = iLeft to iRight)
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(x, i);						
-						r += (weight * (double)pixel[0]);
-						g += (weight * (double)pixel[1]);
-						b += (weight * (double)pixel[2]);
-						pixel += wordspp;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-					dst_bits += wordspp;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
-
-			for (unsigned y = 0; y < height; y++) {
-				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
-
-				for (unsigned x = 0; x < dst_width; x++) {
-					// loop through row
-					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
-					double r = 0, g = 0, b = 0, a = 0;
-
-					// for(i = iLeft to iRight)
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(x, i);						
-						r += (weight * (double)pixel[0]);
-						g += (weight * (double)pixel[1]);
-						b += (weight * (double)pixel[2]);
-						a += (weight * (double)pixel[3]);
-						pixel += wordspp;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-					dst_bits[3] = (WORD)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
-					dst_bits += wordspp;
-				}
-			}
-		}
-		break;
-
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			// Calculate the number of floats per pixel (1 for 32-bit, 3 for 96-bit or 4 for 128-bit)
-			const unsigned floatspp = (FreeImage_GetLine(src) / src_width) / sizeof(float);
-
-			for(unsigned y = 0; y < height; y++) {
-				// scale each row
-				const float *src_bits = (float*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(float);
-				float *dst_bits = (float*)FreeImage_GetScanLine(dst, y);
-
-				for(unsigned x = 0; x < dst_width; x++) {
-					// loop through row
-					const unsigned iLeft = weightsTable.getLeftBoundary(x);    // retrieve left boundary
-					const unsigned iRight = weightsTable.getRightBoundary(x);  // retrieve right boundary
-					double value[4] = {0, 0, 0, 0};                            // 4 = 128 bpp max
-
-					for(unsigned i = iLeft; i < iRight; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(x, i-iLeft);
-
-						unsigned index = i * floatspp;	// pixel index
-						for (unsigned j = 0; j < floatspp; j++) {
-							value[j] += (weight * (double)src_bits[index++]);
-						}
-					}
-
-					// place result in destination pixel
-					for (unsigned j = 0; j < floatspp; j++) {
-						dst_bits[j] = (float)value[j];
-					}
-
-					dst_bits += floatspp;
-				}
-			}
-		}
-		break;
-	}
-}
-
-/// Performs vertical image filtering
-void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned src_height, unsigned src_offset_x, unsigned src_offset_y, const RGBQUAD *const src_pal, FIBITMAP *const dst, unsigned dst_height) {
-
-	// allocate and calculate the contributions
-	CWeightsTable weightsTable(m_pFilter, dst_height, src_height);
-
-	// step through columns
-	switch(FreeImage_GetImageType(src)) {
-		case FIT_BITMAP:
-		{
-			const unsigned dst_pitch = FreeImage_GetPitch(dst);
-			BYTE * const dst_base = FreeImage_GetBits(dst);
-
-			switch(FreeImage_GetBPP(src)) {
-				case 1:
-				{
-					const unsigned src_pitch = FreeImage_GetPitch(src);
-					const BYTE * const src_base = FreeImage_GetBits(src) + src_offset_y * src_pitch + (src_offset_x >> 3);
-
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// transparently convert the 1-bit non-transparent greyscale image to 8 bpp
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x;
-									const unsigned index = x >> 3;
-									const unsigned mask = 0x80 >> (x & 0x07);
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const unsigned pixel = (*src_bits & mask) != 0;
-											value += (weightsTable.getWeight(y, i) * (double)*(BYTE *)&src_pal[pixel]);
-											src_bits += src_pitch;
-										}
-										value *= 0xFF;
-
-										// clamp and place result in destination pixel
-										*dst_bits = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x;
-									const unsigned index = x >> 3;
-									const unsigned mask = 0x80 >> (x & 0x07);
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(y, i) * (double)((*src_bits & mask) != 0));
-											src_bits += src_pitch;
-										}
-										value *= 0xFF;
-
-										// clamp and place result in destination pixel
-										*dst_bits = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 1-bit image to 24 bpp
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x * 3;
-									const unsigned index = x >> 3;
-									const unsigned mask = 0x80 >> (x & 0x07);
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-										double r = 0, g = 0, b = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const double weight = weightsTable.getWeight(y, i);
-											const unsigned pixel = (*src_bits & mask) != 0;
-											const BYTE * const entry = (BYTE *)&src_pal[pixel];
-											r += (weight * (double)entry[FI_RGBA_RED]);
-											g += (weight * (double)entry[FI_RGBA_GREEN]);
-											b += (weight * (double)entry[FI_RGBA_BLUE]);
-											src_bits += src_pitch;
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x * 3;
-									const unsigned index = x >> 3;
-									const unsigned mask = 0x80 >> (x & 0x07);
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(y, i) * (double)((*src_bits & mask) != 0));
-											src_bits += src_pitch;
-										}
-										value *= 0xFF;
-
-										// clamp and place result in destination pixel
-										const BYTE bval = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_RED]	= bval;
-										dst_bits[FI_RGBA_GREEN]	= bval;
-										dst_bits[FI_RGBA_BLUE]	= bval;
-										dst_bits += dst_pitch;
-									}
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 1-bit image to 32 bpp; 
-							// we always have got a palette here
-							for (unsigned x = 0; x < width; x++) {
-								// work on column x in dst
-								BYTE *dst_bits = dst_base + x * 4;
-								const unsigned index = x >> 3;
-								const unsigned mask = 0x80 >> (x & 0x07);
-
-								// scale each column
-								for (unsigned y = 0; y < dst_height; y++) {
-									// loop through column
-									const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-									const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-									double r = 0, g = 0, b = 0, a = 0;
-
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(y, i);
-										const unsigned pixel = (*src_bits & mask) != 0;
-										const BYTE * const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-										src_bits += src_pitch;
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += dst_pitch;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 4:
-				{
-					const unsigned src_pitch = FreeImage_GetPitch(src);
-					const BYTE *const src_base = FreeImage_GetBits(src) + src_offset_y * src_pitch + (src_offset_x >> 1);
-
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// transparently convert the non-transparent 4-bit greyscale image to 8 bpp; 
-							// we always have got a palette for 4-bit images
-							for (unsigned x = 0; x < width; x++) {
-								// work on column x in dst
-								BYTE *dst_bits = dst_base + x;
-								const unsigned index = x >> 1;
-
-								// scale each column
-								for (unsigned y = 0; y < dst_height; y++) {
-									// loop through column
-									const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-									const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-									double value = 0;
-
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const unsigned pixel = x & 0x01 ? *src_bits & 0x0F : *src_bits >> 4;
-										value += (weightsTable.getWeight(y, i) * (double)*(BYTE *)&src_pal[pixel]);
-										src_bits += src_pitch;
-									}
-
-									// clamp and place result in destination pixel
-									*dst_bits = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-									dst_bits += dst_pitch;
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 4-bit image to 24 bpp; 
-							// we always have got a palette for 4-bit images
-							for (unsigned x = 0; x < width; x++) {
-								// work on column x in dst
-								BYTE *dst_bits = dst_base + x * 3;
-								const unsigned index = x >> 1;
-
-								// scale each column
-								for (unsigned y = 0; y < dst_height; y++) {
-									// loop through column
-									const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-									const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-									double r = 0, g = 0, b = 0;
-
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(y, i);
-										const unsigned pixel = x & 0x01 ? *src_bits & 0x0F : *src_bits >> 4;
-										const BYTE *const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										src_bits += src_pitch;
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits += dst_pitch;
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 4-bit image to 32 bpp; 
-							// we always have got a palette for 4-bit images
-							for (unsigned x = 0; x < width; x++) {
-								// work on column x in dst
-								BYTE *dst_bits = dst_base + x * 4;
-								const unsigned index = x >> 1;
-
-								// scale each column
-								for (unsigned y = 0; y < dst_height; y++) {
-									// loop through column
-									const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-									const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-									double r = 0, g = 0, b = 0, a = 0;
-
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(y, i);
-										const unsigned pixel = x & 0x01 ? *src_bits & 0x0F : *src_bits >> 4;
-										const BYTE *const entry = (BYTE *)&src_pal[pixel];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-										src_bits += src_pitch;
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += dst_pitch;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 8:
-				{
-					const unsigned src_pitch = FreeImage_GetPitch(src);
-					const BYTE *const src_base = FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x;
-
-					switch(FreeImage_GetBPP(dst)) {
-						case 8:
-						{
-							// scale the 8-bit non-transparent greyscale image into an 8 bpp destination image
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x;
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + x;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(y, i) * (double)*(BYTE *)&src_pal[*src_bits]);
-											src_bits += src_pitch;
-										}
-
-										// clamp and place result in destination pixel
-										*dst_bits = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x;
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + x;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(y, i) * (double)*src_bits);
-											src_bits += src_pitch;
-										}
-
-										// clamp and place result in destination pixel
-										*dst_bits = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							}
-						}
-						break;
-
-						case 24:
-						{
-							// transparently convert the non-transparent 8-bit image to 24 bpp
-							if (src_pal) {
-								// we have got a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x * 3;
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + x;
-										double r = 0, g = 0, b = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											const double weight = weightsTable.getWeight(y, i);
-											const BYTE * const entry = (BYTE *)&src_pal[*src_bits];
-											r += (weight * (double)entry[FI_RGBA_RED]);
-											g += (weight * (double)entry[FI_RGBA_GREEN]);
-											b += (weight * (double)entry[FI_RGBA_BLUE]);
-											src_bits += src_pitch;
-										}
-
-										// clamp and place result in destination pixel
-										dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-										dst_bits += dst_pitch;
-									}
-								}
-							} else {
-								// we do not have a palette
-								for (unsigned x = 0; x < width; x++) {
-									// work on column x in dst
-									BYTE *dst_bits = dst_base + x * 3;
-
-									// scale each column
-									for (unsigned y = 0; y < dst_height; y++) {
-										// loop through column
-										const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-										const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-										const BYTE *src_bits = src_base + iLeft * src_pitch + x;
-										double value = 0;
-
-										for (unsigned i = 0; i < iLimit; i++) {
-											// scan between boundaries
-											// accumulate weighted effect of each neighboring pixel
-											value += (weightsTable.getWeight(y, i) * (double)*src_bits);
-											src_bits += src_pitch;
-										}
-
-										// clamp and place result in destination pixel
-										const BYTE bval = (BYTE)CLAMP<int>((int)(value + 0.5), 0, 0xFF);
-										dst_bits[FI_RGBA_RED]	= bval;
-										dst_bits[FI_RGBA_GREEN]	= bval;
-										dst_bits[FI_RGBA_BLUE]	= bval;
-										dst_bits += dst_pitch;
-									}
-								}
-							}
-						}
-						break;
-
-						case 32:
-						{
-							// transparently convert the transparent 8-bit image to 32 bpp; 
-							// we always have got a palette here
-							for (unsigned x = 0; x < width; x++) {
-								// work on column x in dst
-								BYTE *dst_bits = dst_base + x * 4;
-
-								// scale each column
-								for (unsigned y = 0; y < dst_height; y++) {
-									// loop through column
-									const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-									const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-									const BYTE *src_bits = src_base + iLeft * src_pitch + x;
-									double r = 0, g = 0, b = 0, a = 0;
-
-									for (unsigned i = 0; i < iLimit; i++) {
-										// scan between boundaries
-										// accumulate weighted effect of each neighboring pixel
-										const double weight = weightsTable.getWeight(y, i);
-										const BYTE * const entry = (BYTE *)&src_pal[*src_bits];
-										r += (weight * (double)entry[FI_RGBA_RED]);
-										g += (weight * (double)entry[FI_RGBA_GREEN]);
-										b += (weight * (double)entry[FI_RGBA_BLUE]);
-										a += (weight * (double)entry[FI_RGBA_ALPHA]);
-										src_bits += src_pitch;
-									}
-
-									// clamp and place result in destination pixel
-									dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(r + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(g + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(b + 0.5), 0, 0xFF);
-									dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int)(a + 0.5), 0, 0xFF);
-									dst_bits += dst_pitch;
-								}
-							}
-						}
-						break;
-					}
-				}
-				break;
-
-				case 16:
-				{
-					// transparently convert the 16-bit non-transparent image to 24 bpp
-					const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-					const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x;
-
-					if (IS_FORMAT_RGB565(src)) {
-						// image has 565 format
-						for (unsigned x = 0; x < width; x++) {
-							// work on column x in dst
-							BYTE *dst_bits = dst_base + x * 3;
-
-							// scale each column
-							for (unsigned y = 0; y < dst_height; y++) {
-								// loop through column
-								const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-								const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-								const WORD *src_bits = src_base + iLeft * src_pitch + x;
-								double r = 0, g = 0, b = 0;
-
-								for (unsigned i = 0; i < iLimit; i++) {
-									// scan between boundaries
-									// accumulate weighted effect of each neighboring pixel
-									const double weight = weightsTable.getWeight(y, i);
-									r += (weight * (double)((*src_bits & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT));
-									g += (weight * (double)((*src_bits & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT));
-									b += (weight * (double)((*src_bits & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT));
-									src_bits += src_pitch;
-								}
-
-								// clamp and place result in destination pixel
-								dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(((r * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(((g * 0xFF) / 0x3F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(((b * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits += dst_pitch;
-							}
-						}
-					} else {
-						// image has 555 format
-						for (unsigned x = 0; x < width; x++) {
-							// work on column x in dst
-							BYTE *dst_bits = dst_base + x * 3;
-
-							// scale each column
-							for (unsigned y = 0; y < dst_height; y++) {
-								// loop through column
-								const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-								const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-								const WORD *src_bits = src_base + iLeft * src_pitch + x;
-								double r = 0, g = 0, b = 0;
-
-								for (unsigned i = 0; i < iLimit; i++) {
-									// scan between boundaries
-									// accumulate weighted effect of each neighboring pixel
-									const double weight = weightsTable.getWeight(y, i);
-									r += (weight * (double)((*src_bits & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT));
-									g += (weight * (double)((*src_bits & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT));
-									b += (weight * (double)((*src_bits & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT));
-									src_bits += src_pitch;
-								}
-
-								// clamp and place result in destination pixel
-								dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int)(((r * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int)(((g * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int)(((b * 0xFF) / 0x1F) + 0.5), 0, 0xFF);
-								dst_bits += dst_pitch;
-							}
-						}
-					}
-				}
-				break;
-
-				case 24:
-				{
-					// scale the 24-bit transparent image into a 24 bpp destination image
-					const unsigned src_pitch = FreeImage_GetPitch(src);
-					const BYTE *const src_base = FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * 3;
-
-					for (unsigned x = 0; x < width; x++) {
-						// work on column x in dst
-						const unsigned index = x * 3;
-						BYTE *dst_bits = dst_base + index;
-
-						// scale each column
-						for (unsigned y = 0; y < dst_height; y++) {
-							// loop through column
-							const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-							const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-							const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-							double r = 0, g = 0, b = 0;
-
-							for (unsigned i = 0; i < iLimit; i++) {
-								// scan between boundaries
-								// accumulate weighted effect of each neighboring pixel
-								const double weight = weightsTable.getWeight(y, i);
-								r += (weight * (double)src_bits[FI_RGBA_RED]);
-								g += (weight * (double)src_bits[FI_RGBA_GREEN]);
-								b += (weight * (double)src_bits[FI_RGBA_BLUE]);
-								src_bits += src_pitch;
-							}
-
-							// clamp and place result in destination pixel
-							dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int) (r + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int) (g + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int) (b + 0.5), 0, 0xFF);
-							dst_bits += dst_pitch;
-						}
-					}
-				}
-				break;
-
-				case 32:
-				{
-					// scale the 32-bit transparent image into a 32 bpp destination image
-					const unsigned src_pitch = FreeImage_GetPitch(src);
-					const BYTE *const src_base = FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * 4;
-
-					for (unsigned x = 0; x < width; x++) {
-						// work on column x in dst
-						const unsigned index = x * 4;
-						BYTE *dst_bits = dst_base + index;
-
-						// scale each column
-						for (unsigned y = 0; y < dst_height; y++) {
-							// loop through column
-							const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-							const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-							const BYTE *src_bits = src_base + iLeft * src_pitch + index;
-							double r = 0, g = 0, b = 0, a = 0;
-
-							for (unsigned i = 0; i < iLimit; i++) {
-								// scan between boundaries
-								// accumulate weighted effect of each neighboring pixel
-								const double weight = weightsTable.getWeight(y, i);
-								r += (weight * (double)src_bits[FI_RGBA_RED]);
-								g += (weight * (double)src_bits[FI_RGBA_GREEN]);
-								b += (weight * (double)src_bits[FI_RGBA_BLUE]);
-								a += (weight * (double)src_bits[FI_RGBA_ALPHA]);
-								src_bits += src_pitch;
-							}
-
-							// clamp and place result in destination pixel
-							dst_bits[FI_RGBA_RED]	= (BYTE)CLAMP<int>((int) (r + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_GREEN]	= (BYTE)CLAMP<int>((int) (g + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_BLUE]	= (BYTE)CLAMP<int>((int) (b + 0.5), 0, 0xFF);
-							dst_bits[FI_RGBA_ALPHA]	= (BYTE)CLAMP<int>((int) (a + 0.5), 0, 0xFF);
-							dst_bits += dst_pitch;
-						}
-					}
-				}
-				break;
-			}
-		}
-		break;
-
-		case FIT_UINT16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
-
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
-
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src)	+ src_offset_y * src_pitch + src_offset_x * wordspp;
-
-			for (unsigned x = 0; x < width; x++) {
-				// work on column x in dst
-				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
-
-				// scale each column
-				for (unsigned y = 0; y < dst_height; y++) {
-					// loop through column
-					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
-					double value = 0;
-
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(y, i);
-						value += (weight * (double)src_bits[0]);
-						src_bits += src_pitch;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
-
-					dst_bits += dst_pitch;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGB16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
-
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
-
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
-
-			for (unsigned x = 0; x < width; x++) {
-				// work on column x in dst
-				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
-
-				// scale each column
-				for (unsigned y = 0; y < dst_height; y++) {
-					// loop through column
-					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
-					double r = 0, g = 0, b = 0;
-
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(y, i);					
-						r += (weight * (double)src_bits[0]);
-						g += (weight * (double)src_bits[1]);
-						b += (weight * (double)src_bits[2]);
-
-						src_bits += src_pitch;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-
-					dst_bits += dst_pitch;
-				}
-			}
-		}
-		break;
-
-		case FIT_RGBA16:
-		{
-			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
-
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
-
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
-
-			for (unsigned x = 0; x < width; x++) {
-				// work on column x in dst
-				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
-
-				// scale each column
-				for (unsigned y = 0; y < dst_height; y++) {
-					// loop through column
-					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
-					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
-					double r = 0, g = 0, b = 0, a = 0;
-
-					for (unsigned i = 0; i < iLimit; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(y, i);					
-						r += (weight * (double)src_bits[0]);
-						g += (weight * (double)src_bits[1]);
-						b += (weight * (double)src_bits[2]);
-						a += (weight * (double)src_bits[3]);
-
-						src_bits += src_pitch;
-					}
-
-					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-					dst_bits[3] = (WORD)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
-
-					dst_bits += dst_pitch;
-				}
-			}
-		}
-		break;
-
-		case FIT_FLOAT:
-		case FIT_RGBF:
-		case FIT_RGBAF:
-		{
-			// Calculate the number of floats per pixel (1 for 32-bit, 3 for 96-bit or 4 for 128-bit)
-			const unsigned floatspp = (FreeImage_GetLine(src) / width) / sizeof(float);
-
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(float);
-			float *const dst_base = (float *)FreeImage_GetBits(dst);
-
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(float);
-			const float *const src_base = (float *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * floatspp;
-
-			for (unsigned x = 0; x < width; x++) {
-				// work on column x in dst
-				const unsigned index = x * floatspp;	// pixel index
-				float *dst_bits = (float *)dst_base + index;
-
-				// scale each column
-				for (unsigned y = 0; y < dst_height; y++) {
-					// loop through column
-					const unsigned iLeft = weightsTable.getLeftBoundary(y);    // retrieve left boundary
-					const unsigned iRight = weightsTable.getRightBoundary(y);  // retrieve right boundary
-					const float *src_bits = src_base + iLeft * src_pitch + index;
-					double value[4] = {0, 0, 0, 0};                            // 4 = 128 bpp max
-
-					for (unsigned i = iLeft; i < iRight; i++) {
-						// scan between boundaries
-						// accumulate weighted effect of each neighboring pixel
-						const double weight = weightsTable.getWeight(y, i - iLeft);
-						for (unsigned j = 0; j < floatspp; j++) {
-							value[j] += (weight * (double)src_bits[j]);
-						}
-						src_bits += src_pitch;
-					}
-
-					// place result in destination pixel
-					for (unsigned j = 0; j < floatspp; j++) {
-						dst_bits[j] = (float)value[j];
-					}
-					dst_bits += dst_pitch;
-				}
-			}
-		}
-		break;
-	}
-}
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Resize.h b/plugins/AdvaImg/src/FreeImageToolkit/Resize.h
deleted file mode 100644
index 466fcc183d..0000000000
--- a/plugins/AdvaImg/src/FreeImageToolkit/Resize.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// ==========================================================
-// Upsampling / downsampling classes
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Detlev Vendt (detlev.vendt@brillit.de)
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef _RESIZE_H_
-#define _RESIZE_H_
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "Filters.h" 
-
-/**
-  Filter weights table.<br>
-  This class stores contribution information for an entire line (row or column).
-*/
-class CWeightsTable
-{
-/**
-  Sampled filter weight table.<br>
-  Contribution information for a single pixel
-*/
-typedef struct {
-	/// Normalized weights of neighboring pixels
-	double *Weights;
-	/// Bounds of source pixels window
-	unsigned Left, Right;
-} Contribution;
-
-private:
-	/// Row (or column) of contribution weights 
-	Contribution *m_WeightTable;
-	/// Filter window size (of affecting source pixels) 
-	unsigned m_WindowSize;
-	/// Length of line (no. of rows / cols) 
-	unsigned m_LineLength;
-
-public:
-	/** 
-	Constructor<br>
-	Allocate and compute the weights table
-	@param pFilter Filter used for upsampling or downsampling
-	@param uDstSize Length (in pixels) of the destination line buffer
-	@param uSrcSize Length (in pixels) of the source line buffer
-	*/
-	CWeightsTable(CGenericFilter *pFilter, unsigned uDstSize, unsigned uSrcSize);
-
-	/**
-	Destructor<br>
-	Destroy the weights table
-	*/
-	~CWeightsTable();
-
-	/** Retrieve a filter weight, given source and destination positions
-	@param dst_pos Pixel position in destination line buffer
-	@param src_pos Pixel position in source line buffer
-	@return Returns the filter weight
-	*/
-	double getWeight(unsigned dst_pos, unsigned src_pos) {
-		return m_WeightTable[dst_pos].Weights[src_pos];
-	}
-
-	/** Retrieve left boundary of source line buffer
-	@param dst_pos Pixel position in destination line buffer
-	@return Returns the left boundary of source line buffer
-	*/
-	unsigned getLeftBoundary(unsigned dst_pos) {
-		return m_WeightTable[dst_pos].Left;
-	}
-
-	/** Retrieve right boundary of source line buffer
-	@param dst_pos Pixel position in destination line buffer
-	@return Returns the right boundary of source line buffer
-	*/
-	unsigned getRightBoundary(unsigned dst_pos) {
-		return m_WeightTable[dst_pos].Right;
-	}
-};
-
-// ---------------------------------------------
-
-/**
- CResizeEngine<br>
- This class performs filtered zoom. It scales an image to the desired dimensions with 
- any of the CGenericFilter derived filter class.<br>
- It works with FIT_BITMAP buffers, WORD buffers (FIT_UINT16, FIT_RGB16, FIT_RGBA16) 
- and float buffers (FIT_FLOAT, FIT_RGBF, FIT_RGBAF).<br><br>
-
- <b>References</b> : <br>
- [1] Paul Heckbert, C code to zoom raster images up or down, with nice filtering. 
- UC Berkeley, August 1989. [online] http://www-2.cs.cmu.edu/afs/cs.cmu.edu/Web/People/ph/heckbert.html
- [2] Eran Yariv, Two Pass Scaling using Filters. The Code Project, December 1999. 
- [online] http://www.codeproject.com/bitmap/2_pass_scaling.asp
-
-*/
-class CResizeEngine
-{
-private:
-	/// Pointer to the FIR / IIR filter
-	CGenericFilter* m_pFilter;
-
-public:
-
-	/**
-	Constructor
-	@param filter FIR /IIR filter to be used
-	*/
-	CResizeEngine(CGenericFilter* filter):m_pFilter(filter) {}
-
-	/// Destructor
-	virtual ~CResizeEngine() {}
-
-	/** Scale an image to the desired dimensions.
-
-	Method CResizeEngine::scale, as well as the two filtering methods
-	CResizeEngine::horizontalFilter and CResizeEngine::verticalFilter take
-	four additional parameters, that define a rectangle in the source
-	image to be rescaled.
-
-	These are src_left, src_top, src_width and src_height and should work
-	like these of function FreeImage_Copy. However, src_left and src_top are
-	actually named src_offset_x and src_offset_y in the filtering methods.
-
-	Additionally, since src_height and dst_height are always the same for
-	method horizontalFilter as src_width and dst_width are always the same
-	for verticalFilter, these have been stripped down to a single parameter
-	height and width for horizontalFilter and verticalFilter respectively.
-
-	Currently, method scale is called with the actual size of the source
-	image. However, in a future version, we could provide a new function
-	called FreeImage_RescaleRect that rescales only part of an image. 
-
-	@param src Pointer to the source image
-	@param dst_width Destination image width
-	@param dst_height Destination image height
-	@param src_left Left boundary of the source rectangle to be scaled
-	@param src_top Top boundary of the source rectangle to be scaled
-	@param src_width Width of the source rectangle to be scaled
-	@param src_height Height of the source rectangle to be scaled
-	@return Returns the scaled image if successful, returns NULL otherwise
-	*/
-	FIBITMAP* scale(FIBITMAP *src, unsigned dst_width, unsigned dst_height, unsigned src_left, unsigned src_top, unsigned src_width, unsigned src_height, unsigned flags);
-
-private:
-
-	/**
-	Performs horizontal image filtering
-
-	@param src Source image
-	@param height Source / Destination image height
-	@param src_width Source image width
-	@param src_offset_x
-	@param src_offset_y
-	@param src_pal
-	@param dst Destination image
-	@param dst_width Destination image width
-	*/
-	void horizontalFilter(FIBITMAP * const src, const unsigned height, const unsigned src_width,
-			const unsigned src_offset_x, const unsigned src_offset_y, const RGBQUAD * const src_pal,
-			FIBITMAP * const dst, const unsigned dst_width);
-
-	/**
-	Performs vertical image filtering
-	@param src Source image
-	@param width Source / Destination image width
-	@param src_height Source image height
-	@param src_offset_x
-	@param src_offset_y
-	@param src_pal
-	@param dst Destination image
-	@param dst_height Destination image height
-	*/
-	void verticalFilter(FIBITMAP * const src, const unsigned width, const unsigned src_height,
-			const unsigned src_offset_x, const unsigned src_offset_y, const RGBQUAD * const src_pal,
-			FIBITMAP * const dst, const unsigned dst_height);
-};
-
-#endif //   _RESIZE_H_
diff --git a/plugins/AdvaImg/src/LibJPEG/README b/plugins/AdvaImg/src/LibJPEG/README
deleted file mode 100644
index 0b5e097362..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/README
+++ /dev/null
@@ -1,375 +0,0 @@
-The Independent JPEG Group's JPEG software

-==========================================

-

-README for release 9b of 17-Jan-2016

-====================================

-

-This distribution contains the ninth public release of the Independent JPEG

-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.

-

-This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,

-Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,

-Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,

-and other members of the Independent JPEG Group.

-

-IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee

-(previously known as JPEG, together with ITU-T SG16).

-

-

-DOCUMENTATION ROADMAP

-=====================

-

-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.

-ACKNOWLEDGMENTS     Special thanks.

-FILE FORMAT WARS    Software *not* to get.

-TO DO               Plans for future IJG releases.

-

-Other documentation files in the distribution are:

-

-User documentation:

-  install.txt       How to configure and install the IJG software.

-  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,

-                    rdjpgcom, and wrjpgcom.

-  *.1               Unix-style man pages for programs (same info as usage.txt).

-  wizard.txt        Advanced usage instructions for JPEG wizards only.

-  change.log        Version-to-version change highlights.

-Programmer and internal documentation:

-  libjpeg.txt       How to use the JPEG library in your own programs.

-  example.c         Sample code for calling the JPEG library.

-  structure.txt     Overview of the JPEG library's internal structure.

-  filelist.txt      Road map of IJG files.

-  coderules.txt     Coding style rules --- please read if you contribute code.

-

-Please read at least the files install.txt and usage.txt.  Some 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.

-

-

-OVERVIEW

-========

-

-This package contains C software to implement JPEG image encoding, decoding,

-and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression

-method for full-color and grayscale images.

-

-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.

-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.

-

-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.

-

-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

-============

-

-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.

-

-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.

-

-This software is copyright (C) 1991-2016, Thomas G. Lane, Guido Vollbeding.

-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

-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

-must be clearly indicated in accompanying documentation.

-(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

-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

-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".

-

-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.

-

-

-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,

-ltmain.sh).  Another support script, install-sh, is copyright by X Consortium

-but is also freely distributable.

-

-The IJG distribution formerly included code to read and write GIF files.

-To avoid entanglement with the Unisys LZW patent (now expired), GIF reading

-support has been removed altogether, and the GIF writer has been simplified

-to produce "uncompressed GIFs".  This technique does not use the LZW

-algorithm; the resulting GIF files are larger than usual, but are readable

-by all standard GIF decoders.

-

-

-REFERENCES

-==========

-

-We 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 PDF file containing a revised version of Wallace's article is

-available at http://www.ijg.org/files/Wallace.JPEG.pdf.  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...

-

-The best currently available 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).

-Although this is by far the most detailed and comprehensive exposition of

-JPEG publicly available, we point out that it is still missing an explanation

-of the most essential properties and algorithms of the underlying DCT

-technology.

-If you think that you know about DCT-based JPEG after reading this book,

-then you are in delusion.  The real fundamentals and corresponding potential

-of DCT-based JPEG are not publicly known so far, and that is the reason for

-all the mistaken developments taking place in the image coding domain.

-

-The original JPEG 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.

-IJG JPEG 8 introduced an implementation of the JPEG SmartScale extension

-which is specified in two documents:  A contributed document at ITU and ISO

-with title "ITU-T JPEG-Plus Proposal for Extending ITU-T T.81 for Advanced

-Image Coding", April 2006, Geneva, Switzerland.  The latest version of this

-document is Revision 3.  And a contributed document ISO/IEC JTC1/SC29/WG1 N

-5799 with title "Evolution of JPEG", June/July 2011, Berlin, Germany.

-IJG JPEG 9 introduces a reversible color transform for improved lossless

-compression which is described in a contributed document ISO/IEC JTC1/SC29/

-WG1 N 6080 with title "JPEG 9 Lossless Coding", June/July 2012, Paris,

-France.

-

-The JPEG standard does not specify all details of an interchangeable file

-format.  For the omitted details we follow the "JFIF" conventions, version 2.

-JFIF version 1 has been adopted as Recommendation ITU-T T.871 (05/2011) :

-Information technology - Digital compression and coding of continuous-tone

-still images: JPEG File Interchange Format (JFIF).  It is available as a

-free download in PDF file format from http://www.itu.int/rec/T-REC-T.871.

-A PDF file of the older JFIF document is available at

-http://www.w3.org/Graphics/JPEG/jfif3.pdf.

-

-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

-http://www.ijg.org/files/.  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.

-

-

-ARCHIVE LOCATIONS

-=================

-

-The "official" archive site for this software is www.ijg.org.

-The most recent released version can always be found there in

-directory "files".  This particular version will be archived as

-http://www.ijg.org/files/jpegsrc.v9b.tar.gz, and in Windows-compatible

-"zip" archive format as http://www.ijg.org/files/jpegsr9b.zip.

-

-The JPEG FAQ (Frequently Asked Questions) article is a source of some

-general information about JPEG.

-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 mail-server@rtfm.mit.edu

-with body

-	send usenet/news.answers/jpeg-faq/part1

-	send usenet/news.answers/jpeg-faq/part2

-

-

-ACKNOWLEDGMENTS

-===============

-

-Thank to Juergen Bruder for providing me with a copy of the common DCT

-algorithm article, only to find out that I had come to the same result

-in a more direct and comprehensible way with a more generative approach.

-

-Thank to Istvan Sebestyen and Joan L. Mitchell for inviting me to the

-ITU JPEG (Study Group 16) meeting in Geneva, Switzerland.

-

-Thank to Thomas Wiegand and Gary Sullivan for inviting me to the

-Joint Video Team (MPEG & ITU) meeting in Geneva, Switzerland.

-

-Thank to Thomas Richter and Daniel Lee for inviting me to the

-ISO/IEC JTC1/SC29/WG1 (previously known as JPEG, together with ITU-T SG16)

-meeting in Berlin, Germany.

-

-Thank to John Korejwa and Massimo Ballerini for inviting me to

-fruitful consultations in Boston, MA and Milan, Italy.

-

-Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther

-Maier-Gerber, Walter Stoeber, Fred Schmitz, and Norbert Braunagel

-for corresponding business development.

-

-Thank to Nico Zschach and Dirk Stelling of the technical support team

-at the Digital Images company in Halle for providing me with extra

-equipment for configuration tests.

-

-Thank to Richard F. Lyon (then of Foveon Inc.) for fruitful

-communication about JPEG configuration in Sigma Photo Pro software.

-

-Thank to Andrew Finkenstadt for hosting the ijg.org site.

-

-Last but not least special thank to Thomas G. Lane for the original

-design and development of this singular software package.

-

-

-FILE FORMAT WARS

-================

-

-The ISO/IEC JTC1/SC29/WG1 standards committee (previously known as JPEG,

-together with ITU-T SG16) currently promotes different formats containing

-the name "JPEG" which is misleading because these formats are incompatible

-with original DCT-based JPEG and are based on faulty technologies.

-IJG therefore does not and will not support such momentary mistakes

-(see REFERENCES).

-There exist also distributions under the name "OpenJPEG" promoting such

-kind of formats which is misleading because they don't support original

-JPEG images.

-We have no sympathy for the promotion of inferior formats.  Indeed, one of

-the original reasons for developing this free software was to help force

-convergence on common, interoperable format standards for JPEG files.

-Don't use an incompatible file format!

-(In any case, our decoder will remain capable of reading existing JPEG

-image files indefinitely.)

-

-The ISO committee pretends to be "responsible for the popular JPEG" in their

-public reports which is not true because they don't respond to actual

-requirements for the maintenance of the original JPEG specification.

-Furthermore, the ISO committee pretends to "ensure interoperability" with

-their standards which is not true because their "standards" support only

-application-specific and proprietary use cases and contain mathematically

-incorrect code.

-

-There are currently different distributions in circulation containing the

-name "libjpeg" which is misleading because they don't have the features and

-are incompatible with formats supported by actual IJG libjpeg distributions.

-One of those fakes is released by members of the ISO committee and just uses

-the name of libjpeg for misdirection of people, similar to the abuse of the

-name JPEG as described above, while having nothing in common with actual IJG

-libjpeg distributions and containing mathematically incorrect code.

-The other one claims to be a "derivative" or "fork" of the original libjpeg,

-but violates the license conditions as described under LEGAL ISSUES above

-and violates basic C programming properties.

-We have no sympathy for the release of misleading, incorrect and illegal

-distributions derived from obsolete code bases.

-Don't use an obsolete code base!

-

-According to the UCC (Uniform Commercial Code) law, IJG has the lawful and

-legal right to foreclose on certain standardization bodies and other

-institutions or corporations that knowingly perform substantial and

-systematic deceptive acts and practices, fraud, theft, and damaging of the

-value of the people of this planet without their knowing, willing and

-intentional consent.

-The titles, ownership, and rights of these institutions and all their assets

-are now duly secured and held in trust for the free people of this planet.

-People of the planet, on every country, may have a financial interest in

-the assets of these former principals, agents, and beneficiaries of the

-foreclosed institutions and corporations.

-IJG asserts what is: that each man, woman, and child has unalienable value

-and rights granted and deposited in them by the Creator and not any one of

-the people is subordinate to any artificial principality, corporate fiction

-or the special interest of another without their appropriate knowing,

-willing and intentional consent made by contract or accommodation agreement.

-IJG expresses that which already was.

-The people have already determined and demanded that public administration

-entities, national governments, and their supporting judicial systems must

-be fully transparent, accountable, and liable.

-IJG has secured the value for all concerned free people of the planet.

-

-A partial list of foreclosed institutions and corporations ("Hall of Shame")

-is currently prepared and will be published later.

-

-

-TO DO

-=====

-

-Version 9 is the second release of a new generation JPEG standard

-to overcome the limitations of the original JPEG specification,

-and is the first true source reference JPEG codec.

-More features are being prepared for coming releases...

-

-Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.

diff --git a/plugins/AdvaImg/src/LibJPEG/cderror.h b/plugins/AdvaImg/src/LibJPEG/cderror.h
deleted file mode 100644
index fb72a51f6b..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/cderror.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

- * cderror.h

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 2009 by Guido Vollbeding.

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

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

- *

- * This file defines the error and message codes for the cjpeg/djpeg

- * applications.  These strings are not needed as part of the JPEG library

- * proper.

- * Edit this file to add new codes, or to translate the message strings to

- * some other language.

- */

-

-/*

- * To define the enum list of message codes, include this file without

- * defining macro JMESSAGE.  To create a message string table, include it

- * again with a suitable JMESSAGE definition (see jerror.c for an example).

- */

-#ifndef JMESSAGE

-#ifndef CDERROR_H

-#define CDERROR_H

-/* First time through, define the enum list */

-#define JMAKE_ENUM_LIST

-#else

-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */

-#define JMESSAGE(code,string)

-#endif /* CDERROR_H */

-#endif /* JMESSAGE */

-

-#ifdef JMAKE_ENUM_LIST

-

-typedef enum {

-

-#define JMESSAGE(code,string)	code ,

-

-#endif /* JMAKE_ENUM_LIST */

-

-JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */

-

-#ifdef BMP_SUPPORTED

-JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")

-JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported")

-JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")

-JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")

-JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")

-JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")

-JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image")

-JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")

-JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image")

-JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")

-JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image")

-JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")

-#endif /* BMP_SUPPORTED */

-

-#ifdef GIF_SUPPORTED

-JMESSAGE(JERR_GIF_BUG, "GIF output got confused")

-JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")

-JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")

-JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")

-JMESSAGE(JERR_GIF_NOT, "Not a GIF file")

-JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")

-JMESSAGE(JTRC_GIF_BADVERSION,

-	 "Warning: unexpected GIF version number '%c%c%c'")

-JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x")

-JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input")

-JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")

-JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring")

-JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image")

-JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits")

-#endif /* GIF_SUPPORTED */

-

-#ifdef PPM_SUPPORTED

-JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB")

-JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file")

-JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file")

-JMESSAGE(JTRC_PGM, "%ux%u PGM image")

-JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image")

-JMESSAGE(JTRC_PPM, "%ux%u PPM image")

-JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image")

-#endif /* PPM_SUPPORTED */

-

-#ifdef RLE_SUPPORTED

-JMESSAGE(JERR_RLE_BADERROR, "Bogus error code from RLE library")

-JMESSAGE(JERR_RLE_COLORSPACE, "RLE output must be grayscale or RGB")

-JMESSAGE(JERR_RLE_DIMENSIONS, "Image dimensions (%ux%u) too large for RLE")

-JMESSAGE(JERR_RLE_EMPTY, "Empty RLE file")

-JMESSAGE(JERR_RLE_EOF, "Premature EOF in RLE header")

-JMESSAGE(JERR_RLE_MEM, "Insufficient memory for RLE header")

-JMESSAGE(JERR_RLE_NOT, "Not an RLE file")

-JMESSAGE(JERR_RLE_TOOMANYCHANNELS, "Cannot handle %d output channels for RLE")

-JMESSAGE(JERR_RLE_UNSUPPORTED, "Cannot handle this RLE setup")

-JMESSAGE(JTRC_RLE, "%ux%u full-color RLE file")

-JMESSAGE(JTRC_RLE_FULLMAP, "%ux%u full-color RLE file with map of length %d")

-JMESSAGE(JTRC_RLE_GRAY, "%ux%u grayscale RLE file")

-JMESSAGE(JTRC_RLE_MAPGRAY, "%ux%u grayscale RLE file with map of length %d")

-JMESSAGE(JTRC_RLE_MAPPED, "%ux%u colormapped RLE file with map of length %d")

-#endif /* RLE_SUPPORTED */

-

-#ifdef TARGA_SUPPORTED

-JMESSAGE(JERR_TGA_BADCMAP, "Unsupported Targa colormap format")

-JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file")

-JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB")

-JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image")

-JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image")

-JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image")

-#else

-JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")

-#endif /* TARGA_SUPPORTED */

-

-JMESSAGE(JERR_BAD_CMAP_FILE,

-	 "Color map file is invalid or of unsupported format")

-JMESSAGE(JERR_TOO_MANY_COLORS,

-	 "Output file format cannot handle %d colormap entries")

-JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")

-#ifdef TARGA_SUPPORTED

-JMESSAGE(JERR_UNKNOWN_FORMAT,

-	 "Unrecognized input file format --- perhaps you need -targa")

-#else

-JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")

-#endif

-JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")

-

-#ifdef JMAKE_ENUM_LIST

-

-  JMSG_LASTADDONCODE

-} ADDON_MESSAGE_CODE;

-

-#undef JMAKE_ENUM_LIST

-#endif /* JMAKE_ENUM_LIST */

-

-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */

-#undef JMESSAGE

diff --git a/plugins/AdvaImg/src/LibJPEG/cdjpeg.c b/plugins/AdvaImg/src/LibJPEG/cdjpeg.c
deleted file mode 100644
index 89fe633728..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/cdjpeg.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*

- * cdjpeg.c

- *

- * Copyright (C) 1991-1997, 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 common support routines used by the IJG application

- * programs (cjpeg, djpeg, jpegtran).

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-#include <ctype.h>		/* to declare isupper(), tolower() */

-#ifdef NEED_SIGNAL_CATCHER

-#include <signal.h>		/* to declare signal() */

-#endif

-#ifdef USE_SETMODE

-#include <fcntl.h>		/* to declare setmode()'s parameter macros */

-/* If you have setmode() but not <io.h>, just delete this line: */

-#include <io.h>			/* to declare setmode() */

-#endif

-

-

-/*

- * Signal catcher to ensure that temporary files are removed before aborting.

- * NB: for Amiga Manx C this is actually a global routine named _abort();

- * we put "#define signal_catcher _abort" in jconfig.h.  Talk about bogus...

- */

-

-#ifdef NEED_SIGNAL_CATCHER

-

-static j_common_ptr sig_cinfo;

-

-void				/* must be global for Manx C */

-signal_catcher (int signum)

-{

-  if (sig_cinfo != NULL) {

-    if (sig_cinfo->err != NULL) /* turn off trace output */

-      sig_cinfo->err->trace_level = 0;

-    jpeg_destroy(sig_cinfo);	/* clean up memory allocation & temp files */

-  }

-  exit(EXIT_FAILURE);

-}

-

-

-GLOBAL(void)

-enable_signal_catcher (j_common_ptr cinfo)

-{

-  sig_cinfo = cinfo;

-#ifdef SIGINT			/* not all systems have SIGINT */

-  signal(SIGINT, signal_catcher);

-#endif

-#ifdef SIGTERM			/* not all systems have SIGTERM */

-  signal(SIGTERM, signal_catcher);

-#endif

-}

-

-#endif

-

-

-/*

- * Optional progress monitor: display a percent-done figure on stderr.

- */

-

-#ifdef PROGRESS_REPORT

-

-METHODDEF(void)

-progress_monitor (j_common_ptr cinfo)

-{

-  cd_progress_ptr prog = (cd_progress_ptr) cinfo->progress;

-  int total_passes = prog->pub.total_passes + prog->total_extra_passes;

-  int percent_done = (int) (prog->pub.pass_counter*100L/prog->pub.pass_limit);

-

-  if (percent_done != prog->percent_done) {

-    prog->percent_done = percent_done;

-    if (total_passes > 1) {

-      fprintf(stderr, "\rPass %d/%d: %3d%% ",

-	      prog->pub.completed_passes + prog->completed_extra_passes + 1,

-	      total_passes, percent_done);

-    } else {

-      fprintf(stderr, "\r %3d%% ", percent_done);

-    }

-    fflush(stderr);

-  }

-}

-

-

-GLOBAL(void)

-start_progress_monitor (j_common_ptr cinfo, cd_progress_ptr progress)

-{

-  /* Enable progress display, unless trace output is on */

-  if (cinfo->err->trace_level == 0) {

-    progress->pub.progress_monitor = progress_monitor;

-    progress->completed_extra_passes = 0;

-    progress->total_extra_passes = 0;

-    progress->percent_done = -1;

-    cinfo->progress = &progress->pub;

-  }

-}

-

-

-GLOBAL(void)

-end_progress_monitor (j_common_ptr cinfo)

-{

-  /* Clear away progress display */

-  if (cinfo->err->trace_level == 0) {

-    fprintf(stderr, "\r                \r");

-    fflush(stderr);

-  }

-}

-

-#endif

-

-

-/*

- * Case-insensitive matching of possibly-abbreviated keyword switches.

- * keyword is the constant keyword (must be lower case already),

- * minchars is length of minimum legal abbreviation.

- */

-

-GLOBAL(boolean)

-keymatch (char * arg, const char * keyword, int minchars)

-{

-  register int ca, ck;

-  register int nmatched = 0;

-

-  while ((ca = *arg++) != '\0') {

-    if ((ck = *keyword++) == '\0')

-      return FALSE;		/* arg longer than keyword, no good */

-    if (isupper(ca))		/* force arg to lcase (assume ck is already) */

-      ca = tolower(ca);

-    if (ca != ck)

-      return FALSE;		/* no good */

-    nmatched++;			/* count matched characters */

-  }

-  /* reached end of argument; fail if it's too short for unique abbrev */

-  if (nmatched < minchars)

-    return FALSE;

-  return TRUE;			/* A-OK */

-}

-

-

-/*

- * Routines to establish binary I/O mode for stdin and stdout.

- * Non-Unix systems often require some hacking to get out of text mode.

- */

-

-GLOBAL(FILE *)

-read_stdin (void)

-{

-  FILE * input_file = stdin;

-

-#ifdef USE_SETMODE		/* need to hack file mode? */

-  setmode(fileno(stdin), O_BINARY);

-#endif

-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */

-  if ((input_file = fdopen(fileno(stdin), READ_BINARY)) == NULL) {

-    fprintf(stderr, "Cannot reopen stdin\n");

-    exit(EXIT_FAILURE);

-  }

-#endif

-  return input_file;

-}

-

-

-GLOBAL(FILE *)

-write_stdout (void)

-{

-  FILE * output_file = stdout;

-

-#ifdef USE_SETMODE		/* need to hack file mode? */

-  setmode(fileno(stdout), O_BINARY);

-#endif

-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */

-  if ((output_file = fdopen(fileno(stdout), WRITE_BINARY)) == NULL) {

-    fprintf(stderr, "Cannot reopen stdout\n");

-    exit(EXIT_FAILURE);

-  }

-#endif

-  return output_file;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/cdjpeg.h b/plugins/AdvaImg/src/LibJPEG/cdjpeg.h
deleted file mode 100644
index c0d064ccab..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/cdjpeg.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*

- * cdjpeg.h

- *

- * Copyright (C) 1994-1997, 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 common declarations for the sample applications

- * cjpeg and djpeg.  It is NOT used by the core JPEG library.

- */

-

-#define JPEG_CJPEG_DJPEG	/* define proper options in jconfig.h */

-#define JPEG_INTERNAL_OPTIONS	/* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jerror.h"		/* get library error codes too */

-#include "cderror.h"		/* get application-specific error codes */

-

-

-/*

- * Object interface for cjpeg's source file decoding modules

- */

-

-typedef struct cjpeg_source_struct * cjpeg_source_ptr;

-

-struct cjpeg_source_struct {

-  JMETHOD(void, start_input, (j_compress_ptr cinfo,

-			      cjpeg_source_ptr sinfo));

-  JMETHOD(JDIMENSION, get_pixel_rows, (j_compress_ptr cinfo,

-				       cjpeg_source_ptr sinfo));

-  JMETHOD(void, finish_input, (j_compress_ptr cinfo,

-			       cjpeg_source_ptr sinfo));

-

-  FILE *input_file;

-

-  JSAMPARRAY buffer;

-  JDIMENSION buffer_height;

-};

-

-

-/*

- * Object interface for djpeg's output file encoding modules

- */

-

-typedef struct djpeg_dest_struct * djpeg_dest_ptr;

-

-struct djpeg_dest_struct {

-  /* start_output is called after jpeg_start_decompress finishes.

-   * The color map will be ready at this time, if one is needed.

-   */

-  JMETHOD(void, start_output, (j_decompress_ptr cinfo,

-			       djpeg_dest_ptr dinfo));

-  /* Emit the specified number of pixel rows from the buffer. */

-  JMETHOD(void, put_pixel_rows, (j_decompress_ptr cinfo,

-				 djpeg_dest_ptr dinfo,

-				 JDIMENSION rows_supplied));

-  /* Finish up at the end of the image. */

-  JMETHOD(void, finish_output, (j_decompress_ptr cinfo,

-				djpeg_dest_ptr dinfo));

-

-  /* Target file spec; filled in by djpeg.c after object is created. */

-  FILE * output_file;

-

-  /* Output pixel-row buffer.  Created by module init or start_output.

-   * Width is cinfo->output_width * cinfo->output_components;

-   * height is buffer_height.

-   */

-  JSAMPARRAY buffer;

-  JDIMENSION buffer_height;

-};

-

-

-/*

- * cjpeg/djpeg may need to perform extra passes to convert to or from

- * the source/destination file format.  The JPEG library does not know

- * about these passes, but we'd like them to be counted by the progress

- * monitor.  We use an expanded progress monitor object to hold the

- * additional pass count.

- */

-

-struct cdjpeg_progress_mgr {

-  struct jpeg_progress_mgr pub;	/* fields known to JPEG library */

-  int completed_extra_passes;	/* extra passes completed */

-  int total_extra_passes;	/* total extra */

-  /* last printed percentage stored here to avoid multiple printouts */

-  int percent_done;

-};

-

-typedef struct cdjpeg_progress_mgr * cd_progress_ptr;

-

-

-/* Short forms of external names for systems with brain-damaged linkers. */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jinit_read_bmp		jIRdBMP

-#define jinit_write_bmp		jIWrBMP

-#define jinit_read_gif		jIRdGIF

-#define jinit_write_gif		jIWrGIF

-#define jinit_read_ppm		jIRdPPM

-#define jinit_write_ppm		jIWrPPM

-#define jinit_read_rle		jIRdRLE

-#define jinit_write_rle		jIWrRLE

-#define jinit_read_targa	jIRdTarga

-#define jinit_write_targa	jIWrTarga

-#define read_quant_tables	RdQTables

-#define read_scan_script	RdScnScript

-#define set_quality_ratings     SetQRates

-#define set_quant_slots		SetQSlots

-#define set_sample_factors	SetSFacts

-#define read_color_map		RdCMap

-#define enable_signal_catcher	EnSigCatcher

-#define start_progress_monitor	StProgMon

-#define end_progress_monitor	EnProgMon

-#define read_stdin		RdStdin

-#define write_stdout		WrStdout

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-/* Module selection routines for I/O modules. */

-

-EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));

-EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,

-					    boolean is_os2));

-EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));

-EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));

-EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));

-EXTERN(djpeg_dest_ptr) jinit_write_ppm JPP((j_decompress_ptr cinfo));

-EXTERN(cjpeg_source_ptr) jinit_read_rle JPP((j_compress_ptr cinfo));

-EXTERN(djpeg_dest_ptr) jinit_write_rle JPP((j_decompress_ptr cinfo));

-EXTERN(cjpeg_source_ptr) jinit_read_targa JPP((j_compress_ptr cinfo));

-EXTERN(djpeg_dest_ptr) jinit_write_targa JPP((j_decompress_ptr cinfo));

-

-/* cjpeg support routines (in rdswitch.c) */

-

-EXTERN(boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,

-				       boolean force_baseline));

-EXTERN(boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));

-EXTERN(boolean) set_quality_ratings JPP((j_compress_ptr cinfo, char *arg,

-					 boolean force_baseline));

-EXTERN(boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));

-EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));

-

-/* djpeg support routines (in rdcolmap.c) */

-

-EXTERN(void) read_color_map JPP((j_decompress_ptr cinfo, FILE * infile));

-

-/* common support routines (in cdjpeg.c) */

-

-EXTERN(void) enable_signal_catcher JPP((j_common_ptr cinfo));

-EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo,

-					 cd_progress_ptr progress));

-EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo));

-EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars));

-EXTERN(FILE *) read_stdin JPP((void));

-EXTERN(FILE *) write_stdout JPP((void));

-

-/* miscellaneous useful macros */

-

-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */

-#define READ_BINARY	"r"

-#define WRITE_BINARY	"w"

-#else

-#ifdef VMS			/* VMS is very nonstandard */

-#define READ_BINARY	"rb", "ctx=stm"

-#define WRITE_BINARY	"wb", "ctx=stm"

-#else				/* standard ANSI-compliant case */

-#define READ_BINARY	"rb"

-#define WRITE_BINARY	"wb"

-#endif

-#endif

-

-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */

-#define EXIT_FAILURE  1

-#endif

-#ifndef EXIT_SUCCESS

-#ifdef VMS

-#define EXIT_SUCCESS  1		/* VMS is very nonstandard */

-#else

-#define EXIT_SUCCESS  0

-#endif

-#endif

-#ifndef EXIT_WARNING

-#ifdef VMS

-#define EXIT_WARNING  1		/* VMS is very nonstandard */

-#else

-#define EXIT_WARNING  2

-#endif

-#endif

diff --git a/plugins/AdvaImg/src/LibJPEG/change.log b/plugins/AdvaImg/src/LibJPEG/change.log
deleted file mode 100644
index 6d5786d500..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/change.log
+++ /dev/null
@@ -1,432 +0,0 @@
-CHANGE LOG for Independent JPEG Group's JPEG software

-

-

-Version 9b  17-Jan-2016

------------------------

-

-Improvements and optimizations in DCT and color calculations.

-Normalize range limit array composition and access pattern.

-Thank to Sia Furler and Maddie Ziegler for inspiration.

-

-Use merged upsample with scaled DCT sizes larger than 8.

-Thank to Taylor Hatala for inspiration.

-

-Check for excessive comment lengths in argument parsing in wrjpgcom.c.

-Thank to Julian Cohen for hint.

-

-Add makefile.b32 for use with Borland C++ 32-bit (bcc32).

-Thank to Joe Slater for contribution.

-

-Document 'f' specifier for jpegtran -crop specification.

-Thank to Michele Martone for suggestion.

-

-Use defined value from header instead of hardwired number in rdswitch.c.

-Thank to Robert Sprowson for hint.

-

-

-Version 9a  19-Jan-2014

------------------------

-

-Add support for wide gamut color spaces (JFIF version 2).

-Improve clarity and accuracy in color conversion modules.

-Note: Requires rebuild of test images.

-

-Extend the bit depth support to all values from 8 to 12

-(BITS_IN_JSAMPLE configuration option in jmorecfg.h).

-jpegtran now supports N bits sample data precision with all N from 8 to 12

-in a single instance.  Thank to Roland Fassauer for inspiration.

-

-Try to resolve issues with new boolean type definition.

-Thank also to v4hn for suggestion.

-

-Enable option to use default Huffman tables for lossless compression

-(for hardware solution), and in this case improve lossless RGB compression

-with reversible color transform.  Thank to Benny Alexandar for hint.

-

-Extend the entropy decoding structure, so that extraneous bytes between

-compressed scan data and following marker can be reported correctly.

-Thank to Nigel Tao for hint.

-

-Add jpegtran -wipe option and extension for -crop.

-Thank to Andrew Senior, David Clunie, and Josef Schmid for suggestion.

-

-

-Version 9  13-Jan-2013

-----------------------

-

-Add cjpeg -rgb1 option to create an RGB JPEG file, and insert

-a simple reversible color transform into the processing which

-significantly improves the compression.

-The recommended command for lossless coding of RGB images is now

-cjpeg -rgb1 -block 1 -arithmetic.

-As said, this option improves the compression significantly, but

-the files are not compatible with JPEG decoders prior to IJG v9

-due to the included color transform.

-The used color transform and marker signaling is compatible with

-other JPEG standards (e.g., JPEG-LS part 2).

-

-Remove the automatic de-ANSI-fication support (Automake 1.12).

-Thank also to Nitin A Kamble for suggestion.

-

-Add remark for jpeg_mem_dest() in jdatadst.c.

-Thank to Elie-Gregoire Khoury for the hint.

-

-Support files with invalid component identifiers (created

-by Adobe PDF).  Thank to Robin Watts for the suggestion.

-

-Adapt full buffer case in jcmainct.c for use with scaled DCT.

-Thank to Sergii Biloshytskyi for the suggestion.

-

-Add type identifier for declaration of noreturn functions.

-Thank to Brett L. Moore for the suggestion.

-

-Correct argument type in format string, avoid compiler warnings.

-Thank to Vincent Torri for hint.

-

-Add missing #include directives in configuration checks, avoid

-configuration errors.  Thank to John Spencer for the hint.

-

-

-Version 8d  15-Jan-2012

------------------------

-

-Add cjpeg -rgb option to create RGB JPEG files.

-Using this switch suppresses the conversion from RGB

-colorspace input to the default YCbCr JPEG colorspace.

-This feature allows true lossless JPEG coding of RGB color images.

-The recommended command for this purpose is currently

-cjpeg -rgb -block 1 -arithmetic.

-SmartScale capable decoder (introduced with IJG JPEG 8) required.

-Thank to Michael Koch for the initial suggestion.

-

-Add option to disable the region adjustment in the transupp crop code.

-Thank to Jeffrey Friedl for the suggestion.

-

-Thank to Richard Jones and Edd Dawson for various minor corrections.

-

-Thank to Akim Demaille for configure.ac cleanup.

-

-

-Version 8c  16-Jan-2011

------------------------

-

-Add option to compression library and cjpeg (-block N) to use

-different DCT block size.

-All N from 1 to 16 are possible.  Default is 8 (baseline format).

-Larger values produce higher compression,

-smaller values produce higher quality.

-SmartScale capable decoder (introduced with IJG JPEG 8) required.

-

-

-Version 8b  16-May-2010

------------------------

-

-Repair problem in new memory source manager with corrupt JPEG data.

-Thank to Ted Campbell and Samuel Chun for the report.

-

-Repair problem in Makefile.am test target.

-Thank to anonymous user for the report.

-

-Support MinGW installation with automatic configure.

-Thank to Volker Grabsch for the suggestion.

-

-

-Version 8a  28-Feb-2010

------------------------

-

-Writing tables-only datastreams via jpeg_write_tables works again.

-

-Support 32-bit BMPs (RGB image with Alpha channel) for read in cjpeg.

-Thank to Brett Blackham for the suggestion.

-

-Improve accuracy in floating point IDCT calculation.

-Thank to Robert Hooke for the hint.

-

-

-Version 8  10-Jan-2010

-----------------------

-

-jpegtran now supports the same -scale option as djpeg for "lossless" resize.

-An implementation of the JPEG SmartScale extension is required for this

-feature.  A (draft) specification of the JPEG SmartScale extension is

-available as a contributed document at ITU and ISO.  Revision 2 or later

-of the document is required (latest document version is Revision 3).

-The SmartScale extension will enable more features beside lossless resize

-in future implementations, as described in the document (new compression

-options).

-

-Add sanity check in BMP reader module to avoid cjpeg crash for empty input

-image (thank to Isaev Ildar of ISP RAS, Moscow, RU for reporting this error).

-

-Add data source and destination managers for read from and write to

-memory buffers.  New API functions jpeg_mem_src and jpeg_mem_dest.

-Thank to Roberto Boni from Italy for the suggestion.

-

-

-Version 7  27-Jun-2009

-----------------------

-

-New scaled DCTs implemented.

-djpeg now supports scalings N/8 with all N from 1 to 16.

-cjpeg now supports scalings 8/N with all N from 1 to 16.

-Scaled DCTs with size larger than 8 are now also used for resolving the

-common 2x2 chroma subsampling case without additional spatial resampling.

-Separate spatial resampling for those kind of files is now only necessary

-for N>8 scaling cases.

-Furthermore, separate scaled DCT functions are provided for direct resolving

-of the common asymmetric subsampling cases (2x1 and 1x2) without additional

-spatial resampling.

-

-cjpeg -quality option has been extended for support of separate quality

-settings for luminance and chrominance (or in general, for every provided

-quantization table slot).

-New API function jpeg_default_qtables() and q_scale_factor array in library.

-

-Added -nosmooth option to cjpeg, complementary to djpeg.

-New variable "do_fancy_downsampling" in library, complement to fancy

-upsampling.  Fancy upsampling now uses direct DCT scaling with sizes

-larger than 8.  The old method is not reversible and has been removed.

-

-Support arithmetic entropy encoding and decoding.

-Added files jaricom.c, jcarith.c, jdarith.c.

-

-Straighten the file structure:

-Removed files jidctred.c, jcphuff.c, jchuff.h, jdphuff.c, jdhuff.h.

-

-jpegtran has a new "lossless" cropping feature.

-

-Implement -perfect option in jpegtran, new API function

-jtransform_perfect_transform() in transupp. (DP 204_perfect.dpatch)

-

-Better error messages for jpegtran fopen failure.

-(DP 203_jpegtran_errmsg.dpatch)

-

-Fix byte order issue with 16bit PPM/PGM files in rdppm.c/wrppm.c:

-according to Netpbm, the de facto standard implementation of the PNM formats,

-the most significant byte is first. (DP 203_rdppm.dpatch)

-

-Add -raw option to rdjpgcom not to mangle the output.

-(DP 205_rdjpgcom_raw.dpatch)

-

-Make rdjpgcom locale aware. (DP 201_rdjpgcom_locale.dpatch)

-

-Add extern "C" to jpeglib.h.

-This avoids the need to put extern "C" { ... } around #include "jpeglib.h"

-in your C++ application.  Defining the symbol DONT_USE_EXTERN_C in the

-configuration prevents this. (DP 202_jpeglib.h_c++.dpatch)

-

-

-Version 6b  27-Mar-1998

------------------------

-

-jpegtran has new features for lossless image transformations (rotation

-and flipping) as well as "lossless" reduction to grayscale.

-

-jpegtran now copies comments by default; it has a -copy switch to enable

-copying all APPn blocks as well, or to suppress comments.  (Formerly it

-always suppressed comments and APPn blocks.)  jpegtran now also preserves

-JFIF version and resolution information.

-

-New decompressor library feature: COM and APPn markers found in the input

-file can be saved in memory for later use by the application.  (Before,

-you had to code this up yourself with a custom marker processor.)

-

-There is an unused field "void * client_data" now in compress and decompress

-parameter structs; this may be useful in some applications.

-

-JFIF version number information is now saved by the decoder and accepted by

-the encoder.  jpegtran uses this to copy the source file's version number,

-to ensure "jpegtran -copy all" won't create bogus files that contain JFXX

-extensions but claim to be version 1.01.  Applications that generate their

-own JFXX extension markers also (finally) have a supported way to cause the

-encoder to emit JFIF version number 1.02.

-

-djpeg's trace mode reports JFIF 1.02 thumbnail images as such, rather

-than as unknown APP0 markers.

-

-In -verbose mode, djpeg and rdjpgcom will try to print the contents of

-APP12 markers as text.  Some digital cameras store useful text information

-in APP12 markers.

-

-Handling of truncated data streams is more robust: blocks beyond the one in

-which the error occurs will be output as uniform gray, or left unchanged

-if decoding a progressive JPEG.  The appearance no longer depends on the

-Huffman tables being used.

-

-Huffman tables are checked for validity much more carefully than before.

-

-To avoid the Unisys LZW patent, djpeg's GIF output capability has been

-changed to produce "uncompressed GIFs", and cjpeg's GIF input capability

-has been removed altogether.  We're not happy about it either, but there

-seems to be no good alternative.

-

-The configure script now supports building libjpeg as a shared library

-on many flavors of Unix (all the ones that GNU libtool knows how to

-build shared libraries for).  Use "./configure --enable-shared" to

-try this out.

-

-New jconfig file and makefiles for Microsoft Visual C++ and Developer Studio.

-Also, a jconfig file and a build script for Metrowerks CodeWarrior

-on Apple Macintosh.  makefile.dj has been updated for DJGPP v2, and there

-are miscellaneous other minor improvements in the makefiles.

-

-jmemmac.c now knows how to create temporary files following Mac System 7

-conventions.

-

-djpeg's -map switch is now able to read raw-format PPM files reliably.

-

-cjpeg -progressive -restart no longer generates any unnecessary DRI markers.

-

-Multiple calls to jpeg_simple_progression for a single JPEG object

-no longer leak memory.

-

-

-Version 6a  7-Feb-96

---------------------

-

-Library initialization sequence modified to detect version mismatches

-and struct field packing mismatches between library and calling application.

-This change requires applications to be recompiled, but does not require

-any application source code change.

-

-All routine declarations changed to the style "GLOBAL(type) name ...",

-that is, GLOBAL, LOCAL, METHODDEF, EXTERN are now macros taking the

-routine's return type as an argument.  This makes it possible to add

-Microsoft-style linkage keywords to all the routines by changing just

-these macros.  Note that any application code that was using these macros

-will have to be changed.

-

-DCT coefficient quantization tables are now stored in normal array order

-rather than zigzag order.  Application code that calls jpeg_add_quant_table,

-or otherwise manipulates quantization tables directly, will need to be

-changed.  If you need to make such code work with either older or newer

-versions of the library, a test like "#if JPEG_LIB_VERSION >= 61" is

-recommended.

-

-djpeg's trace capability now dumps DQT tables in natural order, not zigzag

-order.  This allows the trace output to be made into a "-qtables" file

-more easily.

-

-New system-dependent memory manager module for use on Apple Macintosh.

-

-Fix bug in cjpeg's -smooth option: last one or two scanlines would be

-duplicates of the prior line unless the image height mod 16 was 1 or 2.

-

-Repair minor problems in VMS, BCC, MC6 makefiles.

-

-New configure script based on latest GNU Autoconf.

-

-Correct the list of include files needed by MetroWerks C for ccommand().

-

-Numerous small documentation updates.

-

-

-Version 6  2-Aug-95

--------------------

-

-Progressive JPEG support: library can read and write full progressive JPEG

-files.  A "buffered image" mode supports incremental decoding for on-the-fly

-display of progressive images.  Simply recompiling an existing IJG-v5-based

-decoder with v6 should allow it to read progressive files, though of course

-without any special progressive display.

-

-New "jpegtran" application performs lossless transcoding between different

-JPEG formats; primarily, it can be used to convert baseline to progressive

-JPEG and vice versa.  In support of jpegtran, the library now allows lossless

-reading and writing of JPEG files as DCT coefficient arrays.  This ability

-may be of use in other applications.

-

-Notes for programmers:

-* We changed jpeg_start_decompress() to be able to suspend; this makes all

-decoding modes available to suspending-input applications.  However,

-existing applications that use suspending input will need to be changed

-to check the return value from jpeg_start_decompress().  You don't need to

-do anything if you don't use a suspending data source.

-* We changed the interface to the virtual array routines: access_virt_array

-routines now take a count of the number of rows to access this time.  The

-last parameter to request_virt_array routines is now interpreted as the

-maximum number of rows that may be accessed at once, but not necessarily

-the height of every access.

-

-

-Version 5b  15-Mar-95

----------------------

-

-Correct bugs with grayscale images having v_samp_factor > 1.

-

-jpeg_write_raw_data() now supports output suspension.

-

-Correct bugs in "configure" script for case of compiling in

-a directory other than the one containing the source files.

-

-Repair bug in jquant1.c: sometimes didn't use as many colors as it could.

-

-Borland C makefile and jconfig file work under either MS-DOS or OS/2.

-

-Miscellaneous improvements to documentation.

-

-

-Version 5a  7-Dec-94

---------------------

-

-Changed color conversion roundoff behavior so that grayscale values are

-represented exactly.  (This causes test image files to change.)

-

-Make ordered dither use 16x16 instead of 4x4 pattern for a small quality

-improvement.

-

-New configure script based on latest GNU Autoconf.

-Fix configure script to handle CFLAGS correctly.

-Rename *.auto files to *.cfg, so that configure script still works if

-file names have been truncated for DOS.

-

-Fix bug in rdbmp.c: didn't allow for extra data between header and image.

-

-Modify rdppm.c/wrppm.c to handle 2-byte raw PPM/PGM formats for 12-bit data.

-

-Fix several bugs in rdrle.c.

-

-NEED_SHORT_EXTERNAL_NAMES option was broken.

-

-Revise jerror.h/jerror.c for more flexibility in message table.

-

-Repair oversight in jmemname.c NO_MKTEMP case: file could be there

-but unreadable.

-

-

-Version 5  24-Sep-94

---------------------

-

-Version 5 represents a nearly complete redesign and rewrite of the IJG

-software.  Major user-visible changes include:

-  * Automatic configuration simplifies installation for most Unix systems.

-  * A range of speed vs. image quality tradeoffs are supported.

-    This includes resizing of an image during decompression: scaling down

-    by a factor of 1/2, 1/4, or 1/8 is handled very efficiently.

-  * New programs rdjpgcom and wrjpgcom allow insertion and extraction

-    of text comments in a JPEG file.

-

-The application programmer's interface to the library has changed completely.

-Notable improvements include:

-  * We have eliminated the use of callback routines for handling the

-    uncompressed image data.  The application now sees the library as a

-    set of routines that it calls to read or write image data on a

-    scanline-by-scanline basis.

-  * The application image data is represented in a conventional interleaved-

-    pixel format, rather than as a separate array for each color channel.

-    This can save a copying step in many programs.

-  * The handling of compressed data has been cleaned up: the application can

-    supply routines to source or sink the compressed data.  It is possible to

-    suspend processing on source/sink buffer overrun, although this is not

-    supported in all operating modes.

-  * All static state has been eliminated from the library, so that multiple

-    instances of compression or decompression can be active concurrently.

-  * JPEG abbreviated datastream formats are supported, ie, quantization and

-    Huffman tables can be stored separately from the image data.

-  * And not only that, but the documentation of the library has improved

-    considerably!

-

-

-The last widely used release before the version 5 rewrite was version 4A of

-18-Feb-93.  Change logs before that point have been discarded, since they

-are not of much interest after the rewrite.

diff --git a/plugins/AdvaImg/src/LibJPEG/cjpeg.c b/plugins/AdvaImg/src/LibJPEG/cjpeg.c
deleted file mode 100644
index b9b65b8839..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/cjpeg.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*

- * cjpeg.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 a command-line user interface for the JPEG compressor.

- * It should work on any system with Unix- or MS-DOS-style command lines.

- *

- * Two different command line styles are permitted, depending on the

- * compile-time switch TWO_FILE_COMMANDLINE:

- *	cjpeg [options]  inputfile outputfile

- *	cjpeg [options]  [inputfile]

- * In the second style, output is always to standard output, which you'd

- * normally redirect to a file or pipe to some other program.  Input is

- * either from a named file or from standard input (typically redirected).

- * The second style is convenient on Unix but is unhelpful on systems that

- * don't support pipes.  Also, you MUST use the first style if your system

- * doesn't do binary I/O to stdin/stdout.

- * To simplify script writing, the "-outfile" switch is provided.  The syntax

- *	cjpeg [options]  -outfile outputfile  inputfile

- * works regardless of which command line style is used.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-#include "jversion.h"		/* for version message */

-

-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */

-#ifdef __MWERKS__

-#include <SIOUX.h>              /* Metrowerks needs this */

-#include <console.h>		/* ... and this */

-#endif

-#ifdef THINK_C

-#include <console.h>		/* Think declares it here */

-#endif

-#endif

-

-

-/* Create the add-on message string table. */

-

-#define JMESSAGE(code,string)	string ,

-

-static const char * const cdjpeg_message_table[] = {

-#include "cderror.h"

-  NULL

-};

-

-

-/*

- * This routine determines what format the input file is,

- * and selects the appropriate input-reading module.

- *

- * To determine which family of input formats the file belongs to,

- * we may look only at the first byte of the file, since C does not

- * guarantee that more than one character can be pushed back with ungetc.

- * Looking at additional bytes would require one of these approaches:

- *     1) assume we can fseek() the input file (fails for piped input);

- *     2) assume we can push back more than one character (works in

- *        some C implementations, but unportable);

- *     3) provide our own buffering (breaks input readers that want to use

- *        stdio directly, such as the RLE library);

- * or  4) don't put back the data, and modify the input_init methods to assume

- *        they start reading after the start of file (also breaks RLE library).

- * #1 is attractive for MS-DOS but is untenable on Unix.

- *

- * The most portable solution for file types that can't be identified by their

- * first byte is to make the user tell us what they are.  This is also the

- * only approach for "raw" file types that contain only arbitrary values.

- * We presently apply this method for Targa files.  Most of the time Targa

- * files start with 0x00, so we recognize that case.  Potentially, however,

- * a Targa file could start with any byte value (byte 0 is the length of the

- * seldom-used ID field), so we provide a switch to force Targa input mode.

- */

-

-static boolean is_targa;	/* records user -targa switch */

-

-

-LOCAL(cjpeg_source_ptr)

-select_file_type (j_compress_ptr cinfo, FILE * infile)

-{

-  int c;

-

-  if (is_targa) {

-#ifdef TARGA_SUPPORTED

-    return jinit_read_targa(cinfo);

-#else

-    ERREXIT(cinfo, JERR_TGA_NOTCOMP);

-#endif

-  }

-

-  if ((c = getc(infile)) == EOF)

-    ERREXIT(cinfo, JERR_INPUT_EMPTY);

-  if (ungetc(c, infile) == EOF)

-    ERREXIT(cinfo, JERR_UNGETC_FAILED);

-

-  switch (c) {

-#ifdef BMP_SUPPORTED

-  case 'B':

-    return jinit_read_bmp(cinfo);

-#endif

-#ifdef GIF_SUPPORTED

-  case 'G':

-    return jinit_read_gif(cinfo);

-#endif

-#ifdef PPM_SUPPORTED

-  case 'P':

-    return jinit_read_ppm(cinfo);

-#endif

-#ifdef RLE_SUPPORTED

-  case 'R':

-    return jinit_read_rle(cinfo);

-#endif

-#ifdef TARGA_SUPPORTED

-  case 0x00:

-    return jinit_read_targa(cinfo);

-#endif

-  default:

-    ERREXIT(cinfo, JERR_UNKNOWN_FORMAT);

-    break;

-  }

-

-  return NULL;			/* suppress compiler warnings */

-}

-

-

-/*

- * Argument-parsing code.

- * The switch parser is designed to be useful with DOS-style command line

- * syntax, ie, intermixed switches and file names, where only the switches

- * to the left of a given file name affect processing of that file.

- * The main program in this file doesn't actually use this capability...

- */

-

-

-static const char * progname;	/* program name for error messages */

-static char * outfilename;	/* for -outfile switch */

-

-

-LOCAL(void)

-usage (void)

-/* complain about bad command line */

-{

-  fprintf(stderr, "usage: %s [switches] ", progname);

-#ifdef TWO_FILE_COMMANDLINE

-  fprintf(stderr, "inputfile outputfile\n");

-#else

-  fprintf(stderr, "[inputfile]\n");

-#endif

-

-  fprintf(stderr, "Switches (names may be abbreviated):\n");

-  fprintf(stderr, "  -quality N[,...]   Compression quality (0..100; 5-95 is useful range)\n");

-  fprintf(stderr, "  -grayscale     Create monochrome JPEG file\n");

-  fprintf(stderr, "  -rgb           Create RGB JPEG file\n");

-#ifdef ENTROPY_OPT_SUPPORTED

-  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");

-#endif

-#ifdef C_PROGRESSIVE_SUPPORTED

-  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");

-#endif

-#ifdef DCT_SCALING_SUPPORTED

-  fprintf(stderr, "  -scale M/N     Scale image by fraction M/N, eg, 1/2\n");

-#endif

-#ifdef TARGA_SUPPORTED

-  fprintf(stderr, "  -targa         Input file is Targa format (usually not needed)\n");

-#endif

-  fprintf(stderr, "Switches for advanced users:\n");

-#ifdef C_ARITH_CODING_SUPPORTED

-  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");

-#endif

-#ifdef DCT_SCALING_SUPPORTED

-  fprintf(stderr, "  -block N       DCT block size (1..16; default is 8)\n");

-#endif

-#if JPEG_LIB_VERSION_MAJOR >= 9

-  fprintf(stderr, "  -rgb1          Create RGB JPEG file with reversible color transform\n");

-  fprintf(stderr, "  -bgycc         Create big gamut YCC JPEG file\n");

-#endif

-#ifdef DCT_ISLOW_SUPPORTED

-  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",

-	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",

-	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",

-	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));

-#endif

-  fprintf(stderr, "  -nosmooth      Don't use high-quality downsampling\n");

-  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");

-#ifdef INPUT_SMOOTHING_SUPPORTED

-  fprintf(stderr, "  -smooth N      Smooth dithered input (N=1..100 is strength)\n");

-#endif

-  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");

-  fprintf(stderr, "  -outfile name  Specify name for output file\n");

-  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");

-  fprintf(stderr, "Switches for wizards:\n");

-  fprintf(stderr, "  -baseline      Force baseline quantization tables\n");

-  fprintf(stderr, "  -qtables file  Use quantization tables given in file\n");

-  fprintf(stderr, "  -qslots N[,...]    Set component quantization tables\n");

-  fprintf(stderr, "  -sample HxV[,...]  Set component sampling factors\n");

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");

-#endif

-  exit(EXIT_FAILURE);

-}

-

-

-LOCAL(int)

-parse_switches (j_compress_ptr cinfo, int argc, char **argv,

-		int last_file_arg_seen, boolean for_real)

-/* Parse optional switches.

- * Returns argv[] index of first file-name argument (== argc if none).

- * Any file names with indexes <= last_file_arg_seen are ignored;

- * they have presumably been processed in a previous iteration.

- * (Pass 0 for last_file_arg_seen on the first or only iteration.)

- * for_real is FALSE on the first (dummy) pass; we may skip any expensive

- * processing.

- */

-{

-  int argn;

-  char * arg;

-  boolean force_baseline;

-  boolean simple_progressive;

-  char * qualityarg = NULL;	/* saves -quality parm if any */

-  char * qtablefile = NULL;	/* saves -qtables filename if any */

-  char * qslotsarg = NULL;	/* saves -qslots parm if any */

-  char * samplearg = NULL;	/* saves -sample parm if any */

-  char * scansarg = NULL;	/* saves -scans parm if any */

-

-  /* Set up default JPEG parameters. */

-

-  force_baseline = FALSE;	/* by default, allow 16-bit quantizers */

-  simple_progressive = FALSE;

-  is_targa = FALSE;

-  outfilename = NULL;

-  cinfo->err->trace_level = 0;

-

-  /* Scan command line options, adjust parameters */

-

-  for (argn = 1; argn < argc; argn++) {

-    arg = argv[argn];

-    if (*arg != '-') {

-      /* Not a switch, must be a file name argument */

-      if (argn <= last_file_arg_seen) {

-	outfilename = NULL;	/* -outfile applies to just one input file */

-	continue;		/* ignore this name if previously processed */

-      }

-      break;			/* else done parsing switches */

-    }

-    arg++;			/* advance past switch marker character */

-

-    if (keymatch(arg, "arithmetic", 1)) {

-      /* Use arithmetic coding. */

-#ifdef C_ARITH_CODING_SUPPORTED

-      cinfo->arith_code = TRUE;

-#else

-      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "baseline", 2)) {

-      /* Force baseline-compatible output (8-bit quantizer values). */

-      force_baseline = TRUE;

-

-    } else if (keymatch(arg, "block", 2)) {

-      /* Set DCT block size. */

-#if defined DCT_SCALING_SUPPORTED && JPEG_LIB_VERSION_MAJOR >= 8 && \

-      (JPEG_LIB_VERSION_MAJOR > 8 || JPEG_LIB_VERSION_MINOR >= 3)

-      int val;

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%d", &val) != 1)

-	usage();

-      if (val < 1 || val > 16)

-	usage();

-      cinfo->block_size = val;

-#else

-      fprintf(stderr, "%s: sorry, block size setting not supported\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "dct", 2)) {

-      /* Select DCT algorithm. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "int", 1)) {

-	cinfo->dct_method = JDCT_ISLOW;

-      } else if (keymatch(argv[argn], "fast", 2)) {

-	cinfo->dct_method = JDCT_IFAST;

-      } else if (keymatch(argv[argn], "float", 2)) {

-	cinfo->dct_method = JDCT_FLOAT;

-      } else

-	usage();

-

-    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {

-      /* Enable debug printouts. */

-      /* On first -d, print version identification */

-      static boolean printed_version = FALSE;

-

-      if (! printed_version) {

-	fprintf(stderr, "Independent JPEG Group's CJPEG, version %s\n%s\n",

-		JVERSION, JCOPYRIGHT);

-	printed_version = TRUE;

-      }

-      cinfo->err->trace_level++;

-

-    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {

-      /* Force a monochrome JPEG file to be generated. */

-      jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);

-

-    } else if (keymatch(arg, "rgb", 3) || keymatch(arg, "rgb1", 4)) {

-      /* Force an RGB JPEG file to be generated. */

-#if JPEG_LIB_VERSION_MAJOR >= 9

-      /* Note: Entropy table assignment in jpeg_set_colorspace depends

-       * on color_transform.

-       */

-      cinfo->color_transform = arg[3] ? JCT_SUBTRACT_GREEN : JCT_NONE;

-#endif

-      jpeg_set_colorspace(cinfo, JCS_RGB);

-

-    } else if (keymatch(arg, "bgycc", 5)) {

-      /* Force a big gamut YCC JPEG file to be generated. */

-#if JPEG_LIB_VERSION_MAJOR >= 9 && \

-      (JPEG_LIB_VERSION_MAJOR > 9 || JPEG_LIB_VERSION_MINOR >= 1)

-      jpeg_set_colorspace(cinfo, JCS_BG_YCC);

-#else

-      fprintf(stderr, "%s: sorry, BG_YCC colorspace not supported\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "maxmemory", 3)) {

-      /* Maximum memory in Kb (or Mb with 'm'). */

-      long lval;

-      char ch = 'x';

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)

-	usage();

-      if (ch == 'm' || ch == 'M')

-	lval *= 1000L;

-      cinfo->mem->max_memory_to_use = lval * 1000L;

-

-    } else if (keymatch(arg, "nosmooth", 3)) {

-      /* Suppress fancy downsampling. */

-      cinfo->do_fancy_downsampling = FALSE;

-

-    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {

-      /* Enable entropy parm optimization. */

-#ifdef ENTROPY_OPT_SUPPORTED

-      cinfo->optimize_coding = TRUE;

-#else

-      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "outfile", 4)) {

-      /* Set output file name. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      outfilename = argv[argn];	/* save it away for later use */

-

-    } else if (keymatch(arg, "progressive", 1)) {

-      /* Select simple progressive mode. */

-#ifdef C_PROGRESSIVE_SUPPORTED

-      simple_progressive = TRUE;

-      /* We must postpone execution until num_components is known. */

-#else

-      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "quality", 1)) {

-      /* Quality ratings (quantization table scaling factors). */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      qualityarg = argv[argn];

-

-    } else if (keymatch(arg, "qslots", 2)) {

-      /* Quantization table slot numbers. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      qslotsarg = argv[argn];

-      /* Must delay setting qslots until after we have processed any

-       * colorspace-determining switches, since jpeg_set_colorspace sets

-       * default quant table numbers.

-       */

-

-    } else if (keymatch(arg, "qtables", 2)) {

-      /* Quantization tables fetched from file. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      qtablefile = argv[argn];

-      /* We postpone actually reading the file in case -quality comes later. */

-

-    } else if (keymatch(arg, "restart", 1)) {

-      /* Restart interval in MCU rows (or in MCUs with 'b'). */

-      long lval;

-      char ch = 'x';

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)

-	usage();

-      if (lval < 0 || lval > 65535L)

-	usage();

-      if (ch == 'b' || ch == 'B') {

-	cinfo->restart_interval = (unsigned int) lval;

-	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */

-      } else {

-	cinfo->restart_in_rows = (int) lval;

-	/* restart_interval will be computed during startup */

-      }

-

-    } else if (keymatch(arg, "sample", 2)) {

-      /* Set sampling factors. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      samplearg = argv[argn];

-      /* Must delay setting sample factors until after we have processed any

-       * colorspace-determining switches, since jpeg_set_colorspace sets

-       * default sampling factors.

-       */

-

-    } else if (keymatch(arg, "scale", 4)) {

-      /* Scale the image by a fraction M/N. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%u/%u",

-		 &cinfo->scale_num, &cinfo->scale_denom) != 2)

-	usage();

-

-    } else if (keymatch(arg, "scans", 4)) {

-      /* Set scan script. */

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      scansarg = argv[argn];

-      /* We must postpone reading the file in case -progressive appears. */

-#else

-      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "smooth", 2)) {

-      /* Set input smoothing factor. */

-      int val;

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%d", &val) != 1)

-	usage();

-      if (val < 0 || val > 100)

-	usage();

-      cinfo->smoothing_factor = val;

-

-    } else if (keymatch(arg, "targa", 1)) {

-      /* Input file is Targa format. */

-      is_targa = TRUE;

-

-    } else {

-      usage();			/* bogus switch */

-    }

-  }

-

-  /* Post-switch-scanning cleanup */

-

-  if (for_real) {

-

-    /* Set quantization tables for selected quality. */

-    /* Some or all may be overridden if -qtables is present. */

-    if (qualityarg != NULL)	/* process -quality if it was present */

-      if (! set_quality_ratings(cinfo, qualityarg, force_baseline))

-	usage();

-

-    if (qtablefile != NULL)	/* process -qtables if it was present */

-      if (! read_quant_tables(cinfo, qtablefile, force_baseline))

-	usage();

-

-    if (qslotsarg != NULL)	/* process -qslots if it was present */

-      if (! set_quant_slots(cinfo, qslotsarg))

-	usage();

-

-    if (samplearg != NULL)	/* process -sample if it was present */

-      if (! set_sample_factors(cinfo, samplearg))

-	usage();

-

-#ifdef C_PROGRESSIVE_SUPPORTED

-    if (simple_progressive)	/* process -progressive; -scans can override */

-      jpeg_simple_progression(cinfo);

-#endif

-

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-    if (scansarg != NULL)	/* process -scans if it was present */

-      if (! read_scan_script(cinfo, scansarg))

-	usage();

-#endif

-  }

-

-  return argn;			/* return index of next arg (file name) */

-}

-

-

-/*

- * The main program.

- */

-

-int

-main (int argc, char **argv)

-{

-  struct jpeg_compress_struct cinfo;

-  struct jpeg_error_mgr jerr;

-#ifdef PROGRESS_REPORT

-  struct cdjpeg_progress_mgr progress;

-#endif

-  int file_index;

-  cjpeg_source_ptr src_mgr;

-  FILE * input_file;

-  FILE * output_file;

-  JDIMENSION num_scanlines;

-

-  /* On Mac, fetch a command line. */

-#ifdef USE_CCOMMAND

-  argc = ccommand(&argv);

-#endif

-

-  progname = argv[0];

-  if (progname == NULL || progname[0] == 0)

-    progname = "cjpeg";		/* in case C library doesn't provide it */

-

-  /* Initialize the JPEG compression object with default error handling. */

-  cinfo.err = jpeg_std_error(&jerr);

-  jpeg_create_compress(&cinfo);

-  /* Add some application-specific error messages (from cderror.h) */

-  jerr.addon_message_table = cdjpeg_message_table;

-  jerr.first_addon_message = JMSG_FIRSTADDONCODE;

-  jerr.last_addon_message = JMSG_LASTADDONCODE;

-

-  /* Now safe to enable signal catcher. */

-#ifdef NEED_SIGNAL_CATCHER

-  enable_signal_catcher((j_common_ptr) &cinfo);

-#endif

-

-  /* Initialize JPEG parameters.

-   * Much of this may be overridden later.

-   * In particular, we don't yet know the input file's color space,

-   * but we need to provide some value for jpeg_set_defaults() to work.

-   */

-

-  cinfo.in_color_space = JCS_RGB; /* arbitrary guess */

-  jpeg_set_defaults(&cinfo);

-

-  /* Scan command line to find file names.

-   * It is convenient to use just one switch-parsing routine, but the switch

-   * values read here are ignored; we will rescan the switches after opening

-   * the input file.

-   */

-

-  file_index = parse_switches(&cinfo, argc, argv, 0, FALSE);

-

-#ifdef TWO_FILE_COMMANDLINE

-  /* Must have either -outfile switch or explicit output file name */

-  if (outfilename == NULL) {

-    if (file_index != argc-2) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-    outfilename = argv[file_index+1];

-  } else {

-    if (file_index != argc-1) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-  }

-#else

-  /* Unix style: expect zero or one file name */

-  if (file_index < argc-1) {

-    fprintf(stderr, "%s: only one input file\n", progname);

-    usage();

-  }

-#endif /* TWO_FILE_COMMANDLINE */

-

-  /* Open the input file. */

-  if (file_index < argc) {

-    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default input file is stdin */

-    input_file = read_stdin();

-  }

-

-  /* Open the output file. */

-  if (outfilename != NULL) {

-    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default output file is stdout */

-    output_file = write_stdout();

-  }

-

-#ifdef PROGRESS_REPORT

-  start_progress_monitor((j_common_ptr) &cinfo, &progress);

-#endif

-

-  /* Figure out the input file format, and set up to read it. */

-  src_mgr = select_file_type(&cinfo, input_file);

-  src_mgr->input_file = input_file;

-

-  /* Read the input file header to obtain file size & colorspace. */

-  (*src_mgr->start_input) (&cinfo, src_mgr);

-

-  /* Now that we know input colorspace, fix colorspace-dependent defaults */

-  jpeg_default_colorspace(&cinfo);

-

-  /* Adjust default compression parameters by re-parsing the options */

-  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);

-

-  /* Specify data destination for compression */

-  jpeg_stdio_dest(&cinfo, output_file);

-

-  /* Start compressor */

-  jpeg_start_compress(&cinfo, TRUE);

-

-  /* Process data */

-  while (cinfo.next_scanline < cinfo.image_height) {

-    num_scanlines = (*src_mgr->get_pixel_rows) (&cinfo, src_mgr);

-    (void) jpeg_write_scanlines(&cinfo, src_mgr->buffer, num_scanlines);

-  }

-

-  /* Finish compression and release memory */

-  (*src_mgr->finish_input) (&cinfo, src_mgr);

-  jpeg_finish_compress(&cinfo);

-  jpeg_destroy_compress(&cinfo);

-

-  /* Close files, if we opened them */

-  if (input_file != stdin)

-    fclose(input_file);

-  if (output_file != stdout)

-    fclose(output_file);

-

-#ifdef PROGRESS_REPORT

-  end_progress_monitor((j_common_ptr) &cinfo);

-#endif

-

-  /* All done. */

-  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);

-  return 0;			/* suppress no-return-value warnings */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/ckconfig.c b/plugins/AdvaImg/src/LibJPEG/ckconfig.c
deleted file mode 100644
index fb9429af08..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/ckconfig.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*

- * ckconfig.c

- *

- * Copyright (C) 1991-1994, 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 program is intended to help you determine how to configure the JPEG

- * software for installation on a particular system.  The idea is to try to

- * compile and execute this program.  If your compiler fails to compile the

- * program, make changes as indicated in the comments below.  Once you can

- * compile the program, run it, and it will produce a "jconfig.h" file for

- * your system.

- *

- * As a general rule, each time you try to compile this program,

- * pay attention only to the *first* error message you get from the compiler.

- * Many C compilers will issue lots of spurious error messages once they

- * have gotten confused.  Go to the line indicated in the first error message,

- * and read the comments preceding that line to see what to change.

- *

- * Almost all of the edits you may need to make to this program consist of

- * changing a line that reads "#define SOME_SYMBOL" to "#undef SOME_SYMBOL",

- * or vice versa.  This is called defining or undefining that symbol.

- */

-

-

-/* First we must see if your system has the include files we need.

- * We start out with the assumption that your system has all the ANSI-standard

- * include files.  If you get any error trying to include one of these files,

- * undefine the corresponding HAVE_xxx symbol.

- */

-

-#define HAVE_STDDEF_H		/* replace 'define' by 'undef' if error here */

-#ifdef HAVE_STDDEF_H		/* next line will be skipped if you undef... */

-#include <stddef.h>

-#endif

-

-#define HAVE_STDLIB_H		/* same thing for stdlib.h */

-#ifdef HAVE_STDLIB_H

-#include <stdlib.h>

-#endif

-

-#include <stdio.h>		/* If you ain't got this, you ain't got C. */

-

-/* We have to see if your string functions are defined by

- * strings.h (old BSD convention) or string.h (everybody else).

- * We try the non-BSD convention first; define NEED_BSD_STRINGS

- * if the compiler says it can't find string.h.

- */

-

-#undef NEED_BSD_STRINGS

-

-#ifdef NEED_BSD_STRINGS

-#include <strings.h>

-#else

-#include <string.h>

-#endif

-

-/* On some systems (especially older Unix machines), type size_t is

- * defined only in the include file <sys/types.h>.  If you get a failure

- * on the size_t test below, try defining NEED_SYS_TYPES_H.

- */

-

-#undef NEED_SYS_TYPES_H		/* start by assuming we don't need it */

-#ifdef NEED_SYS_TYPES_H

-#include <sys/types.h>

-#endif

-

-

-/* Usually type size_t is defined in one of the include files we've included

- * above.  If not, you'll get an error on the "typedef size_t my_size_t;" line.

- * In that case, first try defining NEED_SYS_TYPES_H just above.

- * If that doesn't work, you'll have to search through your system library

- * to figure out which include file defines "size_t".  Look for a line that

- * says "typedef something-or-other size_t;".  Then, change the line below

- * that says "#include <someincludefile.h>" to instead include the file

- * you found size_t in, and define NEED_SPECIAL_INCLUDE.  If you can't find

- * type size_t anywhere, try replacing "#include <someincludefile.h>" with

- * "typedef unsigned int size_t;".

- */

-

-#undef NEED_SPECIAL_INCLUDE	/* assume we DON'T need it, for starters */

-

-#ifdef NEED_SPECIAL_INCLUDE

-#include <someincludefile.h>

-#endif

-

-typedef size_t my_size_t;	/* The payoff: do we have size_t now? */

-

-

-/* The next question is whether your compiler supports ANSI-style function

- * prototypes.  You need to know this in order to choose between using

- * makefile.ansi and using makefile.unix.

- * The #define line below is set to assume you have ANSI function prototypes.

- * If you get an error in this group of lines, undefine HAVE_PROTOTYPES.

- */

-

-#define HAVE_PROTOTYPES

-

-#ifdef HAVE_PROTOTYPES

-int testfunction (int arg1, int * arg2); /* check prototypes */

-

-struct methods_struct {		/* check method-pointer declarations */

-  int (*error_exit) (char *msgtext);

-  int (*trace_message) (char *msgtext);

-  int (*another_method) (void);

-};

-

-int testfunction (int arg1, int * arg2) /* check definitions */

-{

-  return arg2[arg1];

-}

-

-int test2function (void)	/* check void arg list */

-{

-  return 0;

-}

-#endif

-

-

-/* Now we want to find out if your compiler knows what "unsigned char" means.

- * If you get an error on the "unsigned char un_char;" line,

- * then undefine HAVE_UNSIGNED_CHAR.

- */

-

-#define HAVE_UNSIGNED_CHAR

-

-#ifdef HAVE_UNSIGNED_CHAR

-unsigned char un_char;

-#endif

-

-

-/* Now we want to find out if your compiler knows what "unsigned short" means.

- * If you get an error on the "unsigned short un_short;" line,

- * then undefine HAVE_UNSIGNED_SHORT.

- */

-

-#define HAVE_UNSIGNED_SHORT

-

-#ifdef HAVE_UNSIGNED_SHORT

-unsigned short un_short;

-#endif

-

-

-/* Now we want to find out if your compiler understands type "void".

- * If you get an error anywhere in here, undefine HAVE_VOID.

- */

-

-#define HAVE_VOID

-

-#ifdef HAVE_VOID

-/* Caution: a C++ compiler will insist on complete prototypes */

-typedef void * void_ptr;	/* check void * */

-#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */

-typedef void (*void_func) (int a, int b);

-#else

-typedef void (*void_func) ();

-#endif

-

-#ifdef HAVE_PROTOTYPES		/* check void function result */

-void test3function (void_ptr arg1, void_func arg2)

-#else

-void test3function (arg1, arg2)

-     void_ptr arg1;

-     void_func arg2;

-#endif

-{

-  char * locptr = (char *) arg1; /* check casting to and from void * */

-  arg1 = (void *) locptr;

-  (*arg2) (1, 2);		/* check call of fcn returning void */

-}

-#endif

-

-

-/* Now we want to find out if your compiler knows what "const" means.

- * If you get an error here, undefine HAVE_CONST.

- */

-

-#define HAVE_CONST

-

-#ifdef HAVE_CONST

-static const int carray[3] = {1, 2, 3};

-

-#ifdef HAVE_PROTOTYPES

-int test4function (const int arg1)

-#else

-int test4function (arg1)

-     const int arg1;

-#endif

-{

-  return carray[arg1];

-}

-#endif

-

-

-/* If you get an error or warning about this structure definition,

- * define INCOMPLETE_TYPES_BROKEN.

- */

-

-#undef INCOMPLETE_TYPES_BROKEN

-

-#ifndef INCOMPLETE_TYPES_BROKEN

-typedef struct undefined_structure * undef_struct_ptr;

-#endif

-

-

-/* If you get an error about duplicate names,

- * define NEED_SHORT_EXTERNAL_NAMES.

- */

-

-#undef NEED_SHORT_EXTERNAL_NAMES

-

-#ifndef NEED_SHORT_EXTERNAL_NAMES

-

-int possibly_duplicate_function ()

-{

-  return 0;

-}

-

-int possibly_dupli_function ()

-{

-  return 1;

-}

-

-#endif

-

-

-

-/************************************************************************

- *  OK, that's it.  You should not have to change anything beyond this

- *  point in order to compile and execute this program.  (You might get

- *  some warnings, but you can ignore them.)

- *  When you run the program, it will make a couple more tests that it

- *  can do automatically, and then it will create jconfig.h and print out

- *  any additional suggestions it has.

- ************************************************************************

- */

-

-

-#ifdef HAVE_PROTOTYPES

-int is_char_signed (int arg)

-#else

-int is_char_signed (arg)

-     int arg;

-#endif

-{

-  if (arg == 189) {		/* expected result for unsigned char */

-    return 0;			/* type char is unsigned */

-  }

-  else if (arg != -67) {	/* expected result for signed char */

-    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");

-    printf("I fear the JPEG software will not work at all.\n\n");

-  }

-  return 1;			/* assume char is signed otherwise */

-}

-

-

-#ifdef HAVE_PROTOTYPES

-int is_shifting_signed (long arg)

-#else

-int is_shifting_signed (arg)

-     long arg;

-#endif

-/* See whether right-shift on a long is signed or not. */

-{

-  long res = arg >> 4;

-

-  if (res == -0x7F7E80CL) {	/* expected result for signed shift */

-    return 1;			/* right shift is signed */

-  }

-  /* see if unsigned-shift hack will fix it. */

-  /* we can't just test exact value since it depends on width of long... */

-  res |= (~0L) << (32-4);

-  if (res == -0x7F7E80CL) {	/* expected result now? */

-    return 0;			/* right shift is unsigned */

-  }

-  printf("Right shift isn't acting as I expect it to.\n");

-  printf("I fear the JPEG software will not work at all.\n\n");

-  return 0;			/* try it with unsigned anyway */

-}

-

-

-#ifdef HAVE_PROTOTYPES

-int main (int argc, char ** argv)

-#else

-int main (argc, argv)

-     int argc;

-     char ** argv;

-#endif

-{

-  char signed_char_check = (char) (-67);

-  FILE *outfile;

-

-  /* Attempt to write jconfig.h */

-  if ((outfile = fopen("jconfig.h", "w")) == NULL) {

-    printf("Failed to write jconfig.h\n");

-    return 1;

-  }

-

-  /* Write out all the info */

-  fprintf(outfile, "/* jconfig.h --- generated by ckconfig.c */\n");

-  fprintf(outfile, "/* see jconfig.txt for explanations */\n\n");

-#ifdef HAVE_PROTOTYPES

-  fprintf(outfile, "#define HAVE_PROTOTYPES\n");

-#else

-  fprintf(outfile, "#undef HAVE_PROTOTYPES\n");

-#endif

-#ifdef HAVE_UNSIGNED_CHAR

-  fprintf(outfile, "#define HAVE_UNSIGNED_CHAR\n");

-#else

-  fprintf(outfile, "#undef HAVE_UNSIGNED_CHAR\n");

-#endif

-#ifdef HAVE_UNSIGNED_SHORT

-  fprintf(outfile, "#define HAVE_UNSIGNED_SHORT\n");

-#else

-  fprintf(outfile, "#undef HAVE_UNSIGNED_SHORT\n");

-#endif

-#ifdef HAVE_VOID

-  fprintf(outfile, "/* #define void char */\n");

-#else

-  fprintf(outfile, "#define void char\n");

-#endif

-#ifdef HAVE_CONST

-  fprintf(outfile, "/* #define const */\n");

-#else

-  fprintf(outfile, "#define const\n");

-#endif

-  if (is_char_signed((int) signed_char_check))

-    fprintf(outfile, "#undef CHAR_IS_UNSIGNED\n");

-  else

-    fprintf(outfile, "#define CHAR_IS_UNSIGNED\n");

-#ifdef HAVE_STDDEF_H

-  fprintf(outfile, "#define HAVE_STDDEF_H\n");

-#else

-  fprintf(outfile, "#undef HAVE_STDDEF_H\n");

-#endif

-#ifdef HAVE_STDLIB_H

-  fprintf(outfile, "#define HAVE_STDLIB_H\n");

-#else

-  fprintf(outfile, "#undef HAVE_STDLIB_H\n");

-#endif

-#ifdef NEED_BSD_STRINGS

-  fprintf(outfile, "#define NEED_BSD_STRINGS\n");

-#else

-  fprintf(outfile, "#undef NEED_BSD_STRINGS\n");

-#endif

-#ifdef NEED_SYS_TYPES_H

-  fprintf(outfile, "#define NEED_SYS_TYPES_H\n");

-#else

-  fprintf(outfile, "#undef NEED_SYS_TYPES_H\n");

-#endif

-  fprintf(outfile, "#undef NEED_FAR_POINTERS\n");

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-  fprintf(outfile, "#define NEED_SHORT_EXTERNAL_NAMES\n");

-#else

-  fprintf(outfile, "#undef NEED_SHORT_EXTERNAL_NAMES\n");

-#endif

-#ifdef INCOMPLETE_TYPES_BROKEN

-  fprintf(outfile, "#define INCOMPLETE_TYPES_BROKEN\n");

-#else

-  fprintf(outfile, "#undef INCOMPLETE_TYPES_BROKEN\n");

-#endif

-  fprintf(outfile, "\n#ifdef JPEG_INTERNALS\n\n");

-  if (is_shifting_signed(-0x7F7E80B1L))

-    fprintf(outfile, "#undef RIGHT_SHIFT_IS_UNSIGNED\n");

-  else

-    fprintf(outfile, "#define RIGHT_SHIFT_IS_UNSIGNED\n");

-  fprintf(outfile, "\n#endif /* JPEG_INTERNALS */\n");

-  fprintf(outfile, "\n#ifdef JPEG_CJPEG_DJPEG\n\n");

-  fprintf(outfile, "#define BMP_SUPPORTED		/* BMP image file format */\n");

-  fprintf(outfile, "#define GIF_SUPPORTED		/* GIF image file format */\n");

-  fprintf(outfile, "#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */\n");

-  fprintf(outfile, "#undef RLE_SUPPORTED		/* Utah RLE image file format */\n");

-  fprintf(outfile, "#define TARGA_SUPPORTED		/* Targa image file format */\n\n");

-  fprintf(outfile, "#undef TWO_FILE_COMMANDLINE	/* You may need this on non-Unix systems */\n");

-  fprintf(outfile, "#undef NEED_SIGNAL_CATCHER	/* Define this if you use jmemname.c */\n");

-  fprintf(outfile, "#undef DONT_USE_B_MODE\n");

-  fprintf(outfile, "/* #define PROGRESS_REPORT */	/* optional */\n");

-  fprintf(outfile, "\n#endif /* JPEG_CJPEG_DJPEG */\n");

-

-  /* Close the jconfig.h file */

-  fclose(outfile);

-

-  /* User report */

-  printf("Configuration check for Independent JPEG Group's software done.\n");

-  printf("\nI have written the jconfig.h file for you.\n\n");

-#ifdef HAVE_PROTOTYPES

-  printf("You should use makefile.ansi as the starting point for your Makefile.\n");

-#else

-  printf("You should use makefile.unix as the starting point for your Makefile.\n");

-#endif

-

-#ifdef NEED_SPECIAL_INCLUDE

-  printf("\nYou'll need to change jconfig.h to include the system include file\n");

-  printf("that you found type size_t in, or add a direct definition of type\n");

-  printf("size_t if that's what you used.  Just add it to the end.\n");

-#endif

-

-  return 0;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/coderules.txt b/plugins/AdvaImg/src/LibJPEG/coderules.txt
deleted file mode 100644
index 382efad3a9..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/coderules.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-IJG JPEG LIBRARY:  CODING RULES

-

-Copyright (C) 1991-1996, 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.

-

-

-Since numerous people will be contributing code and bug fixes, it's important

-to establish a common coding style.  The goal of using similar coding styles

-is much more important than the details of just what that style is.

-

-In general we follow the recommendations of "Recommended C Style and Coding

-Standards" revision 6.1 (Cannon et al. as modified by Spencer, Keppel and

-Brader).  This document is available in the IJG FTP archive (see

-jpeg/doc/cstyle.ms.tbl.Z, or cstyle.txt.Z for those without nroff/tbl).

-

-Block comments should be laid out thusly:

-

-/*

- *  Block comments in this style.

- */

-

-We indent statements in K&R style, e.g.,

-	if (test) {

-	  then-part;

-	} else {

-	  else-part;

-	}

-with two spaces per indentation level.  (This indentation convention is

-handled automatically by GNU Emacs and many other text editors.)

-

-Multi-word names should be written in lower case with underscores, e.g.,

-multi_word_name (not multiWordName).  Preprocessor symbols and enum constants

-are similar but upper case (MULTI_WORD_NAME).  Names should be unique within

-the first fifteen characters.  (On some older systems, global names must be

-unique within six characters.  We accommodate this without cluttering the

-source code by using macros to substitute shorter names.)

-

-We use function prototypes everywhere; we rely on automatic source code

-transformation to feed prototype-less C compilers.  Transformation is done

-by the simple and portable tool 'ansi2knr.c' (courtesy of Ghostscript).

-ansi2knr is not very bright, so it imposes a format requirement on function

-declarations: the function name MUST BEGIN IN COLUMN 1.  Thus all functions

-should be written in the following style:

-

-LOCAL(int *)

-function_name (int a, char *b)

-{

-    code...

-}

-

-Note that each function definition must begin with GLOBAL(type), LOCAL(type),

-or METHODDEF(type).  These macros expand to "static type" or just "type" as

-appropriate.  They provide a readable indication of the routine's usage and

-can readily be changed for special needs.  (For instance, special linkage

-keywords can be inserted for use in Windows DLLs.)

-

-ansi2knr does not transform method declarations (function pointers in

-structs).  We handle these with a macro JMETHOD, defined as

-	#ifdef HAVE_PROTOTYPES

-	#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist

-	#else

-	#define JMETHOD(type,methodname,arglist)  type (*methodname) ()

-	#endif

-which is used like this:

-	struct function_pointers {

-	  JMETHOD(void, init_entropy_encoder, (int somearg, jparms *jp));

-	  JMETHOD(void, term_entropy_encoder, (void));

-	};

-Note the set of parentheses surrounding the parameter list.

-

-A similar solution is used for forward and external function declarations

-(see the EXTERN and JPP macros).

-

-If the code is to work on non-ANSI compilers, we cannot rely on a prototype

-declaration to coerce actual parameters into the right types.  Therefore, use

-explicit casts on actual parameters whenever the actual parameter type is not

-identical to the formal parameter.  Beware of implicit conversions to "int".

-

-It seems there are some non-ANSI compilers in which the sizeof() operator

-is defined to return int, yet size_t is defined as long.  Needless to say,

-this is brain-damaged.  Always use the SIZEOF() macro in place of sizeof(),

-so that the result is guaranteed to be of type size_t.

-

-

-The JPEG library is intended to be used within larger programs.  Furthermore,

-we want it to be reentrant so that it can be used by applications that process

-multiple images concurrently.  The following rules support these requirements:

-

-1. Avoid direct use of file I/O, "malloc", error report printouts, etc;

-pass these through the common routines provided.

-

-2. Minimize global namespace pollution.  Functions should be declared static

-wherever possible.  (Note that our method-based calling conventions help this

-a lot: in many modules only the initialization function will ever need to be

-called directly, so only that function need be externally visible.)  All

-global function names should begin with "jpeg_", and should have an

-abbreviated name (unique in the first six characters) substituted by macro

-when NEED_SHORT_EXTERNAL_NAMES is set.

-

-3. Don't use global variables; anything that must be used in another module

-should be in the common data structures.

-

-4. Don't use static variables except for read-only constant tables.  Variables

-that should be private to a module can be placed into private structures (see

-the system architecture document, structure.txt).

-

-5. Source file names should begin with "j" for files that are part of the

-library proper; source files that are not part of the library, such as cjpeg.c

-and djpeg.c, do not begin with "j".  Keep source file names to eight

-characters (plus ".c" or ".h", etc) to make life easy for MS-DOSers.  Keep

-compression and decompression code in separate source files --- some

-applications may want only one half of the library.

-

-Note: these rules (particularly #4) are not followed religiously in the

-modules that are used in cjpeg/djpeg but are not part of the JPEG library

-proper.  Those modules are not really intended to be used in other

-applications.

diff --git a/plugins/AdvaImg/src/LibJPEG/djpeg.c b/plugins/AdvaImg/src/LibJPEG/djpeg.c
deleted file mode 100644
index 2845f306c1..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/djpeg.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/*

- * djpeg.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2009-2015 by Guido Vollbeding.

- * 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 a command-line user interface for the JPEG decompressor.

- * It should work on any system with Unix- or MS-DOS-style command lines.

- *

- * Two different command line styles are permitted, depending on the

- * compile-time switch TWO_FILE_COMMANDLINE:

- *	djpeg [options]  inputfile outputfile

- *	djpeg [options]  [inputfile]

- * In the second style, output is always to standard output, which you'd

- * normally redirect to a file or pipe to some other program.  Input is

- * either from a named file or from standard input (typically redirected).

- * The second style is convenient on Unix but is unhelpful on systems that

- * don't support pipes.  Also, you MUST use the first style if your system

- * doesn't do binary I/O to stdin/stdout.

- * To simplify script writing, the "-outfile" switch is provided.  The syntax

- *	djpeg [options]  -outfile outputfile  inputfile

- * works regardless of which command line style is used.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-#include "jversion.h"		/* for version message */

-

-#include <ctype.h>		/* to declare isprint() */

-

-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */

-#ifdef __MWERKS__

-#include <SIOUX.h>              /* Metrowerks needs this */

-#include <console.h>		/* ... and this */

-#endif

-#ifdef THINK_C

-#include <console.h>		/* Think declares it here */

-#endif

-#endif

-

-

-/* Create the add-on message string table. */

-

-#define JMESSAGE(code,string)	string ,

-

-static const char * const cdjpeg_message_table[] = {

-#include "cderror.h"

-  NULL

-};

-

-

-/*

- * This list defines the known output image formats

- * (not all of which need be supported by a given version).

- * You can change the default output format by defining DEFAULT_FMT;

- * indeed, you had better do so if you undefine PPM_SUPPORTED.

- */

-

-typedef enum {

-	FMT_BMP,		/* BMP format (Windows flavor) */

-	FMT_GIF,		/* GIF format */

-	FMT_OS2,		/* BMP format (OS/2 flavor) */

-	FMT_PPM,		/* PPM/PGM (PBMPLUS formats) */

-	FMT_RLE,		/* RLE format */

-	FMT_TARGA,		/* Targa format */

-	FMT_TIFF		/* TIFF format */

-} IMAGE_FORMATS;

-

-#ifndef DEFAULT_FMT		/* so can override from CFLAGS in Makefile */

-#define DEFAULT_FMT	FMT_PPM

-#endif

-

-static IMAGE_FORMATS requested_fmt;

-

-

-/*

- * Argument-parsing code.

- * The switch parser is designed to be useful with DOS-style command line

- * syntax, ie, intermixed switches and file names, where only the switches

- * to the left of a given file name affect processing of that file.

- * The main program in this file doesn't actually use this capability...

- */

-

-

-static const char * progname;	/* program name for error messages */

-static char * outfilename;	/* for -outfile switch */

-

-

-LOCAL(void)

-usage (void)

-/* complain about bad command line */

-{

-  fprintf(stderr, "usage: %s [switches] ", progname);

-#ifdef TWO_FILE_COMMANDLINE

-  fprintf(stderr, "inputfile outputfile\n");

-#else

-  fprintf(stderr, "[inputfile]\n");

-#endif

-

-  fprintf(stderr, "Switches (names may be abbreviated):\n");

-  fprintf(stderr, "  -colors N      Reduce image to no more than N colors\n");

-  fprintf(stderr, "  -fast          Fast, low-quality processing\n");

-  fprintf(stderr, "  -grayscale     Force grayscale output\n");

-  fprintf(stderr, "  -rgb           Force RGB output\n");

-#ifdef IDCT_SCALING_SUPPORTED

-  fprintf(stderr, "  -scale M/N     Scale output image by fraction M/N, eg, 1/8\n");

-#endif

-#ifdef BMP_SUPPORTED

-  fprintf(stderr, "  -bmp           Select BMP output format (Windows style)%s\n",

-	  (DEFAULT_FMT == FMT_BMP ? " (default)" : ""));

-#endif

-#ifdef GIF_SUPPORTED

-  fprintf(stderr, "  -gif           Select GIF output format%s\n",

-	  (DEFAULT_FMT == FMT_GIF ? " (default)" : ""));

-#endif

-#ifdef BMP_SUPPORTED

-  fprintf(stderr, "  -os2           Select BMP output format (OS/2 style)%s\n",

-	  (DEFAULT_FMT == FMT_OS2 ? " (default)" : ""));

-#endif

-#ifdef PPM_SUPPORTED

-  fprintf(stderr, "  -pnm           Select PBMPLUS (PPM/PGM) output format%s\n",

-	  (DEFAULT_FMT == FMT_PPM ? " (default)" : ""));

-#endif

-#ifdef RLE_SUPPORTED

-  fprintf(stderr, "  -rle           Select Utah RLE output format%s\n",

-	  (DEFAULT_FMT == FMT_RLE ? " (default)" : ""));

-#endif

-#ifdef TARGA_SUPPORTED

-  fprintf(stderr, "  -targa         Select Targa output format%s\n",

-	  (DEFAULT_FMT == FMT_TARGA ? " (default)" : ""));

-#endif

-  fprintf(stderr, "Switches for advanced users:\n");

-#ifdef DCT_ISLOW_SUPPORTED

-  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",

-	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",

-	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",

-	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));

-#endif

-  fprintf(stderr, "  -dither fs     Use F-S dithering (default)\n");

-  fprintf(stderr, "  -dither none   Don't use dithering in quantization\n");

-  fprintf(stderr, "  -dither ordered  Use ordered dither (medium speed, quality)\n");

-#ifdef QUANT_2PASS_SUPPORTED

-  fprintf(stderr, "  -map FILE      Map to colors used in named image file\n");

-#endif

-  fprintf(stderr, "  -nosmooth      Don't use high-quality upsampling\n");

-#ifdef QUANT_1PASS_SUPPORTED

-  fprintf(stderr, "  -onepass       Use 1-pass quantization (fast, low quality)\n");

-#endif

-  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");

-  fprintf(stderr, "  -outfile name  Specify name for output file\n");

-  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");

-  exit(EXIT_FAILURE);

-}

-

-

-LOCAL(int)

-parse_switches (j_decompress_ptr cinfo, int argc, char **argv,

-		int last_file_arg_seen, boolean for_real)

-/* Parse optional switches.

- * Returns argv[] index of first file-name argument (== argc if none).

- * Any file names with indexes <= last_file_arg_seen are ignored;

- * they have presumably been processed in a previous iteration.

- * (Pass 0 for last_file_arg_seen on the first or only iteration.)

- * for_real is FALSE on the first (dummy) pass; we may skip any expensive

- * processing.

- */

-{

-  int argn;

-  char * arg;

-

-  /* Set up default JPEG parameters. */

-  requested_fmt = DEFAULT_FMT;	/* set default output file format */

-  outfilename = NULL;

-  cinfo->err->trace_level = 0;

-

-  /* Scan command line options, adjust parameters */

-

-  for (argn = 1; argn < argc; argn++) {

-    arg = argv[argn];

-    if (*arg != '-') {

-      /* Not a switch, must be a file name argument */

-      if (argn <= last_file_arg_seen) {

-	outfilename = NULL;	/* -outfile applies to just one input file */

-	continue;		/* ignore this name if previously processed */

-      }

-      break;			/* else done parsing switches */

-    }

-    arg++;			/* advance past switch marker character */

-

-    if (keymatch(arg, "bmp", 1)) {

-      /* BMP output format. */

-      requested_fmt = FMT_BMP;

-

-    } else if (keymatch(arg, "colors", 1) || keymatch(arg, "colours", 1) ||

-	       keymatch(arg, "quantize", 1) || keymatch(arg, "quantise", 1)) {

-      /* Do color quantization. */

-      int val;

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%d", &val) != 1)

-	usage();

-      cinfo->desired_number_of_colors = val;

-      cinfo->quantize_colors = TRUE;

-

-    } else if (keymatch(arg, "dct", 2)) {

-      /* Select IDCT algorithm. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "int", 1)) {

-	cinfo->dct_method = JDCT_ISLOW;

-      } else if (keymatch(argv[argn], "fast", 2)) {

-	cinfo->dct_method = JDCT_IFAST;

-      } else if (keymatch(argv[argn], "float", 2)) {

-	cinfo->dct_method = JDCT_FLOAT;

-      } else

-	usage();

-

-    } else if (keymatch(arg, "dither", 2)) {

-      /* Select dithering algorithm. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "fs", 2)) {

-	cinfo->dither_mode = JDITHER_FS;

-      } else if (keymatch(argv[argn], "none", 2)) {

-	cinfo->dither_mode = JDITHER_NONE;

-      } else if (keymatch(argv[argn], "ordered", 2)) {

-	cinfo->dither_mode = JDITHER_ORDERED;

-      } else

-	usage();

-

-    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {

-      /* Enable debug printouts. */

-      /* On first -d, print version identification */

-      static boolean printed_version = FALSE;

-

-      if (! printed_version) {

-	fprintf(stderr, "Independent JPEG Group's DJPEG, version %s\n%s\n",

-		JVERSION, JCOPYRIGHT);

-	printed_version = TRUE;

-      }

-      cinfo->err->trace_level++;

-

-    } else if (keymatch(arg, "fast", 1)) {

-      /* Select recommended processing options for quick-and-dirty output. */

-      cinfo->two_pass_quantize = FALSE;

-      cinfo->dither_mode = JDITHER_ORDERED;

-      if (! cinfo->quantize_colors) /* don't override an earlier -colors */

-	cinfo->desired_number_of_colors = 216;

-      cinfo->dct_method = JDCT_FASTEST;

-      cinfo->do_fancy_upsampling = FALSE;

-

-    } else if (keymatch(arg, "gif", 1)) {

-      /* GIF output format. */

-      requested_fmt = FMT_GIF;

-

-    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {

-      /* Force monochrome output. */

-      cinfo->out_color_space = JCS_GRAYSCALE;

-

-    } else if (keymatch(arg, "rgb", 3)) {

-      /* Force RGB output. */

-      cinfo->out_color_space = JCS_RGB;

-

-    } else if (keymatch(arg, "map", 3)) {

-      /* Quantize to a color map taken from an input file. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (for_real) {		/* too expensive to do twice! */

-#ifdef QUANT_2PASS_SUPPORTED	/* otherwise can't quantize to supplied map */

-	FILE * mapfile;

-

-	if ((mapfile = fopen(argv[argn], READ_BINARY)) == NULL) {

-	  fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);

-	  exit(EXIT_FAILURE);

-	}

-	read_color_map(cinfo, mapfile);

-	fclose(mapfile);

-	cinfo->quantize_colors = TRUE;

-#else

-	ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-      }

-

-    } else if (keymatch(arg, "maxmemory", 3)) {

-      /* Maximum memory in Kb (or Mb with 'm'). */

-      long lval;

-      char ch = 'x';

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)

-	usage();

-      if (ch == 'm' || ch == 'M')

-	lval *= 1000L;

-      cinfo->mem->max_memory_to_use = lval * 1000L;

-

-    } else if (keymatch(arg, "nosmooth", 3)) {

-      /* Suppress fancy upsampling. */

-      cinfo->do_fancy_upsampling = FALSE;

-

-    } else if (keymatch(arg, "onepass", 3)) {

-      /* Use fast one-pass quantization. */

-      cinfo->two_pass_quantize = FALSE;

-

-    } else if (keymatch(arg, "os2", 3)) {

-      /* BMP output format (OS/2 flavor). */

-      requested_fmt = FMT_OS2;

-

-    } else if (keymatch(arg, "outfile", 4)) {

-      /* Set output file name. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      outfilename = argv[argn];	/* save it away for later use */

-

-    } else if (keymatch(arg, "pnm", 1) || keymatch(arg, "ppm", 1)) {

-      /* PPM/PGM output format. */

-      requested_fmt = FMT_PPM;

-

-    } else if (keymatch(arg, "rle", 1)) {

-      /* RLE output format. */

-      requested_fmt = FMT_RLE;

-

-    } else if (keymatch(arg, "scale", 1)) {

-      /* Scale the output image by a fraction M/N. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%u/%u",

-		 &cinfo->scale_num, &cinfo->scale_denom) < 1)

-	usage();

-

-    } else if (keymatch(arg, "targa", 1)) {

-      /* Targa output format. */

-      requested_fmt = FMT_TARGA;

-

-    } else {

-      usage();			/* bogus switch */

-    }

-  }

-

-  return argn;			/* return index of next arg (file name) */

-}

-

-

-/*

- * Marker processor for COM and interesting APPn markers.

- * This replaces the library's built-in processor, which just skips the marker.

- * We want to print out the marker as text, to the extent possible.

- * Note this code relies on a non-suspending data source.

- */

-

-LOCAL(unsigned int)

-jpeg_getc (j_decompress_ptr cinfo)

-/* Read next byte */

-{

-  struct jpeg_source_mgr * datasrc = cinfo->src;

-

-  if (datasrc->bytes_in_buffer == 0) {

-    if (! (*datasrc->fill_input_buffer) (cinfo))

-      ERREXIT(cinfo, JERR_CANT_SUSPEND);

-  }

-  datasrc->bytes_in_buffer--;

-  return GETJOCTET(*datasrc->next_input_byte++);

-}

-

-

-METHODDEF(boolean)

-print_text_marker (j_decompress_ptr cinfo)

-{

-  boolean traceit = (cinfo->err->trace_level >= 1);

-  INT32 length;

-  unsigned int ch;

-  unsigned int lastch = 0;

-

-  length = jpeg_getc(cinfo) << 8;

-  length += jpeg_getc(cinfo);

-  length -= 2;			/* discount the length word itself */

-

-  if (traceit) {

-    if (cinfo->unread_marker == JPEG_COM)

-      fprintf(stderr, "Comment, length %ld:\n", (long) length);

-    else			/* assume it is an APPn otherwise */

-      fprintf(stderr, "APP%d, length %ld:\n",

-	      cinfo->unread_marker - JPEG_APP0, (long) length);

-  }

-

-  while (--length >= 0) {

-    ch = jpeg_getc(cinfo);

-    if (traceit) {

-      /* Emit the character in a readable form.

-       * Nonprintables are converted to \nnn form,

-       * while \ is converted to \\.

-       * Newlines in CR, CR/LF, or LF form will be printed as one newline.

-       */

-      if (ch == '\r') {

-	fprintf(stderr, "\n");

-      } else if (ch == '\n') {

-	if (lastch != '\r')

-	  fprintf(stderr, "\n");

-      } else if (ch == '\\') {

-	fprintf(stderr, "\\\\");

-      } else if (isprint(ch)) {

-	putc(ch, stderr);

-      } else {

-	fprintf(stderr, "\\%03o", ch);

-      }

-      lastch = ch;

-    }

-  }

-

-  if (traceit)

-    fprintf(stderr, "\n");

-

-  return TRUE;

-}

-

-

-/*

- * The main program.

- */

-

-int

-main (int argc, char **argv)

-{

-  struct jpeg_decompress_struct cinfo;

-  struct jpeg_error_mgr jerr;

-#ifdef PROGRESS_REPORT

-  struct cdjpeg_progress_mgr progress;

-#endif

-  int file_index;

-  djpeg_dest_ptr dest_mgr = NULL;

-  FILE * input_file;

-  FILE * output_file;

-  JDIMENSION num_scanlines;

-

-  /* On Mac, fetch a command line. */

-#ifdef USE_CCOMMAND

-  argc = ccommand(&argv);

-#endif

-

-  progname = argv[0];

-  if (progname == NULL || progname[0] == 0)

-    progname = "djpeg";		/* in case C library doesn't provide it */

-

-  /* Initialize the JPEG decompression object with default error handling. */

-  cinfo.err = jpeg_std_error(&jerr);

-  jpeg_create_decompress(&cinfo);

-  /* Add some application-specific error messages (from cderror.h) */

-  jerr.addon_message_table = cdjpeg_message_table;

-  jerr.first_addon_message = JMSG_FIRSTADDONCODE;

-  jerr.last_addon_message = JMSG_LASTADDONCODE;

-

-  /* Insert custom marker processor for COM and APP12.

-   * APP12 is used by some digital camera makers for textual info,

-   * so we provide the ability to display it as text.

-   * If you like, additional APPn marker types can be selected for display,

-   * but don't try to override APP0 or APP14 this way (see libjpeg.doc).

-   */

-  jpeg_set_marker_processor(&cinfo, JPEG_COM, print_text_marker);

-  jpeg_set_marker_processor(&cinfo, JPEG_APP0+12, print_text_marker);

-

-  /* Now safe to enable signal catcher. */

-#ifdef NEED_SIGNAL_CATCHER

-  enable_signal_catcher((j_common_ptr) &cinfo);

-#endif

-

-  /* Scan command line to find file names. */

-  /* It is convenient to use just one switch-parsing routine, but the switch

-   * values read here are ignored; we will rescan the switches after opening

-   * the input file.

-   * (Exception: tracing level set here controls verbosity for COM markers

-   * found during jpeg_read_header...)

-   */

-

-  file_index = parse_switches(&cinfo, argc, argv, 0, FALSE);

-

-#ifdef TWO_FILE_COMMANDLINE

-  /* Must have either -outfile switch or explicit output file name */

-  if (outfilename == NULL) {

-    if (file_index != argc-2) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-    outfilename = argv[file_index+1];

-  } else {

-    if (file_index != argc-1) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-  }

-#else

-  /* Unix style: expect zero or one file name */

-  if (file_index < argc-1) {

-    fprintf(stderr, "%s: only one input file\n", progname);

-    usage();

-  }

-#endif /* TWO_FILE_COMMANDLINE */

-

-  /* Open the input file. */

-  if (file_index < argc) {

-    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default input file is stdin */

-    input_file = read_stdin();

-  }

-

-  /* Open the output file. */

-  if (outfilename != NULL) {

-    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default output file is stdout */

-    output_file = write_stdout();

-  }

-

-#ifdef PROGRESS_REPORT

-  start_progress_monitor((j_common_ptr) &cinfo, &progress);

-#endif

-

-  /* Specify data source for decompression */

-  jpeg_stdio_src(&cinfo, input_file);

-

-  /* Read file header, set default decompression parameters */

-  (void) jpeg_read_header(&cinfo, TRUE);

-

-  /* Adjust default decompression parameters by re-parsing the options */

-  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);

-

-  /* Initialize the output module now to let it override any crucial

-   * option settings (for instance, GIF wants to force color quantization).

-   */

-  switch (requested_fmt) {

-#ifdef BMP_SUPPORTED

-  case FMT_BMP:

-    dest_mgr = jinit_write_bmp(&cinfo, FALSE);

-    break;

-  case FMT_OS2:

-    dest_mgr = jinit_write_bmp(&cinfo, TRUE);

-    break;

-#endif

-#ifdef GIF_SUPPORTED

-  case FMT_GIF:

-    dest_mgr = jinit_write_gif(&cinfo);

-    break;

-#endif

-#ifdef PPM_SUPPORTED

-  case FMT_PPM:

-    dest_mgr = jinit_write_ppm(&cinfo);

-    break;

-#endif

-#ifdef RLE_SUPPORTED

-  case FMT_RLE:

-    dest_mgr = jinit_write_rle(&cinfo);

-    break;

-#endif

-#ifdef TARGA_SUPPORTED

-  case FMT_TARGA:

-    dest_mgr = jinit_write_targa(&cinfo);

-    break;

-#endif

-  default:

-    ERREXIT(&cinfo, JERR_UNSUPPORTED_FORMAT);

-    break;

-  }

-  dest_mgr->output_file = output_file;

-

-  /* Start decompressor */

-  (void) jpeg_start_decompress(&cinfo);

-

-  /* Write output file header */

-  (*dest_mgr->start_output) (&cinfo, dest_mgr);

-

-  /* Process data */

-  while (cinfo.output_scanline < cinfo.output_height) {

-    num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,

-					dest_mgr->buffer_height);

-    (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);

-  }

-

-#ifdef PROGRESS_REPORT

-  /* Hack: count final pass as done in case finish_output does an extra pass.

-   * The library won't have updated completed_passes.

-   */

-  progress.pub.completed_passes = progress.pub.total_passes;

-#endif

-

-  /* Finish decompression and release memory.

-   * I must do it in this order because output module has allocated memory

-   * of lifespan JPOOL_IMAGE; it needs to finish before releasing memory.

-   */

-  (*dest_mgr->finish_output) (&cinfo, dest_mgr);

-  (void) jpeg_finish_decompress(&cinfo);

-  jpeg_destroy_decompress(&cinfo);

-

-  /* Close files, if we opened them */

-  if (input_file != stdin)

-    fclose(input_file);

-  if (output_file != stdout)

-    fclose(output_file);

-

-#ifdef PROGRESS_REPORT

-  end_progress_monitor((j_common_ptr) &cinfo);

-#endif

-

-  /* All done. */

-  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);

-  return 0;			/* suppress no-return-value warnings */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/example.c b/plugins/AdvaImg/src/LibJPEG/example.c
deleted file mode 100644
index e21cf12126..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/example.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*

- * example.c

- *

- * This file illustrates how to use the IJG code as a subroutine library

- * to read or write JPEG image files.  You should look at this code in

- * conjunction with the documentation file libjpeg.txt.

- *

- * This code will not do anything useful as-is, but it may be helpful as a

- * skeleton for constructing routines that call the JPEG library.  

- *

- * We present these routines in the same coding style used in the JPEG code

- * (ANSI function definitions, etc); but you are of course free to code your

- * routines in a different style if you prefer.

- */

-

-#include <stdio.h>

-

-/*

- * Include file for users of JPEG library.

- * You will need to have included system headers that define at least

- * the typedefs FILE and size_t before you can include jpeglib.h.

- * (stdio.h is sufficient on ANSI-conforming systems.)

- * You may also wish to include "jerror.h".

- */

-

-#include "jpeglib.h"

-

-/*

- * <setjmp.h> is used for the optional error recovery mechanism shown in

- * the second part of the example.

- */

-

-#include <setjmp.h>

-

-

-

-/******************** JPEG COMPRESSION SAMPLE INTERFACE *******************/

-

-/* This half of the example shows how to feed data into the JPEG compressor.

- * We present a minimal version that does not worry about refinements such

- * as error recovery (the JPEG code will just exit() if it gets an error).

- */

-

-

-/*

- * IMAGE DATA FORMATS:

- *

- * The standard input image format is a rectangular array of pixels, with

- * each pixel having the same number of "component" values (color channels).

- * Each pixel row is an array of JSAMPLEs (which typically are unsigned chars).

- * If you are working with color data, then the color values for each pixel

- * must be adjacent in the row; for example, R,G,B,R,G,B,R,G,B,... for 24-bit

- * RGB color.

- *

- * For this example, we'll assume that this data structure matches the way

- * our application has stored the image in memory, so we can just pass a

- * pointer to our image buffer.  In particular, let's say that the image is

- * RGB color and is described by:

- */

-

-extern JSAMPLE * image_buffer;	/* Points to large array of R,G,B-order data */

-extern int image_height;	/* Number of rows in image */

-extern int image_width;		/* Number of columns in image */

-

-

-/*

- * Sample routine for JPEG compression.  We assume that the target file name

- * and a compression quality factor are passed in.

- */

-

-GLOBAL(void)

-write_JPEG_file (char * filename, int quality)

-{

-  /* This struct contains the JPEG compression parameters and pointers to

-   * working space (which is allocated as needed by the JPEG library).

-   * It is possible to have several such structures, representing multiple

-   * compression/decompression processes, in existence at once.  We refer

-   * to any one struct (and its associated working data) as a "JPEG object".

-   */

-  struct jpeg_compress_struct cinfo;

-  /* This struct represents a JPEG error handler.  It is declared separately

-   * because applications often want to supply a specialized error handler

-   * (see the second half of this file for an example).  But here we just

-   * take the easy way out and use the standard error handler, which will

-   * print a message on stderr and call exit() if compression fails.

-   * Note that this struct must live as long as the main JPEG parameter

-   * struct, to avoid dangling-pointer problems.

-   */

-  struct jpeg_error_mgr jerr;

-  /* More stuff */

-  FILE * outfile;		/* target file */

-  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */

-  int row_stride;		/* physical row width in image buffer */

-

-  /* Step 1: allocate and initialize JPEG compression object */

-

-  /* We have to set up the error handler first, in case the initialization

-   * step fails.  (Unlikely, but it could happen if you are out of memory.)

-   * This routine fills in the contents of struct jerr, and returns jerr's

-   * address which we place into the link field in cinfo.

-   */

-  cinfo.err = jpeg_std_error(&jerr);

-  /* Now we can initialize the JPEG compression object. */

-  jpeg_create_compress(&cinfo);

-

-  /* Step 2: specify data destination (eg, a file) */

-  /* Note: steps 2 and 3 can be done in either order. */

-

-  /* Here we use the library-supplied code to send compressed data to a

-   * stdio stream.  You can also write your own code to do something else.

-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that

-   * requires it in order to write binary files.

-   */

-  if ((outfile = fopen(filename, "wb")) == NULL) {

-    fprintf(stderr, "can't open %s\n", filename);

-    exit(1);

-  }

-  jpeg_stdio_dest(&cinfo, outfile);

-

-  /* Step 3: set parameters for compression */

-

-  /* First we supply a description of the input image.

-   * Four fields of the cinfo struct must be filled in:

-   */

-  cinfo.image_width = image_width; 	/* image width and height, in pixels */

-  cinfo.image_height = image_height;

-  cinfo.input_components = 3;		/* # of color components per pixel */

-  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */

-  /* Now use the library's routine to set default compression parameters.

-   * (You must set at least cinfo.in_color_space before calling this,

-   * since the defaults depend on the source color space.)

-   */

-  jpeg_set_defaults(&cinfo);

-  /* Now you can set any non-default parameters you wish to.

-   * Here we just illustrate the use of quality (quantization table) scaling:

-   */

-  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);

-

-  /* Step 4: Start compressor */

-

-  /* TRUE ensures that we will write a complete interchange-JPEG file.

-   * Pass TRUE unless you are very sure of what you're doing.

-   */

-  jpeg_start_compress(&cinfo, TRUE);

-

-  /* Step 5: while (scan lines remain to be written) */

-  /*           jpeg_write_scanlines(...); */

-

-  /* Here we use the library's state variable cinfo.next_scanline as the

-   * loop counter, so that we don't have to keep track ourselves.

-   * To keep things simple, we pass one scanline per call; you can pass

-   * more if you wish, though.

-   */

-  row_stride = image_width * 3;	/* JSAMPLEs per row in image_buffer */

-

-  while (cinfo.next_scanline < cinfo.image_height) {

-    /* jpeg_write_scanlines expects an array of pointers to scanlines.

-     * Here the array is only one element long, but you could pass

-     * more than one scanline at a time if that's more convenient.

-     */

-    row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride];

-    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);

-  }

-

-  /* Step 6: Finish compression */

-

-  jpeg_finish_compress(&cinfo);

-  /* After finish_compress, we can close the output file. */

-  fclose(outfile);

-

-  /* Step 7: release JPEG compression object */

-

-  /* This is an important step since it will release a good deal of memory. */

-  jpeg_destroy_compress(&cinfo);

-

-  /* And we're done! */

-}

-

-

-/*

- * SOME FINE POINTS:

- *

- * In the above loop, we ignored the return value of jpeg_write_scanlines,

- * which is the number of scanlines actually written.  We could get away

- * with this because we were only relying on the value of cinfo.next_scanline,

- * which will be incremented correctly.  If you maintain additional loop

- * variables then you should be careful to increment them properly.

- * Actually, for output to a stdio stream you needn't worry, because

- * then jpeg_write_scanlines will write all the lines passed (or else exit

- * with a fatal error).  Partial writes can only occur if you use a data

- * destination module that can demand suspension of the compressor.

- * (If you don't know what that's for, you don't need it.)

- *

- * If the compressor requires full-image buffers (for entropy-coding

- * optimization or a multi-scan JPEG file), it will create temporary

- * files for anything that doesn't fit within the maximum-memory setting.

- * (Note that temp files are NOT needed if you use the default parameters.)

- * On some systems you may need to set up a signal handler to ensure that

- * temporary files are deleted if the program is interrupted.  See libjpeg.txt.

- *

- * Scanlines MUST be supplied in top-to-bottom order if you want your JPEG

- * files to be compatible with everyone else's.  If you cannot readily read

- * your data in that order, you'll need an intermediate array to hold the

- * image.  See rdtarga.c or rdbmp.c for examples of handling bottom-to-top

- * source data using the JPEG code's internal virtual-array mechanisms.

- */

-

-

-

-/******************** JPEG DECOMPRESSION SAMPLE INTERFACE *******************/

-

-/* This half of the example shows how to read data from the JPEG decompressor.

- * It's a bit more refined than the above, in that we show:

- *   (a) how to modify the JPEG library's standard error-reporting behavior;

- *   (b) how to allocate workspace using the library's memory manager.

- *

- * Just to make this example a little different from the first one, we'll

- * assume that we do not intend to put the whole image into an in-memory

- * buffer, but to send it line-by-line someplace else.  We need a one-

- * scanline-high JSAMPLE array as a work buffer, and we will let the JPEG

- * memory manager allocate it for us.  This approach is actually quite useful

- * because we don't need to remember to deallocate the buffer separately: it

- * will go away automatically when the JPEG object is cleaned up.

- */

-

-

-/*

- * ERROR HANDLING:

- *

- * The JPEG library's standard error handler (jerror.c) is divided into

- * several "methods" which you can override individually.  This lets you

- * adjust the behavior without duplicating a lot of code, which you might

- * have to update with each future release.

- *

- * Our example here shows how to override the "error_exit" method so that

- * control is returned to the library's caller when a fatal error occurs,

- * rather than calling exit() as the standard error_exit method does.

- *

- * We use C's setjmp/longjmp facility to return control.  This means that the

- * routine which calls the JPEG library must first execute a setjmp() call to

- * establish the return point.  We want the replacement error_exit to do a

- * longjmp().  But we need to make the setjmp buffer accessible to the

- * error_exit routine.  To do this, we make a private extension of the

- * standard JPEG error handler object.  (If we were using C++, we'd say we

- * were making a subclass of the regular error handler.)

- *

- * Here's the extended error handler struct:

- */

-

-struct my_error_mgr {

-  struct jpeg_error_mgr pub;	/* "public" fields */

-

-  jmp_buf setjmp_buffer;	/* for return to caller */

-};

-

-typedef struct my_error_mgr * my_error_ptr;

-

-/*

- * Here's the routine that will replace the standard error_exit method:

- */

-

-METHODDEF(void)

-my_error_exit (j_common_ptr cinfo)

-{

-  /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */

-  my_error_ptr myerr = (my_error_ptr) cinfo->err;

-

-  /* Always display the message. */

-  /* We could postpone this until after returning, if we chose. */

-  (*cinfo->err->output_message) (cinfo);

-

-  /* Return control to the setjmp point */

-  longjmp(myerr->setjmp_buffer, 1);

-}

-

-

-/*

- * Sample routine for JPEG decompression.  We assume that the source file name

- * is passed in.  We want to return 1 on success, 0 on error.

- */

-

-

-GLOBAL(int)

-read_JPEG_file (char * filename)

-{

-  /* This struct contains the JPEG decompression parameters and pointers to

-   * working space (which is allocated as needed by the JPEG library).

-   */

-  struct jpeg_decompress_struct cinfo;

-  /* We use our private extension JPEG error handler.

-   * Note that this struct must live as long as the main JPEG parameter

-   * struct, to avoid dangling-pointer problems.

-   */

-  struct my_error_mgr jerr;

-  /* More stuff */

-  FILE * infile;		/* source file */

-  JSAMPARRAY buffer;		/* Output row buffer */

-  int row_stride;		/* physical row width in output buffer */

-

-  /* In this example we want to open the input file before doing anything else,

-   * so that the setjmp() error recovery below can assume the file is open.

-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that

-   * requires it in order to read binary files.

-   */

-

-  if ((infile = fopen(filename, "rb")) == NULL) {

-    fprintf(stderr, "can't open %s\n", filename);

-    return 0;

-  }

-

-  /* Step 1: allocate and initialize JPEG decompression object */

-

-  /* We set up the normal JPEG error routines, then override error_exit. */

-  cinfo.err = jpeg_std_error(&jerr.pub);

-  jerr.pub.error_exit = my_error_exit;

-  /* Establish the setjmp return context for my_error_exit to use. */

-  if (setjmp(jerr.setjmp_buffer)) {

-    /* If we get here, the JPEG code has signaled an error.

-     * We need to clean up the JPEG object, close the input file, and return.

-     */

-    jpeg_destroy_decompress(&cinfo);

-    fclose(infile);

-    return 0;

-  }

-  /* Now we can initialize the JPEG decompression object. */

-  jpeg_create_decompress(&cinfo);

-

-  /* Step 2: specify data source (eg, a file) */

-

-  jpeg_stdio_src(&cinfo, infile);

-

-  /* Step 3: read file parameters with jpeg_read_header() */

-

-  (void) jpeg_read_header(&cinfo, TRUE);

-  /* We can ignore the return value from jpeg_read_header since

-   *   (a) suspension is not possible with the stdio data source, and

-   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.

-   * See libjpeg.txt for more info.

-   */

-

-  /* Step 4: set parameters for decompression */

-

-  /* In this example, we don't need to change any of the defaults set by

-   * jpeg_read_header(), so we do nothing here.

-   */

-

-  /* Step 5: Start decompressor */

-

-  (void) jpeg_start_decompress(&cinfo);

-  /* We can ignore the return value since suspension is not possible

-   * with the stdio data source.

-   */

-

-  /* We may need to do some setup of our own at this point before reading

-   * the data.  After jpeg_start_decompress() we have the correct scaled

-   * output image dimensions available, as well as the output colormap

-   * if we asked for color quantization.

-   * In this example, we need to make an output work buffer of the right size.

-   */ 

-  /* JSAMPLEs per row in output buffer */

-  row_stride = cinfo.output_width * cinfo.output_components;

-  /* Make a one-row-high sample array that will go away when done with image */

-  buffer = (*cinfo.mem->alloc_sarray)

-		((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);

-

-  /* Step 6: while (scan lines remain to be read) */

-  /*           jpeg_read_scanlines(...); */

-

-  /* Here we use the library's state variable cinfo.output_scanline as the

-   * loop counter, so that we don't have to keep track ourselves.

-   */

-  while (cinfo.output_scanline < cinfo.output_height) {

-    /* jpeg_read_scanlines expects an array of pointers to scanlines.

-     * Here the array is only one element long, but you could ask for

-     * more than one scanline at a time if that's more convenient.

-     */

-    (void) jpeg_read_scanlines(&cinfo, buffer, 1);

-    /* Assume put_scanline_someplace wants a pointer and sample count. */

-    put_scanline_someplace(buffer[0], row_stride);

-  }

-

-  /* Step 7: Finish decompression */

-

-  (void) jpeg_finish_decompress(&cinfo);

-  /* We can ignore the return value since suspension is not possible

-   * with the stdio data source.

-   */

-

-  /* Step 8: Release JPEG decompression object */

-

-  /* This is an important step since it will release a good deal of memory. */

-  jpeg_destroy_decompress(&cinfo);

-

-  /* After finish_decompress, we can close the input file.

-   * Here we postpone it until after no more JPEG errors are possible,

-   * so as to simplify the setjmp error logic above.  (Actually, I don't

-   * think that jpeg_destroy can do an error exit, but why assume anything...)

-   */

-  fclose(infile);

-

-  /* At this point you may want to check to see whether any corrupt-data

-   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).

-   */

-

-  /* And we're done! */

-  return 1;

-}

-

-

-/*

- * SOME FINE POINTS:

- *

- * In the above code, we ignored the return value of jpeg_read_scanlines,

- * which is the number of scanlines actually read.  We could get away with

- * this because we asked for only one line at a time and we weren't using

- * a suspending data source.  See libjpeg.txt for more info.

- *

- * We cheated a bit by calling alloc_sarray() after jpeg_start_decompress();

- * we should have done it beforehand to ensure that the space would be

- * counted against the JPEG max_memory setting.  In some systems the above

- * code would risk an out-of-memory error.  However, in general we don't

- * know the output image dimensions before jpeg_start_decompress(), unless we

- * call jpeg_calc_output_dimensions().  See libjpeg.txt for more about this.

- *

- * Scanlines are returned in the same order as they appear in the JPEG file,

- * which is standardly top-to-bottom.  If you must emit data bottom-to-top,

- * you can use one of the virtual arrays provided by the JPEG memory manager

- * to invert the data.  See wrbmp.c for an example.

- *

- * As with compression, some operating modes may require temporary files.

- * On some systems you may need to set up a signal handler to ensure that

- * temporary files are deleted if the program is interrupted.  See libjpeg.txt.

- */

diff --git a/plugins/AdvaImg/src/LibJPEG/filelist.txt b/plugins/AdvaImg/src/LibJPEG/filelist.txt
deleted file mode 100644
index 62aba52552..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/filelist.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-IJG JPEG LIBRARY:  FILE LIST

-

-Copyright (C) 1994-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.

-

-

-Here is a road map to the files in the IJG JPEG distribution.  The

-distribution includes the JPEG library proper, plus two application

-programs ("cjpeg" and "djpeg") which use the library to convert JPEG

-files to and from some other popular image formats.  A third application

-"jpegtran" uses the library to do lossless conversion between different

-variants of JPEG.  There are also two stand-alone applications,

-"rdjpgcom" and "wrjpgcom".

-

-

-THE JPEG LIBRARY

-================

-

-Include files:

-

-jpeglib.h	JPEG library's exported data and function declarations.

-jconfig.h	Configuration declarations.  Note: this file is not present

-		in the distribution; it is generated during installation.

-jmorecfg.h	Additional configuration declarations; need not be changed

-		for a standard installation.

-jerror.h	Declares JPEG library's error and trace message codes.

-jinclude.h	Central include file used by all IJG .c files to reference

-		system include files.

-jpegint.h	JPEG library's internal data structures.

-jdct.h		Private declarations for forward & reverse DCT subsystems.

-jmemsys.h	Private declarations for memory management subsystem.

-jversion.h	Version information.

-

-Applications using the library should include jpeglib.h (which in turn

-includes jconfig.h and jmorecfg.h).  Optionally, jerror.h may be included

-if the application needs to reference individual JPEG error codes.  The

-other include files are intended for internal use and would not normally

-be included by an application program.  (cjpeg/djpeg/etc do use jinclude.h,

-since its function is to improve portability of the whole IJG distribution.

-Most other applications will directly include the system include files they

-want, and hence won't need jinclude.h.)

-

-

-C source code files:

-

-These files contain most of the functions intended to be called directly by

-an application program:

-

-jcapimin.c	Application program interface: core routines for compression.

-jcapistd.c	Application program interface: standard compression.

-jdapimin.c	Application program interface: core routines for decompression.

-jdapistd.c	Application program interface: standard decompression.

-jcomapi.c	Application program interface routines common to compression

-		and decompression.

-jcparam.c	Compression parameter setting helper routines.

-jctrans.c	API and library routines for transcoding compression.

-jdtrans.c	API and library routines for transcoding decompression.

-

-Compression side of the library:

-

-jcinit.c	Initialization: determines which other modules to use.

-jcmaster.c	Master control: setup and inter-pass sequencing logic.

-jcmainct.c	Main buffer controller (preprocessor => JPEG compressor).

-jcprepct.c	Preprocessor buffer controller.

-jccoefct.c	Buffer controller for DCT coefficient buffer.

-jccolor.c	Color space conversion.

-jcsample.c	Downsampling.

-jcdctmgr.c	DCT manager (DCT implementation selection & control).

-jfdctint.c	Forward DCT using slow-but-accurate integer method.

-jfdctfst.c	Forward DCT using faster, less accurate integer method.

-jfdctflt.c	Forward DCT using floating-point arithmetic.

-jchuff.c	Huffman entropy coding.

-jcarith.c	Arithmetic entropy coding.

-jcmarker.c	JPEG marker writing.

-jdatadst.c	Data destination managers for memory and stdio output.

-

-Decompression side of the library:

-

-jdmaster.c	Master control: determines which other modules to use.

-jdinput.c	Input controller: controls input processing modules.

-jdmainct.c	Main buffer controller (JPEG decompressor => postprocessor).

-jdcoefct.c	Buffer controller for DCT coefficient buffer.

-jdpostct.c	Postprocessor buffer controller.

-jdmarker.c	JPEG marker reading.

-jdhuff.c	Huffman entropy decoding.

-jdarith.c	Arithmetic entropy decoding.

-jddctmgr.c	IDCT manager (IDCT implementation selection & control).

-jidctint.c	Inverse DCT using slow-but-accurate integer method.

-jidctfst.c	Inverse DCT using faster, less accurate integer method.

-jidctflt.c	Inverse DCT using floating-point arithmetic.

-jdsample.c	Upsampling.

-jdcolor.c	Color space conversion.

-jdmerge.c	Merged upsampling/color conversion (faster, lower quality).

-jquant1.c	One-pass color quantization using a fixed-spacing colormap.

-jquant2.c	Two-pass color quantization using a custom-generated colormap.

-		Also handles one-pass quantization to an externally given map.

-jdatasrc.c	Data source managers for memory and stdio input.

-

-Support files for both compression and decompression:

-

-jaricom.c	Tables for common use in arithmetic entropy encoding and

-		decoding routines.

-jerror.c	Standard error handling routines (application replaceable).

-jmemmgr.c	System-independent (more or less) memory management code.

-jutils.c	Miscellaneous utility routines.

-

-jmemmgr.c relies on a system-dependent memory management module.  The IJG

-distribution includes the following implementations of the system-dependent

-module:

-

-jmemnobs.c	"No backing store": assumes adequate virtual memory exists.

-jmemansi.c	Makes temporary files with ANSI-standard routine tmpfile().

-jmemname.c	Makes temporary files with program-generated file names.

-jmemdos.c	Custom implementation for MS-DOS (16-bit environment only):

-		can use extended and expanded memory as well as temp files.

-jmemmac.c	Custom implementation for Apple Macintosh.

-

-Exactly one of the system-dependent modules should be configured into an

-installed JPEG library (see install.txt for hints about which one to use).

-On unusual systems you may find it worthwhile to make a special

-system-dependent memory manager.

-

-

-Non-C source code files:

-

-jmemdosa.asm	80x86 assembly code support for jmemdos.c; used only in

-		MS-DOS-specific configurations of the JPEG library.

-

-

-CJPEG/DJPEG/JPEGTRAN

-====================

-

-Include files:

-

-cdjpeg.h	Declarations shared by cjpeg/djpeg/jpegtran modules.

-cderror.h	Additional error and trace message codes for cjpeg et al.

-transupp.h	Declarations for jpegtran support routines in transupp.c.

-

-C source code files:

-

-cjpeg.c		Main program for cjpeg.

-djpeg.c		Main program for djpeg.

-jpegtran.c	Main program for jpegtran.

-cdjpeg.c	Utility routines used by all three programs.

-rdcolmap.c	Code to read a colormap file for djpeg's "-map" switch.

-rdswitch.c	Code to process some of cjpeg's more complex switches.

-		Also used by jpegtran.

-transupp.c	Support code for jpegtran: lossless image manipulations.

-

-Image file reader modules for cjpeg:

-

-rdbmp.c		BMP file input.

-rdgif.c		GIF file input (now just a stub).

-rdppm.c		PPM/PGM file input.

-rdrle.c		Utah RLE file input.

-rdtarga.c	Targa file input.

-

-Image file writer modules for djpeg:

-

-wrbmp.c		BMP file output.

-wrgif.c		GIF file output (a mere shadow of its former self).

-wrppm.c		PPM/PGM file output.

-wrrle.c		Utah RLE file output.

-wrtarga.c	Targa file output.

-

-

-RDJPGCOM/WRJPGCOM

-=================

-

-C source code files:

-

-rdjpgcom.c	Stand-alone rdjpgcom application.

-wrjpgcom.c	Stand-alone wrjpgcom application.

-

-These programs do not depend on the IJG library.  They do use

-jconfig.h and jinclude.h, only to improve portability.

-

-

-ADDITIONAL FILES

-================

-

-Documentation (see README for a guide to the documentation files):

-

-README		Master documentation file.

-*.txt		Other documentation files.

-*.1		Documentation in Unix man page format.

-change.log	Version-to-version change highlights.

-example.c	Sample code for calling JPEG library.

-

-Configuration/installation files and programs (see install.txt for more info):

-

-configure	Unix shell script to perform automatic configuration.

-configure.ac	Source file for use with Autoconf to generate configure.

-ltmain.sh	Support scripts for configure (from GNU libtool).

-config.guess

-config.sub

-depcomp

-missing

-ar-lib

-compile

-install-sh	Install shell script for those Unix systems lacking one.

-Makefile.in	Makefile input for configure.

-Makefile.am	Source file for use with Automake to generate Makefile.in.

-ckconfig.c	Program to generate jconfig.h on non-Unix systems.

-jconfig.txt	Template for making jconfig.h by hand.

-mak*.*		Sample makefiles for particular systems.

-jconfig.*	Sample jconfig.h for particular systems.

-libjpeg.map	Script to generate shared library with versioned symbols.

-aclocal.m4	M4 macro definitions for use with Autoconf.

-

-Test files (see install.txt for test procedure):

-

-test*.*		Source and comparison files for confidence test.

-		These are binary image files, NOT text files.

diff --git a/plugins/AdvaImg/src/LibJPEG/install.txt b/plugins/AdvaImg/src/LibJPEG/install.txt
deleted file mode 100644
index 44a14a28ff..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/install.txt
+++ /dev/null
@@ -1,1107 +0,0 @@
-INSTALLATION INSTRUCTIONS for the Independent JPEG Group's JPEG software

-

-Copyright (C) 1991-2015, 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.

-

-

-This file explains how to configure and install the IJG software.  We have

-tried to make this software extremely portable and flexible, so that it can be

-adapted to almost any environment.  The downside of this decision is that the

-installation process is complicated.  We have provided shortcuts to simplify

-the task on common systems.  But in any case, you will need at least a little

-familiarity with C programming and program build procedures for your system.

-

-If you are only using this software as part of a larger program, the larger

-program's installation procedure may take care of configuring the IJG code.

-For example, Ghostscript's installation script will configure the IJG code.

-You don't need to read this file if you just want to compile Ghostscript.

-

-If you are on a Unix machine, you may not need to read this file at all.

-Try doing

-	./configure

-	make

-	make test

-If that doesn't complain, do

-	make install

-(better do "make -n install" first to see if the makefile will put the files

-where you want them).  Read further if you run into snags or want to customize

-the code for your system.

-

-

-TABLE OF CONTENTS

------------------

-

-Before you start

-Configuring the software:

-	using the automatic "configure" script

-	using one of the supplied jconfig and makefile files

-	by hand

-Building the software

-Testing the software

-Installing the software

-Optional stuff

-Optimization

-Hints for specific systems

-

-

-BEFORE YOU START

-================

-

-Before installing the software you must unpack the distributed source code.

-Since you are reading this file, you have probably already succeeded in this

-task.  However, there is a potential for error if you needed to convert the

-files to the local standard text file format (for example, if you are on

-MS-DOS you may have converted LF end-of-line to CR/LF).  You must apply

-such conversion to all the files EXCEPT those whose names begin with "test".

-The test files contain binary data; if you change them in any way then the

-self-test will give bad results.

-

-Please check the last section of this file to see if there are hints for the

-specific machine or compiler you are using.

-

-

-CONFIGURING THE SOFTWARE

-========================

-

-To configure the IJG code for your system, you need to create two files:

-  * jconfig.h: contains values for system-dependent #define symbols.

-  * Makefile: controls the compilation process.

-(On a non-Unix machine, you may create "project files" or some other

-substitute for a Makefile.  jconfig.h is needed in any environment.)

-

-We provide three different ways to generate these files:

-  * On a Unix system, you can just run the "configure" script.

-  * We provide sample jconfig files and makefiles for popular machines;

-    if your machine matches one of the samples, just copy the right sample

-    files to jconfig.h and Makefile.

-  * If all else fails, read the instructions below and make your own files.

-

-

-Configuring the software using the automatic "configure" script

----------------------------------------------------------------

-

-If you are on a Unix machine, you can just type

-	./configure

-and let the configure script construct appropriate configuration files.

-If you're using "csh" on an old version of System V, you might need to type

-	sh configure

-instead to prevent csh from trying to execute configure itself.

-Expect configure to run for a few minutes, particularly on slower machines;

-it works by compiling a series of test programs.

-

-Configure was created with GNU Autoconf and it follows the usual conventions

-for GNU configure scripts.  It makes a few assumptions that you may want to

-override.  You can do this by providing optional switches to configure:

-

-* Configure will build both static and shared libraries, if possible.

-If you want to build libjpeg only as a static library, say

-	./configure --disable-shared

-If you want to build libjpeg only as a shared library, say

-	./configure --disable-static

-Configure uses GNU libtool to take care of system-dependent shared library

-building methods.

-

-* Configure will use gcc (GNU C compiler) if it's available, otherwise cc.

-To force a particular compiler to be selected, use the CC option, for example

-	./configure CC='cc'

-The same method can be used to include any unusual compiler switches.

-For example, on HP-UX you probably want to say

-	./configure CC='cc -Aa'

-to get HP's compiler to run in ANSI mode.

-

-* The default CFLAGS setting is "-g" for non-gcc compilers, "-g -O2" for gcc.

-You can override this by saying, for example,

-	./configure CFLAGS='-O2'

-if you want to compile without debugging support.

-

-* Configure will set up the makefile so that "make install" will install files

-into /usr/local/bin, /usr/local/man, etc.  You can specify an installation

-prefix other than "/usr/local" by giving configure the option "--prefix=PATH".

-

-* If you don't have a lot of swap space, you may need to enable the IJG

-software's internal virtual memory mechanism.  To do this, give the option

-"--enable-maxmem=N" where N is the default maxmemory limit in megabytes.

-This is discussed in more detail under "Selecting a memory manager", below.

-You probably don't need to worry about this on reasonably-sized Unix machines,

-unless you plan to process very large images.

-

-Configure has some other features that are useful if you are cross-compiling

-or working in a network of multiple machine types; but if you need those

-features, you probably already know how to use them.

-

-

-Configuring the software using one of the supplied jconfig and makefile files

------------------------------------------------------------------------------

-

-If you have one of these systems, you can just use the provided configuration

-files:

-

-Makefile	jconfig file	System and/or compiler

-

-makefile.manx	jconfig.manx	Amiga, Manx Aztec C

-makefile.sas	jconfig.sas	Amiga, SAS C

-makeproj.mac	jconfig.mac	Apple Macintosh, Metrowerks CodeWarrior

-mak*jpeg.st	jconfig.st	Atari ST/STE/TT, Pure C or Turbo C

-makefile.bcc	jconfig.bcc	MS-DOS or OS/2, Borland C

-makefile.dj	jconfig.dj	MS-DOS, DJGPP (Delorie's port of GNU C)

-makefile.mc6	jconfig.mc6	MS-DOS, Microsoft C (16-bit only)

-makefile.wat	jconfig.wat	MS-DOS, OS/2, or Windows NT, Watcom C

-makefile.vc	jconfig.vc	Windows NT/9x, MS Visual C++

-make*.vc6	jconfig.vc	Windows NT/9x, MS Visual C++ 6

-make*.v10	jconfig.vc	Windows NT/9x, MS Visual C++ 2010 (v10)

-makefile.b32	jconfig.vc	Windows NT/9x, Borland C++ 32-bit (bcc32)

-makefile.mms	jconfig.vms	Digital VMS, with MMS software

-makefile.vms	jconfig.vms	Digital VMS, without MMS software

-

-Copy the proper jconfig file to jconfig.h and the makefile to Makefile (or

-whatever your system uses as the standard makefile name).  For more info see

-the appropriate system-specific hints section near the end of this file.

-

-

-Configuring the software by hand

---------------------------------

-

-First, generate a jconfig.h file.  If you are moderately familiar with C,

-the comments in jconfig.txt should be enough information to do this; just

-copy jconfig.txt to jconfig.h and edit it appropriately.  Otherwise, you may

-prefer to use the ckconfig.c program.  You will need to compile and execute

-ckconfig.c by hand --- we hope you know at least enough to do that.

-ckconfig.c may not compile the first try (in fact, the whole idea is for it

-to fail if anything is going to).  If you get compile errors, fix them by

-editing ckconfig.c according to the directions given in ckconfig.c.  Once

-you get it to run, it will write a suitable jconfig.h file, and will also

-print out some advice about which makefile to use.

-

-You may also want to look at the canned jconfig files, if there is one for a

-system similar to yours.

-

-Second, select a makefile and copy it to Makefile (or whatever your system

-uses as the standard makefile name).  The most generic makefiles we provide

-are

-	makefile.ansi:	if your C compiler supports function prototypes

-	makefile.unix:	if not.

-(You have function prototypes if ckconfig.c put "#define HAVE_PROTOTYPES"

-in jconfig.h.)  You may want to start from one of the other makefiles if

-there is one for a system similar to yours.

-

-Look over the selected Makefile and adjust options as needed.  In particular

-you may want to change the CC and CFLAGS definitions.  For instance, if you

-are using GCC, set CC=gcc.  If you had to use any compiler switches to get

-ckconfig.c to work, make sure the same switches are in CFLAGS.

-

-If you are on a system that doesn't use makefiles, you'll need to set up

-project files (or whatever you do use) to compile all the source files and

-link them into executable files cjpeg, djpeg, jpegtran, rdjpgcom, and wrjpgcom.

-See the file lists in any of the makefiles to find out which files go into

-each program.  Note that the provided makefiles all make a "library" file

-libjpeg first, but you don't have to do that if you don't want to; the file

-lists identify which source files are actually needed for compression,

-decompression, or both.  As a last resort, you can make a batch script that

-just compiles everything and links it all together; makefile.vms is an example

-of this (it's for VMS systems that have no make-like utility).

-

-Here are comments about some specific configuration decisions you'll

-need to make:

-

-Command line style

-------------------

-

-These programs can use a Unix-like command line style which supports

-redirection and piping, like this:

-	cjpeg inputfile >outputfile

-	cjpeg <inputfile >outputfile

-	source program | cjpeg >outputfile

-The simpler "two file" command line style is just

-	cjpeg inputfile outputfile

-You may prefer the two-file style, particularly if you don't have pipes.

-

-You MUST use two-file style on any system that doesn't cope well with binary

-data fed through stdin/stdout; this is true for some MS-DOS compilers, for

-example.  If you're not on a Unix system, it's safest to assume you need

-two-file style.  (But if your compiler provides either the Posix-standard

-fdopen() library routine or a Microsoft-compatible setmode() routine, you

-can safely use the Unix command line style, by defining USE_FDOPEN or

-USE_SETMODE respectively.)

-

-To use the two-file style, make jconfig.h say "#define TWO_FILE_COMMANDLINE".

-

-Selecting a memory manager

---------------------------

-

-The IJG code is capable of working on images that are too big to fit in main

-memory; data is swapped out to temporary files as necessary.  However, the

-code to do this is rather system-dependent.  We provide five different

-memory managers:

-

-* jmemansi.c	This version uses the ANSI-standard library routine tmpfile(),

-		which not all non-ANSI systems have.  On some systems

-		tmpfile() may put the temporary file in a non-optimal

-		location; if you don't like what it does, use jmemname.c.

-

-* jmemname.c	This version creates named temporary files.  For anything

-		except a Unix machine, you'll need to configure the

-		select_file_name() routine appropriately; see the comments

-		near the head of jmemname.c.  If you use this version, define

-		NEED_SIGNAL_CATCHER in jconfig.h to make sure the temp files

-		are removed if the program is aborted.

-

-* jmemnobs.c	(That stands for No Backing Store :-).)  This will compile on

-		almost any system, but it assumes you have enough main memory

-		or virtual memory to hold the biggest images you work with.

-

-* jmemdos.c	This should be used with most 16-bit MS-DOS compilers.

-		See the system-specific notes about MS-DOS for more info.

-		IMPORTANT: if you use this, define USE_MSDOS_MEMMGR in

-		jconfig.h, and include the assembly file jmemdosa.asm in the

-		programs.  The supplied makefiles and jconfig files for

-		16-bit MS-DOS compilers already do both.

-

-* jmemmac.c	Custom version for Apple Macintosh; see the system-specific

-		notes for Macintosh for more info.

-

-To use a particular memory manager, change the SYSDEPMEM variable in your

-makefile to equal the corresponding object file name (for example, jmemansi.o

-or jmemansi.obj for jmemansi.c).

-

-If you have plenty of (real or virtual) main memory, just use jmemnobs.c.

-"Plenty" means about ten bytes for every pixel in the largest images

-you plan to process, so a lot of systems don't meet this criterion.

-If yours doesn't, try jmemansi.c first.  If that doesn't compile, you'll have

-to use jmemname.c; be sure to adjust select_file_name() for local conditions.

-You may also need to change unlink() to remove() in close_backing_store().

-

-Except with jmemnobs.c or jmemmac.c, you need to adjust the DEFAULT_MAX_MEM

-setting to a reasonable value for your system (either by adding a #define for

-DEFAULT_MAX_MEM to jconfig.h, or by adding a -D switch to the Makefile).

-This value limits the amount of data space the program will attempt to

-allocate.  Code and static data space isn't counted, so the actual memory

-needs for cjpeg or djpeg are typically 100 to 150Kb more than the max-memory

-setting.  Larger max-memory settings reduce the amount of I/O needed to

-process a large image, but too large a value can result in "insufficient

-memory" failures.  On most Unix machines (and other systems with virtual

-memory), just set DEFAULT_MAX_MEM to several million and forget it.  At the

-other end of the spectrum, for MS-DOS machines you probably can't go much

-above 300K to 400K.  (On MS-DOS the value refers to conventional memory only.

-Extended/expanded memory is handled separately by jmemdos.c.)

-

-

-BUILDING THE SOFTWARE

-=====================

-

-Now you should be able to compile the software.  Just say "make" (or

-whatever's necessary to start the compilation).  Have a cup of coffee.

-

-Here are some things that could go wrong:

-

-If your compiler complains about undefined structures, you should be able to

-shut it up by putting "#define INCOMPLETE_TYPES_BROKEN" in jconfig.h.

-

-If you have trouble with missing system include files or inclusion of the

-wrong ones, read jinclude.h.  This shouldn't happen if you used configure

-or ckconfig.c to set up jconfig.h.

-

-There are a fair number of routines that do not use all of their parameters;

-some compilers will issue warnings about this, which you can ignore.  There

-are also a few configuration checks that may give "unreachable code" warnings.

-Any other warning deserves investigation.

-

-If you don't have a getenv() library routine, define NO_GETENV.

-

-Also see the system-specific hints, below.

-

-

-TESTING THE SOFTWARE

-====================

-

-As a quick test of functionality we've included a small sample image in

-several forms:

-	testorig.jpg	Starting point for the djpeg tests.

-	testimg.ppm	The output of djpeg testorig.jpg

-	testimg.bmp	The output of djpeg -bmp -colors 256 testorig.jpg

-	testimg.jpg	The output of cjpeg testimg.ppm

-	testprog.jpg	Progressive-mode equivalent of testorig.jpg.

-	testimgp.jpg	The output of cjpeg -progressive -optimize testimg.ppm

-(The first- and second-generation .jpg files aren't identical since the

-default compression parameters are lossy.)  If you can generate duplicates

-of the testimg* files then you probably have working programs.

-

-With most of the makefiles, "make test" will perform the necessary

-comparisons.

-

-If you're using a makefile that doesn't provide the test option, run djpeg

-and cjpeg by hand and compare the output files to testimg* with whatever

-binary file comparison tool you have.  The files should be bit-for-bit

-identical.

-

-If the programs complain "MAX_ALLOC_CHUNK is wrong, please fix", then you

-need to reduce MAX_ALLOC_CHUNK to a value that fits in type size_t.

-Try adding "#define MAX_ALLOC_CHUNK 65520L" to jconfig.h.  A less likely

-configuration error is "ALIGN_TYPE is wrong, please fix": defining ALIGN_TYPE

-as long should take care of that one.

-

-If the cjpeg test run fails with "Missing Huffman code table entry", it's a

-good bet that you needed to define RIGHT_SHIFT_IS_UNSIGNED.  Go back to the

-configuration step and run ckconfig.c.  (This is a good plan for any other

-test failure, too.)

-

-If you are using Unix (one-file) command line style on a non-Unix system,

-it's a good idea to check that binary I/O through stdin/stdout actually

-works.  You should get the same results from "djpeg <testorig.jpg >out.ppm"

-as from "djpeg -outfile out.ppm testorig.jpg".  Note that the makefiles all

-use the latter style and therefore do not exercise stdin/stdout!  If this

-check fails, try recompiling with USE_SETMODE or USE_FDOPEN defined.

-If it still doesn't work, better use two-file style.

-

-If you chose a memory manager other than jmemnobs.c, you should test that

-temporary-file usage works.  Try "djpeg -bmp -colors 256 -max 0 testorig.jpg"

-and make sure its output matches testimg.bmp.  If you have any really large

-images handy, try compressing them with -optimize and/or decompressing with

--colors 256 to make sure your DEFAULT_MAX_MEM setting is not too large.

-

-NOTE: this is far from an exhaustive test of the JPEG software; some modules,

-such as 1-pass color quantization, are not exercised at all.  It's just a

-quick test to give you some confidence that you haven't missed something

-major.

-

-

-INSTALLING THE SOFTWARE

-=======================

-

-Once you're done with the above steps, you can install the software by

-copying the executable files (cjpeg, djpeg, jpegtran, rdjpgcom, and wrjpgcom)

-to wherever you normally install programs.  On Unix systems, you'll also want

-to put the man pages (cjpeg.1, djpeg.1, jpegtran.1, rdjpgcom.1, wrjpgcom.1)

-in the man-page directory.  The pre-fab makefiles don't support this step

-since there's such a wide variety of installation procedures on different

-systems.

-

-If you generated a Makefile with the "configure" script, you can just say

-	make install

-to install the programs and their man pages into the standard places.

-(You'll probably need to be root to do this.)  We recommend first saying

-	make -n install

-to see where configure thought the files should go.  You may need to edit

-the Makefile, particularly if your system's conventions for man page

-filenames don't match what configure expects.

-

-If you want to install the IJG library itself, for use in compiling other

-programs besides ours, then you need to put the four include files

-	jpeglib.h jerror.h jconfig.h jmorecfg.h

-into your include-file directory, and put the library file libjpeg.a

-(extension may vary depending on system) wherever library files go.

-If you generated a Makefile with "configure", it will do what it thinks

-is the right thing if you say

-	make install-lib

-

-

-OPTIONAL STUFF

-==============

-

-Progress monitor:

-

-If you like, you can #define PROGRESS_REPORT (in jconfig.h) to enable display

-of percent-done progress reports.  The routine provided in cdjpeg.c merely

-prints percentages to stderr, but you can customize it to do something

-fancier.

-

-Utah RLE file format support:

-

-We distribute the software with support for RLE image files (Utah Raster

-Toolkit format) disabled, because the RLE support won't compile without the

-Utah library.  If you have URT version 3.1 or later, you can enable RLE

-support as follows:

-	1.  #define RLE_SUPPORTED in jconfig.h.

-	2.  Add a -I option to CFLAGS in the Makefile for the directory

-	    containing the URT .h files (typically the "include"

-	    subdirectory of the URT distribution).

-	3.  Add -L... -lrle to LDLIBS in the Makefile, where ... specifies

-	    the directory containing the URT "librle.a" file (typically the

-	    "lib" subdirectory of the URT distribution).

-

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

-

-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 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 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, 9-bit to 12-bit support does not work on 16-bit-int machines.

-

-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 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 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=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 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:

-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:

-

-If you need to make a smaller version of the JPEG software, some optional

-functions can be removed at compile time.  See the xxx_SUPPORTED #defines in

-jconfig.h and jmorecfg.h.  If at all possible, we recommend that you leave in

-decoder support for all valid JPEG files, to ensure that you can read anyone's

-output.  Taking out support for image file formats that you don't use is the

-most painless way to make the programs smaller.  Another possibility is to

-remove some of the DCT methods: in particular, the "IFAST" method may not be

-enough faster than the others to be worth keeping on your machine.  (If you

-do remove ISLOW or IFAST, be sure to redefine JDCT_DEFAULT or JDCT_FASTEST

-to a supported method, by adding a #define in jconfig.h.)

-

-

-OPTIMIZATION

-============

-

-Unless you own a Cray, you'll probably be interested in making the JPEG

-software go as fast as possible.  This section covers some machine-dependent

-optimizations you may want to try.  We suggest that before trying any of

-this, you first get the basic installation to pass the self-test step.

-Repeat the self-test after any optimization to make sure that you haven't

-broken anything.

-

-The integer DCT routines perform a lot of multiplications.  These

-multiplications must yield 32-bit results, but none of their input values

-are more than 16 bits wide.  On many machines, notably the 680x0 and 80x86

-CPUs, a 16x16=>32 bit multiply instruction is faster than a full 32x32=>32

-bit multiply.  Unfortunately there is no portable way to specify such a

-multiplication in C, but some compilers can generate one when you use the

-right combination of casts.  See the MULTIPLYxxx macro definitions in

-jdct.h.  If your compiler makes "int" be 32 bits and "short" be 16 bits,

-defining SHORTxSHORT_32 is fairly likely to work.  When experimenting with

-alternate definitions, be sure to test not only whether the code still works

-(use the self-test), but also whether it is actually faster --- on some

-compilers, alternate definitions may compute the right answer, yet be slower

-than the default.  Timing cjpeg on a large PGM (grayscale) input file is the

-best way to check this, as the DCT will be the largest fraction of the runtime

-in that mode.  (Note: some of the distributed compiler-specific jconfig files

-already contain #define switches to select appropriate MULTIPLYxxx

-definitions.)

-

-If your machine has sufficiently fast floating point hardware, you may find

-that the float DCT method is faster than the integer DCT methods, even

-after tweaking the integer multiply macros.  In that case you may want to

-make the float DCT be the default method.  (The only objection to this is

-that float DCT results may vary slightly across machines.)  To do that, add

-"#define JDCT_DEFAULT JDCT_FLOAT" to jconfig.h.  Even if you don't change

-the default, you should redefine JDCT_FASTEST, which is the method selected

-by djpeg's -fast switch.  Don't forget to update the documentation files

-(usage.txt and/or cjpeg.1, djpeg.1) to agree with what you've done.

-

-If access to "short" arrays is slow on your machine, it may be a win to

-define type JCOEF as int rather than short.  This will cost a good deal of

-memory though, particularly in some multi-pass modes, so don't do it unless

-you have memory to burn and short is REALLY slow.

-

-If your compiler can compile function calls in-line, make sure the INLINE

-macro in jmorecfg.h is defined as the keyword that marks a function

-inline-able.  Some compilers have a switch that tells the compiler to inline

-any function it thinks is profitable (e.g., -finline-functions for gcc).

-Enabling such a switch is likely to make the compiled code bigger but faster.

-

-In general, it's worth trying the maximum optimization level of your compiler,

-and experimenting with any optional optimizations such as loop unrolling.

-(Unfortunately, far too many compilers have optimizer bugs ... be prepared to

-back off if the code fails self-test.)  If you do any experimentation along

-these lines, please report the optimal settings to jpeg-info@jpegclub.org so

-we can mention them in future releases.  Be sure to specify your machine and

-compiler version.

-

-

-HINTS FOR SPECIFIC SYSTEMS

-==========================

-

-We welcome reports on changes needed for systems not mentioned here.  Submit

-'em to jpeg-info@jpegclub.org.  Also, if configure or ckconfig.c is wrong

-about how to configure the JPEG software for your system, please let us know.

-

-

-Acorn RISC OS:

-

-(Thanks to Simon Middleton for these hints on compiling with Desktop C.)

-After renaming the files according to Acorn conventions, take a copy of

-makefile.ansi, change all occurrences of 'libjpeg.a' to 'libjpeg.o' and

-change these definitions as indicated:

-

-CFLAGS= -throwback -IC: -Wn

-LDLIBS=C:o.Stubs

-SYSDEPMEM=jmemansi.o

-LN=Link

-AR=LibFile -c -o

-

-Also add a new line '.c.o:; $(cc) $< $(cflags) -c -o $@'.  Remove the

-lines '$(RM) libjpeg.o' and '$(AR2) libjpeg.o' and the 'jconfig.h'

-dependency section.

-

-Copy jconfig.txt to jconfig.h.  Edit jconfig.h to define TWO_FILE_COMMANDLINE

-and CHAR_IS_UNSIGNED.

-

-Run the makefile using !AMU not !Make.  If you want to use the 'clean' and

-'test' makefile entries then you will have to fiddle with the syntax a bit

-and rename the test files.

-

-

-Amiga:

-

-SAS C 6.50 reportedly is too buggy to compile the IJG code properly.

-A patch to update to 6.51 is available from SAS or AmiNet FTP sites.

-

-The supplied config files are set up to use jmemname.c as the memory

-manager, with temporary files being created on the device named by

-"JPEGTMP:".

-

-

-Atari ST/STE/TT:

-

-Copy the project files makcjpeg.st, makdjpeg.st, maktjpeg.st, and makljpeg.st

-to cjpeg.prj, djpeg.prj, jpegtran.prj, and libjpeg.prj respectively.  The

-project files should work as-is with Pure C.  For Turbo C, change library

-filenames "pc..." to "tc..." in each project file.  Note that libjpeg.prj

-selects jmemansi.c as the recommended memory manager.  You'll probably want to

-adjust the DEFAULT_MAX_MEM setting --- you want it to be a couple hundred K

-less than your normal free memory.  Put "#define DEFAULT_MAX_MEM nnnn" into

-jconfig.h to do this.

-

-To use the 68881/68882 coprocessor for the floating point DCT, add the

-compiler option "-8" to the project files and replace pcfltlib.lib with

-pc881lib.lib in cjpeg.prj and djpeg.prj.  Or if you don't have a

-coprocessor, you may prefer to remove the float DCT code by undefining

-DCT_FLOAT_SUPPORTED in jmorecfg.h (since without a coprocessor, the float

-code will be too slow to be useful).  In that case, you can delete

-pcfltlib.lib from the project files.

-

-Note that you must make libjpeg.lib before making cjpeg.ttp, djpeg.ttp,

-or jpegtran.ttp.  You'll have to perform the self-test by hand.

-

-We haven't bothered to include project files for rdjpgcom and wrjpgcom.

-Those source files should just be compiled by themselves; they don't

-depend on the JPEG library.  You can use the default.prj project file

-of the Pure C distribution to make the programs.

-

-There is a bug in some older versions of the Turbo C library which causes the

-space used by temporary files created with "tmpfile()" not to be freed after

-an abnormal program exit.  If you check your disk afterwards, you will find

-cluster chains that are allocated but not used by a file.  This should not

-happen in cjpeg/djpeg/jpegtran, since we enable a signal catcher to explicitly

-close temp files before exiting.  But if you use the JPEG library with your

-own code, be sure to supply a signal catcher, or else use a different

-system-dependent memory manager.

-

-

-Cray:

-

-Should you be so fortunate as to be running JPEG on a Cray YMP, there is a

-compiler bug in old versions of Cray's Standard C (prior to 3.1).  If you

-still have an old compiler, you'll need to insert a line reading

-"#pragma novector" just before the loop	

-    for (i = 1; i <= (int) htbl->bits[l]; i++)

-      huffsize[p++] = (char) l;

-in fix_huff_tbl (in V5beta1, line 204 of jchuff.c and line 176 of jdhuff.c).

-[This bug may or may not still occur with the current IJG code, but it's

-probably a dead issue anyway...]

-

-

-HP-UX:

-

-If you have HP-UX 7.05 or later with the "software development" C compiler,

-you should run the compiler in ANSI mode.  If using the configure script,

-say

-	./configure CC='cc -Aa'

-(or -Ae if you prefer).  If configuring by hand, use makefile.ansi and add

-"-Aa" to the CFLAGS line in the makefile.

-

-If you have a pre-7.05 system, or if you are using the non-ANSI C compiler

-delivered with a minimum HP-UX system, then you must use makefile.unix

-(and do NOT add -Aa); or just run configure without the CC option.

-

-On HP 9000 series 800 machines, the HP C compiler is buggy in revisions prior

-to A.08.07.  If you get complaints about "not a typedef name", you'll have to

-use makefile.unix, or run configure without the CC option.

-

-

-Macintosh, generic comments:

-

-The supplied user-interface files (cjpeg.c, djpeg.c, etc) are set up to

-provide a Unix-style command line interface.  You can use this interface on

-the Mac by means of the ccommand() library routine provided by Metrowerks

-CodeWarrior or Think C.  This is only appropriate for testing the library,

-however; to make a user-friendly equivalent of cjpeg/djpeg you'd really want

-to develop a Mac-style user interface.  There isn't a complete example

-available at the moment, but there are some helpful starting points:

-1. Sam Bushell's free "To JPEG" applet provides drag-and-drop conversion to

-JPEG under System 7 and later.  This only illustrates how to use the

-compression half of the library, but it does a very nice job of that part.

-The CodeWarrior source code is available from http://www.pobox.com/~jsam.

-2. Jim Brunner prepared a Mac-style user interface for both compression and

-decompression.  Unfortunately, it hasn't been updated since IJG v4, and

-the library's API has changed considerably since then.  Still it may be of

-some help, particularly as a guide to compiling the IJG code under Think C.

-Jim's code is available from the Info-Mac archives, at sumex-aim.stanford.edu

-or mirrors thereof; see file /info-mac/dev/src/jpeg-convert-c.hqx.

-

-jmemmac.c is the recommended memory manager back end for Macintosh.  It uses

-NewPtr/DisposePtr instead of malloc/free, and has a Mac-specific

-implementation of jpeg_mem_available().  It also creates temporary files that

-follow Mac conventions.  (That part of the code relies on System-7-or-later OS

-functions.  See the comments in jmemmac.c if you need to run it on System 6.)

-NOTE that USE_MAC_MEMMGR must be defined in jconfig.h to use jmemmac.c.

-

-You can also use jmemnobs.c, if you don't care about handling images larger

-than available memory.  If you use any memory manager back end other than

-jmemmac.c, we recommend replacing "malloc" and "free" by "NewPtr" and

-"DisposePtr", because Mac C libraries often have peculiar implementations of

-malloc/free.  (For instance, free() may not return the freed space to the

-Mac Memory Manager.  This is undesirable for the IJG code because jmemmgr.c

-already clumps space requests.)

-

-

-Macintosh, Metrowerks CodeWarrior:

-

-The Unix-command-line-style interface can be used by defining USE_CCOMMAND.

-You'll also need to define TWO_FILE_COMMANDLINE to avoid stdin/stdout.

-This means that when using the cjpeg/djpeg programs, you'll have to type the

-input and output file names in the "Arguments" text-edit box, rather than

-using the file radio buttons.  (Perhaps USE_FDOPEN or USE_SETMODE would

-eliminate the problem, but I haven't heard from anyone who's tried it.)

-

-On 680x0 Macs, Metrowerks defines type "double" as a 10-byte IEEE extended

-float.  jmemmgr.c won't like this: it wants sizeof(ALIGN_TYPE) to be a power

-of 2.  Add "#define ALIGN_TYPE long" to jconfig.h to eliminate the complaint.

-

-The supplied configuration file jconfig.mac can be used for your jconfig.h;

-it includes all the recommended symbol definitions.  If you have AppleScript

-installed, you can run the supplied script makeproj.mac to create CodeWarrior

-project files for the library and the testbed applications, then build the

-library and applications.  (Thanks to Dan Sears and Don Agro for this nifty

-hack, which saves us from trying to maintain CodeWarrior project files as part

-of the IJG distribution...)

-

-

-Macintosh, Think C:

-

-The documentation in Jim Brunner's "JPEG Convert" source code (see above)

-includes detailed build instructions for Think C; it's probably somewhat

-out of date for the current release, but may be helpful.

-

-If you want to build the minimal command line version, proceed as follows.

-You'll have to prepare project files for the programs; we don't include any

-in the distribution since they are not text files.  Use the file lists in

-any of the supplied makefiles as a guide.  Also add the ANSI and Unix C

-libraries in a separate segment.  You may need to divide the JPEG files into

-more than one segment; we recommend dividing compression and decompression

-modules.  Define USE_CCOMMAND in jconfig.h so that the ccommand() routine is

-called.  You must also define TWO_FILE_COMMANDLINE because stdin/stdout

-don't handle binary data correctly.

-

-On 680x0 Macs, Think C defines type "double" as a 12-byte IEEE extended float.

-jmemmgr.c won't like this: it wants sizeof(ALIGN_TYPE) to be a power of 2.

-Add "#define ALIGN_TYPE long" to jconfig.h to eliminate the complaint.

-

-jconfig.mac should work as a jconfig.h configuration file for Think C,

-but the makeproj.mac AppleScript script is specific to CodeWarrior.  Sorry.

-

-

-MIPS R3000:

-

-MIPS's cc version 1.31 has a rather nasty optimization bug.  Don't use -O

-if you have that compiler version.  (Use "cc -V" to check the version.)

-Note that the R3000 chip is found in workstations from DEC and others.

-

-

-MS-DOS, generic comments for 16-bit compilers:

-

-The IJG code is designed to work well in 80x86 "small" or "medium" memory

-models (i.e., data pointers are 16 bits unless explicitly declared "far";

-code pointers can be either size).  You may be able to use small model to

-compile cjpeg or djpeg by itself, but you will probably have to use medium

-model for any larger application.  This won't make much difference in

-performance.  You *will* take a noticeable performance hit if you use a

-large-data memory model, and you should avoid "huge" model if at all

-possible.  Be sure that NEED_FAR_POINTERS is defined in jconfig.h if you use

-a small-data memory model; be sure it is NOT defined if you use a large-data

-model.  (The supplied makefiles and jconfig files for Borland and Microsoft C

-compile in medium model and define NEED_FAR_POINTERS.)

-

-The DOS-specific memory manager, jmemdos.c, should be used if possible.

-It needs some assembly-code routines which are in jmemdosa.asm; make sure

-your makefile assembles that file and includes it in the library.  If you

-don't have a suitable assembler, you can get pre-assembled object files for

-jmemdosa by FTP from ftp.uu.net:/graphics/jpeg/jdosaobj.zip.  (DOS-oriented

-distributions of the IJG source code often include these object files.)

-

-When using jmemdos.c, jconfig.h must define USE_MSDOS_MEMMGR and must set

-MAX_ALLOC_CHUNK to less than 64K (65520L is a typical value).  If your

-C library's far-heap malloc() can't allocate blocks that large, reduce

-MAX_ALLOC_CHUNK to whatever it can handle.

-

-If you can't use jmemdos.c for some reason --- for example, because you

-don't have an assembler to assemble jmemdosa.asm --- you'll have to fall

-back to jmemansi.c or jmemname.c.  You'll probably still need to set

-MAX_ALLOC_CHUNK in jconfig.h, because most DOS C libraries won't malloc()

-more than 64K at a time.  IMPORTANT: if you use jmemansi.c or jmemname.c,

-you will have to compile in a large-data memory model in order to get the

-right stdio library.  Too bad.

-

-wrjpgcom needs to be compiled in large model, because it malloc()s a 64KB

-work area to hold the comment text.  If your C library's malloc can't

-handle that, reduce MAX_COM_LENGTH as necessary in wrjpgcom.c.

-

-Most MS-DOS compilers treat stdin/stdout as text files, so you must use

-two-file command line style.  But if your compiler has either fdopen() or

-setmode(), you can use one-file style if you like.  To do this, define

-USE_SETMODE or USE_FDOPEN so that stdin/stdout will be set to binary mode.

-(USE_SETMODE seems to work with more DOS compilers than USE_FDOPEN.)  You

-should test that I/O through stdin/stdout produces the same results as I/O

-to explicitly named files... the "make test" procedures in the supplied

-makefiles do NOT use stdin/stdout.

-

-

-MS-DOS, generic comments for 32-bit compilers:

-

-None of the above comments about memory models apply if you are using a

-32-bit flat-memory-space environment, such as DJGPP or Watcom C.  (And you

-should use one if you have it, as performance will be much better than

-8086-compatible code!)  For flat-memory-space compilers, do NOT define

-NEED_FAR_POINTERS, and do NOT use jmemdos.c.  Use jmemnobs.c if the

-environment supplies adequate virtual memory, otherwise use jmemansi.c or

-jmemname.c.

-

-You'll still need to be careful about binary I/O through stdin/stdout.

-See the last paragraph of the previous section.

-

-

-MS-DOS, Borland C:

-

-Be sure to convert all the source files to DOS text format (CR/LF newlines).

-Although Borland C will often work OK with unmodified Unix (LF newlines)

-source files, sometimes it will give bogus compile errors.

-"Illegal character '#'" is the most common such error.  (This is true with

-Borland C 3.1, but perhaps is fixed in newer releases.)

-

-If you want one-file command line style, just undefine TWO_FILE_COMMANDLINE.

-jconfig.bcc already includes #define USE_SETMODE to make this work.

-(fdopen does not work correctly.)

-

-

-MS-DOS, Microsoft C:

-

-makefile.mc6 works with Microsoft C, DOS Visual C++, etc.  It should only

-be used if you want to build a 16-bit (small or medium memory model) program.

-

-If you want one-file command line style, just undefine TWO_FILE_COMMANDLINE.

-jconfig.mc6 already includes #define USE_SETMODE to make this work.

-(fdopen does not work correctly.)

-

-Note that this makefile assumes that the working copy of itself is called

-"makefile".  If you want to call it something else, say "makefile.mak",

-be sure to adjust the dependency line that reads "$(RFILE) : makefile".

-Otherwise the make will fail because it doesn't know how to create "makefile".

-Worse, some releases of Microsoft's make utilities give an incorrect error

-message in this situation.

-

-Old versions of MS C fail with an "out of macro expansion space" error

-because they can't cope with the macro TRACEMS8 (defined in jerror.h).

-If this happens to you, the easiest solution is to change TRACEMS8 to

-expand to nothing.  You'll lose the ability to dump out JPEG coefficient

-tables with djpeg -debug -debug, but at least you can compile.

-

-Original MS C 6.0 is very buggy; it compiles incorrect code unless you turn

-off optimization entirely (remove -O from CFLAGS).  6.00A is better, but it

-still generates bad code if you enable loop optimizations (-Ol or -Ox).

-

-MS C 8.0 crashes when compiling jquant1.c with optimization switch /Oo ...

-which is on by default.  To work around this bug, compile that one file

-with /Oo-.

-

-

-Microsoft Windows (all versions), generic comments:

-

-Some Windows system include files define typedef boolean as "unsigned char".

-The IJG code also defines typedef boolean, but we make it an "enum" by default.

-This doesn't affect the IJG programs because we don't import those Windows

-include files.  But if you use the JPEG library in your own program, and some

-of your program's files import one definition of boolean while some import the

-other, you can get all sorts of mysterious problems.  A good preventive step

-is to make the IJG library use "unsigned char" for boolean.  To do that,

-add something like this to your jconfig.h file:

-	/* Define "boolean" as unsigned char, not enum, per Windows custom */

-	#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.)

-

-windef.h contains the declarations

-	#define far

-	#define FAR far

-Since jmorecfg.h tries to define FAR as empty, you may get a compiler

-warning if you include both jpeglib.h and windef.h (which windows.h

-includes).  To suppress the warning, you can put "#ifndef FAR"/"#endif"

-around the line "#define FAR" in jmorecfg.h.

-(Something like this is already in jmorecfg.h, by the way.)

-

-When using the library in a Windows application, you will almost certainly

-want to modify or replace the error handler module jerror.c, since our

-default error handler does a couple of inappropriate things:

-  1. it tries to write error and warning messages on stderr;

-  2. in event of a fatal error, it exits by calling exit().

-

-A simple stopgap solution for problem 1 is to replace the line

-	fprintf(stderr, "%s\n", buffer);

-(in output_message in jerror.c) with

-	MessageBox(GetActiveWindow(),buffer,"JPEG Error",MB_OK|MB_ICONERROR);

-It's highly recommended that you at least do that much, since otherwise

-error messages will disappear into nowhere.  (Beginning with IJG v6b, this

-code is already present in jerror.c; just define USE_WINDOWS_MESSAGEBOX in

-jconfig.h to enable it.)

-

-The proper solution for problem 2 is to return control to your calling

-application after a library error.  This can be done with the setjmp/longjmp

-technique discussed in libjpeg.txt and illustrated in example.c.  (NOTE:

-some older Windows C compilers provide versions of setjmp/longjmp that

-don't actually work under Windows.  You may need to use the Windows system

-functions Catch and Throw instead.)

-

-The recommended memory manager under Windows is jmemnobs.c; in other words,

-let Windows do any virtual memory management needed.  You should NOT use

-jmemdos.c nor jmemdosa.asm under Windows.

-

-For Windows 3.1, we recommend compiling in medium or large memory model;

-for newer Windows versions, use a 32-bit flat memory model.  (See the MS-DOS

-sections above for more info about memory models.)  In the 16-bit memory

-models only, you'll need to put

-	#define MAX_ALLOC_CHUNK 65520L	/* Maximum request to malloc() */

-into jconfig.h to limit allocation chunks to 64Kb.  (Without that, you'd

-have to use huge memory model, which slows things down unnecessarily.)

-jmemnobs.c works without modification in large or flat memory models, but to

-use medium model, you need to modify its jpeg_get_large and jpeg_free_large

-routines to allocate far memory.  In any case, you might like to replace

-its calls to malloc and free with direct calls on Windows memory allocation

-functions.

-

-You may also want to modify jdatasrc.c and jdatadst.c to use Windows file

-operations rather than fread/fwrite.  This is only necessary if your C

-compiler doesn't provide a competent implementation of C stdio functions.

-

-You might want to tweak the RGB_xxx macros in jmorecfg.h so that the library

-will accept or deliver color pixels in BGR sample order, not RGB; BGR order

-is usually more convenient under Windows.  Note that this change will break

-the sample applications cjpeg/djpeg, but the library itself works fine.

-

-

-Many people want to convert the IJG library into a DLL.  This is reasonably

-straightforward, but watch out for the following:

-

-  1. Don't try to compile as a DLL in small or medium memory model; use

-large model, or even better, 32-bit flat model.  Many places in the IJG code

-assume the address of a local variable is an ordinary (not FAR) pointer;

-that isn't true in a medium-model DLL.

-

-  2. Microsoft C cannot pass file pointers between applications and DLLs.

-(See Microsoft Knowledge Base, PSS ID Number Q50336.)  So jdatasrc.c and

-jdatadst.c don't work if you open a file in your application and then pass

-the pointer to the DLL.  One workaround is to make jdatasrc.c/jdatadst.c

-part of your main application rather than part of the DLL.

-

-  3. You'll probably need to modify the macros GLOBAL() and EXTERN() to

-attach suitable linkage keywords to the exported routine names.  Similarly,

-you'll want to modify METHODDEF() and JMETHOD() to ensure function pointers

-are declared in a way that lets application routines be called back through

-the function pointers.  These macros are in jmorecfg.h.  Typical definitions

-for a 16-bit DLL are:

-	#define GLOBAL(type)		type _far _pascal _loadds _export

-	#define EXTERN(type)		extern type _far _pascal _loadds

-	#define METHODDEF(type)		static type _far _pascal

-	#define JMETHOD(type,methodname,arglist)  \

-		type (_far _pascal *methodname) arglist

-For a 32-bit DLL you may want something like

-	#define GLOBAL(type)		__declspec(dllexport) type

-	#define EXTERN(type)		extern __declspec(dllexport) type

-Although not all the GLOBAL routines are actually intended to be called by

-the application, the performance cost of making them all DLL entry points is

-negligible.

-

-The unmodified IJG library presents a very C-specific application interface,

-so the resulting DLL is only usable from C or C++ applications.  There has

-been some talk of writing wrapper code that would present a simpler interface

-usable from other languages, such as Visual Basic.  This is on our to-do list

-but hasn't been very high priority --- any volunteers out there?

-

-

-Microsoft Windows, Borland C:

-

-The provided jconfig.bcc should work OK in a 32-bit Windows environment,

-but you'll need to tweak it in a 16-bit environment (you'd need to define

-NEED_FAR_POINTERS and MAX_ALLOC_CHUNK).  Beware that makefile.bcc will need

-alteration if you want to use it for Windows --- in particular, you should

-use jmemnobs.c not jmemdos.c under Windows.

-

-Borland C++ 4.5 fails with an internal compiler error when trying to compile

-jdmerge.c in 32-bit mode.  If enough people complain, perhaps Borland will fix

-it.  In the meantime, the simplest known workaround is to add a redundant

-definition of the variable range_limit in h2v1_merged_upsample(), at the head

-of the block that handles odd image width (about line 268 in v6 jdmerge.c):

-  /* If image width is odd, do the last output column separately */

-  if (cinfo->output_width & 1) {

-    register JSAMPLE * range_limit = cinfo->sample_range_limit; /* ADD THIS */

-    cb = GETJSAMPLE(*inptr1);

-Pretty bizarre, especially since the very similar routine h2v2_merged_upsample

-doesn't trigger the bug.

-Recent reports suggest that this bug does not occur with "bcc32a" (the

-Pentium-optimized version of the compiler).

-

-Another report from a user of Borland C 4.5 was that incorrect code (leading

-to a color shift in processed images) was produced if any of the following

-optimization switch combinations were used: 

-	-Ot -Og

-	-Ot -Op

-	-Ot -Om

-So try backing off on optimization if you see such a problem.  (Are there

-several different releases all numbered "4.5"??)

-

-

-Microsoft Windows, Microsoft Visual C++:

-

-jconfig.vc should work OK with any Microsoft compiler for a 32-bit memory

-model.  makefile.vc is intended for command-line use.  (If you are using

-the Developer Studio environment, you may prefer the DevStudio project

-files; see below.)

-

-IJG JPEG 7 adds extern "C" to jpeglib.h.  This avoids the need to put

-extern "C" { ... } around #include "jpeglib.h" in your C++ application.

-You can also force VC++ to treat the library as C++ code by renaming

-all the *.c files to *.cpp (and adjusting the makefile to match).

-In this case you also need to define the symbol DONT_USE_EXTERN_C in

-the configuration to prevent jpeglib.h from using extern "C".

-

-

-Microsoft Windows, Microsoft Visual C++ 6 Developer Studio:

-

-We include makefiles that should work as project files in DevStudio 6.0 or

-later.  There is a library makefile that builds the IJG library as a static

-Win32 library, and application makefiles that build the sample applications

-as Win32 console applications.  (Even if you only want the library, we

-recommend building the applications so that you can run the self-test.)

-

-To use:

-1. Open the command prompt, change to the main directory and execute the

-   command line

-	NMAKE /f makefile.vc  setup-vc6

-   This will move jconfig.vc to jconfig.h and makefiles to project files.

-   (Note that the renaming is critical!)

-2. Open the workspace file jpeg.dsw, build the library project.

-   (If you are using DevStudio more recent than 6.0, you'll probably

-   get a message saying that the project files are being updated.)

-3. Open the workspace file apps.dsw, build the application projects.

-4. To perform the self-test, execute the command line

-	NMAKE /f makefile.vc  test-build

-5. Move the application .exe files from `app`\Release to an

-   appropriate location on your path.

-

-

-Microsoft Windows, Microsoft Visual C++ 2010 Developer Studio (v10):

-

-We include makefiles that should work as project files in Visual Studio

-2010 or later.  There is a library makefile that builds the IJG library

-as a static Win32 library, and application makefiles that build the sample

-applications as Win32 console applications.  (Even if you only want the

-library, we recommend building the applications so that you can run the

-self-test.)

-

-To use:

-1. Open the command prompt, change to the main directory and execute the

-   command line

-	NMAKE /f makefile.vc  setup-v10

-   This will move jconfig.vc to jconfig.h and makefiles to project files.

-   (Note that the renaming is critical!)

-2. Open the solution file jpeg.sln, build the library project.

-   (If you are using Visual Studio more recent than 2010 (v10), you'll

-   probably get a message saying that the project files are being updated.)

-3. Open the solution file apps.sln, build the application projects.

-4. To perform the self-test, execute the command line

-	NMAKE /f makefile.vc  test-build

-5. Move the application .exe files from `app`\Release to an

-   appropriate location on your path.

-

-Note:

-There seems to be an optimization bug in the compiler which causes the

-self-test to fail with the color quantization option.

-We have disabled optimization for the file jquant2.c in the library

-project file which causes the self-test to pass properly.

-

-

-OS/2, Borland C++:

-

-Watch out for optimization bugs in older Borland compilers; you may need

-to back off the optimization switch settings.  See the comments in

-makefile.bcc.

-

-

-SGI:

-

-On some SGI systems, you may need to set "AR2= ar -ts" in the Makefile.

-If you are using configure, you can do this by saying

-	./configure RANLIB='ar -ts'

-This change is not needed on all SGIs.  Use it only if the make fails at the

-stage of linking the completed programs.

-

-On the MIPS R4000 architecture (Indy, etc.), the compiler option "-mips2"

-reportedly speeds up the float DCT method substantially, enough to make it

-faster than the default int method (but still slower than the fast int

-method).  If you use -mips2, you may want to alter the default DCT method to

-be float.  To do this, put "#define JDCT_DEFAULT JDCT_FLOAT" in jconfig.h.

-

-

-VMS:

-

-On an Alpha/VMS system with MMS, be sure to use the "/Marco=Alpha=1"

-qualifier with MMS when building the JPEG package.

-

-VAX/VMS v5.5-1 may have problems with the test step of the build procedure

-reporting differences when it compares the original and test images.  If the

-error points to the last block of the files, it is most likely bogus and may

-be safely ignored.  It seems to be because the files are Stream_LF and

-Backup/Compare has difficulty with the (presumably) null padded files.

-This problem was not observed on VAX/VMS v6.1 or AXP/VMS v6.1.

diff --git a/plugins/AdvaImg/src/LibJPEG/jaricom.c b/plugins/AdvaImg/src/LibJPEG/jaricom.c
deleted file mode 100644
index 50ad879f53..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jaricom.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*

- * jaricom.c

- *

- * Developed 1997-2011 by Guido Vollbeding.

- * 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 probability estimation tables for common use in

- * arithmetic entropy encoding and decoding routines.

- *

- * This data represents Table D.3 in the JPEG spec (D.2 in the draft),

- * ISO/IEC IS 10918-1 and CCITT Recommendation ITU-T T.81, and Table 24

- * in the JBIG spec, ISO/IEC IS 11544 and CCITT Recommendation ITU-T T.82.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-/* The following #define specifies the packing of the four components

- * into the compact INT32 representation.

- * Note that this formula must match the actual arithmetic encoder

- * and decoder implementation.  The implementation has to be changed

- * if this formula is changed.

- * The current organization is leaned on Markus Kuhn's JBIG

- * implementation (jbig_tab.c).

- */

-

-#define V(i,a,b,c,d) (((INT32)a << 16) | ((INT32)c << 8) | ((INT32)d << 7) | b)

-

-const INT32 jpeg_aritab[113+1] = {

-/*

- * Index, Qe_Value, Next_Index_LPS, Next_Index_MPS, Switch_MPS

- */

-  V(   0, 0x5a1d,   1,   1, 1 ),

-  V(   1, 0x2586,  14,   2, 0 ),

-  V(   2, 0x1114,  16,   3, 0 ),

-  V(   3, 0x080b,  18,   4, 0 ),

-  V(   4, 0x03d8,  20,   5, 0 ),

-  V(   5, 0x01da,  23,   6, 0 ),

-  V(   6, 0x00e5,  25,   7, 0 ),

-  V(   7, 0x006f,  28,   8, 0 ),

-  V(   8, 0x0036,  30,   9, 0 ),

-  V(   9, 0x001a,  33,  10, 0 ),

-  V(  10, 0x000d,  35,  11, 0 ),

-  V(  11, 0x0006,   9,  12, 0 ),

-  V(  12, 0x0003,  10,  13, 0 ),

-  V(  13, 0x0001,  12,  13, 0 ),

-  V(  14, 0x5a7f,  15,  15, 1 ),

-  V(  15, 0x3f25,  36,  16, 0 ),

-  V(  16, 0x2cf2,  38,  17, 0 ),

-  V(  17, 0x207c,  39,  18, 0 ),

-  V(  18, 0x17b9,  40,  19, 0 ),

-  V(  19, 0x1182,  42,  20, 0 ),

-  V(  20, 0x0cef,  43,  21, 0 ),

-  V(  21, 0x09a1,  45,  22, 0 ),

-  V(  22, 0x072f,  46,  23, 0 ),

-  V(  23, 0x055c,  48,  24, 0 ),

-  V(  24, 0x0406,  49,  25, 0 ),

-  V(  25, 0x0303,  51,  26, 0 ),

-  V(  26, 0x0240,  52,  27, 0 ),

-  V(  27, 0x01b1,  54,  28, 0 ),

-  V(  28, 0x0144,  56,  29, 0 ),

-  V(  29, 0x00f5,  57,  30, 0 ),

-  V(  30, 0x00b7,  59,  31, 0 ),

-  V(  31, 0x008a,  60,  32, 0 ),

-  V(  32, 0x0068,  62,  33, 0 ),

-  V(  33, 0x004e,  63,  34, 0 ),

-  V(  34, 0x003b,  32,  35, 0 ),

-  V(  35, 0x002c,  33,   9, 0 ),

-  V(  36, 0x5ae1,  37,  37, 1 ),

-  V(  37, 0x484c,  64,  38, 0 ),

-  V(  38, 0x3a0d,  65,  39, 0 ),

-  V(  39, 0x2ef1,  67,  40, 0 ),

-  V(  40, 0x261f,  68,  41, 0 ),

-  V(  41, 0x1f33,  69,  42, 0 ),

-  V(  42, 0x19a8,  70,  43, 0 ),

-  V(  43, 0x1518,  72,  44, 0 ),

-  V(  44, 0x1177,  73,  45, 0 ),

-  V(  45, 0x0e74,  74,  46, 0 ),

-  V(  46, 0x0bfb,  75,  47, 0 ),

-  V(  47, 0x09f8,  77,  48, 0 ),

-  V(  48, 0x0861,  78,  49, 0 ),

-  V(  49, 0x0706,  79,  50, 0 ),

-  V(  50, 0x05cd,  48,  51, 0 ),

-  V(  51, 0x04de,  50,  52, 0 ),

-  V(  52, 0x040f,  50,  53, 0 ),

-  V(  53, 0x0363,  51,  54, 0 ),

-  V(  54, 0x02d4,  52,  55, 0 ),

-  V(  55, 0x025c,  53,  56, 0 ),

-  V(  56, 0x01f8,  54,  57, 0 ),

-  V(  57, 0x01a4,  55,  58, 0 ),

-  V(  58, 0x0160,  56,  59, 0 ),

-  V(  59, 0x0125,  57,  60, 0 ),

-  V(  60, 0x00f6,  58,  61, 0 ),

-  V(  61, 0x00cb,  59,  62, 0 ),

-  V(  62, 0x00ab,  61,  63, 0 ),

-  V(  63, 0x008f,  61,  32, 0 ),

-  V(  64, 0x5b12,  65,  65, 1 ),

-  V(  65, 0x4d04,  80,  66, 0 ),

-  V(  66, 0x412c,  81,  67, 0 ),

-  V(  67, 0x37d8,  82,  68, 0 ),

-  V(  68, 0x2fe8,  83,  69, 0 ),

-  V(  69, 0x293c,  84,  70, 0 ),

-  V(  70, 0x2379,  86,  71, 0 ),

-  V(  71, 0x1edf,  87,  72, 0 ),

-  V(  72, 0x1aa9,  87,  73, 0 ),

-  V(  73, 0x174e,  72,  74, 0 ),

-  V(  74, 0x1424,  72,  75, 0 ),

-  V(  75, 0x119c,  74,  76, 0 ),

-  V(  76, 0x0f6b,  74,  77, 0 ),

-  V(  77, 0x0d51,  75,  78, 0 ),

-  V(  78, 0x0bb6,  77,  79, 0 ),

-  V(  79, 0x0a40,  77,  48, 0 ),

-  V(  80, 0x5832,  80,  81, 1 ),

-  V(  81, 0x4d1c,  88,  82, 0 ),

-  V(  82, 0x438e,  89,  83, 0 ),

-  V(  83, 0x3bdd,  90,  84, 0 ),

-  V(  84, 0x34ee,  91,  85, 0 ),

-  V(  85, 0x2eae,  92,  86, 0 ),

-  V(  86, 0x299a,  93,  87, 0 ),

-  V(  87, 0x2516,  86,  71, 0 ),

-  V(  88, 0x5570,  88,  89, 1 ),

-  V(  89, 0x4ca9,  95,  90, 0 ),

-  V(  90, 0x44d9,  96,  91, 0 ),

-  V(  91, 0x3e22,  97,  92, 0 ),

-  V(  92, 0x3824,  99,  93, 0 ),

-  V(  93, 0x32b4,  99,  94, 0 ),

-  V(  94, 0x2e17,  93,  86, 0 ),

-  V(  95, 0x56a8,  95,  96, 1 ),

-  V(  96, 0x4f46, 101,  97, 0 ),

-  V(  97, 0x47e5, 102,  98, 0 ),

-  V(  98, 0x41cf, 103,  99, 0 ),

-  V(  99, 0x3c3d, 104, 100, 0 ),

-  V( 100, 0x375e,  99,  93, 0 ),

-  V( 101, 0x5231, 105, 102, 0 ),

-  V( 102, 0x4c0f, 106, 103, 0 ),

-  V( 103, 0x4639, 107, 104, 0 ),

-  V( 104, 0x415e, 103,  99, 0 ),

-  V( 105, 0x5627, 105, 106, 1 ),

-  V( 106, 0x50e7, 108, 107, 0 ),

-  V( 107, 0x4b85, 109, 103, 0 ),

-  V( 108, 0x5597, 110, 109, 0 ),

-  V( 109, 0x504f, 111, 107, 0 ),

-  V( 110, 0x5a10, 110, 111, 1 ),

-  V( 111, 0x5522, 112, 109, 0 ),

-  V( 112, 0x59eb, 112, 111, 1 ),

-/*

- * This last entry is used for fixed probability estimate of 0.5

- * as suggested in Section 10.3 Table 5 of ITU-T Rec. T.851.

- */

-  V( 113, 0x5a1d, 113, 113, 0 )

-};

diff --git a/plugins/AdvaImg/src/LibJPEG/jcapimin.c b/plugins/AdvaImg/src/LibJPEG/jcapimin.c
deleted file mode 100644
index 3382d91557..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcapimin.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*

- * jcapimin.c

- *

- * Copyright (C) 1994-1998, Thomas G. Lane.

- * Modified 2003-2010 by Guido Vollbeding.

- * 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"

-#include "jpeglib.h"

-

-

-/*

- * Initialization of a JPEG compression object.

- * 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;

-

-  /* 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;

-

-  /* 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;

-

-  cinfo->comp_info = NULL;

-

-  for (i = 0; i < NUM_QUANT_TBLS; i++) {

-    cinfo->quant_tbl_ptrs[i] = NULL;

-    cinfo->q_scale_factor[i] = 100;

-  }

-

-  for (i = 0; i < NUM_HUFF_TBLS; i++) {

-    cinfo->dc_huff_tbl_ptrs[i] = NULL;

-    cinfo->ac_huff_tbl_ptrs[i] = NULL;

-  }

-

-  /* Must do it here for emit_dqt in case jpeg_write_tables is used */

-  cinfo->block_size = DCTSIZE;

-  cinfo->natural_order = jpeg_natural_order;

-  cinfo->lim_Se = DCTSIZE2-1;

-

-  cinfo->script_space = NULL;

-

-  cinfo->input_gamma = 1.0;	/* in case application forgets */

-

-  /* OK, I'm ready */

-  cinfo->global_state = CSTATE_START;

-}

-

-

-/*

- * Destruction of a JPEG compression object

- */

-

-GLOBAL(void)

-jpeg_destroy_compress (j_compress_ptr cinfo)

-{

-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */

-}

-

-

-/*

- * Abort processing of a JPEG compression operation,

- * 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 */

-}

-

-

-/*

- * Forcibly suppress or un-suppress all quantization and Huffman tables.

- * Marks all currently defined tables as already written (if suppress)

- * or not written (if !suppress).  This will control whether they get emitted

- * by a subsequent jpeg_start_compress call.

- *

- * This routine is exported for use by applications that want to produce

- * abbreviated JPEG datastreams.  It logically belongs in jcparam.c, but

- * since it is called by jpeg_start_compress, we put it here --- otherwise

- * 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;

-

-  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;

-  }

-}

-

-

-/*

- * Finish JPEG compression.

- *

- * If a multipass operating mode was selected, this may do a great deal of

- * work including most of the actual output.

- */

-

-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);

-}

-

-

-/*

- * Write a special marker.

- * This is only recommended for writing COM or APPn markers.

- * Must be called after jpeg_start_compress() and before

- * 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));

-

-  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++;

-  }

-}

-

-/* 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);

-

-  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);

-}

-

-GLOBAL(void)

-jpeg_write_m_byte (j_compress_ptr cinfo, int val)

-{

-  (*cinfo->marker->write_marker_byte) (cinfo, val);

-}

-

-

-/*

- * Alternate compression function: just write an abbreviated table file.

- * Before calling this, all parameters and a data destination must be set up.

- *

- * To produce a pair of files containing abbreviated tables and abbreviated

- * image data, one would proceed as follows:

- *

- *		initialize JPEG object

- *		set JPEG parameters

- *		set destination to table file

- *		jpeg_write_tables(cinfo);

- *		set destination to image file

- *		jpeg_start_compress(cinfo, FALSE);

- *		write data...

- *		jpeg_finish_compress(cinfo);

- *

- * jpeg_write_tables has the side effect of marking all tables written

- * (same as jpeg_suppress_tables(..., TRUE)).  Thus a subsequent start_compress

- * will not re-emit the tables unless it is passed write_all_tables=TRUE.

- */

-

-GLOBAL(void)

-jpeg_write_tables (j_compress_ptr cinfo)

-{

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  /* (Re)initialize error mgr and destination modules */

-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);

-  (*cinfo->dest->init_destination) (cinfo);

-  /* Initialize the marker writer ... bit of a crock to do it here. */

-  jinit_marker_writer(cinfo);

-  /* Write them tables! */

-  (*cinfo->marker->write_tables_only) (cinfo);

-  /* And clean up. */

-  (*cinfo->dest->term_destination) (cinfo);

-  /*

-   * In library releases up through v6a, we called jpeg_abort() here to free

-   * any working memory allocated by the destination manager and marker

-   * writer.  Some applications had a problem with that: they allocated space

-   * of their own from the library memory manager, and didn't want it to go

-   * away during write_tables.  So now we do nothing.  This will cause a

-   * memory leak if an app calls write_tables repeatedly without doing a full

-   * compression cycle or otherwise resetting the JPEG object.  However, that

-   * seems less bad than unexpectedly freeing memory in the normal case.

-   * An app that prefers the old behavior can call jpeg_abort for itself after

-   * each call to jpeg_write_tables().

-   */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcapistd.c b/plugins/AdvaImg/src/LibJPEG/jcapistd.c
deleted file mode 100644
index 8892bfaac8..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcapistd.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*

- * jcapistd.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2013 by Guido Vollbeding.

- * 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 "standard" API routines that are

- * used in the normal full-compression case.  They are not used by a

- * transcoding-only application.  Note that if an application links in

- * jpeg_start_compress, it will end up linking in the entire compressor.

- * We thus must separate this file from jcapimin.c to avoid linking the

- * whole compression library into a transcoder.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * Compression initialization.

- * Before calling this, all parameters and a data destination must be set up.

- *

- * We require a write_all_tables parameter as a failsafe check when writing

- * multiple datastreams from the same compression object.  Since prior runs

- * will have left all the tables marked sent_table=TRUE, a subsequent run

- * would emit an abbreviated stream (no tables) by default.  This may be what

- * is wanted, but for safety's sake it should not be the default behavior:

- * programmers should have to make a deliberate choice to emit abbreviated

- * images.  Therefore the documentation and examples should encourage people

- * to pass write_all_tables=TRUE; then it will take active thought to do the

- * wrong thing.

- */

-

-GLOBAL(void)

-jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)

-{

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  if (write_all_tables)

-    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */

-

-  /* (Re)initialize error mgr and destination modules */

-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);

-  (*cinfo->dest->init_destination) (cinfo);

-  /* Perform master selection of active modules */

-  jinit_compress_master(cinfo);

-  /* Set up for the first pass */

-  (*cinfo->master->prepare_for_pass) (cinfo);

-  /* Ready for application to drive first pass through jpeg_write_scanlines

-   * or jpeg_write_raw_data.

-   */

-  cinfo->next_scanline = 0;

-  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);

-}

-

-

-/*

- * Write some scanlines of data to the JPEG compressor.

- *

- * The return value will be the number of lines actually written.

- * This should be less than the supplied num_lines only in case that

- * the data destination module has requested suspension of the compressor,

- * or if more than image_height scanlines are passed in.

- *

- * Note: we warn about excess calls to jpeg_write_scanlines() since

- * this likely signals an application programmer error.  However,

- * excess scanlines passed in the last valid call are *silently* ignored,

- * so that the application need not adjust num_lines for end-of-image

- * when using a multiple-scanline buffer.

- */

-

-GLOBAL(JDIMENSION)

-jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,

-		      JDIMENSION num_lines)

-{

-  JDIMENSION row_ctr, rows_left;

-

-  if (cinfo->global_state != CSTATE_SCANNING)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  if (cinfo->next_scanline >= cinfo->image_height)

-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);

-

-  /* Call progress monitor hook if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;

-    cinfo->progress->pass_limit = (long) cinfo->image_height;

-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-  }

-

-  /* Give master control module another chance if this is first call to

-   * jpeg_write_scanlines.  This lets output of the frame/scan headers be

-   * delayed so that application can write COM, etc, markers between

-   * jpeg_start_compress and jpeg_write_scanlines.

-   */

-  if (cinfo->master->call_pass_startup)

-    (*cinfo->master->pass_startup) (cinfo);

-

-  /* Ignore any extra scanlines at bottom of image. */

-  rows_left = cinfo->image_height - cinfo->next_scanline;

-  if (num_lines > rows_left)

-    num_lines = rows_left;

-

-  row_ctr = 0;

-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);

-  cinfo->next_scanline += row_ctr;

-  return row_ctr;

-}

-

-

-/*

- * Alternate entry point to write raw data.

- * Processes exactly one iMCU row per call, unless suspended.

- */

-

-GLOBAL(JDIMENSION)

-jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,

-		     JDIMENSION num_lines)

-{

-  JDIMENSION lines_per_iMCU_row;

-

-  if (cinfo->global_state != CSTATE_RAW_OK)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  if (cinfo->next_scanline >= cinfo->image_height) {

-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);

-    return 0;

-  }

-

-  /* Call progress monitor hook if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;

-    cinfo->progress->pass_limit = (long) cinfo->image_height;

-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-  }

-

-  /* Give master control module another chance if this is first call to

-   * jpeg_write_raw_data.  This lets output of the frame/scan headers be

-   * delayed so that application can write COM, etc, markers between

-   * jpeg_start_compress and jpeg_write_raw_data.

-   */

-  if (cinfo->master->call_pass_startup)

-    (*cinfo->master->pass_startup) (cinfo);

-

-  /* Verify that at least one iMCU row has been passed. */

-  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_DCT_v_scaled_size;

-  if (num_lines < lines_per_iMCU_row)

-    ERREXIT(cinfo, JERR_BUFFER_SIZE);

-

-  /* Directly compress the row. */

-  if (! (*cinfo->coef->compress_data) (cinfo, data)) {

-    /* If compressor did not consume the whole row, suspend processing. */

-    return 0;

-  }

-

-  /* OK, we processed one iMCU row. */

-  cinfo->next_scanline += lines_per_iMCU_row;

-  return lines_per_iMCU_row;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcarith.c b/plugins/AdvaImg/src/LibJPEG/jcarith.c
deleted file mode 100644
index 3bc0a5b8db..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcarith.c
+++ /dev/null
@@ -1,944 +0,0 @@
-/*

- * jcarith.c

- *

- * Developed 1997-2013 by Guido Vollbeding.

- * 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 portable arithmetic entropy encoding routines for JPEG

- * (implementing the ISO/IEC IS 10918-1 and CCITT Recommendation ITU-T T.81).

- *

- * Both sequential and progressive modes are supported in this single module.

- *

- * Suspension is not currently supported in this module.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Expanded entropy encoder object for arithmetic encoding. */

-

-typedef struct {

-  struct jpeg_entropy_encoder pub; /* public fields */

-

-  INT32 c; /* C register, base of coding interval, layout as in sec. D.1.3 */

-  INT32 a;               /* A register, normalized size of coding interval */

-  INT32 sc;        /* counter for stacked 0xFF values which might overflow */

-  INT32 zc;          /* counter for pending 0x00 output values which might *

-                          * be discarded at the end ("Pacman" termination) */

-  int ct;  /* bit shift counter, determines when next byte will be written */

-  int buffer;                /* buffer for most recent output byte != 0xFF */

-

-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */

-  int dc_context[MAX_COMPS_IN_SCAN]; /* context index for DC conditioning */

-

-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */

-  int next_restart_num;		/* next restart number to write (0-7) */

-

-  /* Pointers to statistics areas (these workspaces have image lifespan) */

-  unsigned char * dc_stats[NUM_ARITH_TBLS];

-  unsigned char * ac_stats[NUM_ARITH_TBLS];

-

-  /* Statistics bin for coding with fixed probability 0.5 */

-  unsigned char fixed_bin[4];

-} arith_entropy_encoder;

-

-typedef arith_entropy_encoder * arith_entropy_ptr;

-

-/* The following two definitions specify the allocation chunk size

- * for the statistics area.

- * According to sections F.1.4.4.1.3 and F.1.4.4.2, we need at least

- * 49 statistics bins for DC, and 245 statistics bins for AC coding.

- *

- * We use a compact representation with 1 byte per statistics bin,

- * thus the numbers directly represent byte sizes.

- * This 1 byte per statistics bin contains the meaning of the MPS

- * (more probable symbol) in the highest bit (mask 0x80), and the

- * index into the probability estimation state machine table

- * in the lower bits (mask 0x7F).

- */

-

-#define DC_STAT_BINS 64

-#define AC_STAT_BINS 256

-

-/* NOTE: Uncomment the following #define if you want to use the

- * given formula for calculating the AC conditioning parameter Kx

- * for spectral selection progressive coding in section G.1.3.2

- * of the spec (Kx = Kmin + SRL (8 + Se - Kmin) 4).

- * Although the spec and P&M authors claim that this "has proven

- * to give good results for 8 bit precision samples", I'm not

- * convinced yet that this is really beneficial.

- * Early tests gave only very marginal compression enhancements

- * (a few - around 5 or so - bytes even for very large files),

- * which would turn out rather negative if we'd suppress the

- * DAC (Define Arithmetic Conditioning) marker segments for

- * the default parameters in the future.

- * Note that currently the marker writing module emits 12-byte

- * DAC segments for a full-component scan in a color image.

- * This is not worth worrying about IMHO. However, since the

- * spec defines the default values to be used if the tables

- * are omitted (unlike Huffman tables, which are required

- * anyway), one might optimize this behaviour in the future,

- * and then it would be disadvantageous to use custom tables if

- * they don't provide sufficient gain to exceed the DAC size.

- *

- * On the other hand, I'd consider it as a reasonable result

- * that the conditioning has no significant influence on the

- * compression performance. This means that the basic

- * statistical model is already rather stable.

- *

- * Thus, at the moment, we use the default conditioning values

- * anyway, and do not use the custom formula.

- *

-#define CALCULATE_SPECTRAL_CONDITIONING

- */

-

-/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.

- * We assume that int right shift is unsigned if INT32 right shift is,

- * which should be safe.

- */

-

-#ifdef RIGHT_SHIFT_IS_UNSIGNED

-#define ISHIFT_TEMPS	int ishift_temp;

-#define IRIGHT_SHIFT(x,shft)  \

-	((ishift_temp = (x)) < 0 ? \

-	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \

-	 (ishift_temp >> (shft)))

-#else

-#define ISHIFT_TEMPS

-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))

-#endif

-

-

-LOCAL(void)

-emit_byte (int val, j_compress_ptr cinfo)

-/* Write next output byte; we do not support suspension in this module. */

-{

-  struct jpeg_destination_mgr * dest = cinfo->dest;

-

-  *dest->next_output_byte++ = (JOCTET) val;

-  if (--dest->free_in_buffer == 0)

-    if (! (*dest->empty_output_buffer) (cinfo))

-      ERREXIT(cinfo, JERR_CANT_SUSPEND);

-}

-

-

-/*

- * Finish up at the end of an arithmetic-compressed scan.

- */

-

-METHODDEF(void)

-finish_pass (j_compress_ptr cinfo)

-{

-  arith_entropy_ptr e = (arith_entropy_ptr) cinfo->entropy;

-  INT32 temp;

-

-  /* Section D.1.8: Termination of encoding */

-

-  /* Find the e->c in the coding interval with the largest

-   * number of trailing zero bits */

-  if ((temp = (e->a - 1 + e->c) & 0xFFFF0000L) < e->c)

-    e->c = temp + 0x8000L;

-  else

-    e->c = temp;

-  /* Send remaining bytes to output */

-  e->c <<= e->ct;

-  if (e->c & 0xF8000000L) {

-    /* One final overflow has to be handled */

-    if (e->buffer >= 0) {

-      if (e->zc)

-	do emit_byte(0x00, cinfo);

-	while (--e->zc);

-      emit_byte(e->buffer + 1, cinfo);

-      if (e->buffer + 1 == 0xFF)

-	emit_byte(0x00, cinfo);

-    }

-    e->zc += e->sc;  /* carry-over converts stacked 0xFF bytes to 0x00 */

-    e->sc = 0;

-  } else {

-    if (e->buffer == 0)

-      ++e->zc;

-    else if (e->buffer >= 0) {

-      if (e->zc)

-	do emit_byte(0x00, cinfo);

-	while (--e->zc);

-      emit_byte(e->buffer, cinfo);

-    }

-    if (e->sc) {

-      if (e->zc)

-	do emit_byte(0x00, cinfo);

-	while (--e->zc);

-      do {

-	emit_byte(0xFF, cinfo);

-	emit_byte(0x00, cinfo);

-      } while (--e->sc);

-    }

-  }

-  /* Output final bytes only if they are not 0x00 */

-  if (e->c & 0x7FFF800L) {

-    if (e->zc)  /* output final pending zero bytes */

-      do emit_byte(0x00, cinfo);

-      while (--e->zc);

-    emit_byte((e->c >> 19) & 0xFF, cinfo);

-    if (((e->c >> 19) & 0xFF) == 0xFF)

-      emit_byte(0x00, cinfo);

-    if (e->c & 0x7F800L) {

-      emit_byte((e->c >> 11) & 0xFF, cinfo);

-      if (((e->c >> 11) & 0xFF) == 0xFF)

-	emit_byte(0x00, cinfo);

-    }

-  }

-}

-

-

-/*

- * The core arithmetic encoding routine (common in JPEG and JBIG).

- * This needs to go as fast as possible.

- * Machine-dependent optimization facilities

- * are not utilized in this portable implementation.

- * However, this code should be fairly efficient and

- * may be a good base for further optimizations anyway.

- *

- * Parameter 'val' to be encoded may be 0 or 1 (binary decision).

- *

- * Note: I've added full "Pacman" termination support to the

- * byte output routines, which is equivalent to the optional

- * Discard_final_zeros procedure (Figure D.15) in the spec.

- * Thus, we always produce the shortest possible output

- * stream compliant to the spec (no trailing zero bytes,

- * except for FF stuffing).

- *

- * I've also introduced a new scheme for accessing

- * the probability estimation state machine table,

- * derived from Markus Kuhn's JBIG implementation.

- */

-

-LOCAL(void)

-arith_encode (j_compress_ptr cinfo, unsigned char *st, int val) 

-{

-  register arith_entropy_ptr e = (arith_entropy_ptr) cinfo->entropy;

-  register unsigned char nl, nm;

-  register INT32 qe, temp;

-  register int sv;

-

-  /* Fetch values from our compact representation of Table D.3(D.2):

-   * Qe values and probability estimation state machine

-   */

-  sv = *st;

-  qe = jpeg_aritab[sv & 0x7F];	/* => Qe_Value */

-  nl = qe & 0xFF; qe >>= 8;	/* Next_Index_LPS + Switch_MPS */

-  nm = qe & 0xFF; qe >>= 8;	/* Next_Index_MPS */

-

-  /* Encode & estimation procedures per sections D.1.4 & D.1.5 */

-  e->a -= qe;

-  if (val != (sv >> 7)) {

-    /* Encode the less probable symbol */

-    if (e->a >= qe) {

-      /* If the interval size (qe) for the less probable symbol (LPS)

-       * is larger than the interval size for the MPS, then exchange

-       * the two symbols for coding efficiency, otherwise code the LPS

-       * as usual: */

-      e->c += e->a;

-      e->a = qe;

-    }

-    *st = (sv & 0x80) ^ nl;	/* Estimate_after_LPS */

-  } else {

-    /* Encode the more probable symbol */

-    if (e->a >= 0x8000L)

-      return;  /* A >= 0x8000 -> ready, no renormalization required */

-    if (e->a < qe) {

-      /* If the interval size (qe) for the less probable symbol (LPS)

-       * is larger than the interval size for the MPS, then exchange

-       * the two symbols for coding efficiency: */

-      e->c += e->a;

-      e->a = qe;

-    }

-    *st = (sv & 0x80) ^ nm;	/* Estimate_after_MPS */

-  }

-

-  /* Renormalization & data output per section D.1.6 */

-  do {

-    e->a <<= 1;

-    e->c <<= 1;

-    if (--e->ct == 0) {

-      /* Another byte is ready for output */

-      temp = e->c >> 19;

-      if (temp > 0xFF) {

-	/* Handle overflow over all stacked 0xFF bytes */

-	if (e->buffer >= 0) {

-	  if (e->zc)

-	    do emit_byte(0x00, cinfo);

-	    while (--e->zc);

-	  emit_byte(e->buffer + 1, cinfo);

-	  if (e->buffer + 1 == 0xFF)

-	    emit_byte(0x00, cinfo);

-	}

-	e->zc += e->sc;  /* carry-over converts stacked 0xFF bytes to 0x00 */

-	e->sc = 0;

-	/* Note: The 3 spacer bits in the C register guarantee

-	 * that the new buffer byte can't be 0xFF here

-	 * (see page 160 in the P&M JPEG book). */

-	e->buffer = temp & 0xFF;  /* new output byte, might overflow later */

-      } else if (temp == 0xFF) {

-	++e->sc;  /* stack 0xFF byte (which might overflow later) */

-      } else {

-	/* Output all stacked 0xFF bytes, they will not overflow any more */

-	if (e->buffer == 0)

-	  ++e->zc;

-	else if (e->buffer >= 0) {

-	  if (e->zc)

-	    do emit_byte(0x00, cinfo);

-	    while (--e->zc);

-	  emit_byte(e->buffer, cinfo);

-	}

-	if (e->sc) {

-	  if (e->zc)

-	    do emit_byte(0x00, cinfo);

-	    while (--e->zc);

-	  do {

-	    emit_byte(0xFF, cinfo);

-	    emit_byte(0x00, cinfo);

-	  } while (--e->sc);

-	}

-	e->buffer = temp & 0xFF;  /* new output byte (can still overflow) */

-      }

-      e->c &= 0x7FFFFL;

-      e->ct += 8;

-    }

-  } while (e->a < 0x8000L);

-}

-

-

-/*

- * Emit a restart marker & resynchronize predictions.

- */

-

-LOCAL(void)

-emit_restart (j_compress_ptr cinfo, int restart_num)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  int ci;

-  jpeg_component_info * compptr;

-

-  finish_pass(cinfo);

-

-  emit_byte(0xFF, cinfo);

-  emit_byte(JPEG_RST0 + restart_num, cinfo);

-

-  /* Re-initialize statistics areas */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    /* DC needs no table for refinement scan */

-    if (cinfo->Ss == 0 && cinfo->Ah == 0) {

-      MEMZERO(entropy->dc_stats[compptr->dc_tbl_no], DC_STAT_BINS);

-      /* Reset DC predictions to 0 */

-      entropy->last_dc_val[ci] = 0;

-      entropy->dc_context[ci] = 0;

-    }

-    /* AC needs no table when not present */

-    if (cinfo->Se) {

-      MEMZERO(entropy->ac_stats[compptr->ac_tbl_no], AC_STAT_BINS);

-    }

-  }

-

-  /* Reset arithmetic encoding variables */

-  entropy->c = 0;

-  entropy->a = 0x10000L;

-  entropy->sc = 0;

-  entropy->zc = 0;

-  entropy->ct = 11;

-  entropy->buffer = -1;  /* empty */

-}

-

-

-/*

- * MCU encoding for DC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  unsigned char *st;

-  int blkn, ci, tbl;

-  int v, v2, m;

-  ISHIFT_TEMPS

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      emit_restart(cinfo, entropy->next_restart_num);

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    ci = cinfo->MCU_membership[blkn];

-    tbl = cinfo->cur_comp_info[ci]->dc_tbl_no;

-

-    /* Compute the DC value after the required point transform by Al.

-     * This is simply an arithmetic right shift.

-     */

-    m = IRIGHT_SHIFT((int) (MCU_data[blkn][0][0]), cinfo->Al);

-

-    /* Sections F.1.4.1 & F.1.4.4.1: Encoding of DC coefficients */

-

-    /* Table F.4: Point to statistics bin S0 for DC coefficient coding */

-    st = entropy->dc_stats[tbl] + entropy->dc_context[ci];

-

-    /* Figure F.4: Encode_DC_DIFF */

-    if ((v = m - entropy->last_dc_val[ci]) == 0) {

-      arith_encode(cinfo, st, 0);

-      entropy->dc_context[ci] = 0;	/* zero diff category */

-    } else {

-      entropy->last_dc_val[ci] = m;

-      arith_encode(cinfo, st, 1);

-      /* Figure F.6: Encoding nonzero value v */

-      /* Figure F.7: Encoding the sign of v */

-      if (v > 0) {

-	arith_encode(cinfo, st + 1, 0);	/* Table F.4: SS = S0 + 1 */

-	st += 2;			/* Table F.4: SP = S0 + 2 */

-	entropy->dc_context[ci] = 4;	/* small positive diff category */

-      } else {

-	v = -v;

-	arith_encode(cinfo, st + 1, 1);	/* Table F.4: SS = S0 + 1 */

-	st += 3;			/* Table F.4: SN = S0 + 3 */

-	entropy->dc_context[ci] = 8;	/* small negative diff category */

-      }

-      /* Figure F.8: Encoding the magnitude category of v */

-      m = 0;

-      if (v -= 1) {

-	arith_encode(cinfo, st, 1);

-	m = 1;

-	v2 = v;

-	st = entropy->dc_stats[tbl] + 20; /* Table F.4: X1 = 20 */

-	while (v2 >>= 1) {

-	  arith_encode(cinfo, st, 1);

-	  m <<= 1;

-	  st += 1;

-	}

-      }

-      arith_encode(cinfo, st, 0);

-      /* Section F.1.4.4.1.2: Establish dc_context conditioning category */

-      if (m < (int) ((1L << cinfo->arith_dc_L[tbl]) >> 1))

-	entropy->dc_context[ci] = 0;	/* zero diff category */

-      else if (m > (int) ((1L << cinfo->arith_dc_U[tbl]) >> 1))

-	entropy->dc_context[ci] += 8;	/* large diff category */

-      /* Figure F.9: Encoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	arith_encode(cinfo, st, (m & v) ? 1 : 0);

-    }

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for AC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  JBLOCKROW block;

-  unsigned char *st;

-  int tbl, k, ke;

-  int v, v2, m;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      emit_restart(cinfo, entropy->next_restart_num);

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  natural_order = cinfo->natural_order;

-

-  /* Encode the MCU data block */

-  block = MCU_data[0];

-  tbl = cinfo->cur_comp_info[0]->ac_tbl_no;

-

-  /* Sections F.1.4.2 & F.1.4.4.2: Encoding of AC coefficients */

-

-  /* Establish EOB (end-of-block) index */

-  ke = cinfo->Se;

-  do {

-    /* We must apply the point transform by Al.  For AC coefficients this

-     * is an integer division with rounding towards 0.  To do this portably

-     * in C, we shift after obtaining the absolute value.

-     */

-    if ((v = (*block)[natural_order[ke]]) >= 0) {

-      if (v >>= cinfo->Al) break;

-    } else {

-      v = -v;

-      if (v >>= cinfo->Al) break;

-    }

-  } while (--ke);

-

-  /* Figure F.5: Encode_AC_Coefficients */

-  for (k = cinfo->Ss - 1; k < ke;) {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    arith_encode(cinfo, st, 0);		/* EOB decision */

-    for (;;) {

-      if ((v = (*block)[natural_order[++k]]) >= 0) {

-	if (v >>= cinfo->Al) {

-	  arith_encode(cinfo, st + 1, 1);

-	  arith_encode(cinfo, entropy->fixed_bin, 0);

-	  break;

-	}

-      } else {

-	v = -v;

-	if (v >>= cinfo->Al) {

-	  arith_encode(cinfo, st + 1, 1);

-	  arith_encode(cinfo, entropy->fixed_bin, 1);

-	  break;

-	}

-      }

-      arith_encode(cinfo, st + 1, 0);

-      st += 3;

-    }

-    st += 2;

-    /* Figure F.8: Encoding the magnitude category of v */

-    m = 0;

-    if (v -= 1) {

-      arith_encode(cinfo, st, 1);

-      m = 1;

-      v2 = v;

-      if (v2 >>= 1) {

-	arith_encode(cinfo, st, 1);

-	m <<= 1;

-	st = entropy->ac_stats[tbl] +

-	     (k <= cinfo->arith_ac_K[tbl] ? 189 : 217);

-	while (v2 >>= 1) {

-	  arith_encode(cinfo, st, 1);

-	  m <<= 1;

-	  st += 1;

-	}

-      }

-    }

-    arith_encode(cinfo, st, 0);

-    /* Figure F.9: Encoding the magnitude bit pattern of v */

-    st += 14;

-    while (m >>= 1)

-      arith_encode(cinfo, st, (m & v) ? 1 : 0);

-  }

-  /* Encode EOB decision only if k < cinfo->Se */

-  if (k < cinfo->Se) {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    arith_encode(cinfo, st, 1);

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for DC successive approximation refinement scan.

- * Note: we assume such scans can be multi-component,

- * although the spec is not very clear on the point.

- */

-

-METHODDEF(boolean)

-encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  unsigned char *st;

-  int Al, blkn;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      emit_restart(cinfo, entropy->next_restart_num);

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  st = entropy->fixed_bin;	/* use fixed probability estimation */

-  Al = cinfo->Al;

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    /* We simply emit the Al'th bit of the DC coefficient value. */

-    arith_encode(cinfo, st, (MCU_data[blkn][0][0] >> Al) & 1);

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for AC successive approximation refinement scan.

- */

-

-METHODDEF(boolean)

-encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  JBLOCKROW block;

-  unsigned char *st;

-  int tbl, k, ke, kex;

-  int v;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      emit_restart(cinfo, entropy->next_restart_num);

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  natural_order = cinfo->natural_order;

-

-  /* Encode the MCU data block */

-  block = MCU_data[0];

-  tbl = cinfo->cur_comp_info[0]->ac_tbl_no;

-

-  /* Section G.1.3.3: Encoding of AC coefficients */

-

-  /* Establish EOB (end-of-block) index */

-  ke = cinfo->Se;

-  do {

-    /* We must apply the point transform by Al.  For AC coefficients this

-     * is an integer division with rounding towards 0.  To do this portably

-     * in C, we shift after obtaining the absolute value.

-     */

-    if ((v = (*block)[natural_order[ke]]) >= 0) {

-      if (v >>= cinfo->Al) break;

-    } else {

-      v = -v;

-      if (v >>= cinfo->Al) break;

-    }

-  } while (--ke);

-

-  /* Establish EOBx (previous stage end-of-block) index */

-  for (kex = ke; kex > 0; kex--)

-    if ((v = (*block)[natural_order[kex]]) >= 0) {

-      if (v >>= cinfo->Ah) break;

-    } else {

-      v = -v;

-      if (v >>= cinfo->Ah) break;

-    }

-

-  /* Figure G.10: Encode_AC_Coefficients_SA */

-  for (k = cinfo->Ss - 1; k < ke;) {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    if (k >= kex)

-      arith_encode(cinfo, st, 0);	/* EOB decision */

-    for (;;) {

-      if ((v = (*block)[natural_order[++k]]) >= 0) {

-	if (v >>= cinfo->Al) {

-	  if (v >> 1)			/* previously nonzero coef */

-	    arith_encode(cinfo, st + 2, (v & 1));

-	  else {			/* newly nonzero coef */

-	    arith_encode(cinfo, st + 1, 1);

-	    arith_encode(cinfo, entropy->fixed_bin, 0);

-	  }

-	  break;

-	}

-      } else {

-	v = -v;

-	if (v >>= cinfo->Al) {

-	  if (v >> 1)			/* previously nonzero coef */

-	    arith_encode(cinfo, st + 2, (v & 1));

-	  else {			/* newly nonzero coef */

-	    arith_encode(cinfo, st + 1, 1);

-	    arith_encode(cinfo, entropy->fixed_bin, 1);

-	  }

-	  break;

-	}

-      }

-      arith_encode(cinfo, st + 1, 0);

-      st += 3;

-    }

-  }

-  /* Encode EOB decision only if k < cinfo->Se */

-  if (k < cinfo->Se) {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    arith_encode(cinfo, st, 1);

-  }

-

-  return TRUE;

-}

-

-

-/*

- * Encode and output one MCU's worth of arithmetic-compressed coefficients.

- */

-

-METHODDEF(boolean)

-encode_mcu (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  JBLOCKROW block;

-  unsigned char *st;

-  int tbl, k, ke;

-  int v, v2, m;

-  int blkn, ci;

-  jpeg_component_info * compptr;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      emit_restart(cinfo, entropy->next_restart_num);

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  natural_order = cinfo->natural_order;

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    block = MCU_data[blkn];

-    ci = cinfo->MCU_membership[blkn];

-    compptr = cinfo->cur_comp_info[ci];

-

-    /* Sections F.1.4.1 & F.1.4.4.1: Encoding of DC coefficients */

-

-    tbl = compptr->dc_tbl_no;

-

-    /* Table F.4: Point to statistics bin S0 for DC coefficient coding */

-    st = entropy->dc_stats[tbl] + entropy->dc_context[ci];

-

-    /* Figure F.4: Encode_DC_DIFF */

-    if ((v = (*block)[0] - entropy->last_dc_val[ci]) == 0) {

-      arith_encode(cinfo, st, 0);

-      entropy->dc_context[ci] = 0;	/* zero diff category */

-    } else {

-      entropy->last_dc_val[ci] = (*block)[0];

-      arith_encode(cinfo, st, 1);

-      /* Figure F.6: Encoding nonzero value v */

-      /* Figure F.7: Encoding the sign of v */

-      if (v > 0) {

-	arith_encode(cinfo, st + 1, 0);	/* Table F.4: SS = S0 + 1 */

-	st += 2;			/* Table F.4: SP = S0 + 2 */

-	entropy->dc_context[ci] = 4;	/* small positive diff category */

-      } else {

-	v = -v;

-	arith_encode(cinfo, st + 1, 1);	/* Table F.4: SS = S0 + 1 */

-	st += 3;			/* Table F.4: SN = S0 + 3 */

-	entropy->dc_context[ci] = 8;	/* small negative diff category */

-      }

-      /* Figure F.8: Encoding the magnitude category of v */

-      m = 0;

-      if (v -= 1) {

-	arith_encode(cinfo, st, 1);

-	m = 1;

-	v2 = v;

-	st = entropy->dc_stats[tbl] + 20; /* Table F.4: X1 = 20 */

-	while (v2 >>= 1) {

-	  arith_encode(cinfo, st, 1);

-	  m <<= 1;

-	  st += 1;

-	}

-      }

-      arith_encode(cinfo, st, 0);

-      /* Section F.1.4.4.1.2: Establish dc_context conditioning category */

-      if (m < (int) ((1L << cinfo->arith_dc_L[tbl]) >> 1))

-	entropy->dc_context[ci] = 0;	/* zero diff category */

-      else if (m > (int) ((1L << cinfo->arith_dc_U[tbl]) >> 1))

-	entropy->dc_context[ci] += 8;	/* large diff category */

-      /* Figure F.9: Encoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	arith_encode(cinfo, st, (m & v) ? 1 : 0);

-    }

-

-    /* Sections F.1.4.2 & F.1.4.4.2: Encoding of AC coefficients */

-

-    if ((ke = cinfo->lim_Se) == 0) continue;

-    tbl = compptr->ac_tbl_no;

-

-    /* Establish EOB (end-of-block) index */

-    do {

-      if ((*block)[natural_order[ke]]) break;

-    } while (--ke);

-

-    /* Figure F.5: Encode_AC_Coefficients */

-    for (k = 0; k < ke;) {

-      st = entropy->ac_stats[tbl] + 3 * k;

-      arith_encode(cinfo, st, 0);	/* EOB decision */

-      while ((v = (*block)[natural_order[++k]]) == 0) {

-	arith_encode(cinfo, st + 1, 0);

-	st += 3;

-      }

-      arith_encode(cinfo, st + 1, 1);

-      /* Figure F.6: Encoding nonzero value v */

-      /* Figure F.7: Encoding the sign of v */

-      if (v > 0) {

-	arith_encode(cinfo, entropy->fixed_bin, 0);

-      } else {

-	v = -v;

-	arith_encode(cinfo, entropy->fixed_bin, 1);

-      }

-      st += 2;

-      /* Figure F.8: Encoding the magnitude category of v */

-      m = 0;

-      if (v -= 1) {

-	arith_encode(cinfo, st, 1);

-	m = 1;

-	v2 = v;

-	if (v2 >>= 1) {

-	  arith_encode(cinfo, st, 1);

-	  m <<= 1;

-	  st = entropy->ac_stats[tbl] +

-	       (k <= cinfo->arith_ac_K[tbl] ? 189 : 217);

-	  while (v2 >>= 1) {

-	    arith_encode(cinfo, st, 1);

-	    m <<= 1;

-	    st += 1;

-	  }

-	}

-      }

-      arith_encode(cinfo, st, 0);

-      /* Figure F.9: Encoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	arith_encode(cinfo, st, (m & v) ? 1 : 0);

-    }

-    /* Encode EOB decision only if k < cinfo->lim_Se */

-    if (k < cinfo->lim_Se) {

-      st = entropy->ac_stats[tbl] + 3 * k;

-      arith_encode(cinfo, st, 1);

-    }

-  }

-

-  return TRUE;

-}

-

-

-/*

- * Initialize for an arithmetic-compressed scan.

- */

-

-METHODDEF(void)

-start_pass (j_compress_ptr cinfo, boolean gather_statistics)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  int ci, tbl;

-  jpeg_component_info * compptr;

-

-  if (gather_statistics)

-    /* Make sure to avoid that in the master control logic!

-     * We are fully adaptive here and need no extra

-     * statistics gathering pass!

-     */

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-

-  /* We assume jcmaster.c already validated the progressive scan parameters. */

-

-  /* Select execution routines */

-  if (cinfo->progressive_mode) {

-    if (cinfo->Ah == 0) {

-      if (cinfo->Ss == 0)

-	entropy->pub.encode_mcu = encode_mcu_DC_first;

-      else

-	entropy->pub.encode_mcu = encode_mcu_AC_first;

-    } else {

-      if (cinfo->Ss == 0)

-	entropy->pub.encode_mcu = encode_mcu_DC_refine;

-      else

-	entropy->pub.encode_mcu = encode_mcu_AC_refine;

-    }

-  } else

-    entropy->pub.encode_mcu = encode_mcu;

-

-  /* Allocate & initialize requested statistics areas */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    /* DC needs no table for refinement scan */

-    if (cinfo->Ss == 0 && cinfo->Ah == 0) {

-      tbl = compptr->dc_tbl_no;

-      if (tbl < 0 || tbl >= NUM_ARITH_TBLS)

-	ERREXIT1(cinfo, JERR_NO_ARITH_TABLE, tbl);

-      if (entropy->dc_stats[tbl] == NULL)

-	entropy->dc_stats[tbl] = (unsigned char *) (*cinfo->mem->alloc_small)

-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, DC_STAT_BINS);

-      MEMZERO(entropy->dc_stats[tbl], DC_STAT_BINS);

-      /* Initialize DC predictions to 0 */

-      entropy->last_dc_val[ci] = 0;

-      entropy->dc_context[ci] = 0;

-    }

-    /* AC needs no table when not present */

-    if (cinfo->Se) {

-      tbl = compptr->ac_tbl_no;

-      if (tbl < 0 || tbl >= NUM_ARITH_TBLS)

-	ERREXIT1(cinfo, JERR_NO_ARITH_TABLE, tbl);

-      if (entropy->ac_stats[tbl] == NULL)

-	entropy->ac_stats[tbl] = (unsigned char *) (*cinfo->mem->alloc_small)

-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, AC_STAT_BINS);

-      MEMZERO(entropy->ac_stats[tbl], AC_STAT_BINS);

-#ifdef CALCULATE_SPECTRAL_CONDITIONING

-      if (cinfo->progressive_mode)

-	/* Section G.1.3.2: Set appropriate arithmetic conditioning value Kx */

-	cinfo->arith_ac_K[tbl] = cinfo->Ss + ((8 + cinfo->Se - cinfo->Ss) >> 4);

-#endif

-    }

-  }

-

-  /* Initialize arithmetic encoding variables */

-  entropy->c = 0;

-  entropy->a = 0x10000L;

-  entropy->sc = 0;

-  entropy->zc = 0;

-  entropy->ct = 11;

-  entropy->buffer = -1;  /* empty */

-

-  /* Initialize restart stuff */

-  entropy->restarts_to_go = cinfo->restart_interval;

-  entropy->next_restart_num = 0;

-}

-

-

-/*

- * Module initialization routine for arithmetic entropy encoding.

- */

-

-GLOBAL(void)

-jinit_arith_encoder (j_compress_ptr cinfo)

-{

-  arith_entropy_ptr entropy;

-  int i;

-

-  entropy = (arith_entropy_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(arith_entropy_encoder));

-  cinfo->entropy = &entropy->pub;

-  entropy->pub.start_pass = start_pass;

-  entropy->pub.finish_pass = finish_pass;

-

-  /* Mark tables unallocated */

-  for (i = 0; i < NUM_ARITH_TBLS; i++) {

-    entropy->dc_stats[i] = NULL;

-    entropy->ac_stats[i] = NULL;

-  }

-

-  /* Initialize index for fixed probability estimation */

-  entropy->fixed_bin[0] = 113;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jccoefct.c b/plugins/AdvaImg/src/LibJPEG/jccoefct.c
deleted file mode 100644
index b64b46e75a..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jccoefct.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*

- * jccoefct.c

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 2003-2011 by Guido Vollbeding.

- * 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 the coefficient buffer controller for compression.

- * This controller is the top level of the JPEG compressor proper.

- * The coefficient buffer lies between forward-DCT and entropy encoding steps.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* We use a full-image coefficient buffer when doing Huffman optimization,

- * and also for writing multiple-scan JPEG files.  In all cases, the DCT

- * step is run during the first pass, and subsequent passes need only read

- * the buffered coefficients.

- */

-#ifdef ENTROPY_OPT_SUPPORTED

-#define FULL_COEF_BUFFER_SUPPORTED

-#else

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-#define FULL_COEF_BUFFER_SUPPORTED

-#endif

-#endif

-

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_c_coef_controller pub; /* public fields */

-

-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */

-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */

-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */

-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */

-

-  /* For single-pass compression, it's sufficient to buffer just one MCU

-   * (although this may prove a bit slow in practice).  We allocate a

-   * workspace of C_MAX_BLOCKS_IN_MCU coefficient blocks, and reuse it for each

-   * MCU constructed and sent.  (On 80x86, the workspace is FAR even though

-   * it's not really very big; this is to keep the module interfaces unchanged

-   * when a large coefficient buffer is necessary.)

-   * In multi-pass modes, this array points to the current MCU's blocks

-   * within the virtual arrays.

-   */

-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];

-

-  /* In multi-pass modes, we need a virtual block array for each component. */

-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];

-} my_coef_controller;

-

-typedef my_coef_controller * my_coef_ptr;

-

-

-/* Forward declarations */

-METHODDEF(boolean) compress_data

-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));

-#ifdef FULL_COEF_BUFFER_SUPPORTED

-METHODDEF(boolean) compress_first_pass

-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));

-METHODDEF(boolean) compress_output

-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));

-#endif

-

-

-LOCAL(void)

-start_iMCU_row (j_compress_ptr cinfo)

-/* Reset within-iMCU-row counters for a new row */

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  /* In an interleaved scan, an MCU row is the same as an iMCU row.

-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.

-   * But at the bottom of the image, process only what's left.

-   */

-  if (cinfo->comps_in_scan > 1) {

-    coef->MCU_rows_per_iMCU_row = 1;

-  } else {

-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;

-    else

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;

-  }

-

-  coef->mcu_ctr = 0;

-  coef->MCU_vert_offset = 0;

-}

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  coef->iMCU_row_num = 0;

-  start_iMCU_row(cinfo);

-

-  switch (pass_mode) {

-  case JBUF_PASS_THRU:

-    if (coef->whole_image[0] != NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    coef->pub.compress_data = compress_data;

-    break;

-#ifdef FULL_COEF_BUFFER_SUPPORTED

-  case JBUF_SAVE_AND_PASS:

-    if (coef->whole_image[0] == NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    coef->pub.compress_data = compress_first_pass;

-    break;

-  case JBUF_CRANK_DEST:

-    if (coef->whole_image[0] == NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    coef->pub.compress_data = compress_output;

-    break;

-#endif

-  default:

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    break;

-  }

-}

-

-

-/*

- * Process some data in the single-pass case.

- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)

- * per call, ie, v_samp_factor block rows for each component in the image.

- * Returns TRUE if the iMCU row is completed, FALSE if suspended.

- *

- * NB: input_buf contains a plane for each component in image,

- * which we index according to the component's SOF position.

- */

-

-METHODDEF(boolean)

-compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION MCU_col_num;	/* index of current MCU within row */

-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  int blkn, bi, ci, yindex, yoffset, blockcnt;

-  JDIMENSION ypos, xpos;

-  jpeg_component_info *compptr;

-  forward_DCT_ptr forward_DCT;

-

-  /* Loop to write as much as one whole iMCU row */

-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;

-       yoffset++) {

-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num <= last_MCU_col;

-	 MCU_col_num++) {

-      /* Determine where data comes from in input_buf and do the DCT thing.

-       * Each call on forward_DCT processes a horizontal row of DCT blocks

-       * as wide as an MCU; we rely on having allocated the MCU_buffer[] blocks

-       * sequentially.  Dummy blocks at the right or bottom edge are filled in

-       * specially.  The data in them does not matter for image reconstruction,

-       * so we fill them with values that will encode to the smallest amount of

-       * data, viz: all zeroes in the AC entries, DC entries equal to previous

-       * block's DC value.  (Thanks to Thomas Kinsman for this idea.)

-       */

-      blkn = 0;

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-	compptr = cinfo->cur_comp_info[ci];

-	forward_DCT = cinfo->fdct->forward_DCT[compptr->component_index];

-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width

-						: compptr->last_col_width;

-	xpos = MCU_col_num * compptr->MCU_sample_width;

-	ypos = yoffset * compptr->DCT_v_scaled_size;

-	/* ypos == (yoffset+yindex) * DCTSIZE */

-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {

-	  if (coef->iMCU_row_num < last_iMCU_row ||

-	      yoffset+yindex < compptr->last_row_height) {

-	    (*forward_DCT) (cinfo, compptr,

-			    input_buf[compptr->component_index],

-			    coef->MCU_buffer[blkn],

-			    ypos, xpos, (JDIMENSION) blockcnt);

-	    if (blockcnt < compptr->MCU_width) {

-	      /* Create some dummy blocks at the right edge of the image. */

-	      FMEMZERO((void FAR *) coef->MCU_buffer[blkn + blockcnt],

-		       (compptr->MCU_width - blockcnt) * SIZEOF(JBLOCK));

-	      for (bi = blockcnt; bi < compptr->MCU_width; bi++) {

-		coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn+bi-1][0][0];

-	      }

-	    }

-	  } else {

-	    /* Create a row of dummy blocks at the bottom of the image. */

-	    FMEMZERO((void FAR *) coef->MCU_buffer[blkn],

-		     compptr->MCU_width * SIZEOF(JBLOCK));

-	    for (bi = 0; bi < compptr->MCU_width; bi++) {

-	      coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn-1][0][0];

-	    }

-	  }

-	  blkn += compptr->MCU_width;

-	  ypos += compptr->DCT_v_scaled_size;

-	}

-      }

-      /* Try to write the MCU.  In event of a suspension failure, we will

-       * re-DCT the MCU on restart (a bit inefficient, could be fixed...)

-       */

-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {

-	/* Suspension forced; update state counters and exit */

-	coef->MCU_vert_offset = yoffset;

-	coef->mcu_ctr = MCU_col_num;

-	return FALSE;

-      }

-    }

-    /* Completed an MCU row, but perhaps not an iMCU row */

-    coef->mcu_ctr = 0;

-  }

-  /* Completed the iMCU row, advance counters for next one */

-  coef->iMCU_row_num++;

-  start_iMCU_row(cinfo);

-  return TRUE;

-}

-

-

-#ifdef FULL_COEF_BUFFER_SUPPORTED

-

-/*

- * Process some data in the first pass of a multi-pass case.

- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)

- * per call, ie, v_samp_factor block rows for each component in the image.

- * This amount of data is read from the source buffer, DCT'd and quantized,

- * and saved into the virtual arrays.  We also generate suitable dummy blocks

- * as needed at the right and lower edges.  (The dummy blocks are constructed

- * in the virtual arrays, which have been padded appropriately.)  This makes

- * it possible for subsequent passes not to worry about real vs. dummy blocks.

- *

- * We must also emit the data to the entropy encoder.  This is conveniently

- * done by calling compress_output() after we've loaded the current strip

- * of the virtual arrays.

- *

- * NB: input_buf contains a plane for each component in image.  All

- * components are DCT'd and loaded into the virtual arrays in this pass.

- * However, it may be that only a subset of the components are emitted to

- * the entropy encoder during this first pass; be careful about looking

- * at the scan-dependent variables (MCU dimensions, etc).

- */

-

-METHODDEF(boolean)

-compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  JDIMENSION blocks_across, MCUs_across, MCUindex;

-  int bi, ci, h_samp_factor, block_row, block_rows, ndummy;

-  JCOEF lastDC;

-  jpeg_component_info *compptr;

-  JBLOCKARRAY buffer;

-  JBLOCKROW thisblockrow, lastblockrow;

-  forward_DCT_ptr forward_DCT;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Align the virtual buffer for this component. */

-    buffer = (*cinfo->mem->access_virt_barray)

-      ((j_common_ptr) cinfo, coef->whole_image[ci],

-       coef->iMCU_row_num * compptr->v_samp_factor,

-       (JDIMENSION) compptr->v_samp_factor, TRUE);

-    /* Count non-dummy DCT block rows in this iMCU row. */

-    if (coef->iMCU_row_num < last_iMCU_row)

-      block_rows = compptr->v_samp_factor;

-    else {

-      /* NB: can't use last_row_height here, since may not be set! */

-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);

-      if (block_rows == 0) block_rows = compptr->v_samp_factor;

-    }

-    blocks_across = compptr->width_in_blocks;

-    h_samp_factor = compptr->h_samp_factor;

-    /* Count number of dummy blocks to be added at the right margin. */

-    ndummy = (int) (blocks_across % h_samp_factor);

-    if (ndummy > 0)

-      ndummy = h_samp_factor - ndummy;

-    forward_DCT = cinfo->fdct->forward_DCT[ci];

-    /* Perform DCT for all non-dummy blocks in this iMCU row.  Each call

-     * on forward_DCT processes a complete horizontal row of DCT blocks.

-     */

-    for (block_row = 0; block_row < block_rows; block_row++) {

-      thisblockrow = buffer[block_row];

-      (*forward_DCT) (cinfo, compptr, input_buf[ci], thisblockrow,

-		      (JDIMENSION) (block_row * compptr->DCT_v_scaled_size),

-		      (JDIMENSION) 0, blocks_across);

-      if (ndummy > 0) {

-	/* Create dummy blocks at the right edge of the image. */

-	thisblockrow += blocks_across; /* => first dummy block */

-	FMEMZERO((void FAR *) thisblockrow, ndummy * SIZEOF(JBLOCK));

-	lastDC = thisblockrow[-1][0];

-	for (bi = 0; bi < ndummy; bi++) {

-	  thisblockrow[bi][0] = lastDC;

-	}

-      }

-    }

-    /* If at end of image, create dummy block rows as needed.

-     * The tricky part here is that within each MCU, we want the DC values

-     * of the dummy blocks to match the last real block's DC value.

-     * This squeezes a few more bytes out of the resulting file...

-     */

-    if (coef->iMCU_row_num == last_iMCU_row) {

-      blocks_across += ndummy;	/* include lower right corner */

-      MCUs_across = blocks_across / h_samp_factor;

-      for (block_row = block_rows; block_row < compptr->v_samp_factor;

-	   block_row++) {

-	thisblockrow = buffer[block_row];

-	lastblockrow = buffer[block_row-1];

-	FMEMZERO((void FAR *) thisblockrow,

-		 (size_t) (blocks_across * SIZEOF(JBLOCK)));

-	for (MCUindex = 0; MCUindex < MCUs_across; MCUindex++) {

-	  lastDC = lastblockrow[h_samp_factor-1][0];

-	  for (bi = 0; bi < h_samp_factor; bi++) {

-	    thisblockrow[bi][0] = lastDC;

-	  }

-	  thisblockrow += h_samp_factor; /* advance to next MCU in row */

-	  lastblockrow += h_samp_factor;

-	}

-      }

-    }

-  }

-  /* NB: compress_output will increment iMCU_row_num if successful.

-   * A suspension return will result in redoing all the work above next time.

-   */

-

-  /* Emit data to the entropy encoder, sharing code with subsequent passes */

-  return compress_output(cinfo, input_buf);

-}

-

-

-/*

- * Process some data in subsequent passes of a multi-pass case.

- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)

- * per call, ie, v_samp_factor block rows for each component in the scan.

- * The data is obtained from the virtual arrays and fed to the entropy coder.

- * Returns TRUE if the iMCU row is completed, FALSE if suspended.

- *

- * NB: input_buf is ignored; it is likely to be a NULL pointer.

- */

-

-METHODDEF(boolean)

-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION MCU_col_num;	/* index of current MCU within row */

-  int blkn, ci, xindex, yindex, yoffset;

-  JDIMENSION start_col;

-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];

-  JBLOCKROW buffer_ptr;

-  jpeg_component_info *compptr;

-

-  /* Align the virtual buffers for the components used in this scan.

-   * NB: during first pass, this is safe only because the buffers will

-   * already be aligned properly, so jmemmgr.c won't need to do any I/O.

-   */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    buffer[ci] = (*cinfo->mem->access_virt_barray)

-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],

-       coef->iMCU_row_num * compptr->v_samp_factor,

-       (JDIMENSION) compptr->v_samp_factor, FALSE);

-  }

-

-  /* Loop to process one whole iMCU row */

-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;

-       yoffset++) {

-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;

-	 MCU_col_num++) {

-      /* Construct list of pointers to DCT blocks belonging to this MCU */

-      blkn = 0;			/* index of current DCT block within MCU */

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-	compptr = cinfo->cur_comp_info[ci];

-	start_col = MCU_col_num * compptr->MCU_width;

-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {

-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;

-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {

-	    coef->MCU_buffer[blkn++] = buffer_ptr++;

-	  }

-	}

-      }

-      /* Try to write the MCU. */

-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {

-	/* Suspension forced; update state counters and exit */

-	coef->MCU_vert_offset = yoffset;

-	coef->mcu_ctr = MCU_col_num;

-	return FALSE;

-      }

-    }

-    /* Completed an MCU row, but perhaps not an iMCU row */

-    coef->mcu_ctr = 0;

-  }

-  /* Completed the iMCU row, advance counters for next one */

-  coef->iMCU_row_num++;

-  start_iMCU_row(cinfo);

-  return TRUE;

-}

-

-#endif /* FULL_COEF_BUFFER_SUPPORTED */

-

-

-/*

- * Initialize coefficient buffer controller.

- */

-

-GLOBAL(void)

-jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)

-{

-  my_coef_ptr coef;

-

-  coef = (my_coef_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_coef_controller));

-  cinfo->coef = (struct jpeg_c_coef_controller *) coef;

-  coef->pub.start_pass = start_pass_coef;

-

-  /* Create the coefficient buffer. */

-  if (need_full_buffer) {

-#ifdef FULL_COEF_BUFFER_SUPPORTED

-    /* Allocate a full-image virtual array for each component, */

-    /* padded to a multiple of samp_factor DCT blocks in each direction. */

-    int ci;

-    jpeg_component_info *compptr;

-

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,

-				(long) compptr->h_samp_factor),

-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,

-				(long) compptr->v_samp_factor),

-	 (JDIMENSION) compptr->v_samp_factor);

-    }

-#else

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-#endif

-  } else {

-    /* We only need a single-MCU buffer. */

-    JBLOCKROW buffer;

-    int i;

-

-    buffer = (JBLOCKROW)

-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));

-    for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {

-      coef->MCU_buffer[i] = buffer + i;

-    }

-    coef->whole_image[0] = NULL; /* flag for no virtual arrays */

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jccolor.c b/plugins/AdvaImg/src/LibJPEG/jccolor.c
deleted file mode 100644
index aac5802e92..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jccolor.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/*

- * jccolor.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2011-2013 by Guido Vollbeding.

- * 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 input colorspace conversion routines.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_color_converter pub; /* public fields */

-

-  /* Private state for RGB->YCC conversion */

-  INT32 * rgb_ycc_tab;		/* => table for RGB to YCbCr conversion */

-} my_color_converter;

-

-typedef my_color_converter * my_cconvert_ptr;

-

-

-/**************** RGB -> YCbCr conversion: most common case **************/

-

-/*

- * YCbCr is defined per Recommendation ITU-R BT.601-7 (03/2011),

- * previously known as Recommendation CCIR 601-1, except that Cb and Cr

- * are normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.

- * sRGB (standard RGB color space) is defined per IEC 61966-2-1:1999.

- * sYCC (standard luma-chroma-chroma color space with extended gamut)

- * is defined per IEC 61966-2-1:1999 Amendment A1:2003 Annex F.

- * bg-sRGB and bg-sYCC (big gamut standard color spaces)

- * are defined per IEC 61966-2-1:1999 Amendment A1:2003 Annex G.

- * Note that the derived conversion coefficients given in some of these

- * documents are imprecise.  The general conversion equations are

- *	Y  = Kr * R + (1 - Kr - Kb) * G + Kb * B

- *	Cb = 0.5 * (B - Y) / (1 - Kb)

- *	Cr = 0.5 * (R - Y) / (1 - Kr)

- * With Kr = 0.299 and Kb = 0.114 (derived according to SMPTE RP 177-1993

- * from the 1953 FCC NTSC primaries and CIE Illuminant C),

- * the conversion equations to be implemented are therefore

- *	Y  =  0.299 * R + 0.587 * G + 0.114 * B

- *	Cb = -0.168735892 * R - 0.331264108 * G + 0.5 * B + CENTERJSAMPLE

- *	Cr =  0.5 * R - 0.418687589 * G - 0.081312411 * B + CENTERJSAMPLE

- * Note: older versions of the IJG code used a zero offset of MAXJSAMPLE/2,

- * rather than CENTERJSAMPLE, for Cb and Cr.  This gave equal positive and

- * negative swings for Cb/Cr, but meant that grayscale values (Cb=Cr=0)

- * were not represented exactly.  Now we sacrifice exact representation of

- * maximum red and maximum blue in order to get exact grayscales.

- *

- * To avoid floating-point arithmetic, we represent the fractional constants

- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide

- * the products by 2^16, with appropriate rounding, to get the correct answer.

- *

- * For even more speed, we avoid doing any multiplications in the inner loop

- * by precalculating the constants times R,G,B for all possible values.

- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);

- * for 9-bit to 12-bit samples it is still acceptable.  It's not very

- * reasonable for 16-bit samples, but if you want lossless storage you

- * shouldn't be changing colorspace anyway.

- * The CENTERJSAMPLE offsets and the rounding fudge-factor of 0.5 are included

- * in the tables to save adding them separately in the inner loop.

- */

-

-#define SCALEBITS	16	/* speediest right-shift on some machines */

-#define CBCR_OFFSET	((INT32) CENTERJSAMPLE << SCALEBITS)

-#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))

-#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))

-

-/* We allocate one big table and divide it up into eight parts, instead of

- * doing eight alloc_small requests.  This lets us use a single table base

- * address, which can be held in a register in the inner loops on many

- * machines (more than can hold all eight addresses, anyway).

- */

-

-#define R_Y_OFF		0			/* offset to R => Y section */

-#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */

-#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */

-#define R_CB_OFF	(3*(MAXJSAMPLE+1))

-#define G_CB_OFF	(4*(MAXJSAMPLE+1))

-#define B_CB_OFF	(5*(MAXJSAMPLE+1))

-#define R_CR_OFF	B_CB_OFF		/* B=>Cb, R=>Cr are the same */

-#define G_CR_OFF	(6*(MAXJSAMPLE+1))

-#define B_CR_OFF	(7*(MAXJSAMPLE+1))

-#define TABLE_SIZE	(8*(MAXJSAMPLE+1))

-

-

-/*

- * Initialize for RGB->YCC colorspace conversion.

- */

-

-METHODDEF(void)

-rgb_ycc_start (j_compress_ptr cinfo)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  INT32 * rgb_ycc_tab;

-  INT32 i;

-

-  /* Allocate and fill in the conversion tables. */

-  cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(TABLE_SIZE * SIZEOF(INT32)));

-

-  for (i = 0; i <= MAXJSAMPLE; i++) {

-    rgb_ycc_tab[i+R_Y_OFF] = FIX(0.299) * i;

-    rgb_ycc_tab[i+G_Y_OFF] = FIX(0.587) * i;

-    rgb_ycc_tab[i+B_Y_OFF] = FIX(0.114) * i   + ONE_HALF;

-    rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.168735892)) * i;

-    rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.331264108)) * i;

-    /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.

-     * This ensures that the maximum output will round to MAXJSAMPLE

-     * not MAXJSAMPLE+1, and thus that we don't have to range-limit.

-     */

-    rgb_ycc_tab[i+B_CB_OFF] = FIX(0.5) * i    + CBCR_OFFSET + ONE_HALF-1;

-/*  B=>Cb and R=>Cr tables are the same

-    rgb_ycc_tab[i+R_CR_OFF] = FIX(0.5) * i    + CBCR_OFFSET + ONE_HALF-1;

-*/

-    rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.418687589)) * i;

-    rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.081312411)) * i;

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- *

- * Note that we change from the application's interleaved-pixel format

- * to our internal noninterleaved, one-plane-per-component format.

- * The input buffer is therefore three times as wide as the output buffer.

- *

- * A starting row offset is provided only for the output buffer.  The caller

- * can easily adjust the passed input_buf value to accommodate any row

- * offset required on that side.

- */

-

-METHODDEF(void)

-rgb_ycc_convert (j_compress_ptr cinfo,

-		 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-		 JDIMENSION output_row, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;

-  register int r, g, b;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr0, outptr1, outptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr0 = output_buf[0][output_row];

-    outptr1 = output_buf[1][output_row];

-    outptr2 = output_buf[2][output_row];

-    output_row++;

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr[RGB_RED]);

-      g = GETJSAMPLE(inptr[RGB_GREEN]);

-      b = GETJSAMPLE(inptr[RGB_BLUE]);

-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations

-       * must be too; we do not need an explicit range-limiting operation.

-       * Hence the value being shifted is never negative, and we don't

-       * need the general RIGHT_SHIFT macro.

-       */

-      /* Y */

-      outptr0[col] = (JSAMPLE)

-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])

-		 >> SCALEBITS);

-      /* Cb */

-      outptr1[col] = (JSAMPLE)

-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])

-		 >> SCALEBITS);

-      /* Cr */

-      outptr2[col] = (JSAMPLE)

-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])

-		 >> SCALEBITS);

-      inptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/**************** Cases other than RGB -> YCbCr **************/

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * This version handles RGB->grayscale conversion, which is the same

- * as the RGB->Y portion of RGB->YCbCr.

- * We assume rgb_ycc_start has been called (we only use the Y tables).

- */

-

-METHODDEF(void)

-rgb_gray_convert (j_compress_ptr cinfo,

-		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-		  JDIMENSION output_row, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;

-  register int r, g, b;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr = output_buf[0][output_row++];

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr[RGB_RED]);

-      g = GETJSAMPLE(inptr[RGB_GREEN]);

-      b = GETJSAMPLE(inptr[RGB_BLUE]);

-      /* Y */

-      outptr[col] = (JSAMPLE)

-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])

-		 >> SCALEBITS);

-      inptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * This version handles Adobe-style CMYK->YCCK conversion,

- * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same

- * conversion as above, while passing K (black) unchanged.

- * We assume rgb_ycc_start has been called.

- */

-

-METHODDEF(void)

-cmyk_ycck_convert (j_compress_ptr cinfo,

-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-		   JDIMENSION output_row, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;

-  register int r, g, b;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr0, outptr1, outptr2, outptr3;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr0 = output_buf[0][output_row];

-    outptr1 = output_buf[1][output_row];

-    outptr2 = output_buf[2][output_row];

-    outptr3 = output_buf[3][output_row];

-    output_row++;

-    for (col = 0; col < num_cols; col++) {

-      r = MAXJSAMPLE - GETJSAMPLE(inptr[0]);

-      g = MAXJSAMPLE - GETJSAMPLE(inptr[1]);

-      b = MAXJSAMPLE - GETJSAMPLE(inptr[2]);

-      /* K passes through as-is */

-      outptr3[col] = inptr[3];	/* don't need GETJSAMPLE here */

-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations

-       * must be too; we do not need an explicit range-limiting operation.

-       * Hence the value being shifted is never negative, and we don't

-       * need the general RIGHT_SHIFT macro.

-       */

-      /* Y */

-      outptr0[col] = (JSAMPLE)

-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])

-		 >> SCALEBITS);

-      /* Cb */

-      outptr1[col] = (JSAMPLE)

-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])

-		 >> SCALEBITS);

-      /* Cr */

-      outptr2[col] = (JSAMPLE)

-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])

-		 >> SCALEBITS);

-      inptr += 4;

-    }

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * [R,G,B] to [R-G,G,B-G] conversion with modulo calculation

- * (forward reversible color transform).

- * This can be seen as an adaption of the general RGB->YCbCr

- * conversion equation with Kr = Kb = 0, while replacing the

- * normalization by modulo calculation.

- */

-

-METHODDEF(void)

-rgb_rgb1_convert (j_compress_ptr cinfo,

-		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-		  JDIMENSION output_row, int num_rows)

-{

-  register int r, g, b;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr0, outptr1, outptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr0 = output_buf[0][output_row];

-    outptr1 = output_buf[1][output_row];

-    outptr2 = output_buf[2][output_row];

-    output_row++;

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr[RGB_RED]);

-      g = GETJSAMPLE(inptr[RGB_GREEN]);

-      b = GETJSAMPLE(inptr[RGB_BLUE]);

-      /* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD

-       * (modulo) operator is equivalent to the bitmask operator AND.

-       */

-      outptr0[col] = (JSAMPLE) ((r - g + CENTERJSAMPLE) & MAXJSAMPLE);

-      outptr1[col] = (JSAMPLE) g;

-      outptr2[col] = (JSAMPLE) ((b - g + CENTERJSAMPLE) & MAXJSAMPLE);

-      inptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * This version handles grayscale output with no conversion.

- * The source can be either plain grayscale or YCC (since Y == gray).

- */

-

-METHODDEF(void)

-grayscale_convert (j_compress_ptr cinfo,

-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-		   JDIMENSION output_row, int num_rows)

-{

-  int instride = cinfo->input_components;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr = output_buf[0][output_row++];

-    for (col = 0; col < num_cols; col++) {

-      outptr[col] = inptr[0];	/* don't need GETJSAMPLE() here */

-      inptr += instride;

-    }

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * No colorspace conversion, but change from interleaved

- * to separate-planes representation.

- */

-

-METHODDEF(void)

-rgb_convert (j_compress_ptr cinfo,

-	     JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-	     JDIMENSION output_row, int num_rows)

-{

-  register JSAMPROW inptr;

-  register JSAMPROW outptr0, outptr1, outptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    inptr = *input_buf++;

-    outptr0 = output_buf[0][output_row];

-    outptr1 = output_buf[1][output_row];

-    outptr2 = output_buf[2][output_row];

-    output_row++;

-    for (col = 0; col < num_cols; col++) {

-      /* We can dispense with GETJSAMPLE() here */

-      outptr0[col] = inptr[RGB_RED];

-      outptr1[col] = inptr[RGB_GREEN];

-      outptr2[col] = inptr[RGB_BLUE];

-      inptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * Convert some rows of samples to the JPEG colorspace.

- * This version handles multi-component colorspaces without conversion.

- * We assume input_components == num_components.

- */

-

-METHODDEF(void)

-null_convert (j_compress_ptr cinfo,

-	      JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-	      JDIMENSION output_row, int num_rows)

-{

-  int ci;

-  register int nc = cinfo->num_components;

-  register JSAMPROW inptr;

-  register JSAMPROW outptr;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->image_width;

-

-  while (--num_rows >= 0) {

-    /* It seems fastest to make a separate pass for each component. */

-    for (ci = 0; ci < nc; ci++) {

-      inptr = input_buf[0] + ci;

-      outptr = output_buf[ci][output_row];

-      for (col = 0; col < num_cols; col++) {

-	*outptr++ = *inptr;	/* don't need GETJSAMPLE() here */

-	inptr += nc;

-      }

-    }

-    input_buf++;

-    output_row++;

-  }

-}

-

-

-/*

- * Empty method for start_pass.

- */

-

-METHODDEF(void)

-null_method (j_compress_ptr cinfo)

-{

-  /* no work needed */

-}

-

-

-/*

- * Module initialization routine for input colorspace conversion.

- */

-

-GLOBAL(void)

-jinit_color_converter (j_compress_ptr cinfo)

-{

-  my_cconvert_ptr cconvert;

-

-  cconvert = (my_cconvert_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_color_converter));

-  cinfo->cconvert = &cconvert->pub;

-  /* set start_pass to null method until we find out differently */

-  cconvert->pub.start_pass = null_method;

-

-  /* Make sure input_components agrees with in_color_space */

-  switch (cinfo->in_color_space) {

-  case JCS_GRAYSCALE:

-    if (cinfo->input_components != 1)

-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-    break;

-

-  case JCS_RGB:

-  case JCS_BG_RGB:

-    if (cinfo->input_components != RGB_PIXELSIZE)

-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-    break;

-

-  case JCS_YCbCr:

-  case JCS_BG_YCC:

-    if (cinfo->input_components != 3)

-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-    break;

-

-  case JCS_CMYK:

-  case JCS_YCCK:

-    if (cinfo->input_components != 4)

-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-    break;

-

-  default:			/* JCS_UNKNOWN can be anything */

-    if (cinfo->input_components < 1)

-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-    break;

-  }

-

-  /* Support color transform only for RGB colorspaces */

-  if (cinfo->color_transform &&

-      cinfo->jpeg_color_space != JCS_RGB &&

-      cinfo->jpeg_color_space != JCS_BG_RGB)

-    ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-

-  /* Check num_components, set conversion method based on requested space */

-  switch (cinfo->jpeg_color_space) {

-  case JCS_GRAYSCALE:

-    if (cinfo->num_components != 1)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    switch (cinfo->in_color_space) {

-    case JCS_GRAYSCALE:

-    case JCS_YCbCr:

-    case JCS_BG_YCC:

-      cconvert->pub.color_convert = grayscale_convert;

-      break;

-    case JCS_RGB:

-      cconvert->pub.start_pass = rgb_ycc_start;

-      cconvert->pub.color_convert = rgb_gray_convert;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  case JCS_RGB:

-  case JCS_BG_RGB:

-    if (cinfo->num_components != 3)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    if (cinfo->in_color_space == cinfo->jpeg_color_space) {

-      switch (cinfo->color_transform) {

-      case JCT_NONE:

-	cconvert->pub.color_convert = rgb_convert;

-	break;

-      case JCT_SUBTRACT_GREEN:

-	cconvert->pub.color_convert = rgb_rgb1_convert;

-	break;

-      default:

-	ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-      }

-    } else

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    break;

-

-  case JCS_YCbCr:

-    if (cinfo->num_components != 3)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    switch (cinfo->in_color_space) {

-    case JCS_RGB:

-      cconvert->pub.start_pass = rgb_ycc_start;

-      cconvert->pub.color_convert = rgb_ycc_convert;

-      break;

-    case JCS_YCbCr:

-      cconvert->pub.color_convert = null_convert;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  case JCS_BG_YCC:

-    if (cinfo->num_components != 3)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    switch (cinfo->in_color_space) {

-    case JCS_RGB:

-      /* For conversion from normal RGB input to BG_YCC representation,

-       * the Cb/Cr values are first computed as usual, and then

-       * quantized further after DCT processing by a factor of

-       * 2 in reference to the nominal quantization factor.

-       */

-      /* need quantization scale by factor of 2 after DCT */

-      cinfo->comp_info[1].component_needed = TRUE;

-      cinfo->comp_info[2].component_needed = TRUE;

-      /* compute normal YCC first */

-      cconvert->pub.start_pass = rgb_ycc_start;

-      cconvert->pub.color_convert = rgb_ycc_convert;

-      break;

-    case JCS_YCbCr:

-      /* need quantization scale by factor of 2 after DCT */

-      cinfo->comp_info[1].component_needed = TRUE;

-      cinfo->comp_info[2].component_needed = TRUE;

-      /*FALLTHROUGH*/

-    case JCS_BG_YCC:

-      /* Pass through for BG_YCC input */

-      cconvert->pub.color_convert = null_convert;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  case JCS_CMYK:

-    if (cinfo->num_components != 4)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    if (cinfo->in_color_space == JCS_CMYK)

-      cconvert->pub.color_convert = null_convert;

-    else

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    break;

-

-  case JCS_YCCK:

-    if (cinfo->num_components != 4)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    switch (cinfo->in_color_space) {

-    case JCS_CMYK:

-      cconvert->pub.start_pass = rgb_ycc_start;

-      cconvert->pub.color_convert = cmyk_ycck_convert;

-      break;

-    case JCS_YCCK:

-      cconvert->pub.color_convert = null_convert;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  default:			/* allow null conversion of JCS_UNKNOWN */

-    if (cinfo->jpeg_color_space != cinfo->in_color_space ||

-	cinfo->num_components != cinfo->input_components)

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    cconvert->pub.color_convert = null_convert;

-    break;

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcdctmgr.c b/plugins/AdvaImg/src/LibJPEG/jcdctmgr.c
deleted file mode 100644
index 9daea85f62..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcdctmgr.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*

- * jcdctmgr.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 the forward-DCT management logic.

- * This code selects a particular DCT implementation to be used,

- * and it performs related housekeeping chores including coefficient

- * quantization.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-

-/* Private subobject for this module */

-

-typedef struct {

-  struct jpeg_forward_dct pub;	/* public fields */

-

-  /* Pointer to the DCT routine actually in use */

-  forward_DCT_method_ptr do_dct[MAX_COMPONENTS];

-

-#ifdef DCT_FLOAT_SUPPORTED

-  /* Same as above for the floating-point case. */

-  float_DCT_method_ptr do_float_dct[MAX_COMPONENTS];

-#endif

-} my_fdct_controller;

-

-typedef my_fdct_controller * my_fdct_ptr;

-

-

-/* The allocated post-DCT divisor tables -- big enough for any

- * supported variant and not identical to the quant table entries,

- * because of scaling (especially for an unnormalized DCT) --

- * are pointed to by dct_table in the per-component comp_info

- * structures.  Each table is given in normal array order.

- */

-

-typedef union {

-  DCTELEM int_array[DCTSIZE2];

-#ifdef DCT_FLOAT_SUPPORTED

-  FAST_FLOAT float_array[DCTSIZE2];

-#endif

-} divisor_table;

-

-

-/* The current scaled-DCT routines require ISLOW-style divisor tables,

- * so be sure to compile that code if either ISLOW or SCALING is requested.

- */

-#ifdef DCT_ISLOW_SUPPORTED

-#define PROVIDE_ISLOW_TABLES

-#else

-#ifdef DCT_SCALING_SUPPORTED

-#define PROVIDE_ISLOW_TABLES

-#endif

-#endif

-

-

-/*

- * Perform forward DCT on one or more blocks of a component.

- *

- * The input samples are taken from the sample_data[] array starting at

- * position start_row/start_col, and moving to the right for any additional

- * blocks. The quantized coefficients are returned in coef_blocks[].

- */

-

-METHODDEF(void)

-forward_DCT (j_compress_ptr cinfo, jpeg_component_info * compptr,

-	     JSAMPARRAY sample_data, JBLOCKROW coef_blocks,

-	     JDIMENSION start_row, JDIMENSION start_col,

-	     JDIMENSION num_blocks)

-/* This version is used for integer DCT implementations. */

-{

-  /* This routine is heavily used, so it's worth coding it tightly. */

-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;

-  forward_DCT_method_ptr do_dct = fdct->do_dct[compptr->component_index];

-  DCTELEM * divisors = (DCTELEM *) compptr->dct_table;

-  DCTELEM workspace[DCTSIZE2];	/* work area for FDCT subroutine */

-  JDIMENSION bi;

-

-  sample_data += start_row;	/* fold in the vertical offset once */

-

-  for (bi = 0; bi < num_blocks; bi++, start_col += compptr->DCT_h_scaled_size) {

-    /* Perform the DCT */

-    (*do_dct) (workspace, sample_data, start_col);

-

-    /* Quantize/descale the coefficients, and store into coef_blocks[] */

-    { register DCTELEM temp, qval;

-      register int i;

-      register JCOEFPTR output_ptr = coef_blocks[bi];

-

-      for (i = 0; i < DCTSIZE2; i++) {

-	qval = divisors[i];

-	temp = workspace[i];

-	/* Divide the coefficient value by qval, ensuring proper rounding.

-	 * Since C does not specify the direction of rounding for negative

-	 * quotients, we have to force the dividend positive for portability.

-	 *

-	 * In most files, at least half of the output values will be zero

-	 * (at default quantization settings, more like three-quarters...)

-	 * so we should ensure that this case is fast.  On many machines,

-	 * a comparison is enough cheaper than a divide to make a special test

-	 * a win.  Since both inputs will be nonnegative, we need only test

-	 * for a < b to discover whether a/b is 0.

-	 * If your machine's division is fast enough, define FAST_DIVIDE.

-	 */

-#ifdef FAST_DIVIDE

-#define DIVIDE_BY(a,b)	a /= b

-#else

-#define DIVIDE_BY(a,b)	if (a >= b) a /= b; else a = 0

-#endif

-	if (temp < 0) {

-	  temp = -temp;

-	  temp += qval>>1;	/* for rounding */

-	  DIVIDE_BY(temp, qval);

-	  temp = -temp;

-	} else {

-	  temp += qval>>1;	/* for rounding */

-	  DIVIDE_BY(temp, qval);

-	}

-	output_ptr[i] = (JCOEF) temp;

-      }

-    }

-  }

-}

-

-

-#ifdef DCT_FLOAT_SUPPORTED

-

-METHODDEF(void)

-forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,

-		   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,

-		   JDIMENSION start_row, JDIMENSION start_col,

-		   JDIMENSION num_blocks)

-/* This version is used for floating-point DCT implementations. */

-{

-  /* This routine is heavily used, so it's worth coding it tightly. */

-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;

-  float_DCT_method_ptr do_dct = fdct->do_float_dct[compptr->component_index];

-  FAST_FLOAT * divisors = (FAST_FLOAT *) compptr->dct_table;

-  FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */

-  JDIMENSION bi;

-

-  sample_data += start_row;	/* fold in the vertical offset once */

-

-  for (bi = 0; bi < num_blocks; bi++, start_col += compptr->DCT_h_scaled_size) {

-    /* Perform the DCT */

-    (*do_dct) (workspace, sample_data, start_col);

-

-    /* Quantize/descale the coefficients, and store into coef_blocks[] */

-    { register FAST_FLOAT temp;

-      register int i;

-      register JCOEFPTR output_ptr = coef_blocks[bi];

-

-      for (i = 0; i < DCTSIZE2; i++) {

-	/* Apply the quantization and scaling factor */

-	temp = workspace[i] * divisors[i];

-	/* Round to nearest integer.

-	 * Since C does not specify the direction of rounding for negative

-	 * quotients, we have to force the dividend positive for portability.

-	 * The maximum coefficient size is +-16K (for 12-bit data), so this

-	 * code should work for either 16-bit or 32-bit ints.

-	 */

-	output_ptr[i] = (JCOEF) ((int) (temp + (FAST_FLOAT) 16384.5) - 16384);

-      }

-    }

-  }

-}

-

-#endif /* DCT_FLOAT_SUPPORTED */

-

-

-/*

- * Initialize for a processing pass.

- * Verify that all referenced Q-tables are present, and set up

- * the divisor table for each one.

- * In the current implementation, DCT of all components is done during

- * the first pass, even if only some components will be output in the

- * first scan.  Hence all components should be examined here.

- */

-

-METHODDEF(void)

-start_pass_fdctmgr (j_compress_ptr cinfo)

-{

-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;

-  int ci, qtblno, i;

-  jpeg_component_info *compptr;

-  int method = 0;

-  JQUANT_TBL * qtbl;

-  DCTELEM * dtbl;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Select the proper DCT routine for this component's scaling */

-    switch ((compptr->DCT_h_scaled_size << 8) + compptr->DCT_v_scaled_size) {

-#ifdef DCT_SCALING_SUPPORTED

-    case ((1 << 8) + 1):

-      fdct->do_dct[ci] = jpeg_fdct_1x1;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((2 << 8) + 2):

-      fdct->do_dct[ci] = jpeg_fdct_2x2;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((3 << 8) + 3):

-      fdct->do_dct[ci] = jpeg_fdct_3x3;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((4 << 8) + 4):

-      fdct->do_dct[ci] = jpeg_fdct_4x4;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((5 << 8) + 5):

-      fdct->do_dct[ci] = jpeg_fdct_5x5;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((6 << 8) + 6):

-      fdct->do_dct[ci] = jpeg_fdct_6x6;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((7 << 8) + 7):

-      fdct->do_dct[ci] = jpeg_fdct_7x7;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((9 << 8) + 9):

-      fdct->do_dct[ci] = jpeg_fdct_9x9;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((10 << 8) + 10):

-      fdct->do_dct[ci] = jpeg_fdct_10x10;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((11 << 8) + 11):

-      fdct->do_dct[ci] = jpeg_fdct_11x11;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((12 << 8) + 12):

-      fdct->do_dct[ci] = jpeg_fdct_12x12;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((13 << 8) + 13):

-      fdct->do_dct[ci] = jpeg_fdct_13x13;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((14 << 8) + 14):

-      fdct->do_dct[ci] = jpeg_fdct_14x14;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((15 << 8) + 15):

-      fdct->do_dct[ci] = jpeg_fdct_15x15;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((16 << 8) + 16):

-      fdct->do_dct[ci] = jpeg_fdct_16x16;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((16 << 8) + 8):

-      fdct->do_dct[ci] = jpeg_fdct_16x8;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((14 << 8) + 7):

-      fdct->do_dct[ci] = jpeg_fdct_14x7;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((12 << 8) + 6):

-      fdct->do_dct[ci] = jpeg_fdct_12x6;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((10 << 8) + 5):

-      fdct->do_dct[ci] = jpeg_fdct_10x5;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((8 << 8) + 4):

-      fdct->do_dct[ci] = jpeg_fdct_8x4;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((6 << 8) + 3):

-      fdct->do_dct[ci] = jpeg_fdct_6x3;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((4 << 8) + 2):

-      fdct->do_dct[ci] = jpeg_fdct_4x2;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((2 << 8) + 1):

-      fdct->do_dct[ci] = jpeg_fdct_2x1;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((8 << 8) + 16):

-      fdct->do_dct[ci] = jpeg_fdct_8x16;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((7 << 8) + 14):

-      fdct->do_dct[ci] = jpeg_fdct_7x14;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((6 << 8) + 12):

-      fdct->do_dct[ci] = jpeg_fdct_6x12;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((5 << 8) + 10):

-      fdct->do_dct[ci] = jpeg_fdct_5x10;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((4 << 8) + 8):

-      fdct->do_dct[ci] = jpeg_fdct_4x8;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((3 << 8) + 6):

-      fdct->do_dct[ci] = jpeg_fdct_3x6;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((2 << 8) + 4):

-      fdct->do_dct[ci] = jpeg_fdct_2x4;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-    case ((1 << 8) + 2):

-      fdct->do_dct[ci] = jpeg_fdct_1x2;

-      method = JDCT_ISLOW;	/* jfdctint uses islow-style table */

-      break;

-#endif

-    case ((DCTSIZE << 8) + DCTSIZE):

-      switch (cinfo->dct_method) {

-#ifdef DCT_ISLOW_SUPPORTED

-      case JDCT_ISLOW:

-	fdct->do_dct[ci] = jpeg_fdct_islow;

-	method = JDCT_ISLOW;

-	break;

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-      case JDCT_IFAST:

-	fdct->do_dct[ci] = jpeg_fdct_ifast;

-	method = JDCT_IFAST;

-	break;

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-      case JDCT_FLOAT:

-	fdct->do_float_dct[ci] = jpeg_fdct_float;

-	method = JDCT_FLOAT;

-	break;

-#endif

-      default:

-	ERREXIT(cinfo, JERR_NOT_COMPILED);

-	break;

-      }

-      break;

-    default:

-      ERREXIT2(cinfo, JERR_BAD_DCTSIZE,

-	       compptr->DCT_h_scaled_size, compptr->DCT_v_scaled_size);

-      break;

-    }

-    qtblno = compptr->quant_tbl_no;

-    /* Make sure specified quantization table is present */

-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||

-	cinfo->quant_tbl_ptrs[qtblno] == NULL)

-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);

-    qtbl = cinfo->quant_tbl_ptrs[qtblno];

-    /* Create divisor table from quant table */

-    switch (method) {

-#ifdef PROVIDE_ISLOW_TABLES

-    case JDCT_ISLOW:

-      /* For LL&M IDCT method, divisors are equal to raw quantization

-       * coefficients multiplied by 8 (to counteract scaling).

-       */

-      dtbl = (DCTELEM *) compptr->dct_table;

-      for (i = 0; i < DCTSIZE2; i++) {

-	dtbl[i] =

-	  ((DCTELEM) qtbl->quantval[i]) << (compptr->component_needed ? 4 : 3);

-      }

-      fdct->pub.forward_DCT[ci] = forward_DCT;

-      break;

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-    case JDCT_IFAST:

-      {

-	/* For AA&N IDCT method, divisors are equal to quantization

-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where

-	 *   scalefactor[0] = 1

-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7

-	 * We apply a further scale factor of 8.

-	 */

-#define CONST_BITS 14

-	static const INT16 aanscales[DCTSIZE2] = {

-	  /* precomputed values scaled up by 14 bits */

-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,

-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,

-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,

-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,

-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,

-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,

-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,

-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247

-	};

-	SHIFT_TEMPS

-

-	dtbl = (DCTELEM *) compptr->dct_table;

-	for (i = 0; i < DCTSIZE2; i++) {

-	  dtbl[i] = (DCTELEM)

-	    DESCALE(MULTIPLY16V16((INT32) qtbl->quantval[i],

-				  (INT32) aanscales[i]),

-		    compptr->component_needed ? CONST_BITS-4 : CONST_BITS-3);

-	}

-      }

-      fdct->pub.forward_DCT[ci] = forward_DCT;

-      break;

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-    case JDCT_FLOAT:

-      {

-	/* For float AA&N IDCT method, divisors are equal to quantization

-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where

-	 *   scalefactor[0] = 1

-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7

-	 * We apply a further scale factor of 8.

-	 * What's actually stored is 1/divisor so that the inner loop can

-	 * use a multiplication rather than a division.

-	 */

-	FAST_FLOAT * fdtbl = (FAST_FLOAT *) compptr->dct_table;

-	int row, col;

-	static const double aanscalefactor[DCTSIZE] = {

-	  1.0, 1.387039845, 1.306562965, 1.175875602,

-	  1.0, 0.785694958, 0.541196100, 0.275899379

-	};

-

-	i = 0;

-	for (row = 0; row < DCTSIZE; row++) {

-	  for (col = 0; col < DCTSIZE; col++) {

-	    fdtbl[i] = (FAST_FLOAT)

-	      (1.0 / ((double) qtbl->quantval[i] *

-		      aanscalefactor[row] * aanscalefactor[col] *

-		      (compptr->component_needed ? 16.0 : 8.0)));

-	    i++;

-	  }

-	}

-      }

-      fdct->pub.forward_DCT[ci] = forward_DCT_float;

-      break;

-#endif

-    default:

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-      break;

-    }

-  }

-}

-

-

-/*

- * Initialize FDCT manager.

- */

-

-GLOBAL(void)

-jinit_forward_dct (j_compress_ptr cinfo)

-{

-  my_fdct_ptr fdct;

-  int ci;

-  jpeg_component_info *compptr;

-

-  fdct = (my_fdct_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_fdct_controller));

-  cinfo->fdct = &fdct->pub;

-  fdct->pub.start_pass = start_pass_fdctmgr;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Allocate a divisor table for each component */

-    compptr->dct_table =

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(divisor_table));

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jchuff.c b/plugins/AdvaImg/src/LibJPEG/jchuff.c
deleted file mode 100644
index 92fd974caf..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jchuff.c
+++ /dev/null
@@ -1,1573 +0,0 @@
-/*

- * jchuff.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2006-2013 by Guido Vollbeding.

- * 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 Huffman entropy encoding routines.

- * Both sequential and progressive modes are supported in this single module.

- *

- * Much of the complexity here has to do with supporting output suspension.

- * If the data destination module demands suspension, we want to be able to

- * back up to the start of the current MCU.  To do this, we copy state

- * variables into local working storage, and update them back to the

- * permanent JPEG objects only upon successful completion of an MCU.

- *

- * We do not support output suspension for the progressive JPEG mode, since

- * the library currently does not allow multiple-scan files to be written

- * with output suspension.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* The legal range of a DCT coefficient is

- *  -1024 .. +1023  for 8-bit data;

- * -16384 .. +16383 for 12-bit data.

- * Hence the magnitude should always fit in 10 or 14 bits respectively.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define MAX_COEF_BITS 10

-#else

-#define MAX_COEF_BITS 14

-#endif

-

-/* Derived data constructed for each Huffman table */

-

-typedef struct {

-  unsigned int ehufco[256];	/* code for each symbol */

-  char ehufsi[256];		/* length of code for each symbol */

-  /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */

-} c_derived_tbl;

-

-

-/* Expanded entropy encoder object for Huffman encoding.

- *

- * The savable_state subrecord contains fields that change within an MCU,

- * but must not be updated permanently until we complete the MCU.

- */

-

-typedef struct {

-  INT32 put_buffer;		/* current bit-accumulation buffer */

-  int put_bits;			/* # of bits now in it */

-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */

-} savable_state;

-

-/* This macro is to work around compilers with missing or broken

- * structure assignment.  You'll need to fix this code if you have

- * such a compiler and you change MAX_COMPS_IN_SCAN.

- */

-

-#ifndef NO_STRUCT_ASSIGN

-#define ASSIGN_STATE(dest,src)  ((dest) = (src))

-#else

-#if MAX_COMPS_IN_SCAN == 4

-#define ASSIGN_STATE(dest,src)  \

-	((dest).put_buffer = (src).put_buffer, \

-	 (dest).put_bits = (src).put_bits, \

-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \

-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \

-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \

-	 (dest).last_dc_val[3] = (src).last_dc_val[3])

-#endif

-#endif

-

-

-typedef struct {

-  struct jpeg_entropy_encoder pub; /* public fields */

-

-  savable_state saved;		/* Bit buffer & DC state at start of MCU */

-

-  /* These fields are NOT loaded into local working state. */

-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */

-  int next_restart_num;		/* next restart number to write (0-7) */

-

-  /* Pointers to derived tables (these workspaces have image lifespan) */

-  c_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];

-  c_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];

-

-  /* Statistics tables for optimization */

-  long * dc_count_ptrs[NUM_HUFF_TBLS];

-  long * ac_count_ptrs[NUM_HUFF_TBLS];

-

-  /* Following fields used only in progressive mode */

-

-  /* Mode flag: TRUE for optimization, FALSE for actual data output */

-  boolean gather_statistics;

-

-  /* next_output_byte/free_in_buffer are local copies of cinfo->dest fields.

-   */

-  JOCTET * next_output_byte;	/* => next byte to write in buffer */

-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */

-  j_compress_ptr cinfo;		/* link to cinfo (needed for dump_buffer) */

-

-  /* Coding status for AC components */

-  int ac_tbl_no;		/* the table number of the single component */

-  unsigned int EOBRUN;		/* run length of EOBs */

-  unsigned int BE;		/* # of buffered correction bits before MCU */

-  char * bit_buffer;		/* buffer for correction bits (1 per char) */

-  /* packing correction bits tightly would save some space but cost time... */

-} huff_entropy_encoder;

-

-typedef huff_entropy_encoder * huff_entropy_ptr;

-

-/* Working state while writing an MCU (sequential mode).

- * This struct contains all the fields that are needed by subroutines.

- */

-

-typedef struct {

-  JOCTET * next_output_byte;	/* => next byte to write in buffer */

-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */

-  savable_state cur;		/* Current bit buffer & DC state */

-  j_compress_ptr cinfo;		/* dump_buffer needs access to this */

-} working_state;

-

-/* MAX_CORR_BITS is the number of bits the AC refinement correction-bit

- * buffer can hold.  Larger sizes may slightly improve compression, but

- * 1000 is already well into the realm of overkill.

- * The minimum safe size is 64 bits.

- */

-

-#define MAX_CORR_BITS  1000	/* Max # of correction bits I can buffer */

-

-/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.

- * We assume that int right shift is unsigned if INT32 right shift is,

- * which should be safe.

- */

-

-#ifdef RIGHT_SHIFT_IS_UNSIGNED

-#define ISHIFT_TEMPS	int ishift_temp;

-#define IRIGHT_SHIFT(x,shft)  \

-	((ishift_temp = (x)) < 0 ? \

-	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \

-	 (ishift_temp >> (shft)))

-#else

-#define ISHIFT_TEMPS

-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))

-#endif

-

-

-/*

- * Compute the derived values for a Huffman table.

- * This routine also performs some validation checks on the table.

- */

-

-LOCAL(void)

-jpeg_make_c_derived_tbl (j_compress_ptr cinfo, boolean isDC, int tblno,

-			 c_derived_tbl ** pdtbl)

-{

-  JHUFF_TBL *htbl;

-  c_derived_tbl *dtbl;

-  int p, i, l, lastp, si, maxsymbol;

-  char huffsize[257];

-  unsigned int huffcode[257];

-  unsigned int code;

-

-  /* Note that huffsize[] and huffcode[] are filled in code-length order,

-   * paralleling the order of the symbols themselves in htbl->huffval[].

-   */

-

-  /* Find the input Huffman table */

-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)

-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);

-  htbl =

-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];

-  if (htbl == NULL)

-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);

-

-  /* Allocate a workspace if we haven't already done so. */

-  if (*pdtbl == NULL)

-    *pdtbl = (c_derived_tbl *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(c_derived_tbl));

-  dtbl = *pdtbl;

-  

-  /* Figure C.1: make table of Huffman code length for each symbol */

-

-  p = 0;

-  for (l = 1; l <= 16; l++) {

-    i = (int) htbl->bits[l];

-    if (i < 0 || p + i > 256)	/* protect against table overrun */

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    while (i--)

-      huffsize[p++] = (char) l;

-  }

-  huffsize[p] = 0;

-  lastp = p;

-  

-  /* Figure C.2: generate the codes themselves */

-  /* We also validate that the counts represent a legal Huffman code tree. */

-

-  code = 0;

-  si = huffsize[0];

-  p = 0;

-  while (huffsize[p]) {

-    while (((int) huffsize[p]) == si) {

-      huffcode[p++] = code;

-      code++;

-    }

-    /* code is now 1 more than the last code used for codelength si; but

-     * it must still fit in si bits, since no code is allowed to be all ones.

-     */

-    if (((INT32) code) >= (((INT32) 1) << si))

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    code <<= 1;

-    si++;

-  }

-  

-  /* Figure C.3: generate encoding tables */

-  /* These are code and size indexed by symbol value */

-

-  /* Set all codeless symbols to have code length 0;

-   * this lets us detect duplicate VAL entries here, and later

-   * allows emit_bits to detect any attempt to emit such symbols.

-   */

-  MEMZERO(dtbl->ehufsi, SIZEOF(dtbl->ehufsi));

-

-  /* This is also a convenient place to check for out-of-range

-   * and duplicated VAL entries.  We allow 0..255 for AC symbols

-   * but only 0..15 for DC.  (We could constrain them further

-   * based on data depth and mode, but this seems enough.)

-   */

-  maxsymbol = isDC ? 15 : 255;

-

-  for (p = 0; p < lastp; p++) {

-    i = htbl->huffval[p];

-    if (i < 0 || i > maxsymbol || dtbl->ehufsi[i])

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    dtbl->ehufco[i] = huffcode[p];

-    dtbl->ehufsi[i] = huffsize[p];

-  }

-}

-

-

-/* Outputting bytes to the file.

- * NB: these must be called only when actually outputting,

- * that is, entropy->gather_statistics == FALSE.

- */

-

-/* Emit a byte, taking 'action' if must suspend. */

-#define emit_byte_s(state,val,action)  \

-	{ *(state)->next_output_byte++ = (JOCTET) (val);  \

-	  if (--(state)->free_in_buffer == 0)  \

-	    if (! dump_buffer_s(state))  \

-	      { action; } }

-

-/* Emit a byte */

-#define emit_byte_e(entropy,val)  \

-	{ *(entropy)->next_output_byte++ = (JOCTET) (val);  \

-	  if (--(entropy)->free_in_buffer == 0)  \

-	    dump_buffer_e(entropy); }

-

-

-LOCAL(boolean)

-dump_buffer_s (working_state * state)

-/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */

-{

-  struct jpeg_destination_mgr * dest = state->cinfo->dest;

-

-  if (! (*dest->empty_output_buffer) (state->cinfo))

-    return FALSE;

-  /* After a successful buffer dump, must reset buffer pointers */

-  state->next_output_byte = dest->next_output_byte;

-  state->free_in_buffer = dest->free_in_buffer;

-  return TRUE;

-}

-

-

-LOCAL(void)

-dump_buffer_e (huff_entropy_ptr entropy)

-/* Empty the output buffer; we do not support suspension in this case. */

-{

-  struct jpeg_destination_mgr * dest = entropy->cinfo->dest;

-

-  if (! (*dest->empty_output_buffer) (entropy->cinfo))

-    ERREXIT(entropy->cinfo, JERR_CANT_SUSPEND);

-  /* After a successful buffer dump, must reset buffer pointers */

-  entropy->next_output_byte = dest->next_output_byte;

-  entropy->free_in_buffer = dest->free_in_buffer;

-}

-

-

-/* Outputting bits to the file */

-

-/* Only the right 24 bits of put_buffer are used; the valid bits are

- * left-justified in this part.  At most 16 bits can be passed to emit_bits

- * in one call, and we never retain more than 7 bits in put_buffer

- * between calls, so 24 bits are sufficient.

- */

-

-INLINE

-LOCAL(boolean)

-emit_bits_s (working_state * state, unsigned int code, int size)

-/* Emit some bits; return TRUE if successful, FALSE if must suspend */

-{

-  /* This routine is heavily used, so it's worth coding tightly. */

-  register INT32 put_buffer;

-  register int put_bits;

-

-  /* if size is 0, caller used an invalid Huffman table entry */

-  if (size == 0)

-    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);

-

-  /* mask off any extra bits in code */

-  put_buffer = ((INT32) code) & ((((INT32) 1) << size) - 1);

-

-  /* new number of bits in buffer */

-  put_bits = size + state->cur.put_bits;

-

-  put_buffer <<= 24 - put_bits; /* align incoming bits */

-

-  /* and merge with old buffer contents */

-  put_buffer |= state->cur.put_buffer;

-

-  while (put_bits >= 8) {

-    int c = (int) ((put_buffer >> 16) & 0xFF);

-

-    emit_byte_s(state, c, return FALSE);

-    if (c == 0xFF) {		/* need to stuff a zero byte? */

-      emit_byte_s(state, 0, return FALSE);

-    }

-    put_buffer <<= 8;

-    put_bits -= 8;

-  }

-

-  state->cur.put_buffer = put_buffer; /* update state variables */

-  state->cur.put_bits = put_bits;

-

-  return TRUE;

-}

-

-

-INLINE

-LOCAL(void)

-emit_bits_e (huff_entropy_ptr entropy, unsigned int code, int size)

-/* Emit some bits, unless we are in gather mode */

-{

-  /* This routine is heavily used, so it's worth coding tightly. */

-  register INT32 put_buffer;

-  register int put_bits;

-

-  /* if size is 0, caller used an invalid Huffman table entry */

-  if (size == 0)

-    ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);

-

-  if (entropy->gather_statistics)

-    return;			/* do nothing if we're only getting stats */

-

-  /* mask off any extra bits in code */

-  put_buffer = ((INT32) code) & ((((INT32) 1) << size) - 1);

-

-  /* new number of bits in buffer */

-  put_bits = size + entropy->saved.put_bits;

-

-  put_buffer <<= 24 - put_bits; /* align incoming bits */

-

-  /* and merge with old buffer contents */

-  put_buffer |= entropy->saved.put_buffer;

-

-  while (put_bits >= 8) {

-    int c = (int) ((put_buffer >> 16) & 0xFF);

-

-    emit_byte_e(entropy, c);

-    if (c == 0xFF) {		/* need to stuff a zero byte? */

-      emit_byte_e(entropy, 0);

-    }

-    put_buffer <<= 8;

-    put_bits -= 8;

-  }

-

-  entropy->saved.put_buffer = put_buffer; /* update variables */

-  entropy->saved.put_bits = put_bits;

-}

-

-

-LOCAL(boolean)

-flush_bits_s (working_state * state)

-{

-  if (! emit_bits_s(state, 0x7F, 7)) /* fill any partial byte with ones */

-    return FALSE;

-  state->cur.put_buffer = 0;	     /* and reset bit-buffer to empty */

-  state->cur.put_bits = 0;

-  return TRUE;

-}

-

-

-LOCAL(void)

-flush_bits_e (huff_entropy_ptr entropy)

-{

-  emit_bits_e(entropy, 0x7F, 7); /* fill any partial byte with ones */

-  entropy->saved.put_buffer = 0; /* and reset bit-buffer to empty */

-  entropy->saved.put_bits = 0;

-}

-

-

-/*

- * Emit (or just count) a Huffman symbol.

- */

-

-INLINE

-LOCAL(void)

-emit_dc_symbol (huff_entropy_ptr entropy, int tbl_no, int symbol)

-{

-  if (entropy->gather_statistics)

-    entropy->dc_count_ptrs[tbl_no][symbol]++;

-  else {

-    c_derived_tbl * tbl = entropy->dc_derived_tbls[tbl_no];

-    emit_bits_e(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);

-  }

-}

-

-

-INLINE

-LOCAL(void)

-emit_ac_symbol (huff_entropy_ptr entropy, int tbl_no, int symbol)

-{

-  if (entropy->gather_statistics)

-    entropy->ac_count_ptrs[tbl_no][symbol]++;

-  else {

-    c_derived_tbl * tbl = entropy->ac_derived_tbls[tbl_no];

-    emit_bits_e(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);

-  }

-}

-

-

-/*

- * Emit bits from a correction bit buffer.

- */

-

-LOCAL(void)

-emit_buffered_bits (huff_entropy_ptr entropy, char * bufstart,

-		    unsigned int nbits)

-{

-  if (entropy->gather_statistics)

-    return;			/* no real work */

-

-  while (nbits > 0) {

-    emit_bits_e(entropy, (unsigned int) (*bufstart), 1);

-    bufstart++;

-    nbits--;

-  }

-}

-

-

-/*

- * Emit any pending EOBRUN symbol.

- */

-

-LOCAL(void)

-emit_eobrun (huff_entropy_ptr entropy)

-{

-  register int temp, nbits;

-

-  if (entropy->EOBRUN > 0) {	/* if there is any pending EOBRUN */

-    temp = entropy->EOBRUN;

-    nbits = 0;

-    while ((temp >>= 1))

-      nbits++;

-    /* safety check: shouldn't happen given limited correction-bit buffer */

-    if (nbits > 14)

-      ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);

-

-    emit_ac_symbol(entropy, entropy->ac_tbl_no, nbits << 4);

-    if (nbits)

-      emit_bits_e(entropy, entropy->EOBRUN, nbits);

-

-    entropy->EOBRUN = 0;

-

-    /* Emit any buffered correction bits */

-    emit_buffered_bits(entropy, entropy->bit_buffer, entropy->BE);

-    entropy->BE = 0;

-  }

-}

-

-

-/*

- * Emit a restart marker & resynchronize predictions.

- */

-

-LOCAL(boolean)

-emit_restart_s (working_state * state, int restart_num)

-{

-  int ci;

-

-  if (! flush_bits_s(state))

-    return FALSE;

-

-  emit_byte_s(state, 0xFF, return FALSE);

-  emit_byte_s(state, JPEG_RST0 + restart_num, return FALSE);

-

-  /* Re-initialize DC predictions to 0 */

-  for (ci = 0; ci < state->cinfo->comps_in_scan; ci++)

-    state->cur.last_dc_val[ci] = 0;

-

-  /* The restart counter is not updated until we successfully write the MCU. */

-

-  return TRUE;

-}

-

-

-LOCAL(void)

-emit_restart_e (huff_entropy_ptr entropy, int restart_num)

-{

-  int ci;

-

-  emit_eobrun(entropy);

-

-  if (! entropy->gather_statistics) {

-    flush_bits_e(entropy);

-    emit_byte_e(entropy, 0xFF);

-    emit_byte_e(entropy, JPEG_RST0 + restart_num);

-  }

-

-  if (entropy->cinfo->Ss == 0) {

-    /* Re-initialize DC predictions to 0 */

-    for (ci = 0; ci < entropy->cinfo->comps_in_scan; ci++)

-      entropy->saved.last_dc_val[ci] = 0;

-  } else {

-    /* Re-initialize all AC-related fields to 0 */

-    entropy->EOBRUN = 0;

-    entropy->BE = 0;

-  }

-}

-

-

-/*

- * MCU encoding for DC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  register int temp, temp2;

-  register int nbits;

-  int blkn, ci, tbl;

-  ISHIFT_TEMPS

-

-  entropy->next_output_byte = cinfo->dest->next_output_byte;

-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval)

-    if (entropy->restarts_to_go == 0)

-      emit_restart_e(entropy, entropy->next_restart_num);

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    ci = cinfo->MCU_membership[blkn];

-    tbl = cinfo->cur_comp_info[ci]->dc_tbl_no;

-

-    /* Compute the DC value after the required point transform by Al.

-     * This is simply an arithmetic right shift.

-     */

-    temp = IRIGHT_SHIFT((int) (MCU_data[blkn][0][0]), cinfo->Al);

-

-    /* DC differences are figured on the point-transformed values. */

-    temp2 = temp - entropy->saved.last_dc_val[ci];

-    entropy->saved.last_dc_val[ci] = temp;

-

-    /* Encode the DC coefficient difference per section G.1.2.1 */

-    temp = temp2;

-    if (temp < 0) {

-      temp = -temp;		/* temp is abs value of input */

-      /* For a negative input, want temp2 = bitwise complement of abs(input) */

-      /* This code assumes we are on a two's complement machine */

-      temp2--;

-    }

-

-    /* Find the number of bits needed for the magnitude of the coefficient */

-    nbits = 0;

-    while (temp) {

-      nbits++;

-      temp >>= 1;

-    }

-    /* Check for out-of-range coefficient values.

-     * Since we're encoding a difference, the range limit is twice as much.

-     */

-    if (nbits > MAX_COEF_BITS+1)

-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);

-

-    /* Count/emit the Huffman-coded symbol for the number of bits */

-    emit_dc_symbol(entropy, tbl, nbits);

-

-    /* Emit that number of bits of the value, if positive, */

-    /* or the complement of its magnitude, if negative. */

-    if (nbits)			/* emit_bits rejects calls with size 0 */

-      emit_bits_e(entropy, (unsigned int) temp2, nbits);

-  }

-

-  cinfo->dest->next_output_byte = entropy->next_output_byte;

-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;

-

-  /* Update restart-interval state too */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for AC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  JBLOCKROW block;

-  register int temp, temp2;

-  register int nbits;

-  register int r, k;

-  int Se, Al;

-

-  entropy->next_output_byte = cinfo->dest->next_output_byte;

-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval)

-    if (entropy->restarts_to_go == 0)

-      emit_restart_e(entropy, entropy->next_restart_num);

-

-  Se = cinfo->Se;

-  Al = cinfo->Al;

-  natural_order = cinfo->natural_order;

-

-  /* Encode the MCU data block */

-  block = MCU_data[0];

-

-  /* Encode the AC coefficients per section G.1.2.2, fig. G.3 */

-  

-  r = 0;			/* r = run length of zeros */

-   

-  for (k = cinfo->Ss; k <= Se; k++) {

-    if ((temp = (*block)[natural_order[k]]) == 0) {

-      r++;

-      continue;

-    }

-    /* We must apply the point transform by Al.  For AC coefficients this

-     * is an integer division with rounding towards 0.  To do this portably

-     * in C, we shift after obtaining the absolute value; so the code is

-     * interwoven with finding the abs value (temp) and output bits (temp2).

-     */

-    if (temp < 0) {

-      temp = -temp;		/* temp is abs value of input */

-      temp >>= Al;		/* apply the point transform */

-      /* For a negative coef, want temp2 = bitwise complement of abs(coef) */

-      temp2 = ~temp;

-    } else {

-      temp >>= Al;		/* apply the point transform */

-      temp2 = temp;

-    }

-    /* Watch out for case that nonzero coef is zero after point transform */

-    if (temp == 0) {

-      r++;

-      continue;

-    }

-

-    /* Emit any pending EOBRUN */

-    if (entropy->EOBRUN > 0)

-      emit_eobrun(entropy);

-    /* if run length > 15, must emit special run-length-16 codes (0xF0) */

-    while (r > 15) {

-      emit_ac_symbol(entropy, entropy->ac_tbl_no, 0xF0);

-      r -= 16;

-    }

-

-    /* Find the number of bits needed for the magnitude of the coefficient */

-    nbits = 1;			/* there must be at least one 1 bit */

-    while ((temp >>= 1))

-      nbits++;

-    /* Check for out-of-range coefficient values */

-    if (nbits > MAX_COEF_BITS)

-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);

-

-    /* Count/emit Huffman symbol for run length / number of bits */

-    emit_ac_symbol(entropy, entropy->ac_tbl_no, (r << 4) + nbits);

-

-    /* Emit that number of bits of the value, if positive, */

-    /* or the complement of its magnitude, if negative. */

-    emit_bits_e(entropy, (unsigned int) temp2, nbits);

-

-    r = 0;			/* reset zero run length */

-  }

-

-  if (r > 0) {			/* If there are trailing zeroes, */

-    entropy->EOBRUN++;		/* count an EOB */

-    if (entropy->EOBRUN == 0x7FFF)

-      emit_eobrun(entropy);	/* force it out to avoid overflow */

-  }

-

-  cinfo->dest->next_output_byte = entropy->next_output_byte;

-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;

-

-  /* Update restart-interval state too */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for DC successive approximation refinement scan.

- * Note: we assume such scans can be multi-component,

- * although the spec is not very clear on the point.

- */

-

-METHODDEF(boolean)

-encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int Al, blkn;

-

-  entropy->next_output_byte = cinfo->dest->next_output_byte;

-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval)

-    if (entropy->restarts_to_go == 0)

-      emit_restart_e(entropy, entropy->next_restart_num);

-

-  Al = cinfo->Al;

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    /* We simply emit the Al'th bit of the DC coefficient value. */

-    emit_bits_e(entropy, (unsigned int) (MCU_data[blkn][0][0] >> Al), 1);

-  }

-

-  cinfo->dest->next_output_byte = entropy->next_output_byte;

-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;

-

-  /* Update restart-interval state too */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU encoding for AC successive approximation refinement scan.

- */

-

-METHODDEF(boolean)

-encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  JBLOCKROW block;

-  register int temp;

-  register int r, k;

-  int Se, Al;

-  int EOB;

-  char *BR_buffer;

-  unsigned int BR;

-  int absvalues[DCTSIZE2];

-

-  entropy->next_output_byte = cinfo->dest->next_output_byte;

-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval)

-    if (entropy->restarts_to_go == 0)

-      emit_restart_e(entropy, entropy->next_restart_num);

-

-  Se = cinfo->Se;

-  Al = cinfo->Al;

-  natural_order = cinfo->natural_order;

-

-  /* Encode the MCU data block */

-  block = MCU_data[0];

-

-  /* It is convenient to make a pre-pass to determine the transformed

-   * coefficients' absolute values and the EOB position.

-   */

-  EOB = 0;

-  for (k = cinfo->Ss; k <= Se; k++) {

-    temp = (*block)[natural_order[k]];

-    /* We must apply the point transform by Al.  For AC coefficients this

-     * is an integer division with rounding towards 0.  To do this portably

-     * in C, we shift after obtaining the absolute value.

-     */

-    if (temp < 0)

-      temp = -temp;		/* temp is abs value of input */

-    temp >>= Al;		/* apply the point transform */

-    absvalues[k] = temp;	/* save abs value for main pass */

-    if (temp == 1)

-      EOB = k;			/* EOB = index of last newly-nonzero coef */

-  }

-

-  /* Encode the AC coefficients per section G.1.2.3, fig. G.7 */

-  

-  r = 0;			/* r = run length of zeros */

-  BR = 0;			/* BR = count of buffered bits added now */

-  BR_buffer = entropy->bit_buffer + entropy->BE; /* Append bits to buffer */

-

-  for (k = cinfo->Ss; k <= Se; k++) {

-    if ((temp = absvalues[k]) == 0) {

-      r++;

-      continue;

-    }

-

-    /* Emit any required ZRLs, but not if they can be folded into EOB */

-    while (r > 15 && k <= EOB) {

-      /* emit any pending EOBRUN and the BE correction bits */

-      emit_eobrun(entropy);

-      /* Emit ZRL */

-      emit_ac_symbol(entropy, entropy->ac_tbl_no, 0xF0);

-      r -= 16;

-      /* Emit buffered correction bits that must be associated with ZRL */

-      emit_buffered_bits(entropy, BR_buffer, BR);

-      BR_buffer = entropy->bit_buffer; /* BE bits are gone now */

-      BR = 0;

-    }

-

-    /* If the coef was previously nonzero, it only needs a correction bit.

-     * NOTE: a straight translation of the spec's figure G.7 would suggest

-     * that we also need to test r > 15.  But if r > 15, we can only get here

-     * if k > EOB, which implies that this coefficient is not 1.

-     */

-    if (temp > 1) {

-      /* The correction bit is the next bit of the absolute value. */

-      BR_buffer[BR++] = (char) (temp & 1);

-      continue;

-    }

-

-    /* Emit any pending EOBRUN and the BE correction bits */

-    emit_eobrun(entropy);

-

-    /* Count/emit Huffman symbol for run length / number of bits */

-    emit_ac_symbol(entropy, entropy->ac_tbl_no, (r << 4) + 1);

-

-    /* Emit output bit for newly-nonzero coef */

-    temp = ((*block)[natural_order[k]] < 0) ? 0 : 1;

-    emit_bits_e(entropy, (unsigned int) temp, 1);

-

-    /* Emit buffered correction bits that must be associated with this code */

-    emit_buffered_bits(entropy, BR_buffer, BR);

-    BR_buffer = entropy->bit_buffer; /* BE bits are gone now */

-    BR = 0;

-    r = 0;			/* reset zero run length */

-  }

-

-  if (r > 0 || BR > 0) {	/* If there are trailing zeroes, */

-    entropy->EOBRUN++;		/* count an EOB */

-    entropy->BE += BR;		/* concat my correction bits to older ones */

-    /* We force out the EOB if we risk either:

-     * 1. overflow of the EOB counter;

-     * 2. overflow of the correction bit buffer during the next MCU.

-     */

-    if (entropy->EOBRUN == 0x7FFF || entropy->BE > (MAX_CORR_BITS-DCTSIZE2+1))

-      emit_eobrun(entropy);

-  }

-

-  cinfo->dest->next_output_byte = entropy->next_output_byte;

-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;

-

-  /* Update restart-interval state too */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  return TRUE;

-}

-

-

-/* Encode a single block's worth of coefficients */

-

-LOCAL(boolean)

-encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,

-		  c_derived_tbl *dctbl, c_derived_tbl *actbl)

-{

-  register int temp, temp2;

-  register int nbits;

-  register int r, k;

-  int Se = state->cinfo->lim_Se;

-  const int * natural_order = state->cinfo->natural_order;

-

-  /* Encode the DC coefficient difference per section F.1.2.1 */

-

-  temp = temp2 = block[0] - last_dc_val;

-

-  if (temp < 0) {

-    temp = -temp;		/* temp is abs value of input */

-    /* For a negative input, want temp2 = bitwise complement of abs(input) */

-    /* This code assumes we are on a two's complement machine */

-    temp2--;

-  }

-

-  /* Find the number of bits needed for the magnitude of the coefficient */

-  nbits = 0;

-  while (temp) {

-    nbits++;

-    temp >>= 1;

-  }

-  /* Check for out-of-range coefficient values.

-   * Since we're encoding a difference, the range limit is twice as much.

-   */

-  if (nbits > MAX_COEF_BITS+1)

-    ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);

-

-  /* Emit the Huffman-coded symbol for the number of bits */

-  if (! emit_bits_s(state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))

-    return FALSE;

-

-  /* Emit that number of bits of the value, if positive, */

-  /* or the complement of its magnitude, if negative. */

-  if (nbits)			/* emit_bits rejects calls with size 0 */

-    if (! emit_bits_s(state, (unsigned int) temp2, nbits))

-      return FALSE;

-

-  /* Encode the AC coefficients per section F.1.2.2 */

-

-  r = 0;			/* r = run length of zeros */

-

-  for (k = 1; k <= Se; k++) {

-    if ((temp2 = block[natural_order[k]]) == 0) {

-      r++;

-    } else {

-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */

-      while (r > 15) {

-	if (! emit_bits_s(state, actbl->ehufco[0xF0], actbl->ehufsi[0xF0]))

-	  return FALSE;

-	r -= 16;

-      }

-

-      temp = temp2;

-      if (temp < 0) {

-	temp = -temp;		/* temp is abs value of input */

-	/* This code assumes we are on a two's complement machine */

-	temp2--;

-      }

-

-      /* Find the number of bits needed for the magnitude of the coefficient */

-      nbits = 1;		/* there must be at least one 1 bit */

-      while ((temp >>= 1))

-	nbits++;

-      /* Check for out-of-range coefficient values */

-      if (nbits > MAX_COEF_BITS)

-	ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);

-

-      /* Emit Huffman symbol for run length / number of bits */

-      temp = (r << 4) + nbits;

-      if (! emit_bits_s(state, actbl->ehufco[temp], actbl->ehufsi[temp]))

-	return FALSE;

-

-      /* Emit that number of bits of the value, if positive, */

-      /* or the complement of its magnitude, if negative. */

-      if (! emit_bits_s(state, (unsigned int) temp2, nbits))

-	return FALSE;

-

-      r = 0;

-    }

-  }

-

-  /* If the last coef(s) were zero, emit an end-of-block code */

-  if (r > 0)

-    if (! emit_bits_s(state, actbl->ehufco[0], actbl->ehufsi[0]))

-      return FALSE;

-

-  return TRUE;

-}

-

-

-/*

- * Encode and output one MCU's worth of Huffman-compressed coefficients.

- */

-

-METHODDEF(boolean)

-encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  working_state state;

-  int blkn, ci;

-  jpeg_component_info * compptr;

-

-  /* Load up working state */

-  state.next_output_byte = cinfo->dest->next_output_byte;

-  state.free_in_buffer = cinfo->dest->free_in_buffer;

-  ASSIGN_STATE(state.cur, entropy->saved);

-  state.cinfo = cinfo;

-

-  /* Emit restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! emit_restart_s(&state, entropy->next_restart_num))

-	return FALSE;

-  }

-

-  /* Encode the MCU data blocks */

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    ci = cinfo->MCU_membership[blkn];

-    compptr = cinfo->cur_comp_info[ci];

-    if (! encode_one_block(&state,

-			   MCU_data[blkn][0], state.cur.last_dc_val[ci],

-			   entropy->dc_derived_tbls[compptr->dc_tbl_no],

-			   entropy->ac_derived_tbls[compptr->ac_tbl_no]))

-      return FALSE;

-    /* Update last_dc_val */

-    state.cur.last_dc_val[ci] = MCU_data[blkn][0][0];

-  }

-

-  /* Completed MCU, so update state */

-  cinfo->dest->next_output_byte = state.next_output_byte;

-  cinfo->dest->free_in_buffer = state.free_in_buffer;

-  ASSIGN_STATE(entropy->saved, state.cur);

-

-  /* Update restart-interval state too */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      entropy->restarts_to_go = cinfo->restart_interval;

-      entropy->next_restart_num++;

-      entropy->next_restart_num &= 7;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  return TRUE;

-}

-

-

-/*

- * Finish up at the end of a Huffman-compressed scan.

- */

-

-METHODDEF(void)

-finish_pass_huff (j_compress_ptr cinfo)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  working_state state;

-

-  if (cinfo->progressive_mode) {

-    entropy->next_output_byte = cinfo->dest->next_output_byte;

-    entropy->free_in_buffer = cinfo->dest->free_in_buffer;

-

-    /* Flush out any buffered data */

-    emit_eobrun(entropy);

-    flush_bits_e(entropy);

-

-    cinfo->dest->next_output_byte = entropy->next_output_byte;

-    cinfo->dest->free_in_buffer = entropy->free_in_buffer;

-  } else {

-    /* Load up working state ... flush_bits needs it */

-    state.next_output_byte = cinfo->dest->next_output_byte;

-    state.free_in_buffer = cinfo->dest->free_in_buffer;

-    ASSIGN_STATE(state.cur, entropy->saved);

-    state.cinfo = cinfo;

-

-    /* Flush out the last data */

-    if (! flush_bits_s(&state))

-      ERREXIT(cinfo, JERR_CANT_SUSPEND);

-

-    /* Update state */

-    cinfo->dest->next_output_byte = state.next_output_byte;

-    cinfo->dest->free_in_buffer = state.free_in_buffer;

-    ASSIGN_STATE(entropy->saved, state.cur);

-  }

-}

-

-

-/*

- * Huffman coding optimization.

- *

- * We first scan the supplied data and count the number of uses of each symbol

- * that is to be Huffman-coded. (This process MUST agree with the code above.)

- * Then we build a Huffman coding tree for the observed counts.

- * Symbols which are not needed at all for the particular image are not

- * assigned any code, which saves space in the DHT marker as well as in

- * the compressed data.

- */

-

-

-/* Process a single block's worth of coefficients */

-

-LOCAL(void)

-htest_one_block (j_compress_ptr cinfo, JCOEFPTR block, int last_dc_val,

-		 long dc_counts[], long ac_counts[])

-{

-  register int temp;

-  register int nbits;

-  register int r, k;

-  int Se = cinfo->lim_Se;

-  const int * natural_order = cinfo->natural_order;

-

-  /* Encode the DC coefficient difference per section F.1.2.1 */

-

-  temp = block[0] - last_dc_val;

-  if (temp < 0)

-    temp = -temp;

-

-  /* Find the number of bits needed for the magnitude of the coefficient */

-  nbits = 0;

-  while (temp) {

-    nbits++;

-    temp >>= 1;

-  }

-  /* Check for out-of-range coefficient values.

-   * Since we're encoding a difference, the range limit is twice as much.

-   */

-  if (nbits > MAX_COEF_BITS+1)

-    ERREXIT(cinfo, JERR_BAD_DCT_COEF);

-

-  /* Count the Huffman symbol for the number of bits */

-  dc_counts[nbits]++;

-

-  /* Encode the AC coefficients per section F.1.2.2 */

-

-  r = 0;			/* r = run length of zeros */

-

-  for (k = 1; k <= Se; k++) {

-    if ((temp = block[natural_order[k]]) == 0) {

-      r++;

-    } else {

-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */

-      while (r > 15) {

-	ac_counts[0xF0]++;

-	r -= 16;

-      }

-

-      /* Find the number of bits needed for the magnitude of the coefficient */

-      if (temp < 0)

-	temp = -temp;

-

-      /* Find the number of bits needed for the magnitude of the coefficient */

-      nbits = 1;		/* there must be at least one 1 bit */

-      while ((temp >>= 1))

-	nbits++;

-      /* Check for out-of-range coefficient values */

-      if (nbits > MAX_COEF_BITS)

-	ERREXIT(cinfo, JERR_BAD_DCT_COEF);

-

-      /* Count Huffman symbol for run length / number of bits */

-      ac_counts[(r << 4) + nbits]++;

-

-      r = 0;

-    }

-  }

-

-  /* If the last coef(s) were zero, emit an end-of-block code */

-  if (r > 0)

-    ac_counts[0]++;

-}

-

-

-/*

- * Trial-encode one MCU's worth of Huffman-compressed coefficients.

- * No data is actually output, so no suspension return is possible.

- */

-

-METHODDEF(boolean)

-encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int blkn, ci;

-  jpeg_component_info * compptr;

-

-  /* Take care of restart intervals if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0) {

-      /* Re-initialize DC predictions to 0 */

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++)

-	entropy->saved.last_dc_val[ci] = 0;

-      /* Update restart state */

-      entropy->restarts_to_go = cinfo->restart_interval;

-    }

-    entropy->restarts_to_go--;

-  }

-

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    ci = cinfo->MCU_membership[blkn];

-    compptr = cinfo->cur_comp_info[ci];

-    htest_one_block(cinfo, MCU_data[blkn][0], entropy->saved.last_dc_val[ci],

-		    entropy->dc_count_ptrs[compptr->dc_tbl_no],

-		    entropy->ac_count_ptrs[compptr->ac_tbl_no]);

-    entropy->saved.last_dc_val[ci] = MCU_data[blkn][0][0];

-  }

-

-  return TRUE;

-}

-

-

-/*

- * Generate the best Huffman code table for the given counts, fill htbl.

- *

- * The JPEG standard requires that no symbol be assigned a codeword of all

- * one bits (so that padding bits added at the end of a compressed segment

- * can't look like a valid code).  Because of the canonical ordering of

- * codewords, this just means that there must be an unused slot in the

- * longest codeword length category.  Section K.2 of the JPEG spec suggests

- * reserving such a slot by pretending that symbol 256 is a valid symbol

- * with count 1.  In theory that's not optimal; giving it count zero but

- * including it in the symbol set anyway should give a better Huffman code.

- * But the theoretically better code actually seems to come out worse in

- * practice, because it produces more all-ones bytes (which incur stuffed

- * zero bytes in the final file).  In any case the difference is tiny.

- *

- * The JPEG standard requires Huffman codes to be no more than 16 bits long.

- * If some symbols have a very small but nonzero probability, the Huffman tree

- * must be adjusted to meet the code length restriction.  We currently use

- * the adjustment method suggested in JPEG section K.2.  This method is *not*

- * optimal; it may not choose the best possible limited-length code.  But

- * typically only very-low-frequency symbols will be given less-than-optimal

- * lengths, so the code is almost optimal.  Experimental comparisons against

- * an optimal limited-length-code algorithm indicate that the difference is

- * microscopic --- usually less than a hundredth of a percent of total size.

- * So the extra complexity of an optimal algorithm doesn't seem worthwhile.

- */

-

-LOCAL(void)

-jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])

-{

-#define MAX_CLEN 32		/* assumed maximum initial code length */

-  UINT8 bits[MAX_CLEN+1];	/* bits[k] = # of symbols with code length k */

-  int codesize[257];		/* codesize[k] = code length of symbol k */

-  int others[257];		/* next symbol in current branch of tree */

-  int c1, c2;

-  int p, i, j;

-  long v;

-

-  /* This algorithm is explained in section K.2 of the JPEG standard */

-

-  MEMZERO(bits, SIZEOF(bits));

-  MEMZERO(codesize, SIZEOF(codesize));

-  for (i = 0; i < 257; i++)

-    others[i] = -1;		/* init links to empty */

-  

-  freq[256] = 1;		/* make sure 256 has a nonzero count */

-  /* Including the pseudo-symbol 256 in the Huffman procedure guarantees

-   * that no real symbol is given code-value of all ones, because 256

-   * will be placed last in the largest codeword category.

-   */

-

-  /* Huffman's basic algorithm to assign optimal code lengths to symbols */

-

-  for (;;) {

-    /* Find the smallest nonzero frequency, set c1 = its symbol */

-    /* In case of ties, take the larger symbol number */

-    c1 = -1;

-    v = 1000000000L;

-    for (i = 0; i <= 256; i++) {

-      if (freq[i] && freq[i] <= v) {

-	v = freq[i];

-	c1 = i;

-      }

-    }

-

-    /* Find the next smallest nonzero frequency, set c2 = its symbol */

-    /* In case of ties, take the larger symbol number */

-    c2 = -1;

-    v = 1000000000L;

-    for (i = 0; i <= 256; i++) {

-      if (freq[i] && freq[i] <= v && i != c1) {

-	v = freq[i];

-	c2 = i;

-      }

-    }

-

-    /* Done if we've merged everything into one frequency */

-    if (c2 < 0)

-      break;

-    

-    /* Else merge the two counts/trees */

-    freq[c1] += freq[c2];

-    freq[c2] = 0;

-

-    /* Increment the codesize of everything in c1's tree branch */

-    codesize[c1]++;

-    while (others[c1] >= 0) {

-      c1 = others[c1];

-      codesize[c1]++;

-    }

-    

-    others[c1] = c2;		/* chain c2 onto c1's tree branch */

-    

-    /* Increment the codesize of everything in c2's tree branch */

-    codesize[c2]++;

-    while (others[c2] >= 0) {

-      c2 = others[c2];

-      codesize[c2]++;

-    }

-  }

-

-  /* Now count the number of symbols of each code length */

-  for (i = 0; i <= 256; i++) {

-    if (codesize[i]) {

-      /* The JPEG standard seems to think that this can't happen, */

-      /* but I'm paranoid... */

-      if (codesize[i] > MAX_CLEN)

-	ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);

-

-      bits[codesize[i]]++;

-    }

-  }

-

-  /* JPEG doesn't allow symbols with code lengths over 16 bits, so if the pure

-   * Huffman procedure assigned any such lengths, we must adjust the coding.

-   * Here is what the JPEG spec says about how this next bit works:

-   * Since symbols are paired for the longest Huffman code, the symbols are

-   * removed from this length category two at a time.  The prefix for the pair

-   * (which is one bit shorter) is allocated to one of the pair; then,

-   * skipping the BITS entry for that prefix length, a code word from the next

-   * shortest nonzero BITS entry is converted into a prefix for two code words

-   * one bit longer.

-   */

-  

-  for (i = MAX_CLEN; i > 16; i--) {

-    while (bits[i] > 0) {

-      j = i - 2;		/* find length of new prefix to be used */

-      while (bits[j] == 0)

-	j--;

-      

-      bits[i] -= 2;		/* remove two symbols */

-      bits[i-1]++;		/* one goes in this length */

-      bits[j+1] += 2;		/* two new symbols in this length */

-      bits[j]--;		/* symbol of this length is now a prefix */

-    }

-  }

-

-  /* Remove the count for the pseudo-symbol 256 from the largest codelength */

-  while (bits[i] == 0)		/* find largest codelength still in use */

-    i--;

-  bits[i]--;

-  

-  /* Return final symbol counts (only for lengths 0..16) */

-  MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits));

-  

-  /* Return a list of the symbols sorted by code length */

-  /* It's not real clear to me why we don't need to consider the codelength

-   * changes made above, but the JPEG spec seems to think this works.

-   */

-  p = 0;

-  for (i = 1; i <= MAX_CLEN; i++) {

-    for (j = 0; j <= 255; j++) {

-      if (codesize[j] == i) {

-	htbl->huffval[p] = (UINT8) j;

-	p++;

-      }

-    }

-  }

-

-  /* Set sent_table FALSE so updated table will be written to JPEG file. */

-  htbl->sent_table = FALSE;

-}

-

-

-/*

- * Finish up a statistics-gathering pass and create the new Huffman tables.

- */

-

-METHODDEF(void)

-finish_pass_gather (j_compress_ptr cinfo)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int ci, tbl;

-  jpeg_component_info * compptr;

-  JHUFF_TBL **htblptr;

-  boolean did_dc[NUM_HUFF_TBLS];

-  boolean did_ac[NUM_HUFF_TBLS];

-

-  /* It's important not to apply jpeg_gen_optimal_table more than once

-   * per table, because it clobbers the input frequency counts!

-   */

-  if (cinfo->progressive_mode)

-    /* Flush out buffered data (all we care about is counting the EOB symbol) */

-    emit_eobrun(entropy);

-

-  MEMZERO(did_dc, SIZEOF(did_dc));

-  MEMZERO(did_ac, SIZEOF(did_ac));

-

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    /* DC needs no table for refinement scan */

-    if (cinfo->Ss == 0 && cinfo->Ah == 0) {

-      tbl = compptr->dc_tbl_no;

-      if (! did_dc[tbl]) {

-	htblptr = & cinfo->dc_huff_tbl_ptrs[tbl];

-	if (*htblptr == NULL)

-	  *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);

-	jpeg_gen_optimal_table(cinfo, *htblptr, entropy->dc_count_ptrs[tbl]);

-	did_dc[tbl] = TRUE;

-      }

-    }

-    /* AC needs no table when not present */

-    if (cinfo->Se) {

-      tbl = compptr->ac_tbl_no;

-      if (! did_ac[tbl]) {

-	htblptr = & cinfo->ac_huff_tbl_ptrs[tbl];

-	if (*htblptr == NULL)

-	  *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);

-	jpeg_gen_optimal_table(cinfo, *htblptr, entropy->ac_count_ptrs[tbl]);

-	did_ac[tbl] = TRUE;

-      }

-    }

-  }

-}

-

-

-/*

- * Initialize for a Huffman-compressed scan.

- * If gather_statistics is TRUE, we do not output anything during the scan,

- * just count the Huffman symbols used and generate Huffman code tables.

- */

-

-METHODDEF(void)

-start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int ci, tbl;

-  jpeg_component_info * compptr;

-

-  if (gather_statistics)

-    entropy->pub.finish_pass = finish_pass_gather;

-  else

-    entropy->pub.finish_pass = finish_pass_huff;

-

-  if (cinfo->progressive_mode) {

-    entropy->cinfo = cinfo;

-    entropy->gather_statistics = gather_statistics;

-

-    /* We assume jcmaster.c already validated the scan parameters. */

-

-    /* Select execution routine */

-    if (cinfo->Ah == 0) {

-      if (cinfo->Ss == 0)

-	entropy->pub.encode_mcu = encode_mcu_DC_first;

-      else

-	entropy->pub.encode_mcu = encode_mcu_AC_first;

-    } else {

-      if (cinfo->Ss == 0)

-	entropy->pub.encode_mcu = encode_mcu_DC_refine;

-      else {

-	entropy->pub.encode_mcu = encode_mcu_AC_refine;

-	/* AC refinement needs a correction bit buffer */

-	if (entropy->bit_buffer == NULL)

-	  entropy->bit_buffer = (char *)

-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-					MAX_CORR_BITS * SIZEOF(char));

-      }

-    }

-

-    /* Initialize AC stuff */

-    entropy->ac_tbl_no = cinfo->cur_comp_info[0]->ac_tbl_no;

-    entropy->EOBRUN = 0;

-    entropy->BE = 0;

-  } else {

-    if (gather_statistics)

-      entropy->pub.encode_mcu = encode_mcu_gather;

-    else

-      entropy->pub.encode_mcu = encode_mcu_huff;

-  }

-

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    /* DC needs no table for refinement scan */

-    if (cinfo->Ss == 0 && cinfo->Ah == 0) {

-      tbl = compptr->dc_tbl_no;

-      if (gather_statistics) {

-	/* Check for invalid table index */

-	/* (make_c_derived_tbl does this in the other path) */

-	if (tbl < 0 || tbl >= NUM_HUFF_TBLS)

-	  ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);

-	/* Allocate and zero the statistics tables */

-	/* Note that jpeg_gen_optimal_table expects 257 entries in each table! */

-	if (entropy->dc_count_ptrs[tbl] == NULL)

-	  entropy->dc_count_ptrs[tbl] = (long *)

-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-					257 * SIZEOF(long));

-	MEMZERO(entropy->dc_count_ptrs[tbl], 257 * SIZEOF(long));

-      } else {

-	/* Compute derived values for Huffman tables */

-	/* We may do this more than once for a table, but it's not expensive */

-	jpeg_make_c_derived_tbl(cinfo, TRUE, tbl,

-				& entropy->dc_derived_tbls[tbl]);

-      }

-      /* Initialize DC predictions to 0 */

-      entropy->saved.last_dc_val[ci] = 0;

-    }

-    /* AC needs no table when not present */

-    if (cinfo->Se) {

-      tbl = compptr->ac_tbl_no;

-      if (gather_statistics) {

-	if (tbl < 0 || tbl >= NUM_HUFF_TBLS)

-	  ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);

-	if (entropy->ac_count_ptrs[tbl] == NULL)

-	  entropy->ac_count_ptrs[tbl] = (long *)

-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-					257 * SIZEOF(long));

-	MEMZERO(entropy->ac_count_ptrs[tbl], 257 * SIZEOF(long));

-      } else {

-	jpeg_make_c_derived_tbl(cinfo, FALSE, tbl,

-				& entropy->ac_derived_tbls[tbl]);

-      }

-    }

-  }

-

-  /* Initialize bit buffer to empty */

-  entropy->saved.put_buffer = 0;

-  entropy->saved.put_bits = 0;

-

-  /* Initialize restart stuff */

-  entropy->restarts_to_go = cinfo->restart_interval;

-  entropy->next_restart_num = 0;

-}

-

-

-/*

- * Module initialization routine for Huffman entropy encoding.

- */

-

-GLOBAL(void)

-jinit_huff_encoder (j_compress_ptr cinfo)

-{

-  huff_entropy_ptr entropy;

-  int i;

-

-  entropy = (huff_entropy_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(huff_entropy_encoder));

-  cinfo->entropy = &entropy->pub;

-  entropy->pub.start_pass = start_pass_huff;

-

-  /* Mark tables unallocated */

-  for (i = 0; i < NUM_HUFF_TBLS; i++) {

-    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;

-    entropy->dc_count_ptrs[i] = entropy->ac_count_ptrs[i] = NULL;

-  }

-

-  if (cinfo->progressive_mode)

-    entropy->bit_buffer = NULL;	/* needed only in AC refinement scan */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcinit.c b/plugins/AdvaImg/src/LibJPEG/jcinit.c
deleted file mode 100644
index 397b488aee..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcinit.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

- * jcinit.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 initialization logic for the JPEG compressor.

- * This routine is in charge of selecting the modules to be executed and

- * making an initialization call to each one.

- *

- * Logically, this code belongs in jcmaster.c.  It's split out because

- * linking this routine implies linking the entire compression library.

- * For a transcoding-only application, we want to be able to use jcmaster.c

- * without linking in the whole library.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * Master selection of compression modules.

- * This is done once at the start of processing an image.  We determine

- * which modules will be used and give them appropriate initialization calls.

- */

-

-GLOBAL(void)

-jinit_compress_master (j_compress_ptr cinfo)

-{

-  long samplesperrow;

-  JDIMENSION jd_samplesperrow;

-

-  /* For now, precision must match compiled-in value... */

-  if (cinfo->data_precision != BITS_IN_JSAMPLE)

-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);

-

-  /* Sanity check on image dimensions */

-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0 ||

-      cinfo->input_components <= 0)

-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);

-

-  /* Width of an input scanline must be representable as JDIMENSION. */

-  samplesperrow = (long) cinfo->image_width * (long) cinfo->input_components;

-  jd_samplesperrow = (JDIMENSION) samplesperrow;

-  if ((long) jd_samplesperrow != samplesperrow)

-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);

-

-  /* Initialize master control (includes parameter checking/processing) */

-  jinit_c_master_control(cinfo, FALSE /* full compression */);

-

-  /* Preprocessing */

-  if (! cinfo->raw_data_in) {

-    jinit_color_converter(cinfo);

-    jinit_downsampler(cinfo);

-    jinit_c_prep_controller(cinfo, FALSE /* never need full buffer here */);

-  }

-  /* Forward DCT */

-  jinit_forward_dct(cinfo);

-  /* Entropy encoding: either Huffman or arithmetic coding. */

-  if (cinfo->arith_code)

-    jinit_arith_encoder(cinfo);

-  else {

-    jinit_huff_encoder(cinfo);

-  }

-

-  /* Need a full-image coefficient buffer in any multi-pass mode. */

-  jinit_c_coef_controller(cinfo,

-		(boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));

-  jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);

-

-  jinit_marker_writer(cinfo);

-

-  /* We can now tell the memory manager to allocate virtual arrays. */

-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);

-

-  /* Write the datastream header (SOI) immediately.

-   * Frame and scan headers are postponed till later.

-   * This lets application insert special markers after the SOI.

-   */

-  (*cinfo->marker->write_file_header) (cinfo);

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcmainct.c b/plugins/AdvaImg/src/LibJPEG/jcmainct.c
deleted file mode 100644
index 29d53a22ea..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcmainct.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*

- * jcmainct.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2003-2012 by Guido Vollbeding.

- * 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 the main buffer controller for compression.

- * The main buffer lies between the pre-processor and the JPEG

- * compressor proper; it holds downsampled data in the JPEG colorspace.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Note: currently, there is no operating mode in which a full-image buffer

- * is needed at this step.  If there were, that mode could not be used with

- * "raw data" input, since this module is bypassed in that case.  However,

- * we've left the code here for possible use in special applications.

- */

-#undef FULL_MAIN_BUFFER_SUPPORTED

-

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_c_main_controller pub; /* public fields */

-

-  JDIMENSION cur_iMCU_row;	/* number of current iMCU row */

-  JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */

-  boolean suspended;		/* remember if we suspended output */

-  J_BUF_MODE pass_mode;		/* current operating mode */

-

-  /* If using just a strip buffer, this points to the entire set of buffers

-   * (we allocate one for each component).  In the full-image case, this

-   * points to the currently accessible strips of the virtual arrays.

-   */

-  JSAMPARRAY buffer[MAX_COMPONENTS];

-

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-  /* If using full-image storage, this array holds pointers to virtual-array

-   * control blocks for each component.  Unused if not full-image storage.

-   */

-  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];

-#endif

-} my_main_controller;

-

-typedef my_main_controller * my_main_ptr;

-

-

-/* Forward declarations */

-METHODDEF(void) process_data_simple_main

-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,

-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-METHODDEF(void) process_data_buffer_main

-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,

-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));

-#endif

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-

-  /* Do nothing in raw-data mode. */

-  if (cinfo->raw_data_in)

-    return;

-

-  mainp->cur_iMCU_row = 0;	/* initialize counters */

-  mainp->rowgroup_ctr = 0;

-  mainp->suspended = FALSE;

-  mainp->pass_mode = pass_mode;	/* save mode for use by process_data */

-

-  switch (pass_mode) {

-  case JBUF_PASS_THRU:

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-    if (mainp->whole_image[0] != NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-#endif

-    mainp->pub.process_data = process_data_simple_main;

-    break;

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-  case JBUF_SAVE_SOURCE:

-  case JBUF_CRANK_DEST:

-  case JBUF_SAVE_AND_PASS:

-    if (mainp->whole_image[0] == NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    mainp->pub.process_data = process_data_buffer_main;

-    break;

-#endif

-  default:

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    break;

-  }

-}

-

-

-/*

- * Process some data.

- * This routine handles the simple pass-through mode,

- * where we have only a strip buffer.

- */

-

-METHODDEF(void)

-process_data_simple_main (j_compress_ptr cinfo,

-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,

-			  JDIMENSION in_rows_avail)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-

-  while (mainp->cur_iMCU_row < cinfo->total_iMCU_rows) {

-    /* Read input data if we haven't filled the main buffer yet */

-    if (mainp->rowgroup_ctr < (JDIMENSION) cinfo->min_DCT_v_scaled_size)

-      (*cinfo->prep->pre_process_data) (cinfo,

-					input_buf, in_row_ctr, in_rows_avail,

-					mainp->buffer, &mainp->rowgroup_ctr,

-					(JDIMENSION) cinfo->min_DCT_v_scaled_size);

-

-    /* If we don't have a full iMCU row buffered, return to application for

-     * more data.  Note that preprocessor will always pad to fill the iMCU row

-     * at the bottom of the image.

-     */

-    if (mainp->rowgroup_ctr != (JDIMENSION) cinfo->min_DCT_v_scaled_size)

-      return;

-

-    /* Send the completed row to the compressor */

-    if (! (*cinfo->coef->compress_data) (cinfo, mainp->buffer)) {

-      /* If compressor did not consume the whole row, then we must need to

-       * suspend processing and return to the application.  In this situation

-       * we pretend we didn't yet consume the last input row; otherwise, if

-       * it happened to be the last row of the image, the application would

-       * think we were done.

-       */

-      if (! mainp->suspended) {

-	(*in_row_ctr)--;

-	mainp->suspended = TRUE;

-      }

-      return;

-    }

-    /* We did finish the row.  Undo our little suspension hack if a previous

-     * call suspended; then mark the main buffer empty.

-     */

-    if (mainp->suspended) {

-      (*in_row_ctr)++;

-      mainp->suspended = FALSE;

-    }

-    mainp->rowgroup_ctr = 0;

-    mainp->cur_iMCU_row++;

-  }

-}

-

-

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-

-/*

- * Process some data.

- * This routine handles all of the modes that use a full-size buffer.

- */

-

-METHODDEF(void)

-process_data_buffer_main (j_compress_ptr cinfo,

-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,

-			  JDIMENSION in_rows_avail)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  int ci;

-  jpeg_component_info *compptr;

-  boolean writing = (mainp->pass_mode != JBUF_CRANK_DEST);

-

-  while (mainp->cur_iMCU_row < cinfo->total_iMCU_rows) {

-    /* Realign the virtual buffers if at the start of an iMCU row. */

-    if (mainp->rowgroup_ctr == 0) {

-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	   ci++, compptr++) {

-	mainp->buffer[ci] = (*cinfo->mem->access_virt_sarray)

-	  ((j_common_ptr) cinfo, mainp->whole_image[ci], mainp->cur_iMCU_row *

-	   ((JDIMENSION) (compptr->v_samp_factor * cinfo->min_DCT_v_scaled_size)),

-	   (JDIMENSION) (compptr->v_samp_factor * cinfo->min_DCT_v_scaled_size),

-	   writing);

-      }

-      /* In a read pass, pretend we just read some source data. */

-      if (! writing) {

-	*in_row_ctr += (JDIMENSION)

-	  (cinfo->max_v_samp_factor * cinfo->min_DCT_v_scaled_size);

-	mainp->rowgroup_ctr = (JDIMENSION) cinfo->min_DCT_v_scaled_size;

-      }

-    }

-

-    /* If a write pass, read input data until the current iMCU row is full. */

-    /* Note: preprocessor will pad if necessary to fill the last iMCU row. */

-    if (writing) {

-      (*cinfo->prep->pre_process_data) (cinfo,

-					input_buf, in_row_ctr, in_rows_avail,

-					mainp->buffer, &mainp->rowgroup_ctr,

-					(JDIMENSION) cinfo->min_DCT_v_scaled_size);

-      /* Return to application if we need more data to fill the iMCU row. */

-      if (mainp->rowgroup_ctr < (JDIMENSION) cinfo->min_DCT_v_scaled_size)

-	return;

-    }

-

-    /* Emit data, unless this is a sink-only pass. */

-    if (mainp->pass_mode != JBUF_SAVE_SOURCE) {

-      if (! (*cinfo->coef->compress_data) (cinfo, mainp->buffer)) {

-	/* If compressor did not consume the whole row, then we must need to

-	 * suspend processing and return to the application.  In this situation

-	 * we pretend we didn't yet consume the last input row; otherwise, if

-	 * it happened to be the last row of the image, the application would

-	 * think we were done.

-	 */

-	if (! mainp->suspended) {

-	  (*in_row_ctr)--;

-	  mainp->suspended = TRUE;

-	}

-	return;

-      }

-      /* We did finish the row.  Undo our little suspension hack if a previous

-       * call suspended; then mark the main buffer empty.

-       */

-      if (mainp->suspended) {

-	(*in_row_ctr)++;

-	mainp->suspended = FALSE;

-      }

-    }

-

-    /* If get here, we are done with this iMCU row.  Mark buffer empty. */

-    mainp->rowgroup_ctr = 0;

-    mainp->cur_iMCU_row++;

-  }

-}

-

-#endif /* FULL_MAIN_BUFFER_SUPPORTED */

-

-

-/*

- * Initialize main buffer controller.

- */

-

-GLOBAL(void)

-jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)

-{

-  my_main_ptr mainp;

-  int ci;

-  jpeg_component_info *compptr;

-

-  mainp = (my_main_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_main_controller));

-  cinfo->main = &mainp->pub;

-  mainp->pub.start_pass = start_pass_main;

-

-  /* We don't need to create a buffer in raw-data mode. */

-  if (cinfo->raw_data_in)

-    return;

-

-  /* Create the buffer.  It holds downsampled data, so each component

-   * may be of a different size.

-   */

-  if (need_full_buffer) {

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-    /* Allocate a full-image virtual array for each component */

-    /* Note we pad the bottom to a multiple of the iMCU height */

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      mainp->whole_image[ci] = (*cinfo->mem->request_virt_sarray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-	 compptr->width_in_blocks * ((JDIMENSION) compptr->DCT_h_scaled_size),

-	 ((JDIMENSION) jround_up((long) compptr->height_in_blocks,

-				 (long) compptr->v_samp_factor)) *

-	 ((JDIMENSION) cinfo->min_DCT_v_scaled_size),

-	 (JDIMENSION) (compptr->v_samp_factor * compptr->DCT_v_scaled_size));

-    }

-#else

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-#endif

-  } else {

-#ifdef FULL_MAIN_BUFFER_SUPPORTED

-    mainp->whole_image[0] = NULL; /* flag for no virtual arrays */

-#endif

-    /* Allocate a strip buffer for each component */

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      mainp->buffer[ci] = (*cinfo->mem->alloc_sarray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE,

-	 compptr->width_in_blocks * ((JDIMENSION) compptr->DCT_h_scaled_size),

-	 (JDIMENSION) (compptr->v_samp_factor * compptr->DCT_v_scaled_size));

-    }

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcmarker.c b/plugins/AdvaImg/src/LibJPEG/jcmarker.c
deleted file mode 100644
index f2cd7a393a..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcmarker.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*

- * jcmarker.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 routines to write JPEG datastream markers.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-typedef enum {			/* JPEG marker codes */

-  M_SOF0  = 0xc0,

-  M_SOF1  = 0xc1,

-  M_SOF2  = 0xc2,

-  M_SOF3  = 0xc3,

-

-  M_SOF5  = 0xc5,

-  M_SOF6  = 0xc6,

-  M_SOF7  = 0xc7,

-

-  M_JPG   = 0xc8,

-  M_SOF9  = 0xc9,

-  M_SOF10 = 0xca,

-  M_SOF11 = 0xcb,

-

-  M_SOF13 = 0xcd,

-  M_SOF14 = 0xce,

-  M_SOF15 = 0xcf,

-

-  M_DHT   = 0xc4,

-

-  M_DAC   = 0xcc,

-

-  M_RST0  = 0xd0,

-  M_RST1  = 0xd1,

-  M_RST2  = 0xd2,

-  M_RST3  = 0xd3,

-  M_RST4  = 0xd4,

-  M_RST5  = 0xd5,

-  M_RST6  = 0xd6,

-  M_RST7  = 0xd7,

-

-  M_SOI   = 0xd8,

-  M_EOI   = 0xd9,

-  M_SOS   = 0xda,

-  M_DQT   = 0xdb,

-  M_DNL   = 0xdc,

-  M_DRI   = 0xdd,

-  M_DHP   = 0xde,

-  M_EXP   = 0xdf,

-

-  M_APP0  = 0xe0,

-  M_APP1  = 0xe1,

-  M_APP2  = 0xe2,

-  M_APP3  = 0xe3,

-  M_APP4  = 0xe4,

-  M_APP5  = 0xe5,

-  M_APP6  = 0xe6,

-  M_APP7  = 0xe7,

-  M_APP8  = 0xe8,

-  M_APP9  = 0xe9,

-  M_APP10 = 0xea,

-  M_APP11 = 0xeb,

-  M_APP12 = 0xec,

-  M_APP13 = 0xed,

-  M_APP14 = 0xee,

-  M_APP15 = 0xef,

-

-  M_JPG0  = 0xf0,

-  M_JPG8  = 0xf8,

-  M_JPG13 = 0xfd,

-  M_COM   = 0xfe,

-

-  M_TEM   = 0x01,

-

-  M_ERROR = 0x100

-} JPEG_MARKER;

-

-

-/* Private state */

-

-typedef struct {

-  struct jpeg_marker_writer pub; /* public fields */

-

-  unsigned int last_restart_interval; /* last DRI value emitted; 0 after SOI */

-} my_marker_writer;

-

-typedef my_marker_writer * my_marker_ptr;

-

-

-/*

- * Basic output routines.

- *

- * Note that we do not support suspension while writing a marker.

- * Therefore, an application using suspension must ensure that there is

- * enough buffer space for the initial markers (typ. 600-700 bytes) before

- * calling jpeg_start_compress, and enough space to write the trailing EOI

- * (a few bytes) before calling jpeg_finish_compress.  Multipass compression

- * modes are not supported at all with suspension, so those two are the only

- * points where markers will be written.

- */

-

-LOCAL(void)

-emit_byte (j_compress_ptr cinfo, int val)

-/* Emit a byte */

-{

-  struct jpeg_destination_mgr * dest = cinfo->dest;

-

-  *(dest->next_output_byte)++ = (JOCTET) val;

-  if (--dest->free_in_buffer == 0) {

-    if (! (*dest->empty_output_buffer) (cinfo))

-      ERREXIT(cinfo, JERR_CANT_SUSPEND);

-  }

-}

-

-

-LOCAL(void)

-emit_marker (j_compress_ptr cinfo, JPEG_MARKER mark)

-/* Emit a marker code */

-{

-  emit_byte(cinfo, 0xFF);

-  emit_byte(cinfo, (int) mark);

-}

-

-

-LOCAL(void)

-emit_2bytes (j_compress_ptr cinfo, int value)

-/* Emit a 2-byte integer; these are always MSB first in JPEG files */

-{

-  emit_byte(cinfo, (value >> 8) & 0xFF);

-  emit_byte(cinfo, value & 0xFF);

-}

-

-

-/*

- * Routines to write specific marker types.

- */

-

-LOCAL(int)

-emit_dqt (j_compress_ptr cinfo, int index)

-/* Emit a DQT marker */

-/* Returns the precision used (0 = 8bits, 1 = 16bits) for baseline checking */

-{

-  JQUANT_TBL * qtbl = cinfo->quant_tbl_ptrs[index];

-  int prec;

-  int i;

-

-  if (qtbl == NULL)

-    ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, index);

-

-  prec = 0;

-  for (i = 0; i <= cinfo->lim_Se; i++) {

-    if (qtbl->quantval[cinfo->natural_order[i]] > 255)

-      prec = 1;

-  }

-

-  if (! qtbl->sent_table) {

-    emit_marker(cinfo, M_DQT);

-

-    emit_2bytes(cinfo,

-      prec ? cinfo->lim_Se * 2 + 2 + 1 + 2 : cinfo->lim_Se + 1 + 1 + 2);

-

-    emit_byte(cinfo, index + (prec<<4));

-

-    for (i = 0; i <= cinfo->lim_Se; i++) {

-      /* The table entries must be emitted in zigzag order. */

-      unsigned int qval = qtbl->quantval[cinfo->natural_order[i]];

-      if (prec)

-	emit_byte(cinfo, (int) (qval >> 8));

-      emit_byte(cinfo, (int) (qval & 0xFF));

-    }

-

-    qtbl->sent_table = TRUE;

-  }

-

-  return prec;

-}

-

-

-LOCAL(void)

-emit_dht (j_compress_ptr cinfo, int index, boolean is_ac)

-/* Emit a DHT marker */

-{

-  JHUFF_TBL * htbl;

-  int length, i;

-  

-  if (is_ac) {

-    htbl = cinfo->ac_huff_tbl_ptrs[index];

-    index += 0x10;		/* output index has AC bit set */

-  } else {

-    htbl = cinfo->dc_huff_tbl_ptrs[index];

-  }

-

-  if (htbl == NULL)

-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, index);

-  

-  if (! htbl->sent_table) {

-    emit_marker(cinfo, M_DHT);

-    

-    length = 0;

-    for (i = 1; i <= 16; i++)

-      length += htbl->bits[i];

-    

-    emit_2bytes(cinfo, length + 2 + 1 + 16);

-    emit_byte(cinfo, index);

-    

-    for (i = 1; i <= 16; i++)

-      emit_byte(cinfo, htbl->bits[i]);

-    

-    for (i = 0; i < length; i++)

-      emit_byte(cinfo, htbl->huffval[i]);

-    

-    htbl->sent_table = TRUE;

-  }

-}

-

-

-LOCAL(void)

-emit_dac (j_compress_ptr cinfo)

-/* Emit a DAC marker */

-/* Since the useful info is so small, we want to emit all the tables in */

-/* one DAC marker.  Therefore this routine does its own scan of the table. */

-{

-#ifdef C_ARITH_CODING_SUPPORTED

-  char dc_in_use[NUM_ARITH_TBLS];

-  char ac_in_use[NUM_ARITH_TBLS];

-  int length, i;

-  jpeg_component_info *compptr;

-

-  for (i = 0; i < NUM_ARITH_TBLS; i++)

-    dc_in_use[i] = ac_in_use[i] = 0;

-

-  for (i = 0; i < cinfo->comps_in_scan; i++) {

-    compptr = cinfo->cur_comp_info[i];

-    /* DC needs no table for refinement scan */

-    if (cinfo->Ss == 0 && cinfo->Ah == 0)

-      dc_in_use[compptr->dc_tbl_no] = 1;

-    /* AC needs no table when not present */

-    if (cinfo->Se)

-      ac_in_use[compptr->ac_tbl_no] = 1;

-  }

-

-  length = 0;

-  for (i = 0; i < NUM_ARITH_TBLS; i++)

-    length += dc_in_use[i] + ac_in_use[i];

-

-  if (length) {

-    emit_marker(cinfo, M_DAC);

-

-    emit_2bytes(cinfo, length*2 + 2);

-

-    for (i = 0; i < NUM_ARITH_TBLS; i++) {

-      if (dc_in_use[i]) {

-	emit_byte(cinfo, i);

-	emit_byte(cinfo, cinfo->arith_dc_L[i] + (cinfo->arith_dc_U[i]<<4));

-      }

-      if (ac_in_use[i]) {

-	emit_byte(cinfo, i + 0x10);

-	emit_byte(cinfo, cinfo->arith_ac_K[i]);

-      }

-    }

-  }

-#endif /* C_ARITH_CODING_SUPPORTED */

-}

-

-

-LOCAL(void)

-emit_dri (j_compress_ptr cinfo)

-/* Emit a DRI marker */

-{

-  emit_marker(cinfo, M_DRI);

-  

-  emit_2bytes(cinfo, 4);	/* fixed length */

-

-  emit_2bytes(cinfo, (int) cinfo->restart_interval);

-}

-

-

-LOCAL(void)

-emit_lse_ict (j_compress_ptr cinfo)

-/* Emit an LSE inverse color transform specification marker */

-{

-  /* Support only 1 transform */

-  if (cinfo->color_transform != JCT_SUBTRACT_GREEN ||

-      cinfo->num_components < 3)

-    ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-

-  emit_marker(cinfo, M_JPG8);

-  

-  emit_2bytes(cinfo, 24);	/* fixed length */

-

-  emit_byte(cinfo, 0x0D);	/* ID inverse transform specification */

-  emit_2bytes(cinfo, MAXJSAMPLE);	/* MAXTRANS */

-  emit_byte(cinfo, 3);		/* Nt=3 */

-  emit_byte(cinfo, cinfo->comp_info[1].component_id);

-  emit_byte(cinfo, cinfo->comp_info[0].component_id);

-  emit_byte(cinfo, cinfo->comp_info[2].component_id);

-  emit_byte(cinfo, 0x80);	/* F1: CENTER1=1, NORM1=0 */

-  emit_2bytes(cinfo, 0);	/* A(1,1)=0 */

-  emit_2bytes(cinfo, 0);	/* A(1,2)=0 */

-  emit_byte(cinfo, 0);		/* F2: CENTER2=0, NORM2=0 */

-  emit_2bytes(cinfo, 1);	/* A(2,1)=1 */

-  emit_2bytes(cinfo, 0);	/* A(2,2)=0 */

-  emit_byte(cinfo, 0);		/* F3: CENTER3=0, NORM3=0 */

-  emit_2bytes(cinfo, 1);	/* A(3,1)=1 */

-  emit_2bytes(cinfo, 0);	/* A(3,2)=0 */

-}

-

-

-LOCAL(void)

-emit_sof (j_compress_ptr cinfo, JPEG_MARKER code)

-/* Emit a SOF marker */

-{

-  int ci;

-  jpeg_component_info *compptr;

-  

-  emit_marker(cinfo, code);

-  

-  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */

-

-  /* Make sure image isn't bigger than SOF field can handle */

-  if ((long) cinfo->jpeg_height > 65535L ||

-      (long) cinfo->jpeg_width > 65535L)

-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);

-

-  emit_byte(cinfo, cinfo->data_precision);

-  emit_2bytes(cinfo, (int) cinfo->jpeg_height);

-  emit_2bytes(cinfo, (int) cinfo->jpeg_width);

-

-  emit_byte(cinfo, cinfo->num_components);

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    emit_byte(cinfo, compptr->component_id);

-    emit_byte(cinfo, (compptr->h_samp_factor << 4) + compptr->v_samp_factor);

-    emit_byte(cinfo, compptr->quant_tbl_no);

-  }

-}

-

-

-LOCAL(void)

-emit_sos (j_compress_ptr cinfo)

-/* Emit a SOS marker */

-{

-  int i, td, ta;

-  jpeg_component_info *compptr;

-  

-  emit_marker(cinfo, M_SOS);

-  

-  emit_2bytes(cinfo, 2 * cinfo->comps_in_scan + 2 + 1 + 3); /* length */

-  

-  emit_byte(cinfo, cinfo->comps_in_scan);

-  

-  for (i = 0; i < cinfo->comps_in_scan; i++) {

-    compptr = cinfo->cur_comp_info[i];

-    emit_byte(cinfo, compptr->component_id);

-

-    /* We emit 0 for unused field(s); this is recommended by the P&M text

-     * but does not seem to be specified in the standard.

-     */

-

-    /* DC needs no table for refinement scan */

-    td = cinfo->Ss == 0 && cinfo->Ah == 0 ? compptr->dc_tbl_no : 0;

-    /* AC needs no table when not present */

-    ta = cinfo->Se ? compptr->ac_tbl_no : 0;

-

-    emit_byte(cinfo, (td << 4) + ta);

-  }

-

-  emit_byte(cinfo, cinfo->Ss);

-  emit_byte(cinfo, cinfo->Se);

-  emit_byte(cinfo, (cinfo->Ah << 4) + cinfo->Al);

-}

-

-

-LOCAL(void)

-emit_pseudo_sos (j_compress_ptr cinfo)

-/* Emit a pseudo SOS marker */

-{

-  emit_marker(cinfo, M_SOS);

-  

-  emit_2bytes(cinfo, 2 + 1 + 3); /* length */

-  

-  emit_byte(cinfo, 0); /* Ns */

-

-  emit_byte(cinfo, 0); /* Ss */

-  emit_byte(cinfo, cinfo->block_size * cinfo->block_size - 1); /* Se */

-  emit_byte(cinfo, 0); /* Ah/Al */

-}

-

-

-LOCAL(void)

-emit_jfif_app0 (j_compress_ptr cinfo)

-/* Emit a JFIF-compliant APP0 marker */

-{

-  /*

-   * Length of APP0 block	(2 bytes)

-   * Block ID			(4 bytes - ASCII "JFIF")

-   * Zero byte			(1 byte to terminate the ID string)

-   * Version Major, Minor	(2 bytes - major first)

-   * Units			(1 byte - 0x00 = none, 0x01 = inch, 0x02 = cm)

-   * Xdpu			(2 bytes - dots per unit horizontal)

-   * Ydpu			(2 bytes - dots per unit vertical)

-   * Thumbnail X size		(1 byte)

-   * Thumbnail Y size		(1 byte)

-   */

-  

-  emit_marker(cinfo, M_APP0);

-  

-  emit_2bytes(cinfo, 2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); /* length */

-

-  emit_byte(cinfo, 0x4A);	/* Identifier: ASCII "JFIF" */

-  emit_byte(cinfo, 0x46);

-  emit_byte(cinfo, 0x49);

-  emit_byte(cinfo, 0x46);

-  emit_byte(cinfo, 0);

-  emit_byte(cinfo, cinfo->JFIF_major_version); /* Version fields */

-  emit_byte(cinfo, cinfo->JFIF_minor_version);

-  emit_byte(cinfo, cinfo->density_unit); /* Pixel size information */

-  emit_2bytes(cinfo, (int) cinfo->X_density);

-  emit_2bytes(cinfo, (int) cinfo->Y_density);

-  emit_byte(cinfo, 0);		/* No thumbnail image */

-  emit_byte(cinfo, 0);

-}

-

-

-LOCAL(void)

-emit_adobe_app14 (j_compress_ptr cinfo)

-/* Emit an Adobe APP14 marker */

-{

-  /*

-   * Length of APP14 block	(2 bytes)

-   * Block ID			(5 bytes - ASCII "Adobe")

-   * Version Number		(2 bytes - currently 100)

-   * Flags0			(2 bytes - currently 0)

-   * Flags1			(2 bytes - currently 0)

-   * Color transform		(1 byte)

-   *

-   * Although Adobe TN 5116 mentions Version = 101, all the Adobe files

-   * now in circulation seem to use Version = 100, so that's what we write.

-   *

-   * We write the color transform byte as 1 if the JPEG color space is

-   * YCbCr, 2 if it's YCCK, 0 otherwise.  Adobe's definition has to do with

-   * whether the encoder performed a transformation, which is pretty useless.

-   */

-  

-  emit_marker(cinfo, M_APP14);

-  

-  emit_2bytes(cinfo, 2 + 5 + 2 + 2 + 2 + 1); /* length */

-

-  emit_byte(cinfo, 0x41);	/* Identifier: ASCII "Adobe" */

-  emit_byte(cinfo, 0x64);

-  emit_byte(cinfo, 0x6F);

-  emit_byte(cinfo, 0x62);

-  emit_byte(cinfo, 0x65);

-  emit_2bytes(cinfo, 100);	/* Version */

-  emit_2bytes(cinfo, 0);	/* Flags0 */

-  emit_2bytes(cinfo, 0);	/* Flags1 */

-  switch (cinfo->jpeg_color_space) {

-  case JCS_YCbCr:

-    emit_byte(cinfo, 1);	/* Color transform = 1 */

-    break;

-  case JCS_YCCK:

-    emit_byte(cinfo, 2);	/* Color transform = 2 */

-    break;

-  default:

-    emit_byte(cinfo, 0);	/* Color transform = 0 */

-    break;

-  }

-}

-

-

-/*

- * These routines allow writing an arbitrary marker with parameters.

- * The only intended use is to emit COM or APPn markers after calling

- * write_file_header and before calling write_frame_header.

- * Other uses are not guaranteed to produce desirable results.

- * Counting the parameter bytes properly is the caller's responsibility.

- */

-

-METHODDEF(void)

-write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)

-/* Emit an arbitrary marker header */

-{

-  if (datalen > (unsigned int) 65533)		/* safety check */

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  emit_marker(cinfo, (JPEG_MARKER) marker);

-

-  emit_2bytes(cinfo, (int) (datalen + 2));	/* total length */

-}

-

-METHODDEF(void)

-write_marker_byte (j_compress_ptr cinfo, int val)

-/* Emit one byte of marker parameters following write_marker_header */

-{

-  emit_byte(cinfo, val);

-}

-

-

-/*

- * Write datastream header.

- * This consists of an SOI and optional APPn markers.

- * We recommend use of the JFIF marker, but not the Adobe marker,

- * when using YCbCr or grayscale data.  The JFIF marker is also used

- * for other standard JPEG colorspaces.  The Adobe marker is helpful

- * to distinguish RGB, CMYK, and YCCK colorspaces.

- * Note that an application can write additional header markers after

- * jpeg_start_compress returns.

- */

-

-METHODDEF(void)

-write_file_header (j_compress_ptr cinfo)

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-

-  emit_marker(cinfo, M_SOI);	/* first the SOI */

-

-  /* SOI is defined to reset restart interval to 0 */

-  marker->last_restart_interval = 0;

-

-  if (cinfo->write_JFIF_header)	/* next an optional JFIF APP0 */

-    emit_jfif_app0(cinfo);

-  if (cinfo->write_Adobe_marker) /* next an optional Adobe APP14 */

-    emit_adobe_app14(cinfo);

-}

-

-

-/*

- * Write frame header.

- * This consists of DQT and SOFn markers,

- * a conditional LSE marker and a conditional pseudo SOS marker.

- * Note that we do not emit the SOF until we have emitted the DQT(s).

- * This avoids compatibility problems with incorrect implementations that

- * try to error-check the quant table numbers as soon as they see the SOF.

- */

-

-METHODDEF(void)

-write_frame_header (j_compress_ptr cinfo)

-{

-  int ci, prec;

-  boolean is_baseline;

-  jpeg_component_info *compptr;

-  

-  /* Emit DQT for each quantization table.

-   * Note that emit_dqt() suppresses any duplicate tables.

-   */

-  prec = 0;

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    prec += emit_dqt(cinfo, compptr->quant_tbl_no);

-  }

-  /* now prec is nonzero iff there are any 16-bit quant tables. */

-

-  /* Check for a non-baseline specification.

-   * Note we assume that Huffman table numbers won't be changed later.

-   */

-  if (cinfo->arith_code || cinfo->progressive_mode ||

-      cinfo->data_precision != 8 || cinfo->block_size != DCTSIZE) {

-    is_baseline = FALSE;

-  } else {

-    is_baseline = TRUE;

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      if (compptr->dc_tbl_no > 1 || compptr->ac_tbl_no > 1)

-	is_baseline = FALSE;

-    }

-    if (prec && is_baseline) {

-      is_baseline = FALSE;

-      /* If it's baseline except for quantizer size, warn the user */

-      TRACEMS(cinfo, 0, JTRC_16BIT_TABLES);

-    }

-  }

-

-  /* Emit the proper SOF marker */

-  if (cinfo->arith_code) {

-    if (cinfo->progressive_mode)

-      emit_sof(cinfo, M_SOF10); /* SOF code for progressive arithmetic */

-    else

-      emit_sof(cinfo, M_SOF9);  /* SOF code for sequential arithmetic */

-  } else {

-    if (cinfo->progressive_mode)

-      emit_sof(cinfo, M_SOF2);	/* SOF code for progressive Huffman */

-    else if (is_baseline)

-      emit_sof(cinfo, M_SOF0);	/* SOF code for baseline implementation */

-    else

-      emit_sof(cinfo, M_SOF1);	/* SOF code for non-baseline Huffman file */

-  }

-

-  /* Check to emit LSE inverse color transform specification marker */

-  if (cinfo->color_transform)

-    emit_lse_ict(cinfo);

-

-  /* Check to emit pseudo SOS marker */

-  if (cinfo->progressive_mode && cinfo->block_size != DCTSIZE)

-    emit_pseudo_sos(cinfo);

-}

-

-

-/*

- * Write scan header.

- * This consists of DHT or DAC markers, optional DRI, and SOS.

- * Compressed data will be written following the SOS.

- */

-

-METHODDEF(void)

-write_scan_header (j_compress_ptr cinfo)

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-  int i;

-  jpeg_component_info *compptr;

-

-  if (cinfo->arith_code) {

-    /* Emit arith conditioning info.  We may have some duplication

-     * if the file has multiple scans, but it's so small it's hardly

-     * worth worrying about.

-     */

-    emit_dac(cinfo);

-  } else {

-    /* Emit Huffman tables.

-     * Note that emit_dht() suppresses any duplicate tables.

-     */

-    for (i = 0; i < cinfo->comps_in_scan; i++) {

-      compptr = cinfo->cur_comp_info[i];

-      /* DC needs no table for refinement scan */

-      if (cinfo->Ss == 0 && cinfo->Ah == 0)

-	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);

-      /* AC needs no table when not present */

-      if (cinfo->Se)

-	emit_dht(cinfo, compptr->ac_tbl_no, TRUE);

-    }

-  }

-

-  /* Emit DRI if required --- note that DRI value could change for each scan.

-   * We avoid wasting space with unnecessary DRIs, however.

-   */

-  if (cinfo->restart_interval != marker->last_restart_interval) {

-    emit_dri(cinfo);

-    marker->last_restart_interval = cinfo->restart_interval;

-  }

-

-  emit_sos(cinfo);

-}

-

-

-/*

- * Write datastream trailer.

- */

-

-METHODDEF(void)

-write_file_trailer (j_compress_ptr cinfo)

-{

-  emit_marker(cinfo, M_EOI);

-}

-

-

-/*

- * Write an abbreviated table-specification datastream.

- * This consists of SOI, DQT and DHT tables, and EOI.

- * Any table that is defined and not marked sent_table = TRUE will be

- * emitted.  Note that all tables will be marked sent_table = TRUE at exit.

- */

-

-METHODDEF(void)

-write_tables_only (j_compress_ptr cinfo)

-{

-  int i;

-

-  emit_marker(cinfo, M_SOI);

-

-  for (i = 0; i < NUM_QUANT_TBLS; i++) {

-    if (cinfo->quant_tbl_ptrs[i] != NULL)

-      (void) emit_dqt(cinfo, i);

-  }

-

-  if (! cinfo->arith_code) {

-    for (i = 0; i < NUM_HUFF_TBLS; i++) {

-      if (cinfo->dc_huff_tbl_ptrs[i] != NULL)

-	emit_dht(cinfo, i, FALSE);

-      if (cinfo->ac_huff_tbl_ptrs[i] != NULL)

-	emit_dht(cinfo, i, TRUE);

-    }

-  }

-

-  emit_marker(cinfo, M_EOI);

-}

-

-

-/*

- * Initialize the marker writer module.

- */

-

-GLOBAL(void)

-jinit_marker_writer (j_compress_ptr cinfo)

-{

-  my_marker_ptr marker;

-

-  /* Create the subobject */

-  marker = (my_marker_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_marker_writer));

-  cinfo->marker = &marker->pub;

-  /* Initialize method pointers */

-  marker->pub.write_file_header = write_file_header;

-  marker->pub.write_frame_header = write_frame_header;

-  marker->pub.write_scan_header = write_scan_header;

-  marker->pub.write_file_trailer = write_file_trailer;

-  marker->pub.write_tables_only = write_tables_only;

-  marker->pub.write_marker_header = write_marker_header;

-  marker->pub.write_marker_byte = write_marker_byte;

-  /* Initialize private state */

-  marker->last_restart_interval = 0;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcmaster.c b/plugins/AdvaImg/src/LibJPEG/jcmaster.c
deleted file mode 100644
index 431744ebe1..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcmaster.c
+++ /dev/null
@@ -1,856 +0,0 @@
-/*

- * jcmaster.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 master control logic for the JPEG compressor.

- * These routines are concerned with parameter validation, initial setup,

- * and inter-pass control (determining the number of passes and the work 

- * to be done in each pass).

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private state */

-

-typedef enum {

-	main_pass,		/* input data, also do first output step */

-	huff_opt_pass,		/* Huffman code optimization pass */

-	output_pass		/* data output pass */

-} c_pass_type;

-

-typedef struct {

-  struct jpeg_comp_master pub;	/* public fields */

-

-  c_pass_type pass_type;	/* the type of the current pass */

-

-  int pass_number;		/* # of passes completed */

-  int total_passes;		/* total # of passes needed */

-

-  int scan_number;		/* current index in scan_info[] */

-} my_comp_master;

-

-typedef my_comp_master * my_master_ptr;

-

-

-/*

- * Support routines that do various essential calculations.

- */

-

-/*

- * Compute JPEG image dimensions and related values.

- * NOTE: this is exported for possible use by application.

- * Hence it mustn't do anything that can't be done twice.

- */

-

-GLOBAL(void)

-jpeg_calc_jpeg_dimensions (j_compress_ptr cinfo)

-/* Do computations that are needed before master selection phase */

-{

-#ifdef DCT_SCALING_SUPPORTED

-

-  /* Sanity check on input image dimensions to prevent overflow in

-   * following calculation.

-   * We do check jpeg_width and jpeg_height in initial_setup below,

-   * but image_width and image_height can come from arbitrary data,

-   * and we need some space for multiplication by block_size.

-   */

-  if (((long) cinfo->image_width >> 24) || ((long) cinfo->image_height >> 24))

-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);

-

-  /* Compute actual JPEG image dimensions and DCT scaling choices. */

-  if (cinfo->scale_num >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/1 scaling */

-    cinfo->jpeg_width = cinfo->image_width * cinfo->block_size;

-    cinfo->jpeg_height = cinfo->image_height * cinfo->block_size;

-    cinfo->min_DCT_h_scaled_size = 1;

-    cinfo->min_DCT_v_scaled_size = 1;

-  } else if (cinfo->scale_num * 2 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/2 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 2L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 2L);

-    cinfo->min_DCT_h_scaled_size = 2;

-    cinfo->min_DCT_v_scaled_size = 2;

-  } else if (cinfo->scale_num * 3 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/3 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 3L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 3L);

-    cinfo->min_DCT_h_scaled_size = 3;

-    cinfo->min_DCT_v_scaled_size = 3;

-  } else if (cinfo->scale_num * 4 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/4 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 4L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 4L);

-    cinfo->min_DCT_h_scaled_size = 4;

-    cinfo->min_DCT_v_scaled_size = 4;

-  } else if (cinfo->scale_num * 5 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/5 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 5L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 5L);

-    cinfo->min_DCT_h_scaled_size = 5;

-    cinfo->min_DCT_v_scaled_size = 5;

-  } else if (cinfo->scale_num * 6 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/6 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 6L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 6L);

-    cinfo->min_DCT_h_scaled_size = 6;

-    cinfo->min_DCT_v_scaled_size = 6;

-  } else if (cinfo->scale_num * 7 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/7 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 7L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 7L);

-    cinfo->min_DCT_h_scaled_size = 7;

-    cinfo->min_DCT_v_scaled_size = 7;

-  } else if (cinfo->scale_num * 8 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/8 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 8L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 8L);

-    cinfo->min_DCT_h_scaled_size = 8;

-    cinfo->min_DCT_v_scaled_size = 8;

-  } else if (cinfo->scale_num * 9 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/9 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 9L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 9L);

-    cinfo->min_DCT_h_scaled_size = 9;

-    cinfo->min_DCT_v_scaled_size = 9;

-  } else if (cinfo->scale_num * 10 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/10 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 10L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 10L);

-    cinfo->min_DCT_h_scaled_size = 10;

-    cinfo->min_DCT_v_scaled_size = 10;

-  } else if (cinfo->scale_num * 11 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/11 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 11L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 11L);

-    cinfo->min_DCT_h_scaled_size = 11;

-    cinfo->min_DCT_v_scaled_size = 11;

-  } else if (cinfo->scale_num * 12 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/12 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 12L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 12L);

-    cinfo->min_DCT_h_scaled_size = 12;

-    cinfo->min_DCT_v_scaled_size = 12;

-  } else if (cinfo->scale_num * 13 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/13 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 13L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 13L);

-    cinfo->min_DCT_h_scaled_size = 13;

-    cinfo->min_DCT_v_scaled_size = 13;

-  } else if (cinfo->scale_num * 14 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/14 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 14L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 14L);

-    cinfo->min_DCT_h_scaled_size = 14;

-    cinfo->min_DCT_v_scaled_size = 14;

-  } else if (cinfo->scale_num * 15 >= cinfo->scale_denom * cinfo->block_size) {

-    /* Provide block_size/15 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 15L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 15L);

-    cinfo->min_DCT_h_scaled_size = 15;

-    cinfo->min_DCT_v_scaled_size = 15;

-  } else {

-    /* Provide block_size/16 scaling */

-    cinfo->jpeg_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * cinfo->block_size, 16L);

-    cinfo->jpeg_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * cinfo->block_size, 16L);

-    cinfo->min_DCT_h_scaled_size = 16;

-    cinfo->min_DCT_v_scaled_size = 16;

-  }

-

-#else /* !DCT_SCALING_SUPPORTED */

-

-  /* Hardwire it to "no scaling" */

-  cinfo->jpeg_width = cinfo->image_width;

-  cinfo->jpeg_height = cinfo->image_height;

-  cinfo->min_DCT_h_scaled_size = DCTSIZE;

-  cinfo->min_DCT_v_scaled_size = DCTSIZE;

-

-#endif /* DCT_SCALING_SUPPORTED */

-}

-

-

-LOCAL(void)

-jpeg_calc_trans_dimensions (j_compress_ptr cinfo)

-{

-  if (cinfo->min_DCT_h_scaled_size != cinfo->min_DCT_v_scaled_size)

-    ERREXIT2(cinfo, JERR_BAD_DCTSIZE,

-	     cinfo->min_DCT_h_scaled_size, cinfo->min_DCT_v_scaled_size);

-

-  cinfo->block_size = cinfo->min_DCT_h_scaled_size;

-}

-

-

-LOCAL(void)

-initial_setup (j_compress_ptr cinfo, boolean transcode_only)

-/* Do computations that are needed before master selection phase */

-{

-  int ci, ssize;

-  jpeg_component_info *compptr;

-

-  if (transcode_only)

-    jpeg_calc_trans_dimensions(cinfo);

-  else

-    jpeg_calc_jpeg_dimensions(cinfo);

-

-  /* Sanity check on block_size */

-  if (cinfo->block_size < 1 || cinfo->block_size > 16)

-    ERREXIT2(cinfo, JERR_BAD_DCTSIZE, cinfo->block_size, cinfo->block_size);

-

-  /* Derive natural_order from block_size */

-  switch (cinfo->block_size) {

-  case 2: cinfo->natural_order = jpeg_natural_order2; break;

-  case 3: cinfo->natural_order = jpeg_natural_order3; break;

-  case 4: cinfo->natural_order = jpeg_natural_order4; break;

-  case 5: cinfo->natural_order = jpeg_natural_order5; break;

-  case 6: cinfo->natural_order = jpeg_natural_order6; break;

-  case 7: cinfo->natural_order = jpeg_natural_order7; break;

-  default: cinfo->natural_order = jpeg_natural_order; break;

-  }

-

-  /* Derive lim_Se from block_size */

-  cinfo->lim_Se = cinfo->block_size < DCTSIZE ?

-    cinfo->block_size * cinfo->block_size - 1 : DCTSIZE2-1;

-

-  /* Sanity check on image dimensions */

-  if (cinfo->jpeg_height <= 0 || cinfo->jpeg_width <= 0 ||

-      cinfo->num_components <= 0)

-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);

-

-  /* Make sure image isn't bigger than I can handle */

-  if ((long) cinfo->jpeg_height > (long) JPEG_MAX_DIMENSION ||

-      (long) cinfo->jpeg_width > (long) JPEG_MAX_DIMENSION)

-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);

-

-  /* Only 8 to 12 bits data precision are supported for DCT based JPEG */

-  if (cinfo->data_precision < 8 || cinfo->data_precision > 12)

-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);

-

-  /* Check that number of components won't exceed internal array sizes */

-  if (cinfo->num_components > MAX_COMPONENTS)

-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,

-	     MAX_COMPONENTS);

-

-  /* Compute maximum sampling factors; check factor validity */

-  cinfo->max_h_samp_factor = 1;

-  cinfo->max_v_samp_factor = 1;

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||

-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)

-      ERREXIT(cinfo, JERR_BAD_SAMPLING);

-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,

-				   compptr->h_samp_factor);

-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,

-				   compptr->v_samp_factor);

-  }

-

-  /* Compute dimensions of components */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Fill in the correct component_index value; don't rely on application */

-    compptr->component_index = ci;

-    /* In selecting the actual DCT scaling for each component, we try to

-     * scale down the chroma components via DCT scaling rather than downsampling.

-     * This saves time if the downsampler gets to use 1:1 scaling.

-     * Note this code adapts subsampling ratios which are powers of 2.

-     */

-    ssize = 1;

-#ifdef DCT_SCALING_SUPPORTED

-    while (cinfo->min_DCT_h_scaled_size * ssize <=

-	   (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) &&

-	   (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == 0) {

-      ssize = ssize * 2;

-    }

-#endif

-    compptr->DCT_h_scaled_size = cinfo->min_DCT_h_scaled_size * ssize;

-    ssize = 1;

-#ifdef DCT_SCALING_SUPPORTED

-    while (cinfo->min_DCT_v_scaled_size * ssize <=

-	   (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) &&

-	   (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == 0) {

-      ssize = ssize * 2;

-    }

-#endif

-    compptr->DCT_v_scaled_size = cinfo->min_DCT_v_scaled_size * ssize;

-

-    /* We don't support DCT ratios larger than 2. */

-    if (compptr->DCT_h_scaled_size > compptr->DCT_v_scaled_size * 2)

-	compptr->DCT_h_scaled_size = compptr->DCT_v_scaled_size * 2;

-    else if (compptr->DCT_v_scaled_size > compptr->DCT_h_scaled_size * 2)

-	compptr->DCT_v_scaled_size = compptr->DCT_h_scaled_size * 2;

-

-    /* Size in DCT blocks */

-    compptr->width_in_blocks = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_width * (long) compptr->h_samp_factor,

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    compptr->height_in_blocks = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_height * (long) compptr->v_samp_factor,

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-    /* Size in samples */

-    compptr->downsampled_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_width *

-		    (long) (compptr->h_samp_factor * compptr->DCT_h_scaled_size),

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    compptr->downsampled_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_height *

-		    (long) (compptr->v_samp_factor * compptr->DCT_v_scaled_size),

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-    /* Don't need quantization scale after DCT,

-     * until color conversion says otherwise.

-     */

-    compptr->component_needed = FALSE;

-  }

-

-  /* Compute number of fully interleaved MCU rows (number of times that

-   * main controller will call coefficient controller).

-   */

-  cinfo->total_iMCU_rows = (JDIMENSION)

-    jdiv_round_up((long) cinfo->jpeg_height,

-		  (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-}

-

-

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-

-LOCAL(void)

-validate_script (j_compress_ptr cinfo)

-/* Verify that the scan script in cinfo->scan_info[] is valid; also

- * determine whether it uses progressive JPEG, and set cinfo->progressive_mode.

- */

-{

-  const jpeg_scan_info * scanptr;

-  int scanno, ncomps, ci, coefi, thisi;

-  int Ss, Se, Ah, Al;

-  boolean component_sent[MAX_COMPONENTS];

-#ifdef C_PROGRESSIVE_SUPPORTED

-  int * last_bitpos_ptr;

-  int last_bitpos[MAX_COMPONENTS][DCTSIZE2];

-  /* -1 until that coefficient has been seen; then last Al for it */

-#endif

-

-  if (cinfo->num_scans <= 0)

-    ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, 0);

-

-  /* For sequential JPEG, all scans must have Ss=0, Se=DCTSIZE2-1;

-   * for progressive JPEG, no scan can have this.

-   */

-  scanptr = cinfo->scan_info;

-  if (scanptr->Ss != 0 || scanptr->Se != DCTSIZE2-1) {

-#ifdef C_PROGRESSIVE_SUPPORTED

-    cinfo->progressive_mode = TRUE;

-    last_bitpos_ptr = & last_bitpos[0][0];

-    for (ci = 0; ci < cinfo->num_components; ci++) 

-      for (coefi = 0; coefi < DCTSIZE2; coefi++)

-	*last_bitpos_ptr++ = -1;

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-  } else {

-    cinfo->progressive_mode = FALSE;

-    for (ci = 0; ci < cinfo->num_components; ci++) 

-      component_sent[ci] = FALSE;

-  }

-

-  for (scanno = 1; scanno <= cinfo->num_scans; scanptr++, scanno++) {

-    /* Validate component indexes */

-    ncomps = scanptr->comps_in_scan;

-    if (ncomps <= 0 || ncomps > MAX_COMPS_IN_SCAN)

-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, ncomps, MAX_COMPS_IN_SCAN);

-    for (ci = 0; ci < ncomps; ci++) {

-      thisi = scanptr->component_index[ci];

-      if (thisi < 0 || thisi >= cinfo->num_components)

-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);

-      /* Components must appear in SOF order within each scan */

-      if (ci > 0 && thisi <= scanptr->component_index[ci-1])

-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);

-    }

-    /* Validate progression parameters */

-    Ss = scanptr->Ss;

-    Se = scanptr->Se;

-    Ah = scanptr->Ah;

-    Al = scanptr->Al;

-    if (cinfo->progressive_mode) {

-#ifdef C_PROGRESSIVE_SUPPORTED

-      /* The JPEG spec simply gives the ranges 0..13 for Ah and Al, but that

-       * seems wrong: the upper bound ought to depend on data precision.

-       * Perhaps they really meant 0..N+1 for N-bit precision.

-       * Here we allow 0..10 for 8-bit data; Al larger than 10 results in

-       * out-of-range reconstructed DC values during the first DC scan,

-       * which might cause problems for some decoders.

-       */

-#if BITS_IN_JSAMPLE == 8

-#define MAX_AH_AL 10

-#else

-#define MAX_AH_AL 13

-#endif

-      if (Ss < 0 || Ss >= DCTSIZE2 || Se < Ss || Se >= DCTSIZE2 ||

-	  Ah < 0 || Ah > MAX_AH_AL || Al < 0 || Al > MAX_AH_AL)

-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-      if (Ss == 0) {

-	if (Se != 0)		/* DC and AC together not OK */

-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-      } else {

-	if (ncomps != 1)	/* AC scans must be for only one component */

-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-      }

-      for (ci = 0; ci < ncomps; ci++) {

-	last_bitpos_ptr = & last_bitpos[scanptr->component_index[ci]][0];

-	if (Ss != 0 && last_bitpos_ptr[0] < 0) /* AC without prior DC scan */

-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-	for (coefi = Ss; coefi <= Se; coefi++) {

-	  if (last_bitpos_ptr[coefi] < 0) {

-	    /* first scan of this coefficient */

-	    if (Ah != 0)

-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-	  } else {

-	    /* not first scan */

-	    if (Ah != last_bitpos_ptr[coefi] || Al != Ah-1)

-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-	  }

-	  last_bitpos_ptr[coefi] = Al;

-	}

-      }

-#endif

-    } else {

-      /* For sequential JPEG, all progression parameters must be these: */

-      if (Ss != 0 || Se != DCTSIZE2-1 || Ah != 0 || Al != 0)

-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);

-      /* Make sure components are not sent twice */

-      for (ci = 0; ci < ncomps; ci++) {

-	thisi = scanptr->component_index[ci];

-	if (component_sent[thisi])

-	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);

-	component_sent[thisi] = TRUE;

-      }

-    }

-  }

-

-  /* Now verify that everything got sent. */

-  if (cinfo->progressive_mode) {

-#ifdef C_PROGRESSIVE_SUPPORTED

-    /* For progressive mode, we only check that at least some DC data

-     * got sent for each component; the spec does not require that all bits

-     * of all coefficients be transmitted.  Would it be wiser to enforce

-     * transmission of all coefficient bits??

-     */

-    for (ci = 0; ci < cinfo->num_components; ci++) {

-      if (last_bitpos[ci][0] < 0)

-	ERREXIT(cinfo, JERR_MISSING_DATA);

-    }

-#endif

-  } else {

-    for (ci = 0; ci < cinfo->num_components; ci++) {

-      if (! component_sent[ci])

-	ERREXIT(cinfo, JERR_MISSING_DATA);

-    }

-  }

-}

-

-

-LOCAL(void)

-reduce_script (j_compress_ptr cinfo)

-/* Adapt scan script for use with reduced block size;

- * assume that script has been validated before.

- */

-{

-  jpeg_scan_info * scanptr;

-  int idxout, idxin;

-

-  /* Circumvent const declaration for this function */

-  scanptr = (jpeg_scan_info *) cinfo->scan_info;

-  idxout = 0;

-

-  for (idxin = 0; idxin < cinfo->num_scans; idxin++) {

-    /* After skipping, idxout becomes smaller than idxin */

-    if (idxin != idxout)

-      /* Copy rest of data;

-       * note we stay in given chunk of allocated memory.

-       */

-      scanptr[idxout] = scanptr[idxin];

-    if (scanptr[idxout].Ss > cinfo->lim_Se)

-      /* Entire scan out of range - skip this entry */

-      continue;

-    if (scanptr[idxout].Se > cinfo->lim_Se)

-      /* Limit scan to end of block */

-      scanptr[idxout].Se = cinfo->lim_Se;

-    idxout++;

-  }

-

-  cinfo->num_scans = idxout;

-}

-

-#endif /* C_MULTISCAN_FILES_SUPPORTED */

-

-

-LOCAL(void)

-select_scan_parameters (j_compress_ptr cinfo)

-/* Set up the scan parameters for the current scan */

-{

-  int ci;

-

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-  if (cinfo->scan_info != NULL) {

-    /* Prepare for current scan --- the script is already validated */

-    my_master_ptr master = (my_master_ptr) cinfo->master;

-    const jpeg_scan_info * scanptr = cinfo->scan_info + master->scan_number;

-

-    cinfo->comps_in_scan = scanptr->comps_in_scan;

-    for (ci = 0; ci < scanptr->comps_in_scan; ci++) {

-      cinfo->cur_comp_info[ci] =

-	&cinfo->comp_info[scanptr->component_index[ci]];

-    }

-    if (cinfo->progressive_mode) {

-      cinfo->Ss = scanptr->Ss;

-      cinfo->Se = scanptr->Se;

-      cinfo->Ah = scanptr->Ah;

-      cinfo->Al = scanptr->Al;

-      return;

-    }

-  }

-  else

-#endif

-  {

-    /* Prepare for single sequential-JPEG scan containing all components */

-    if (cinfo->num_components > MAX_COMPS_IN_SCAN)

-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,

-	       MAX_COMPS_IN_SCAN);

-    cinfo->comps_in_scan = cinfo->num_components;

-    for (ci = 0; ci < cinfo->num_components; ci++) {

-      cinfo->cur_comp_info[ci] = &cinfo->comp_info[ci];

-    }

-  }

-  cinfo->Ss = 0;

-  cinfo->Se = cinfo->block_size * cinfo->block_size - 1;

-  cinfo->Ah = 0;

-  cinfo->Al = 0;

-}

-

-

-LOCAL(void)

-per_scan_setup (j_compress_ptr cinfo)

-/* Do computations that are needed before processing a JPEG scan */

-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] are already set */

-{

-  int ci, mcublks, tmp;

-  jpeg_component_info *compptr;

-  

-  if (cinfo->comps_in_scan == 1) {

-    

-    /* Noninterleaved (single-component) scan */

-    compptr = cinfo->cur_comp_info[0];

-    

-    /* Overall image size in MCUs */

-    cinfo->MCUs_per_row = compptr->width_in_blocks;

-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;

-    

-    /* For noninterleaved scan, always one block per MCU */

-    compptr->MCU_width = 1;

-    compptr->MCU_height = 1;

-    compptr->MCU_blocks = 1;

-    compptr->MCU_sample_width = compptr->DCT_h_scaled_size;

-    compptr->last_col_width = 1;

-    /* For noninterleaved scans, it is convenient to define last_row_height

-     * as the number of block rows present in the last iMCU row.

-     */

-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);

-    if (tmp == 0) tmp = compptr->v_samp_factor;

-    compptr->last_row_height = tmp;

-    

-    /* Prepare array describing MCU composition */

-    cinfo->blocks_in_MCU = 1;

-    cinfo->MCU_membership[0] = 0;

-    

-  } else {

-    

-    /* Interleaved (multi-component) scan */

-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)

-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,

-	       MAX_COMPS_IN_SCAN);

-    

-    /* Overall image size in MCUs */

-    cinfo->MCUs_per_row = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_width,

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    cinfo->MCU_rows_in_scan = (JDIMENSION)

-      jdiv_round_up((long) cinfo->jpeg_height,

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-    

-    cinfo->blocks_in_MCU = 0;

-    

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      compptr = cinfo->cur_comp_info[ci];

-      /* Sampling factors give # of blocks of component in each MCU */

-      compptr->MCU_width = compptr->h_samp_factor;

-      compptr->MCU_height = compptr->v_samp_factor;

-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;

-      compptr->MCU_sample_width = compptr->MCU_width * compptr->DCT_h_scaled_size;

-      /* Figure number of non-dummy blocks in last MCU column & row */

-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);

-      if (tmp == 0) tmp = compptr->MCU_width;

-      compptr->last_col_width = tmp;

-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);

-      if (tmp == 0) tmp = compptr->MCU_height;

-      compptr->last_row_height = tmp;

-      /* Prepare array describing MCU composition */

-      mcublks = compptr->MCU_blocks;

-      if (cinfo->blocks_in_MCU + mcublks > C_MAX_BLOCKS_IN_MCU)

-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);

-      while (mcublks-- > 0) {

-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;

-      }

-    }

-    

-  }

-

-  /* Convert restart specified in rows to actual MCU count. */

-  /* Note that count must fit in 16 bits, so we provide limiting. */

-  if (cinfo->restart_in_rows > 0) {

-    long nominal = (long) cinfo->restart_in_rows * (long) cinfo->MCUs_per_row;

-    cinfo->restart_interval = (unsigned int) MIN(nominal, 65535L);

-  }

-}

-

-

-/*

- * Per-pass setup.

- * This is called at the beginning of each pass.  We determine which modules

- * will be active during this pass and give them appropriate start_pass calls.

- * We also set is_last_pass to indicate whether any more passes will be

- * required.

- */

-

-METHODDEF(void)

-prepare_for_pass (j_compress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-

-  switch (master->pass_type) {

-  case main_pass:

-    /* Initial pass: will collect input data, and do either Huffman

-     * optimization or data output for the first scan.

-     */

-    select_scan_parameters(cinfo);

-    per_scan_setup(cinfo);

-    if (! cinfo->raw_data_in) {

-      (*cinfo->cconvert->start_pass) (cinfo);

-      (*cinfo->downsample->start_pass) (cinfo);

-      (*cinfo->prep->start_pass) (cinfo, JBUF_PASS_THRU);

-    }

-    (*cinfo->fdct->start_pass) (cinfo);

-    (*cinfo->entropy->start_pass) (cinfo, cinfo->optimize_coding);

-    (*cinfo->coef->start_pass) (cinfo,

-				(master->total_passes > 1 ?

-				 JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));

-    (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);

-    if (cinfo->optimize_coding) {

-      /* No immediate data output; postpone writing frame/scan headers */

-      master->pub.call_pass_startup = FALSE;

-    } else {

-      /* Will write frame/scan headers at first jpeg_write_scanlines call */

-      master->pub.call_pass_startup = TRUE;

-    }

-    break;

-#ifdef ENTROPY_OPT_SUPPORTED

-  case huff_opt_pass:

-    /* Do Huffman optimization for a scan after the first one. */

-    select_scan_parameters(cinfo);

-    per_scan_setup(cinfo);

-    if (cinfo->Ss != 0 || cinfo->Ah == 0) {

-      (*cinfo->entropy->start_pass) (cinfo, TRUE);

-      (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);

-      master->pub.call_pass_startup = FALSE;

-      break;

-    }

-    /* Special case: Huffman DC refinement scans need no Huffman table

-     * and therefore we can skip the optimization pass for them.

-     */

-    master->pass_type = output_pass;

-    master->pass_number++;

-    /*FALLTHROUGH*/

-#endif

-  case output_pass:

-    /* Do a data-output pass. */

-    /* We need not repeat per-scan setup if prior optimization pass did it. */

-    if (! cinfo->optimize_coding) {

-      select_scan_parameters(cinfo);

-      per_scan_setup(cinfo);

-    }

-    (*cinfo->entropy->start_pass) (cinfo, FALSE);

-    (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);

-    /* We emit frame/scan headers now */

-    if (master->scan_number == 0)

-      (*cinfo->marker->write_frame_header) (cinfo);

-    (*cinfo->marker->write_scan_header) (cinfo);

-    master->pub.call_pass_startup = FALSE;

-    break;

-  default:

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-  }

-

-  master->pub.is_last_pass = (master->pass_number == master->total_passes-1);

-

-  /* Set up progress monitor's pass info if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->completed_passes = master->pass_number;

-    cinfo->progress->total_passes = master->total_passes;

-  }

-}

-

-

-/*

- * Special start-of-pass hook.

- * This is called by jpeg_write_scanlines if call_pass_startup is TRUE.

- * In single-pass processing, we need this hook because we don't want to

- * write frame/scan headers during jpeg_start_compress; we want to let the

- * application write COM markers etc. between jpeg_start_compress and the

- * jpeg_write_scanlines loop.

- * In multi-pass processing, this routine is not used.

- */

-

-METHODDEF(void)

-pass_startup (j_compress_ptr cinfo)

-{

-  cinfo->master->call_pass_startup = FALSE; /* reset flag so call only once */

-

-  (*cinfo->marker->write_frame_header) (cinfo);

-  (*cinfo->marker->write_scan_header) (cinfo);

-}

-

-

-/*

- * Finish up at end of pass.

- */

-

-METHODDEF(void)

-finish_pass_master (j_compress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-

-  /* The entropy coder always needs an end-of-pass call,

-   * either to analyze statistics or to flush its output buffer.

-   */

-  (*cinfo->entropy->finish_pass) (cinfo);

-

-  /* Update state for next pass */

-  switch (master->pass_type) {

-  case main_pass:

-    /* next pass is either output of scan 0 (after optimization)

-     * or output of scan 1 (if no optimization).

-     */

-    master->pass_type = output_pass;

-    if (! cinfo->optimize_coding)

-      master->scan_number++;

-    break;

-  case huff_opt_pass:

-    /* next pass is always output of current scan */

-    master->pass_type = output_pass;

-    break;

-  case output_pass:

-    /* next pass is either optimization or output of next scan */

-    if (cinfo->optimize_coding)

-      master->pass_type = huff_opt_pass;

-    master->scan_number++;

-    break;

-  }

-

-  master->pass_number++;

-}

-

-

-/*

- * Initialize master compression control.

- */

-

-GLOBAL(void)

-jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)

-{

-  my_master_ptr master;

-

-  master = (my_master_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(my_comp_master));

-  cinfo->master = &master->pub;

-  master->pub.prepare_for_pass = prepare_for_pass;

-  master->pub.pass_startup = pass_startup;

-  master->pub.finish_pass = finish_pass_master;

-  master->pub.is_last_pass = FALSE;

-

-  /* Validate parameters, determine derived values */

-  initial_setup(cinfo, transcode_only);

-

-  if (cinfo->scan_info != NULL) {

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-    validate_script(cinfo);

-    if (cinfo->block_size < DCTSIZE)

-      reduce_script(cinfo);

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-  } else {

-    cinfo->progressive_mode = FALSE;

-    cinfo->num_scans = 1;

-  }

-

-  if (cinfo->optimize_coding)

-    cinfo->arith_code = FALSE; /* disable arithmetic coding */

-  else if (! cinfo->arith_code &&

-	   (cinfo->progressive_mode ||

-	    (cinfo->block_size > 1 && cinfo->block_size < DCTSIZE)))

-    /* TEMPORARY HACK ??? */

-    /* assume default tables no good for progressive or reduced AC mode */

-    cinfo->optimize_coding = TRUE; /* force Huffman optimization */

-

-  /* Initialize my private state */

-  if (transcode_only) {

-    /* no main pass in transcoding */

-    if (cinfo->optimize_coding)

-      master->pass_type = huff_opt_pass;

-    else

-      master->pass_type = output_pass;

-  } else {

-    /* for normal compression, first pass is always this type: */

-    master->pass_type = main_pass;

-  }

-  master->scan_number = 0;

-  master->pass_number = 0;

-  if (cinfo->optimize_coding)

-    master->total_passes = cinfo->num_scans * 2;

-  else

-    master->total_passes = cinfo->num_scans;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcomapi.c b/plugins/AdvaImg/src/LibJPEG/jcomapi.c
deleted file mode 100644
index 1b1a340c1c..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcomapi.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * jcomapi.c

- *

- * Copyright (C) 1994-1997, 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 routines that are used for both

- * compression and decompression.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * Abort processing of a JPEG compression or decompression operation,

- * but don't destroy the object itself.

- *

- * For this, we merely clean up all the nonpermanent memory pools.

- * Note that temp files (virtual arrays) are not allowed to belong to

- * the permanent pool, so we will be able to close all temp files here.

- * Closing a data source or destination, if necessary, is the application's

- * responsibility.

- */

-

-GLOBAL(void)

-jpeg_abort (j_common_ptr cinfo)

-{

-  int pool;

-

-  /* Do nothing if called on a not-initialized or destroyed JPEG object. */

-  if (cinfo->mem == NULL)

-    return;

-

-  /* Releasing pools in reverse order might help avoid fragmentation

-   * with some (brain-damaged) malloc libraries.

-   */

-  for (pool = JPOOL_NUMPOOLS-1; pool > JPOOL_PERMANENT; pool--) {

-    (*cinfo->mem->free_pool) (cinfo, pool);

-  }

-

-  /* Reset overall state for possible reuse of object */

-  if (cinfo->is_decompressor) {

-    cinfo->global_state = DSTATE_START;

-    /* Try to keep application from accessing now-deleted marker list.

-     * A bit kludgy to do it here, but this is the most central place.

-     */

-    ((j_decompress_ptr) cinfo)->marker_list = NULL;

-  } else {

-    cinfo->global_state = CSTATE_START;

-  }

-}

-

-

-/*

- * Destruction of a JPEG object.

- *

- * Everything gets deallocated except the master jpeg_compress_struct itself

- * and the error manager struct.  Both of these are supplied by the application

- * and must be freed, if necessary, by the application.  (Often they are on

- * the stack and so don't need to be freed anyway.)

- * Closing a data source or destination, if necessary, is the application's

- * responsibility.

- */

-

-GLOBAL(void)

-jpeg_destroy (j_common_ptr cinfo)

-{

-  /* We need only tell the memory manager to release everything. */

-  /* NB: mem pointer is NULL if memory mgr failed to initialize. */

-  if (cinfo->mem != NULL)

-    (*cinfo->mem->self_destruct) (cinfo);

-  cinfo->mem = NULL;		/* be safe if jpeg_destroy is called twice */

-  cinfo->global_state = 0;	/* mark it destroyed */

-}

-

-

-/*

- * Convenience routines for allocating quantization and Huffman tables.

- * (Would jutils.c be a more reasonable place to put these?)

- */

-

-GLOBAL(JQUANT_TBL *)

-jpeg_alloc_quant_table (j_common_ptr cinfo)

-{

-  JQUANT_TBL *tbl;

-

-  tbl = (JQUANT_TBL *)

-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JQUANT_TBL));

-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */

-  return tbl;

-}

-

-

-GLOBAL(JHUFF_TBL *)

-jpeg_alloc_huff_table (j_common_ptr cinfo)

-{

-  JHUFF_TBL *tbl;

-

-  tbl = (JHUFF_TBL *)

-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JHUFF_TBL));

-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */

-  return tbl;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jconfig.h b/plugins/AdvaImg/src/LibJPEG/jconfig.h
deleted file mode 100644
index 9b71ed2db1..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jconfig.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 9x or NT. */

-/* This file also works for Borland C++ 32-bit (bcc32) on Windows 9x or NT. */

-/* see jconfig.txt for explanations */

-

-#define HAVE_PROTOTYPES

-#define HAVE_UNSIGNED_CHAR

-#define HAVE_UNSIGNED_SHORT

-/* #define void char */

-/* #define const */

-#undef CHAR_IS_UNSIGNED

-#define HAVE_STDDEF_H

-#define HAVE_STDLIB_H

-#undef NEED_BSD_STRINGS

-#undef NEED_SYS_TYPES_H

-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */

-#undef NEED_SHORT_EXTERNAL_NAMES

-#undef INCOMPLETE_TYPES_BROKEN

-

-/* Define "boolean" as unsigned char, not enum, per Windows custom */

-#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 */

-

-

-#ifdef JPEG_INTERNALS

-

-#undef RIGHT_SHIFT_IS_UNSIGNED

-

-#endif /* JPEG_INTERNALS */

-

-#ifdef JPEG_CJPEG_DJPEG

-

-#define BMP_SUPPORTED		/* BMP image file format */

-#define GIF_SUPPORTED		/* GIF image file format */

-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */

-#undef RLE_SUPPORTED		/* Utah RLE image file format */

-#define TARGA_SUPPORTED		/* Targa image file format */

-

-#define TWO_FILE_COMMANDLINE	/* optional */

-#define USE_SETMODE		/* Microsoft has setmode() */

-#undef NEED_SIGNAL_CATCHER

-#undef DONT_USE_B_MODE

-#undef PROGRESS_REPORT		/* optional */

-

-#endif /* JPEG_CJPEG_DJPEG */

diff --git a/plugins/AdvaImg/src/LibJPEG/jconfig.txt b/plugins/AdvaImg/src/LibJPEG/jconfig.txt
deleted file mode 100644
index 6c92b82d39..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jconfig.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

- * jconfig.txt

- *

- * Copyright (C) 1991-1994, Thomas G. Lane.

- * Modified 2009-2013 by Guido Vollbeding.

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

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

- *

- * This file documents the configuration options that are required to

- * customize the JPEG software for a particular system.

- *

- * The actual configuration options for a particular installation are stored

- * in jconfig.h.  On many machines, jconfig.h can be generated automatically

- * or copied from one of the "canned" jconfig files that we supply.  But if

- * you need to generate a jconfig.h file by hand, this file tells you how.

- *

- * DO NOT EDIT THIS FILE --- IT WON'T ACCOMPLISH ANYTHING.

- * EDIT A COPY NAMED JCONFIG.H.

- */

-

-

-/*

- * These symbols indicate the properties of your machine or compiler.

- * #define the symbol if yes, #undef it if no.

- */

-

-/* Does your compiler support function prototypes?

- * (If not, you also need to use ansi2knr, see install.txt)

- */

-#define HAVE_PROTOTYPES

-

-/* Does your compiler support the declaration "unsigned char" ?

- * How about "unsigned short" ?

- */

-#define HAVE_UNSIGNED_CHAR

-#define HAVE_UNSIGNED_SHORT

-

-/* Define "void" as "char" if your compiler doesn't know about type void.

- * NOTE: be sure to define void such that "void *" represents the most general

- * pointer type, e.g., that returned by malloc().

- */

-/* #define void char */

-

-/* Define "const" as empty if your compiler doesn't know the "const" keyword.

- */

-/* #define const */

-

-/* Define this if an ordinary "char" type is unsigned.

- * If you're not sure, leaving it undefined will work at some cost in speed.

- * If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.

- */

-#undef CHAR_IS_UNSIGNED

-

-/* Define this if your system has an ANSI-conforming <stddef.h> file.

- */

-#define HAVE_STDDEF_H

-

-/* Define this if your system has an ANSI-conforming <stdlib.h> file.

- */

-#define HAVE_STDLIB_H

-

-/* Define this if your system does not have an ANSI/SysV <string.h>,

- * but does have a BSD-style <strings.h>.

- */

-#undef NEED_BSD_STRINGS

-

-/* Define this if your system does not provide typedef size_t in any of the

- * ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in

- * <sys/types.h> instead.

- */

-#undef NEED_SYS_TYPES_H

-

-/* For 80x86 machines, you need to define NEED_FAR_POINTERS,

- * unless you are using a large-data memory model or 80386 flat-memory mode.

- * On less brain-damaged CPUs this symbol must not be defined.

- * (Defining this symbol causes large data structures to be referenced through

- * "far" pointers and to be allocated with a special version of malloc.)

- */

-#undef NEED_FAR_POINTERS

-

-/* Define this if your linker needs global names to be unique in less

- * than the first 15 characters.

- */

-#undef NEED_SHORT_EXTERNAL_NAMES

-

-/* Although a real ANSI C compiler can deal perfectly well with pointers to

- * unspecified structures (see "incomplete types" in the spec), a few pre-ANSI

- * and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,

- * define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you

- * actually get "missing structure definition" warnings or errors while

- * compiling the JPEG code.

- */

-#undef INCOMPLETE_TYPES_BROKEN

-

-/* Define "boolean" as unsigned char, not enum, on Windows systems.

- */

-#ifdef _WIN32

-#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 */

-#endif

-

-

-/*

- * The following options affect code selection within the JPEG library,

- * but they don't need to be visible to applications using the library.

- * To minimize application namespace pollution, the symbols won't be

- * defined unless JPEG_INTERNALS has been defined.

- */

-

-#ifdef JPEG_INTERNALS

-

-/* Define this if your compiler implements ">>" on signed values as a logical

- * (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,

- * which is the normal and rational definition.

- */

-#undef RIGHT_SHIFT_IS_UNSIGNED

-

-

-#endif /* JPEG_INTERNALS */

-

-

-/*

- * The remaining options do not affect the JPEG library proper,

- * but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).

- * Other applications can ignore these.

- */

-

-#ifdef JPEG_CJPEG_DJPEG

-

-/* These defines indicate which image (non-JPEG) file formats are allowed. */

-

-#define BMP_SUPPORTED		/* BMP image file format */

-#define GIF_SUPPORTED		/* GIF image file format */

-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */

-#undef RLE_SUPPORTED		/* Utah RLE image file format */

-#define TARGA_SUPPORTED		/* Targa image file format */

-

-/* Define this if you want to name both input and output files on the command

- * line, rather than using stdout and optionally stdin.  You MUST do this if

- * your system can't cope with binary I/O to stdin/stdout.  See comments at

- * head of cjpeg.c or djpeg.c.

- */

-#undef TWO_FILE_COMMANDLINE

-

-/* Define this if your system needs explicit cleanup of temporary files.

- * This is crucial under MS-DOS, where the temporary "files" may be areas

- * of extended memory; on most other systems it's not as important.

- */

-#undef NEED_SIGNAL_CATCHER

-

-/* By default, we open image files with fopen(...,"rb") or fopen(...,"wb").

- * This is necessary on systems that distinguish text files from binary files,

- * and is harmless on most systems that don't.  If you have one of the rare

- * systems that complains about the "b" spec, define this symbol.

- */

-#undef DONT_USE_B_MODE

-

-/* Define this if you want percent-done progress reports from cjpeg/djpeg.

- */

-#undef PROGRESS_REPORT

-

-

-#endif /* JPEG_CJPEG_DJPEG */

diff --git a/plugins/AdvaImg/src/LibJPEG/jcparam.c b/plugins/AdvaImg/src/LibJPEG/jcparam.c
deleted file mode 100644
index 1680e39257..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcparam.c
+++ /dev/null
@@ -1,675 +0,0 @@
-/*

- * jcparam.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2003-2013 by Guido Vollbeding.

- * 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 optional default-setting code for the JPEG compressor.

- * Applications do not have to use this file, but those that don't use it

- * must know a lot more about the innards of the JPEG code.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * Quantization table setup routines

- */

-

-GLOBAL(void)

-jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,

-		      const unsigned int *basic_table,

-		      int scale_factor, boolean force_baseline)

-/* Define a quantization table equal to the basic_table times

- * a scale factor (given as a percentage).

- * If force_baseline is TRUE, the computed quantization table entries

- * are limited to 1..255 for JPEG baseline compatibility.

- */

-{

-  JQUANT_TBL ** qtblptr;

-  int i;

-  long temp;

-

-  /* Safety check to ensure start_compress not called yet. */

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  if (which_tbl < 0 || which_tbl >= NUM_QUANT_TBLS)

-    ERREXIT1(cinfo, JERR_DQT_INDEX, which_tbl);

-

-  qtblptr = & cinfo->quant_tbl_ptrs[which_tbl];

-

-  if (*qtblptr == NULL)

-    *qtblptr = jpeg_alloc_quant_table((j_common_ptr) cinfo);

-

-  for (i = 0; i < DCTSIZE2; i++) {

-    temp = ((long) basic_table[i] * scale_factor + 50L) / 100L;

-    /* limit the values to the valid range */

-    if (temp <= 0L) temp = 1L;

-    if (temp > 32767L) temp = 32767L; /* max quantizer needed for 12 bits */

-    if (force_baseline && temp > 255L)

-      temp = 255L;		/* limit to baseline range if requested */

-    (*qtblptr)->quantval[i] = (UINT16) temp;

-  }

-

-  /* Initialize sent_table FALSE so table will be written to JPEG file. */

-  (*qtblptr)->sent_table = FALSE;

-}

-

-

-/* These are the sample quantization tables given in JPEG spec section K.1.

- * The spec says that the values given produce "good" quality, and

- * when divided by 2, "very good" quality.

- */

-static const unsigned int std_luminance_quant_tbl[DCTSIZE2] = {

-  16,  11,  10,  16,  24,  40,  51,  61,

-  12,  12,  14,  19,  26,  58,  60,  55,

-  14,  13,  16,  24,  40,  57,  69,  56,

-  14,  17,  22,  29,  51,  87,  80,  62,

-  18,  22,  37,  56,  68, 109, 103,  77,

-  24,  35,  55,  64,  81, 104, 113,  92,

-  49,  64,  78,  87, 103, 121, 120, 101,

-  72,  92,  95,  98, 112, 100, 103,  99

-};

-static const unsigned int std_chrominance_quant_tbl[DCTSIZE2] = {

-  17,  18,  24,  47,  99,  99,  99,  99,

-  18,  21,  26,  66,  99,  99,  99,  99,

-  24,  26,  56,  99,  99,  99,  99,  99,

-  47,  66,  99,  99,  99,  99,  99,  99,

-  99,  99,  99,  99,  99,  99,  99,  99,

-  99,  99,  99,  99,  99,  99,  99,  99,

-  99,  99,  99,  99,  99,  99,  99,  99,

-  99,  99,  99,  99,  99,  99,  99,  99

-};

-

-

-GLOBAL(void)

-jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline)

-/* Set or change the 'quality' (quantization) setting, using default tables

- * and straight percentage-scaling quality scales.

- * This entry point allows different scalings for luminance and chrominance.

- */

-{

-  /* Set up two quantization tables using the specified scaling */

-  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,

-		       cinfo->q_scale_factor[0], force_baseline);

-  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,

-		       cinfo->q_scale_factor[1], force_baseline);

-}

-

-

-GLOBAL(void)

-jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,

-			 boolean force_baseline)

-/* Set or change the 'quality' (quantization) setting, using default tables

- * and a straight percentage-scaling quality scale.  In most cases it's better

- * to use jpeg_set_quality (below); this entry point is provided for

- * applications that insist on a linear percentage scaling.

- */

-{

-  /* Set up two quantization tables using the specified scaling */

-  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,

-		       scale_factor, force_baseline);

-  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,

-		       scale_factor, force_baseline);

-}

-

-

-GLOBAL(int)

-jpeg_quality_scaling (int quality)

-/* Convert a user-specified quality rating to a percentage scaling factor

- * for an underlying quantization table, using our recommended scaling curve.

- * The input 'quality' factor should be 0 (terrible) to 100 (very good).

- */

-{

-  /* Safety limit on quality factor.  Convert 0 to 1 to avoid zero divide. */

-  if (quality <= 0) quality = 1;

-  if (quality > 100) quality = 100;

-

-  /* The basic table is used as-is (scaling 100) for a quality of 50.

-   * Qualities 50..100 are converted to scaling percentage 200 - 2*Q;

-   * note that at Q=100 the scaling is 0, which will cause jpeg_add_quant_table

-   * to make all the table entries 1 (hence, minimum quantization loss).

-   * Qualities 1..50 are converted to scaling percentage 5000/Q.

-   */

-  if (quality < 50)

-    quality = 5000 / quality;

-  else

-    quality = 200 - quality*2;

-

-  return quality;

-}

-

-

-GLOBAL(void)

-jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline)

-/* Set or change the 'quality' (quantization) setting, using default tables.

- * This is the standard quality-adjusting entry point for typical user

- * interfaces; only those who want detailed control over quantization tables

- * would use the preceding routines directly.

- */

-{

-  /* Convert user 0-100 rating to percentage scaling */

-  quality = jpeg_quality_scaling(quality);

-

-  /* Set up standard quality tables */

-  jpeg_set_linear_quality(cinfo, quality, force_baseline);

-}

-

-

-/*

- * Huffman table setup routines

- */

-

-LOCAL(void)

-add_huff_table (j_compress_ptr cinfo,

-		JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)

-/* Define a Huffman table */

-{

-  int nsymbols, len;

-

-  if (*htblptr == NULL)

-    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);

-

-  /* Copy the number-of-symbols-of-each-code-length counts */

-  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));

-

-  /* Validate the counts.  We do this here mainly so we can copy the right

-   * number of symbols from the val[] array, without risking marching off

-   * the end of memory.  jchuff.c will do a more thorough test later.

-   */

-  nsymbols = 0;

-  for (len = 1; len <= 16; len++)

-    nsymbols += bits[len];

-  if (nsymbols < 1 || nsymbols > 256)

-    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-

-  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));

-

-  /* Initialize sent_table FALSE so table will be written to JPEG file. */

-  (*htblptr)->sent_table = FALSE;

-}

-

-

-LOCAL(void)

-std_huff_tables (j_compress_ptr cinfo)

-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */

-/* IMPORTANT: these are only valid for 8-bit data precision! */

-{

-  static const UINT8 bits_dc_luminance[17] =

-    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };

-  static const UINT8 val_dc_luminance[] =

-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };

-  

-  static const UINT8 bits_dc_chrominance[17] =

-    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };

-  static const UINT8 val_dc_chrominance[] =

-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };

-  

-  static const UINT8 bits_ac_luminance[17] =

-    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };

-  static const UINT8 val_ac_luminance[] =

-    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,

-      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,

-      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,

-      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,

-      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,

-      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,

-      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,

-      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,

-      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,

-      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,

-      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,

-      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,

-      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,

-      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,

-      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,

-      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,

-      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,

-      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,

-      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,

-      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,

-      0xf9, 0xfa };

-  

-  static const UINT8 bits_ac_chrominance[17] =

-    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };

-  static const UINT8 val_ac_chrominance[] =

-    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,

-      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,

-      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,

-      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,

-      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,

-      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,

-      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,

-      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,

-      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

-      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,

-      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,

-      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,

-      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,

-      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,

-      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,

-      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,

-      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,

-      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,

-      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,

-      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,

-      0xf9, 0xfa };

-  

-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],

-		 bits_dc_luminance, val_dc_luminance);

-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],

-		 bits_ac_luminance, val_ac_luminance);

-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],

-		 bits_dc_chrominance, val_dc_chrominance);

-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],

-		 bits_ac_chrominance, val_ac_chrominance);

-}

-

-

-/*

- * Default parameter setup for compression.

- *

- * Applications that don't choose to use this routine must do their

- * own setup of all these parameters.  Alternately, you can call this

- * to establish defaults and then alter parameters selectively.  This

- * is the recommended approach since, if we add any new parameters,

- * your code will still work (they'll be set to reasonable defaults).

- */

-

-GLOBAL(void)

-jpeg_set_defaults (j_compress_ptr cinfo)

-{

-  int i;

-

-  /* Safety check to ensure start_compress not called yet. */

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  /* Allocate comp_info array large enough for maximum component count.

-   * Array is made permanent in case application wants to compress

-   * multiple images at same param settings.

-   */

-  if (cinfo->comp_info == NULL)

-    cinfo->comp_info = (jpeg_component_info *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  MAX_COMPONENTS * SIZEOF(jpeg_component_info));

-

-  /* Initialize everything not dependent on the color space */

-

-  cinfo->scale_num = 1;		/* 1:1 scaling */

-  cinfo->scale_denom = 1;

-  cinfo->data_precision = BITS_IN_JSAMPLE;

-  /* Set up two quantization tables using default quality of 75 */

-  jpeg_set_quality(cinfo, 75, TRUE);

-  /* Set up two Huffman tables */

-  std_huff_tables(cinfo);

-

-  /* Initialize default arithmetic coding conditioning */

-  for (i = 0; i < NUM_ARITH_TBLS; i++) {

-    cinfo->arith_dc_L[i] = 0;

-    cinfo->arith_dc_U[i] = 1;

-    cinfo->arith_ac_K[i] = 5;

-  }

-

-  /* Default is no multiple-scan output */

-  cinfo->scan_info = NULL;

-  cinfo->num_scans = 0;

-

-  /* Expect normal source image, not raw downsampled data */

-  cinfo->raw_data_in = FALSE;

-

-  /* The standard Huffman tables are only valid for 8-bit data precision.

-   * If the precision is higher, use arithmetic coding.

-   * (Alternatively, using Huffman coding would be possible with forcing

-   * optimization on so that usable tables will be computed, or by

-   * supplying default tables that are valid for the desired precision.)

-   * Otherwise, use Huffman coding by default.

-   */

-  cinfo->arith_code = cinfo->data_precision > 8 ? TRUE : FALSE;

-

-  /* By default, don't do extra passes to optimize entropy coding */

-  cinfo->optimize_coding = FALSE;

-

-  /* By default, use the simpler non-cosited sampling alignment */

-  cinfo->CCIR601_sampling = FALSE;

-

-  /* By default, apply fancy downsampling */

-  cinfo->do_fancy_downsampling = TRUE;

-

-  /* No input smoothing */

-  cinfo->smoothing_factor = 0;

-

-  /* DCT algorithm preference */

-  cinfo->dct_method = JDCT_DEFAULT;

-

-  /* No restart markers */

-  cinfo->restart_interval = 0;

-  cinfo->restart_in_rows = 0;

-

-  /* Fill in default JFIF marker parameters.  Note that whether the marker

-   * will actually be written is determined by jpeg_set_colorspace.

-   *

-   * By default, the library emits JFIF version code 1.01.

-   * An application that wants to emit JFIF 1.02 extension markers should set

-   * JFIF_minor_version to 2.  We could probably get away with just defaulting

-   * to 1.02, but there may still be some decoders in use that will complain

-   * about that; saying 1.01 should minimize compatibility problems.

-   *

-   * For wide gamut colorspaces (BG_RGB and BG_YCC), the major version will be

-   * overridden by jpeg_set_colorspace and set to 2.

-   */

-  cinfo->JFIF_major_version = 1; /* Default JFIF version = 1.01 */

-  cinfo->JFIF_minor_version = 1;

-  cinfo->density_unit = 0;	/* Pixel size is unknown by default */

-  cinfo->X_density = 1;		/* Pixel aspect ratio is square by default */

-  cinfo->Y_density = 1;

-

-  /* No color transform */

-  cinfo->color_transform = JCT_NONE;

-

-  /* Choose JPEG colorspace based on input space, set defaults accordingly */

-

-  jpeg_default_colorspace(cinfo);

-}

-

-

-/*

- * Select an appropriate JPEG colorspace for in_color_space.

- */

-

-GLOBAL(void)

-jpeg_default_colorspace (j_compress_ptr cinfo)

-{

-  switch (cinfo->in_color_space) {

-  case JCS_UNKNOWN:

-    jpeg_set_colorspace(cinfo, JCS_UNKNOWN);

-    break;

-  case JCS_GRAYSCALE:

-    jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);

-    break;

-  case JCS_RGB:

-    jpeg_set_colorspace(cinfo, JCS_YCbCr);

-    break;

-  case JCS_YCbCr:

-    jpeg_set_colorspace(cinfo, JCS_YCbCr);

-    break;

-  case JCS_CMYK:

-    jpeg_set_colorspace(cinfo, JCS_CMYK); /* By default, no translation */

-    break;

-  case JCS_YCCK:

-    jpeg_set_colorspace(cinfo, JCS_YCCK);

-    break;

-  case JCS_BG_RGB:

-    /* No translation for now -- conversion to BG_YCC not yet supportet */

-    jpeg_set_colorspace(cinfo, JCS_BG_RGB);

-    break;

-  case JCS_BG_YCC:

-    jpeg_set_colorspace(cinfo, JCS_BG_YCC);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);

-  }

-}

-

-

-/*

- * Set the JPEG colorspace, and choose colorspace-dependent default values.

- */

-

-GLOBAL(void)

-jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)

-{

-  jpeg_component_info * compptr;

-  int ci;

-

-#define SET_COMP(index,id,hsamp,vsamp,quant,dctbl,actbl)  \

-  (compptr = &cinfo->comp_info[index], \

-   compptr->component_id = (id), \

-   compptr->h_samp_factor = (hsamp), \

-   compptr->v_samp_factor = (vsamp), \

-   compptr->quant_tbl_no = (quant), \

-   compptr->dc_tbl_no = (dctbl), \

-   compptr->ac_tbl_no = (actbl) )

-

-  /* Safety check to ensure start_compress not called yet. */

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  /* For all colorspaces, we use Q and Huff tables 0 for luminance components,

-   * tables 1 for chrominance components.

-   */

-

-  cinfo->jpeg_color_space = colorspace;

-

-  cinfo->write_JFIF_header = FALSE; /* No marker for non-JFIF colorspaces */

-  cinfo->write_Adobe_marker = FALSE; /* write no Adobe marker by default */

-

-  switch (colorspace) {

-  case JCS_UNKNOWN:

-    cinfo->num_components = cinfo->input_components;

-    if (cinfo->num_components < 1 || cinfo->num_components > MAX_COMPONENTS)

-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,

-	       MAX_COMPONENTS);

-    for (ci = 0; ci < cinfo->num_components; ci++) {

-      SET_COMP(ci, ci, 1,1, 0, 0,0);

-    }

-    break;

-  case JCS_GRAYSCALE:

-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */

-    cinfo->num_components = 1;

-    /* JFIF specifies component ID 1 */

-    SET_COMP(0, 0x01, 1,1, 0, 0,0);

-    break;

-  case JCS_RGB:

-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag RGB */

-    cinfo->num_components = 3;

-    SET_COMP(0, 0x52 /* 'R' */, 1,1, 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0);

-    SET_COMP(1, 0x47 /* 'G' */, 1,1, 0, 0,0);

-    SET_COMP(2, 0x42 /* 'B' */, 1,1, 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0);

-    break;

-  case JCS_YCbCr:

-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */

-    cinfo->num_components = 3;

-    /* JFIF specifies component IDs 1,2,3 */

-    /* We default to 2x2 subsamples of chrominance */

-    SET_COMP(0, 0x01, 2,2, 0, 0,0);

-    SET_COMP(1, 0x02, 1,1, 1, 1,1);

-    SET_COMP(2, 0x03, 1,1, 1, 1,1);

-    break;

-  case JCS_CMYK:

-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag CMYK */

-    cinfo->num_components = 4;

-    SET_COMP(0, 0x43 /* 'C' */, 1,1, 0, 0,0);

-    SET_COMP(1, 0x4D /* 'M' */, 1,1, 0, 0,0);

-    SET_COMP(2, 0x59 /* 'Y' */, 1,1, 0, 0,0);

-    SET_COMP(3, 0x4B /* 'K' */, 1,1, 0, 0,0);

-    break;

-  case JCS_YCCK:

-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag YCCK */

-    cinfo->num_components = 4;

-    SET_COMP(0, 0x01, 2,2, 0, 0,0);

-    SET_COMP(1, 0x02, 1,1, 1, 1,1);

-    SET_COMP(2, 0x03, 1,1, 1, 1,1);

-    SET_COMP(3, 0x04, 2,2, 0, 0,0);

-    break;

-  case JCS_BG_RGB:

-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */

-    cinfo->JFIF_major_version = 2;   /* Set JFIF major version = 2 */

-    cinfo->num_components = 3;

-    /* Add offset 0x20 to the normal R/G/B component IDs */

-    SET_COMP(0, 0x72 /* 'r' */, 1,1, 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0);

-    SET_COMP(1, 0x67 /* 'g' */, 1,1, 0, 0,0);

-    SET_COMP(2, 0x62 /* 'b' */, 1,1, 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0,

-		cinfo->color_transform == JCT_SUBTRACT_GREEN ? 1 : 0);

-    break;

-  case JCS_BG_YCC:

-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */

-    cinfo->JFIF_major_version = 2;   /* Set JFIF major version = 2 */

-    cinfo->num_components = 3;

-    /* Add offset 0x20 to the normal Cb/Cr component IDs */

-    /* We default to 2x2 subsamples of chrominance */

-    SET_COMP(0, 0x01, 2,2, 0, 0,0);

-    SET_COMP(1, 0x22, 1,1, 1, 1,1);

-    SET_COMP(2, 0x23, 1,1, 1, 1,1);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-  }

-}

-

-

-#ifdef C_PROGRESSIVE_SUPPORTED

-

-LOCAL(jpeg_scan_info *)

-fill_a_scan (jpeg_scan_info * scanptr, int ci,

-	     int Ss, int Se, int Ah, int Al)

-/* Support routine: generate one scan for specified component */

-{

-  scanptr->comps_in_scan = 1;

-  scanptr->component_index[0] = ci;

-  scanptr->Ss = Ss;

-  scanptr->Se = Se;

-  scanptr->Ah = Ah;

-  scanptr->Al = Al;

-  scanptr++;

-  return scanptr;

-}

-

-LOCAL(jpeg_scan_info *)

-fill_scans (jpeg_scan_info * scanptr, int ncomps,

-	    int Ss, int Se, int Ah, int Al)

-/* Support routine: generate one scan for each component */

-{

-  int ci;

-

-  for (ci = 0; ci < ncomps; ci++) {

-    scanptr->comps_in_scan = 1;

-    scanptr->component_index[0] = ci;

-    scanptr->Ss = Ss;

-    scanptr->Se = Se;

-    scanptr->Ah = Ah;

-    scanptr->Al = Al;

-    scanptr++;

-  }

-  return scanptr;

-}

-

-LOCAL(jpeg_scan_info *)

-fill_dc_scans (jpeg_scan_info * scanptr, int ncomps, int Ah, int Al)

-/* Support routine: generate interleaved DC scan if possible, else N scans */

-{

-  int ci;

-

-  if (ncomps <= MAX_COMPS_IN_SCAN) {

-    /* Single interleaved DC scan */

-    scanptr->comps_in_scan = ncomps;

-    for (ci = 0; ci < ncomps; ci++)

-      scanptr->component_index[ci] = ci;

-    scanptr->Ss = scanptr->Se = 0;

-    scanptr->Ah = Ah;

-    scanptr->Al = Al;

-    scanptr++;

-  } else {

-    /* Noninterleaved DC scan for each component */

-    scanptr = fill_scans(scanptr, ncomps, 0, 0, Ah, Al);

-  }

-  return scanptr;

-}

-

-

-/*

- * Create a recommended progressive-JPEG script.

- * cinfo->num_components and cinfo->jpeg_color_space must be correct.

- */

-

-GLOBAL(void)

-jpeg_simple_progression (j_compress_ptr cinfo)

-{

-  int ncomps = cinfo->num_components;

-  int nscans;

-  jpeg_scan_info * scanptr;

-

-  /* Safety check to ensure start_compress not called yet. */

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  /* Figure space needed for script.  Calculation must match code below! */

-  if (ncomps == 3 &&

-      (cinfo->jpeg_color_space == JCS_YCbCr ||

-       cinfo->jpeg_color_space == JCS_BG_YCC)) {

-    /* Custom script for YCC color images. */

-    nscans = 10;

-  } else {

-    /* All-purpose script for other color spaces. */

-    if (ncomps > MAX_COMPS_IN_SCAN)

-      nscans = 6 * ncomps;	/* 2 DC + 4 AC scans per component */

-    else

-      nscans = 2 + 4 * ncomps;	/* 2 DC scans; 4 AC scans per component */

-  }

-

-  /* Allocate space for script.

-   * We need to put it in the permanent pool in case the application performs

-   * multiple compressions without changing the settings.  To avoid a memory

-   * leak if jpeg_simple_progression is called repeatedly for the same JPEG

-   * object, we try to re-use previously allocated space, and we allocate

-   * enough space to handle YCC even if initially asked for grayscale.

-   */

-  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {

-    cinfo->script_space_size = MAX(nscans, 10);

-    cinfo->script_space = (jpeg_scan_info *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-			cinfo->script_space_size * SIZEOF(jpeg_scan_info));

-  }

-  scanptr = cinfo->script_space;

-  cinfo->scan_info = scanptr;

-  cinfo->num_scans = nscans;

-

-  if (ncomps == 3 &&

-      (cinfo->jpeg_color_space == JCS_YCbCr ||

-       cinfo->jpeg_color_space == JCS_BG_YCC)) {

-    /* Custom script for YCC color images. */

-    /* Initial DC scan */

-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);

-    /* Initial AC scan: get some luma data out in a hurry */

-    scanptr = fill_a_scan(scanptr, 0, 1, 5, 0, 2);

-    /* Chroma data is too small to be worth expending many scans on */

-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 0, 1);

-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 0, 1);

-    /* Complete spectral selection for luma AC */

-    scanptr = fill_a_scan(scanptr, 0, 6, 63, 0, 2);

-    /* Refine next bit of luma AC */

-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 2, 1);

-    /* Finish DC successive approximation */

-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);

-    /* Finish AC successive approximation */

-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 1, 0);

-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 1, 0);

-    /* Luma bottom bit comes last since it's usually largest scan */

-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 1, 0);

-  } else {

-    /* All-purpose script for other color spaces. */

-    /* Successive approximation first pass */

-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);

-    scanptr = fill_scans(scanptr, ncomps, 1, 5, 0, 2);

-    scanptr = fill_scans(scanptr, ncomps, 6, 63, 0, 2);

-    /* Successive approximation second pass */

-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 2, 1);

-    /* Successive approximation final pass */

-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);

-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 1, 0);

-  }

-}

-

-#endif /* C_PROGRESSIVE_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jcprepct.c b/plugins/AdvaImg/src/LibJPEG/jcprepct.c
deleted file mode 100644
index 00101e0b57..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcprepct.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*

- * jcprepct.c

- *

- * Copyright (C) 1994-1996, 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 the compression preprocessing controller.

- * This controller manages the color conversion, downsampling,

- * and edge expansion steps.

- *

- * Most of the complexity here is associated with buffering input rows

- * as required by the downsampler.  See the comments at the head of

- * jcsample.c for the downsampler's needs.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* At present, jcsample.c can request context rows only for smoothing.

- * In the future, we might also need context rows for CCIR601 sampling

- * or other more-complex downsampling procedures.  The code to support

- * context rows should be compiled only if needed.

- */

-#ifdef INPUT_SMOOTHING_SUPPORTED

-#define CONTEXT_ROWS_SUPPORTED

-#endif

-

-

-/*

- * For the simple (no-context-row) case, we just need to buffer one

- * row group's worth of pixels for the downsampling step.  At the bottom of

- * the image, we pad to a full row group by replicating the last pixel row.

- * The downsampler's last output row is then replicated if needed to pad

- * out to a full iMCU row.

- *

- * When providing context rows, we must buffer three row groups' worth of

- * pixels.  Three row groups are physically allocated, but the row pointer

- * arrays are made five row groups high, with the extra pointers above and

- * below "wrapping around" to point to the last and first real row groups.

- * This allows the downsampler to access the proper context rows.

- * At the top and bottom of the image, we create dummy context rows by

- * copying the first or last real pixel row.  This copying could be avoided

- * by pointer hacking as is done in jdmainct.c, but it doesn't seem worth the

- * trouble on the compression side.

- */

-

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_c_prep_controller pub; /* public fields */

-

-  /* Downsampling input buffer.  This buffer holds color-converted data

-   * until we have enough to do a downsample step.

-   */

-  JSAMPARRAY color_buf[MAX_COMPONENTS];

-

-  JDIMENSION rows_to_go;	/* counts rows remaining in source image */

-  int next_buf_row;		/* index of next row to store in color_buf */

-

-#ifdef CONTEXT_ROWS_SUPPORTED	/* only needed for context case */

-  int this_row_group;		/* starting row index of group to process */

-  int next_buf_stop;		/* downsample when we reach this index */

-#endif

-} my_prep_controller;

-

-typedef my_prep_controller * my_prep_ptr;

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_prep (j_compress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;

-

-  if (pass_mode != JBUF_PASS_THRU)

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-

-  /* Initialize total-height counter for detecting bottom of image */

-  prep->rows_to_go = cinfo->image_height;

-  /* Mark the conversion buffer empty */

-  prep->next_buf_row = 0;

-#ifdef CONTEXT_ROWS_SUPPORTED

-  /* Preset additional state variables for context mode.

-   * These aren't used in non-context mode, so we needn't test which mode.

-   */

-  prep->this_row_group = 0;

-  /* Set next_buf_stop to stop after two row groups have been read in. */

-  prep->next_buf_stop = 2 * cinfo->max_v_samp_factor;

-#endif

-}

-

-

-/*

- * Expand an image vertically from height input_rows to height output_rows,

- * by duplicating the bottom row.

- */

-

-LOCAL(void)

-expand_bottom_edge (JSAMPARRAY image_data, JDIMENSION num_cols,

-		    int input_rows, int output_rows)

-{

-  register int row;

-

-  for (row = input_rows; row < output_rows; row++) {

-    jcopy_sample_rows(image_data, input_rows-1, image_data, row,

-		      1, num_cols);

-  }

-}

-

-

-/*

- * Process some data in the simple no-context case.

- *

- * Preprocessor output data is counted in "row groups".  A row group

- * is defined to be v_samp_factor sample rows of each component.

- * Downsampling will produce this much data from each max_v_samp_factor

- * input rows.

- */

-

-METHODDEF(void)

-pre_process_data (j_compress_ptr cinfo,

-		  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,

-		  JDIMENSION in_rows_avail,

-		  JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,

-		  JDIMENSION out_row_groups_avail)

-{

-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;

-  int numrows, ci;

-  JDIMENSION inrows;

-  jpeg_component_info * compptr;

-

-  while (*in_row_ctr < in_rows_avail &&

-	 *out_row_group_ctr < out_row_groups_avail) {

-    /* Do color conversion to fill the conversion buffer. */

-    inrows = in_rows_avail - *in_row_ctr;

-    numrows = cinfo->max_v_samp_factor - prep->next_buf_row;

-    numrows = (int) MIN((JDIMENSION) numrows, inrows);

-    (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,

-				       prep->color_buf,

-				       (JDIMENSION) prep->next_buf_row,

-				       numrows);

-    *in_row_ctr += numrows;

-    prep->next_buf_row += numrows;

-    prep->rows_to_go -= numrows;

-    /* If at bottom of image, pad to fill the conversion buffer. */

-    if (prep->rows_to_go == 0 &&

-	prep->next_buf_row < cinfo->max_v_samp_factor) {

-      for (ci = 0; ci < cinfo->num_components; ci++) {

-	expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,

-			   prep->next_buf_row, cinfo->max_v_samp_factor);

-      }

-      prep->next_buf_row = cinfo->max_v_samp_factor;

-    }

-    /* If we've filled the conversion buffer, empty it. */

-    if (prep->next_buf_row == cinfo->max_v_samp_factor) {

-      (*cinfo->downsample->downsample) (cinfo,

-					prep->color_buf, (JDIMENSION) 0,

-					output_buf, *out_row_group_ctr);

-      prep->next_buf_row = 0;

-      (*out_row_group_ctr)++;

-    }

-    /* If at bottom of image, pad the output to a full iMCU height.

-     * Note we assume the caller is providing a one-iMCU-height output buffer!

-     */

-    if (prep->rows_to_go == 0 &&

-	*out_row_group_ctr < out_row_groups_avail) {

-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	   ci++, compptr++) {

-	numrows = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-		  cinfo->min_DCT_v_scaled_size;

-	expand_bottom_edge(output_buf[ci],

-			   compptr->width_in_blocks * compptr->DCT_h_scaled_size,

-			   (int) (*out_row_group_ctr * numrows),

-			   (int) (out_row_groups_avail * numrows));

-      }

-      *out_row_group_ctr = out_row_groups_avail;

-      break;			/* can exit outer loop without test */

-    }

-  }

-}

-

-

-#ifdef CONTEXT_ROWS_SUPPORTED

-

-/*

- * Process some data in the context case.

- */

-

-METHODDEF(void)

-pre_process_context (j_compress_ptr cinfo,

-		     JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,

-		     JDIMENSION in_rows_avail,

-		     JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,

-		     JDIMENSION out_row_groups_avail)

-{

-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;

-  int numrows, ci;

-  int buf_height = cinfo->max_v_samp_factor * 3;

-  JDIMENSION inrows;

-

-  while (*out_row_group_ctr < out_row_groups_avail) {

-    if (*in_row_ctr < in_rows_avail) {

-      /* Do color conversion to fill the conversion buffer. */

-      inrows = in_rows_avail - *in_row_ctr;

-      numrows = prep->next_buf_stop - prep->next_buf_row;

-      numrows = (int) MIN((JDIMENSION) numrows, inrows);

-      (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,

-					 prep->color_buf,

-					 (JDIMENSION) prep->next_buf_row,

-					 numrows);

-      /* Pad at top of image, if first time through */

-      if (prep->rows_to_go == cinfo->image_height) {

-	for (ci = 0; ci < cinfo->num_components; ci++) {

-	  int row;

-	  for (row = 1; row <= cinfo->max_v_samp_factor; row++) {

-	    jcopy_sample_rows(prep->color_buf[ci], 0,

-			      prep->color_buf[ci], -row,

-			      1, cinfo->image_width);

-	  }

-	}

-      }

-      *in_row_ctr += numrows;

-      prep->next_buf_row += numrows;

-      prep->rows_to_go -= numrows;

-    } else {

-      /* Return for more data, unless we are at the bottom of the image. */

-      if (prep->rows_to_go != 0)

-	break;

-      /* When at bottom of image, pad to fill the conversion buffer. */

-      if (prep->next_buf_row < prep->next_buf_stop) {

-	for (ci = 0; ci < cinfo->num_components; ci++) {

-	  expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,

-			     prep->next_buf_row, prep->next_buf_stop);

-	}

-	prep->next_buf_row = prep->next_buf_stop;

-      }

-    }

-    /* If we've gotten enough data, downsample a row group. */

-    if (prep->next_buf_row == prep->next_buf_stop) {

-      (*cinfo->downsample->downsample) (cinfo,

-					prep->color_buf,

-					(JDIMENSION) prep->this_row_group,

-					output_buf, *out_row_group_ctr);

-      (*out_row_group_ctr)++;

-      /* Advance pointers with wraparound as necessary. */

-      prep->this_row_group += cinfo->max_v_samp_factor;

-      if (prep->this_row_group >= buf_height)

-	prep->this_row_group = 0;

-      if (prep->next_buf_row >= buf_height)

-	prep->next_buf_row = 0;

-      prep->next_buf_stop = prep->next_buf_row + cinfo->max_v_samp_factor;

-    }

-  }

-}

-

-

-/*

- * Create the wrapped-around downsampling input buffer needed for context mode.

- */

-

-LOCAL(void)

-create_context_buffer (j_compress_ptr cinfo)

-{

-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;

-  int rgroup_height = cinfo->max_v_samp_factor;

-  int ci, i;

-  jpeg_component_info * compptr;

-  JSAMPARRAY true_buffer, fake_buffer;

-

-  /* Grab enough space for fake row pointers for all the components;

-   * we need five row groups' worth of pointers for each component.

-   */

-  fake_buffer = (JSAMPARRAY)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(cinfo->num_components * 5 * rgroup_height) *

-				SIZEOF(JSAMPROW));

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Allocate the actual buffer space (3 row groups) for this component.

-     * We make the buffer wide enough to allow the downsampler to edge-expand

-     * horizontally within the buffer, if it so chooses.

-     */

-    true_buffer = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) (((long) compptr->width_in_blocks *

-		      cinfo->min_DCT_h_scaled_size *

-		      cinfo->max_h_samp_factor) / compptr->h_samp_factor),

-       (JDIMENSION) (3 * rgroup_height));

-    /* Copy true buffer row pointers into the middle of the fake row array */

-    MEMCOPY(fake_buffer + rgroup_height, true_buffer,

-	    3 * rgroup_height * SIZEOF(JSAMPROW));

-    /* Fill in the above and below wraparound pointers */

-    for (i = 0; i < rgroup_height; i++) {

-      fake_buffer[i] = true_buffer[2 * rgroup_height + i];

-      fake_buffer[4 * rgroup_height + i] = true_buffer[i];

-    }

-    prep->color_buf[ci] = fake_buffer + rgroup_height;

-    fake_buffer += 5 * rgroup_height; /* point to space for next component */

-  }

-}

-

-#endif /* CONTEXT_ROWS_SUPPORTED */

-

-

-/*

- * Initialize preprocessing controller.

- */

-

-GLOBAL(void)

-jinit_c_prep_controller (j_compress_ptr cinfo, boolean need_full_buffer)

-{

-  my_prep_ptr prep;

-  int ci;

-  jpeg_component_info * compptr;

-

-  if (need_full_buffer)		/* safety check */

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-

-  prep = (my_prep_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_prep_controller));

-  cinfo->prep = (struct jpeg_c_prep_controller *) prep;

-  prep->pub.start_pass = start_pass_prep;

-

-  /* Allocate the color conversion buffer.

-   * We make the buffer wide enough to allow the downsampler to edge-expand

-   * horizontally within the buffer, if it so chooses.

-   */

-  if (cinfo->downsample->need_context_rows) {

-    /* Set up to provide context rows */

-#ifdef CONTEXT_ROWS_SUPPORTED

-    prep->pub.pre_process_data = pre_process_context;

-    create_context_buffer(cinfo);

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-  } else {

-    /* No context, just make it tall enough for one row group */

-    prep->pub.pre_process_data = pre_process_data;

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE,

-	 (JDIMENSION) (((long) compptr->width_in_blocks *

-			cinfo->min_DCT_h_scaled_size *

-			cinfo->max_h_samp_factor) / compptr->h_samp_factor),

-	 (JDIMENSION) cinfo->max_v_samp_factor);

-    }

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jcsample.c b/plugins/AdvaImg/src/LibJPEG/jcsample.c
deleted file mode 100644
index 1aef8a6fc7..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jcsample.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/*

- * jcsample.c

- *

- * Copyright (C) 1991-1996, 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 downsampling routines.

- *

- * Downsampling input data is counted in "row groups".  A row group

- * is defined to be max_v_samp_factor pixel rows of each component,

- * from which the downsampler produces v_samp_factor sample rows.

- * A single row group is processed in each call to the downsampler module.

- *

- * The downsampler is responsible for edge-expansion of its output data

- * to fill an integral number of DCT blocks horizontally.  The source buffer

- * may be modified if it is helpful for this purpose (the source buffer is

- * allocated wide enough to correspond to the desired output width).

- * The caller (the prep controller) is responsible for vertical padding.

- *

- * The downsampler may request "context rows" by setting need_context_rows

- * during startup.  In this case, the input arrays will contain at least

- * one row group's worth of pixels above and below the passed-in data;

- * the caller will create dummy rows at image top and bottom by replicating

- * the first or last real pixel row.

- *

- * An excellent reference for image resampling is

- *   Digital Image Warping, George Wolberg, 1990.

- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.

- *

- * The downsampling algorithm used here is a simple average of the source

- * pixels covered by the output pixel.  The hi-falutin sampling literature

- * refers to this as a "box filter".  In general the characteristics of a box

- * filter are not very good, but for the specific cases we normally use (1:1

- * and 2:1 ratios) the box is equivalent to a "triangle filter" which is not

- * nearly so bad.  If you intend to use other sampling ratios, you'd be well

- * advised to improve this code.

- *

- * A simple input-smoothing capability is provided.  This is mainly intended

- * for cleaning up color-dithered GIF input files (if you find it inadequate,

- * we suggest using an external filtering program such as pnmconvol).  When

- * enabled, each input pixel P is replaced by a weighted sum of itself and its

- * eight neighbors.  P's weight is 1-8*SF and each neighbor's weight is SF,

- * where SF = (smoothing_factor / 1024).

- * Currently, smoothing is only supported for 2h2v sampling factors.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Pointer to routine to downsample a single component */

-typedef JMETHOD(void, downsample1_ptr,

-		(j_compress_ptr cinfo, jpeg_component_info * compptr,

-		 JSAMPARRAY input_data, JSAMPARRAY output_data));

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_downsampler pub;	/* public fields */

-

-  /* Downsampling method pointers, one per component */

-  downsample1_ptr methods[MAX_COMPONENTS];

-

-  /* Height of an output row group for each component. */

-  int rowgroup_height[MAX_COMPONENTS];

-

-  /* These arrays save pixel expansion factors so that int_downsample need not

-   * recompute them each time.  They are unused for other downsampling methods.

-   */

-  UINT8 h_expand[MAX_COMPONENTS];

-  UINT8 v_expand[MAX_COMPONENTS];

-} my_downsampler;

-

-typedef my_downsampler * my_downsample_ptr;

-

-

-/*

- * Initialize for a downsampling pass.

- */

-

-METHODDEF(void)

-start_pass_downsample (j_compress_ptr cinfo)

-{

-  /* no work for now */

-}

-

-

-/*

- * Expand a component horizontally from width input_cols to width output_cols,

- * by duplicating the rightmost samples.

- */

-

-LOCAL(void)

-expand_right_edge (JSAMPARRAY image_data, int num_rows,

-		   JDIMENSION input_cols, JDIMENSION output_cols)

-{

-  register JSAMPROW ptr;

-  register JSAMPLE pixval;

-  register int count;

-  int row;

-  int numcols = (int) (output_cols - input_cols);

-

-  if (numcols > 0) {

-    for (row = 0; row < num_rows; row++) {

-      ptr = image_data[row] + input_cols;

-      pixval = ptr[-1];		/* don't need GETJSAMPLE() here */

-      for (count = numcols; count > 0; count--)

-	*ptr++ = pixval;

-    }

-  }

-}

-

-

-/*

- * Do downsampling for a whole row group (all components).

- *

- * In this version we simply downsample each component independently.

- */

-

-METHODDEF(void)

-sep_downsample (j_compress_ptr cinfo,

-		JSAMPIMAGE input_buf, JDIMENSION in_row_index,

-		JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)

-{

-  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;

-  int ci;

-  jpeg_component_info * compptr;

-  JSAMPARRAY in_ptr, out_ptr;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    in_ptr = input_buf[ci] + in_row_index;

-    out_ptr = output_buf[ci] +

-	      (out_row_group_index * downsample->rowgroup_height[ci]);

-    (*downsample->methods[ci]) (cinfo, compptr, in_ptr, out_ptr);

-  }

-}

-

-

-/*

- * Downsample pixel values of a single component.

- * One row group is processed per call.

- * This version handles arbitrary integral sampling ratios, without smoothing.

- * Note that this version is not actually used for customary sampling ratios.

- */

-

-METHODDEF(void)

-int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,

-		JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;

-  int inrow, outrow, h_expand, v_expand, numpix, numpix2, h, v;

-  JDIMENSION outcol, outcol_h;	/* outcol_h == outcol*h_expand */

-  JDIMENSION output_cols = compptr->width_in_blocks * compptr->DCT_h_scaled_size;

-  JSAMPROW inptr, outptr;

-  INT32 outvalue;

-

-  h_expand = downsample->h_expand[compptr->component_index];

-  v_expand = downsample->v_expand[compptr->component_index];

-  numpix = h_expand * v_expand;

-  numpix2 = numpix/2;

-

-  /* Expand input data enough to let all the output samples be generated

-   * by the standard loop.  Special-casing padded output would be more

-   * efficient.

-   */

-  expand_right_edge(input_data, cinfo->max_v_samp_factor,

-		    cinfo->image_width, output_cols * h_expand);

-

-  inrow = outrow = 0;

-  while (inrow < cinfo->max_v_samp_factor) {

-    outptr = output_data[outrow];

-    for (outcol = 0, outcol_h = 0; outcol < output_cols;

-	 outcol++, outcol_h += h_expand) {

-      outvalue = 0;

-      for (v = 0; v < v_expand; v++) {

-	inptr = input_data[inrow+v] + outcol_h;

-	for (h = 0; h < h_expand; h++) {

-	  outvalue += (INT32) GETJSAMPLE(*inptr++);

-	}

-      }

-      *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);

-    }

-    inrow += v_expand;

-    outrow++;

-  }

-}

-

-

-/*

- * Downsample pixel values of a single component.

- * This version handles the special case of a full-size component,

- * without smoothing.

- */

-

-METHODDEF(void)

-fullsize_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,

-		     JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  /* Copy the data */

-  jcopy_sample_rows(input_data, 0, output_data, 0,

-		    cinfo->max_v_samp_factor, cinfo->image_width);

-  /* Edge-expand */

-  expand_right_edge(output_data, cinfo->max_v_samp_factor, cinfo->image_width,

-		    compptr->width_in_blocks * compptr->DCT_h_scaled_size);

-}

-

-

-/*

- * Downsample pixel values of a single component.

- * This version handles the common case of 2:1 horizontal and 1:1 vertical,

- * without smoothing.

- *

- * A note about the "bias" calculations: when rounding fractional values to

- * integer, we do not want to always round 0.5 up to the next integer.

- * If we did that, we'd introduce a noticeable bias towards larger values.

- * Instead, this code is arranged so that 0.5 will be rounded up or down at

- * alternate pixel locations (a simple ordered dither pattern).

- */

-

-METHODDEF(void)

-h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,

-		 JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  int inrow;

-  JDIMENSION outcol;

-  JDIMENSION output_cols = compptr->width_in_blocks * compptr->DCT_h_scaled_size;

-  register JSAMPROW inptr, outptr;

-  register int bias;

-

-  /* Expand input data enough to let all the output samples be generated

-   * by the standard loop.  Special-casing padded output would be more

-   * efficient.

-   */

-  expand_right_edge(input_data, cinfo->max_v_samp_factor,

-		    cinfo->image_width, output_cols * 2);

-

-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {

-    outptr = output_data[inrow];

-    inptr = input_data[inrow];

-    bias = 0;			/* bias = 0,1,0,1,... for successive samples */

-    for (outcol = 0; outcol < output_cols; outcol++) {

-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr) + GETJSAMPLE(inptr[1])

-			      + bias) >> 1);

-      bias ^= 1;		/* 0=>1, 1=>0 */

-      inptr += 2;

-    }

-  }

-}

-

-

-/*

- * Downsample pixel values of a single component.

- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,

- * without smoothing.

- */

-

-METHODDEF(void)

-h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,

-		 JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  int inrow, outrow;

-  JDIMENSION outcol;

-  JDIMENSION output_cols = compptr->width_in_blocks * compptr->DCT_h_scaled_size;

-  register JSAMPROW inptr0, inptr1, outptr;

-  register int bias;

-

-  /* Expand input data enough to let all the output samples be generated

-   * by the standard loop.  Special-casing padded output would be more

-   * efficient.

-   */

-  expand_right_edge(input_data, cinfo->max_v_samp_factor,

-		    cinfo->image_width, output_cols * 2);

-

-  inrow = outrow = 0;

-  while (inrow < cinfo->max_v_samp_factor) {

-    outptr = output_data[outrow];

-    inptr0 = input_data[inrow];

-    inptr1 = input_data[inrow+1];

-    bias = 1;			/* bias = 1,2,1,2,... for successive samples */

-    for (outcol = 0; outcol < output_cols; outcol++) {

-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +

-			      GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1])

-			      + bias) >> 2);

-      bias ^= 3;		/* 1=>2, 2=>1 */

-      inptr0 += 2; inptr1 += 2;

-    }

-    inrow += 2;

-    outrow++;

-  }

-}

-

-

-#ifdef INPUT_SMOOTHING_SUPPORTED

-

-/*

- * Downsample pixel values of a single component.

- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,

- * with smoothing.  One row of context is required.

- */

-

-METHODDEF(void)

-h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,

-			JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  int inrow, outrow;

-  JDIMENSION colctr;

-  JDIMENSION output_cols = compptr->width_in_blocks * compptr->DCT_h_scaled_size;

-  register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;

-  INT32 membersum, neighsum, memberscale, neighscale;

-

-  /* Expand input data enough to let all the output samples be generated

-   * by the standard loop.  Special-casing padded output would be more

-   * efficient.

-   */

-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,

-		    cinfo->image_width, output_cols * 2);

-

-  /* We don't bother to form the individual "smoothed" input pixel values;

-   * we can directly compute the output which is the average of the four

-   * smoothed values.  Each of the four member pixels contributes a fraction

-   * (1-8*SF) to its own smoothed image and a fraction SF to each of the three

-   * other smoothed pixels, therefore a total fraction (1-5*SF)/4 to the final

-   * output.  The four corner-adjacent neighbor pixels contribute a fraction

-   * SF to just one smoothed pixel, or SF/4 to the final output; while the

-   * eight edge-adjacent neighbors contribute SF to each of two smoothed

-   * pixels, or SF/2 overall.  In order to use integer arithmetic, these

-   * factors are scaled by 2^16 = 65536.

-   * Also recall that SF = smoothing_factor / 1024.

-   */

-

-  memberscale = 16384 - cinfo->smoothing_factor * 80; /* scaled (1-5*SF)/4 */

-  neighscale = cinfo->smoothing_factor * 16; /* scaled SF/4 */

-

-  inrow = outrow = 0;

-  while (inrow < cinfo->max_v_samp_factor) {

-    outptr = output_data[outrow];

-    inptr0 = input_data[inrow];

-    inptr1 = input_data[inrow+1];

-    above_ptr = input_data[inrow-1];

-    below_ptr = input_data[inrow+2];

-

-    /* Special case for first column: pretend column -1 is same as column 0 */

-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +

-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);

-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +

-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +

-	       GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[2]) +

-	       GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[2]);

-    neighsum += neighsum;

-    neighsum += GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[2]) +

-		GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);

-    membersum = membersum * memberscale + neighsum * neighscale;

-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);

-    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;

-

-    for (colctr = output_cols - 2; colctr > 0; colctr--) {

-      /* sum of pixels directly mapped to this output element */

-      membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +

-		  GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);

-      /* sum of edge-neighbor pixels */

-      neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +

-		 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +

-		 GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[2]) +

-		 GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[2]);

-      /* The edge-neighbors count twice as much as corner-neighbors */

-      neighsum += neighsum;

-      /* Add in the corner-neighbors */

-      neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[2]) +

-		  GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[2]);

-      /* form final output scaled up by 2^16 */

-      membersum = membersum * memberscale + neighsum * neighscale;

-      /* round, descale and output it */

-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);

-      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;

-    }

-

-    /* Special case for last column */

-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +

-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);

-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +

-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +

-	       GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[1]) +

-	       GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[1]);

-    neighsum += neighsum;

-    neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[1]) +

-		GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[1]);

-    membersum = membersum * memberscale + neighsum * neighscale;

-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);

-

-    inrow += 2;

-    outrow++;

-  }

-}

-

-

-/*

- * Downsample pixel values of a single component.

- * This version handles the special case of a full-size component,

- * with smoothing.  One row of context is required.

- */

-

-METHODDEF(void)

-fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,

-			    JSAMPARRAY input_data, JSAMPARRAY output_data)

-{

-  int inrow;

-  JDIMENSION colctr;

-  JDIMENSION output_cols = compptr->width_in_blocks * compptr->DCT_h_scaled_size;

-  register JSAMPROW inptr, above_ptr, below_ptr, outptr;

-  INT32 membersum, neighsum, memberscale, neighscale;

-  int colsum, lastcolsum, nextcolsum;

-

-  /* Expand input data enough to let all the output samples be generated

-   * by the standard loop.  Special-casing padded output would be more

-   * efficient.

-   */

-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,

-		    cinfo->image_width, output_cols);

-

-  /* Each of the eight neighbor pixels contributes a fraction SF to the

-   * smoothed pixel, while the main pixel contributes (1-8*SF).  In order

-   * to use integer arithmetic, these factors are multiplied by 2^16 = 65536.

-   * Also recall that SF = smoothing_factor / 1024.

-   */

-

-  memberscale = 65536L - cinfo->smoothing_factor * 512L; /* scaled 1-8*SF */

-  neighscale = cinfo->smoothing_factor * 64; /* scaled SF */

-

-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {

-    outptr = output_data[inrow];

-    inptr = input_data[inrow];

-    above_ptr = input_data[inrow-1];

-    below_ptr = input_data[inrow+1];

-

-    /* Special case for first column */

-    colsum = GETJSAMPLE(*above_ptr++) + GETJSAMPLE(*below_ptr++) +

-	     GETJSAMPLE(*inptr);

-    membersum = GETJSAMPLE(*inptr++);

-    nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +

-		 GETJSAMPLE(*inptr);

-    neighsum = colsum + (colsum - membersum) + nextcolsum;

-    membersum = membersum * memberscale + neighsum * neighscale;

-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);

-    lastcolsum = colsum; colsum = nextcolsum;

-

-    for (colctr = output_cols - 2; colctr > 0; colctr--) {

-      membersum = GETJSAMPLE(*inptr++);

-      above_ptr++; below_ptr++;

-      nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +

-		   GETJSAMPLE(*inptr);

-      neighsum = lastcolsum + (colsum - membersum) + nextcolsum;

-      membersum = membersum * memberscale + neighsum * neighscale;

-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);

-      lastcolsum = colsum; colsum = nextcolsum;

-    }

-

-    /* Special case for last column */

-    membersum = GETJSAMPLE(*inptr);

-    neighsum = lastcolsum + (colsum - membersum) + colsum;

-    membersum = membersum * memberscale + neighsum * neighscale;

-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);

-

-  }

-}

-

-#endif /* INPUT_SMOOTHING_SUPPORTED */

-

-

-/*

- * Module initialization routine for downsampling.

- * Note that we must select a routine for each component.

- */

-

-GLOBAL(void)

-jinit_downsampler (j_compress_ptr cinfo)

-{

-  my_downsample_ptr downsample;

-  int ci;

-  jpeg_component_info * compptr;

-  boolean smoothok = TRUE;

-  int h_in_group, v_in_group, h_out_group, v_out_group;

-

-  downsample = (my_downsample_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_downsampler));

-  cinfo->downsample = (struct jpeg_downsampler *) downsample;

-  downsample->pub.start_pass = start_pass_downsample;

-  downsample->pub.downsample = sep_downsample;

-  downsample->pub.need_context_rows = FALSE;

-

-  if (cinfo->CCIR601_sampling)

-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);

-

-  /* Verify we can handle the sampling factors, and set up method pointers */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Compute size of an "output group" for DCT scaling.  This many samples

-     * are to be converted from max_h_samp_factor * max_v_samp_factor pixels.

-     */

-    h_out_group = (compptr->h_samp_factor * compptr->DCT_h_scaled_size) /

-		  cinfo->min_DCT_h_scaled_size;

-    v_out_group = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-		  cinfo->min_DCT_v_scaled_size;

-    h_in_group = cinfo->max_h_samp_factor;

-    v_in_group = cinfo->max_v_samp_factor;

-    downsample->rowgroup_height[ci] = v_out_group; /* save for use later */

-    if (h_in_group == h_out_group && v_in_group == v_out_group) {

-#ifdef INPUT_SMOOTHING_SUPPORTED

-      if (cinfo->smoothing_factor) {

-	downsample->methods[ci] = fullsize_smooth_downsample;

-	downsample->pub.need_context_rows = TRUE;

-      } else

-#endif

-	downsample->methods[ci] = fullsize_downsample;

-    } else if (h_in_group == h_out_group * 2 &&

-	       v_in_group == v_out_group) {

-      smoothok = FALSE;

-      downsample->methods[ci] = h2v1_downsample;

-    } else if (h_in_group == h_out_group * 2 &&

-	       v_in_group == v_out_group * 2) {

-#ifdef INPUT_SMOOTHING_SUPPORTED

-      if (cinfo->smoothing_factor) {

-	downsample->methods[ci] = h2v2_smooth_downsample;

-	downsample->pub.need_context_rows = TRUE;

-      } else

-#endif

-	downsample->methods[ci] = h2v2_downsample;

-    } else if ((h_in_group % h_out_group) == 0 &&

-	       (v_in_group % v_out_group) == 0) {

-      smoothok = FALSE;

-      downsample->methods[ci] = int_downsample;

-      downsample->h_expand[ci] = (UINT8) (h_in_group / h_out_group);

-      downsample->v_expand[ci] = (UINT8) (v_in_group / v_out_group);

-    } else

-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);

-  }

-

-#ifdef INPUT_SMOOTHING_SUPPORTED

-  if (cinfo->smoothing_factor && !smoothok)

-    TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);

-#endif

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jctrans.c b/plugins/AdvaImg/src/LibJPEG/jctrans.c
deleted file mode 100644
index 38f06e097c..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jctrans.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*

- * jctrans.c

- *

- * Copyright (C) 1995-1998, Thomas G. Lane.

- * Modified 2000-2013 by Guido Vollbeding.

- * 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 library routines for transcoding compression,

- * that is, writing raw DCT coefficient arrays to an output JPEG file.

- * The routines in jcapimin.c will also be needed by a transcoder.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Forward declarations */

-LOCAL(void) transencode_master_selection

-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));

-LOCAL(void) transencode_coef_controller

-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));

-

-

-/*

- * Compression initialization for writing raw-coefficient data.

- * Before calling this, all parameters and a data destination must be set up.

- * Call jpeg_finish_compress() to actually write the data.

- *

- * The number of passed virtual arrays must match cinfo->num_components.

- * Note that the virtual arrays need not be filled or even realized at

- * the time write_coefficients is called; indeed, if the virtual arrays

- * were requested from this compression object's memory manager, they

- * typically will be realized during this routine and filled afterwards.

- */

-

-GLOBAL(void)

-jpeg_write_coefficients (j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)

-{

-  if (cinfo->global_state != CSTATE_START)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  /* Mark all tables to be written */

-  jpeg_suppress_tables(cinfo, FALSE);

-  /* (Re)initialize error mgr and destination modules */

-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);

-  (*cinfo->dest->init_destination) (cinfo);

-  /* Perform master selection of active modules */

-  transencode_master_selection(cinfo, coef_arrays);

-  /* Wait for jpeg_finish_compress() call */

-  cinfo->next_scanline = 0;	/* so jpeg_write_marker works */

-  cinfo->global_state = CSTATE_WRCOEFS;

-}

-

-

-/*

- * Initialize the compression object with default parameters,

- * then copy from the source object all parameters needed for lossless

- * transcoding.  Parameters that can be varied without loss (such as

- * scan script and Huffman optimization) are left in their default states.

- */

-

-GLOBAL(void)

-jpeg_copy_critical_parameters (j_decompress_ptr srcinfo,

-			       j_compress_ptr dstinfo)

-{

-  JQUANT_TBL ** qtblptr;

-  jpeg_component_info *incomp, *outcomp;

-  JQUANT_TBL *c_quant, *slot_quant;

-  int tblno, ci, coefi;

-

-  /* Safety check to ensure start_compress not called yet. */

-  if (dstinfo->global_state != CSTATE_START)

-    ERREXIT1(dstinfo, JERR_BAD_STATE, dstinfo->global_state);

-  /* Copy fundamental image dimensions */

-  dstinfo->image_width = srcinfo->image_width;

-  dstinfo->image_height = srcinfo->image_height;

-  dstinfo->input_components = srcinfo->num_components;

-  dstinfo->in_color_space = srcinfo->jpeg_color_space;

-  dstinfo->jpeg_width = srcinfo->output_width;

-  dstinfo->jpeg_height = srcinfo->output_height;

-  dstinfo->min_DCT_h_scaled_size = srcinfo->min_DCT_h_scaled_size;

-  dstinfo->min_DCT_v_scaled_size = srcinfo->min_DCT_v_scaled_size;

-  /* Initialize all parameters to default values */

-  jpeg_set_defaults(dstinfo);

-  /* jpeg_set_defaults may choose wrong colorspace, eg YCbCr if input is RGB.

-   * Fix it to get the right header markers for the image colorspace.

-   * Note: Entropy table assignment in jpeg_set_colorspace depends

-   * on color_transform.

-   */

-  dstinfo->color_transform = srcinfo->color_transform;

-  jpeg_set_colorspace(dstinfo, srcinfo->jpeg_color_space);

-  dstinfo->data_precision = srcinfo->data_precision;

-  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;

-  /* Copy the source's quantization tables. */

-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {

-    if (srcinfo->quant_tbl_ptrs[tblno] != NULL) {

-      qtblptr = & dstinfo->quant_tbl_ptrs[tblno];

-      if (*qtblptr == NULL)

-	*qtblptr = jpeg_alloc_quant_table((j_common_ptr) dstinfo);

-      MEMCOPY((*qtblptr)->quantval,

-	      srcinfo->quant_tbl_ptrs[tblno]->quantval,

-	      SIZEOF((*qtblptr)->quantval));

-      (*qtblptr)->sent_table = FALSE;

-    }

-  }

-  /* Copy the source's per-component info.

-   * Note we assume jpeg_set_defaults has allocated the dest comp_info array.

-   */

-  dstinfo->num_components = srcinfo->num_components;

-  if (dstinfo->num_components < 1 || dstinfo->num_components > MAX_COMPONENTS)

-    ERREXIT2(dstinfo, JERR_COMPONENT_COUNT, dstinfo->num_components,

-	     MAX_COMPONENTS);

-  for (ci = 0, incomp = srcinfo->comp_info, outcomp = dstinfo->comp_info;

-       ci < dstinfo->num_components; ci++, incomp++, outcomp++) {

-    outcomp->component_id = incomp->component_id;

-    outcomp->h_samp_factor = incomp->h_samp_factor;

-    outcomp->v_samp_factor = incomp->v_samp_factor;

-    outcomp->quant_tbl_no = incomp->quant_tbl_no;

-    /* Make sure saved quantization table for component matches the qtable

-     * slot.  If not, the input file re-used this qtable slot.

-     * IJG encoder currently cannot duplicate this.

-     */

-    tblno = outcomp->quant_tbl_no;

-    if (tblno < 0 || tblno >= NUM_QUANT_TBLS ||

-	srcinfo->quant_tbl_ptrs[tblno] == NULL)

-      ERREXIT1(dstinfo, JERR_NO_QUANT_TABLE, tblno);

-    slot_quant = srcinfo->quant_tbl_ptrs[tblno];

-    c_quant = incomp->quant_table;

-    if (c_quant != NULL) {

-      for (coefi = 0; coefi < DCTSIZE2; coefi++) {

-	if (c_quant->quantval[coefi] != slot_quant->quantval[coefi])

-	  ERREXIT1(dstinfo, JERR_MISMATCHED_QUANT_TABLE, tblno);

-      }

-    }

-    /* Note: we do not copy the source's entropy table assignments;

-     * instead we rely on jpeg_set_colorspace to have made a suitable choice.

-     */

-  }

-  /* Also copy JFIF version and resolution information, if available.

-   * Strictly speaking this isn't "critical" info, but it's nearly

-   * always appropriate to copy it if available.  In particular,

-   * if the application chooses to copy JFIF 1.02 extension markers from

-   * the source file, we need to copy the version to make sure we don't

-   * emit a file that has 1.02 extensions but a claimed version of 1.01.

-   */

-  if (srcinfo->saw_JFIF_marker) {

-    if (srcinfo->JFIF_major_version == 1 ||

-	srcinfo->JFIF_major_version == 2) {

-      dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;

-      dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;

-    }

-    dstinfo->density_unit = srcinfo->density_unit;

-    dstinfo->X_density = srcinfo->X_density;

-    dstinfo->Y_density = srcinfo->Y_density;

-  }

-}

-

-

-/*

- * Master selection of compression modules for transcoding.

- * This substitutes for jcinit.c's initialization of the full compressor.

- */

-

-LOCAL(void)

-transencode_master_selection (j_compress_ptr cinfo,

-			      jvirt_barray_ptr * coef_arrays)

-{

-  /* Initialize master control (includes parameter checking/processing) */

-  jinit_c_master_control(cinfo, TRUE /* transcode only */);

-

-  /* Entropy encoding: either Huffman or arithmetic coding. */

-  if (cinfo->arith_code)

-    jinit_arith_encoder(cinfo);

-  else {

-    jinit_huff_encoder(cinfo);

-  }

-

-  /* We need a special coefficient buffer controller. */

-  transencode_coef_controller(cinfo, coef_arrays);

-

-  jinit_marker_writer(cinfo);

-

-  /* We can now tell the memory manager to allocate virtual arrays. */

-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);

-

-  /* Write the datastream header (SOI, JFIF) immediately.

-   * Frame and scan headers are postponed till later.

-   * This lets application insert special markers after the SOI.

-   */

-  (*cinfo->marker->write_file_header) (cinfo);

-}

-

-

-/*

- * The rest of this file is a special implementation of the coefficient

- * buffer controller.  This is similar to jccoefct.c, but it handles only

- * output from presupplied virtual arrays.  Furthermore, we generate any

- * dummy padding blocks on-the-fly rather than expecting them to be present

- * in the arrays.

- */

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_c_coef_controller pub; /* public fields */

-

-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */

-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */

-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */

-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */

-

-  /* Virtual block array for each component. */

-  jvirt_barray_ptr * whole_image;

-

-  /* Workspace for constructing dummy blocks at right/bottom edges. */

-  JBLOCKROW dummy_buffer[C_MAX_BLOCKS_IN_MCU];

-} my_coef_controller;

-

-typedef my_coef_controller * my_coef_ptr;

-

-

-LOCAL(void)

-start_iMCU_row (j_compress_ptr cinfo)

-/* Reset within-iMCU-row counters for a new row */

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  /* In an interleaved scan, an MCU row is the same as an iMCU row.

-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.

-   * But at the bottom of the image, process only what's left.

-   */

-  if (cinfo->comps_in_scan > 1) {

-    coef->MCU_rows_per_iMCU_row = 1;

-  } else {

-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;

-    else

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;

-  }

-

-  coef->mcu_ctr = 0;

-  coef->MCU_vert_offset = 0;

-}

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  if (pass_mode != JBUF_CRANK_DEST)

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-

-  coef->iMCU_row_num = 0;

-  start_iMCU_row(cinfo);

-}

-

-

-/*

- * Process some data.

- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)

- * per call, ie, v_samp_factor block rows for each component in the scan.

- * The data is obtained from the virtual arrays and fed to the entropy coder.

- * Returns TRUE if the iMCU row is completed, FALSE if suspended.

- *

- * NB: input_buf is ignored; it is likely to be a NULL pointer.

- */

-

-METHODDEF(boolean)

-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION MCU_col_num;	/* index of current MCU within row */

-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  int blkn, ci, xindex, yindex, yoffset, blockcnt;

-  JDIMENSION start_col;

-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];

-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];

-  JBLOCKROW buffer_ptr;

-  jpeg_component_info *compptr;

-

-  /* Align the virtual buffers for the components used in this scan. */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    buffer[ci] = (*cinfo->mem->access_virt_barray)

-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],

-       coef->iMCU_row_num * compptr->v_samp_factor,

-       (JDIMENSION) compptr->v_samp_factor, FALSE);

-  }

-

-  /* Loop to process one whole iMCU row */

-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;

-       yoffset++) {

-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;

-	 MCU_col_num++) {

-      /* Construct list of pointers to DCT blocks belonging to this MCU */

-      blkn = 0;			/* index of current DCT block within MCU */

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-	compptr = cinfo->cur_comp_info[ci];

-	start_col = MCU_col_num * compptr->MCU_width;

-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width

-						: compptr->last_col_width;

-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {

-	  if (coef->iMCU_row_num < last_iMCU_row ||

-	      yindex+yoffset < compptr->last_row_height) {

-	    /* Fill in pointers to real blocks in this row */

-	    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;

-	    for (xindex = 0; xindex < blockcnt; xindex++)

-	      MCU_buffer[blkn++] = buffer_ptr++;

-	  } else {

-	    /* At bottom of image, need a whole row of dummy blocks */

-	    xindex = 0;

-	  }

-	  /* Fill in any dummy blocks needed in this row.

-	   * Dummy blocks are filled in the same way as in jccoefct.c:

-	   * all zeroes in the AC entries, DC entries equal to previous

-	   * block's DC value.  The init routine has already zeroed the

-	   * AC entries, so we need only set the DC entries correctly.

-	   */

-	  for (; xindex < compptr->MCU_width; xindex++) {

-	    MCU_buffer[blkn] = coef->dummy_buffer[blkn];

-	    MCU_buffer[blkn][0][0] = MCU_buffer[blkn-1][0][0];

-	    blkn++;

-	  }

-	}

-      }

-      /* Try to write the MCU. */

-      if (! (*cinfo->entropy->encode_mcu) (cinfo, MCU_buffer)) {

-	/* Suspension forced; update state counters and exit */

-	coef->MCU_vert_offset = yoffset;

-	coef->mcu_ctr = MCU_col_num;

-	return FALSE;

-      }

-    }

-    /* Completed an MCU row, but perhaps not an iMCU row */

-    coef->mcu_ctr = 0;

-  }

-  /* Completed the iMCU row, advance counters for next one */

-  coef->iMCU_row_num++;

-  start_iMCU_row(cinfo);

-  return TRUE;

-}

-

-

-/*

- * Initialize coefficient buffer controller.

- *

- * Each passed coefficient array must be the right size for that

- * coefficient: width_in_blocks wide and height_in_blocks high,

- * with unitheight at least v_samp_factor.

- */

-

-LOCAL(void)

-transencode_coef_controller (j_compress_ptr cinfo,

-			     jvirt_barray_ptr * coef_arrays)

-{

-  my_coef_ptr coef;

-  JBLOCKROW buffer;

-  int i;

-

-  coef = (my_coef_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_coef_controller));

-  cinfo->coef = &coef->pub;

-  coef->pub.start_pass = start_pass_coef;

-  coef->pub.compress_data = compress_output;

-

-  /* Save pointer to virtual arrays */

-  coef->whole_image = coef_arrays;

-

-  /* Allocate and pre-zero space for dummy DCT blocks. */

-  buffer = (JBLOCKROW)

-    (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));

-  FMEMZERO((void FAR *) buffer, C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));

-  for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {

-    coef->dummy_buffer[i] = buffer + i;

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdapimin.c b/plugins/AdvaImg/src/LibJPEG/jdapimin.c
deleted file mode 100644
index c1b88f75ea..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdapimin.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*

- * jdapimin.c

- *

- * Copyright (C) 1994-1998, Thomas G. Lane.

- * Modified 2009-2013 by Guido Vollbeding.

- * 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 decompression half

- * of the JPEG library.  These are the "minimum" API routines that may be

- * needed in either the normal full-decompression case or the

- * transcoding-only case.

- *

- * Most of the routines intended to be called directly by an application

- * are in this file or in jdapistd.c.  But also see jcomapi.c for routines

- * shared by compression and decompression, and jdtrans.c for the transcoding

- * case.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * Initialization of a JPEG decompression object.

- * The error manager must already be set up (in case memory manager fails).

- */

-

-GLOBAL(void)

-jpeg_CreateDecompress (j_decompress_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_decompress_struct))

-    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 

-	     (int) SIZEOF(struct jpeg_decompress_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_decompress_struct));

-    cinfo->err = err;

-    cinfo->client_data = client_data;

-  }

-  cinfo->is_decompressor = TRUE;

-

-  /* 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->src = 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;

-  }

-

-  /* Initialize marker processor so application can override methods

-   * for COM, APPn markers before calling jpeg_read_header.

-   */

-  cinfo->marker_list = NULL;

-  jinit_marker_reader(cinfo);

-

-  /* And initialize the overall input controller. */

-  jinit_input_controller(cinfo);

-

-  /* OK, I'm ready */

-  cinfo->global_state = DSTATE_START;

-}

-

-

-/*

- * Destruction of a JPEG decompression object

- */

-

-GLOBAL(void)

-jpeg_destroy_decompress (j_decompress_ptr cinfo)

-{

-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */

-}

-

-

-/*

- * Abort processing of a JPEG decompression operation,

- * but don't destroy the object itself.

- */

-

-GLOBAL(void)

-jpeg_abort_decompress (j_decompress_ptr cinfo)

-{

-  jpeg_abort((j_common_ptr) cinfo); /* use common routine */

-}

-

-

-/*

- * Set default decompression parameters.

- */

-

-LOCAL(void)

-default_decompress_parms (j_decompress_ptr cinfo)

-{

-  int cid0, cid1, cid2;

-

-  /* Guess the input colorspace, and set output colorspace accordingly. */

-  /* Note application may override our guesses. */

-  switch (cinfo->num_components) {

-  case 1:

-    cinfo->jpeg_color_space = JCS_GRAYSCALE;

-    cinfo->out_color_space = JCS_GRAYSCALE;

-    break;

-    

-  case 3:

-    cid0 = cinfo->comp_info[0].component_id;

-    cid1 = cinfo->comp_info[1].component_id;

-    cid2 = cinfo->comp_info[2].component_id;

-

-    /* First try to guess from the component IDs */

-    if      (cid0 == 0x01 && cid1 == 0x02 && cid2 == 0x03)

-      cinfo->jpeg_color_space = JCS_YCbCr;

-    else if (cid0 == 0x01 && cid1 == 0x22 && cid2 == 0x23)

-      cinfo->jpeg_color_space = JCS_BG_YCC;

-    else if (cid0 == 0x52 && cid1 == 0x47 && cid2 == 0x42)

-      cinfo->jpeg_color_space = JCS_RGB;	/* ASCII 'R', 'G', 'B' */

-    else if (cid0 == 0x72 && cid1 == 0x67 && cid2 == 0x62)

-      cinfo->jpeg_color_space = JCS_BG_RGB;	/* ASCII 'r', 'g', 'b' */

-    else if (cinfo->saw_JFIF_marker)

-      cinfo->jpeg_color_space = JCS_YCbCr;	/* assume it's YCbCr */

-    else if (cinfo->saw_Adobe_marker) {

-      switch (cinfo->Adobe_transform) {

-      case 0:

-	cinfo->jpeg_color_space = JCS_RGB;

-	break;

-      case 1:

-	cinfo->jpeg_color_space = JCS_YCbCr;

-	break;

-      default:

-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);

-	cinfo->jpeg_color_space = JCS_YCbCr;	/* assume it's YCbCr */

-	break;

-      }

-    } else {

-      TRACEMS3(cinfo, 1, JTRC_UNKNOWN_IDS, cid0, cid1, cid2);

-      cinfo->jpeg_color_space = JCS_YCbCr;	/* assume it's YCbCr */

-    }

-    /* Always guess RGB is proper output colorspace. */

-    cinfo->out_color_space = JCS_RGB;

-    break;

-    

-  case 4:

-    if (cinfo->saw_Adobe_marker) {

-      switch (cinfo->Adobe_transform) {

-      case 0:

-	cinfo->jpeg_color_space = JCS_CMYK;

-	break;

-      case 2:

-	cinfo->jpeg_color_space = JCS_YCCK;

-	break;

-      default:

-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);

-	cinfo->jpeg_color_space = JCS_YCCK;	/* assume it's YCCK */

-	break;

-      }

-    } else {

-      /* No special markers, assume straight CMYK. */

-      cinfo->jpeg_color_space = JCS_CMYK;

-    }

-    cinfo->out_color_space = JCS_CMYK;

-    break;

-    

-  default:

-    cinfo->jpeg_color_space = JCS_UNKNOWN;

-    cinfo->out_color_space = JCS_UNKNOWN;

-    break;

-  }

-

-  /* Set defaults for other decompression parameters. */

-  cinfo->scale_num = cinfo->block_size;		/* 1:1 scaling */

-  cinfo->scale_denom = cinfo->block_size;

-  cinfo->output_gamma = 1.0;

-  cinfo->buffered_image = FALSE;

-  cinfo->raw_data_out = FALSE;

-  cinfo->dct_method = JDCT_DEFAULT;

-  cinfo->do_fancy_upsampling = TRUE;

-  cinfo->do_block_smoothing = TRUE;

-  cinfo->quantize_colors = FALSE;

-  /* We set these in case application only sets quantize_colors. */

-  cinfo->dither_mode = JDITHER_FS;

-#ifdef QUANT_2PASS_SUPPORTED

-  cinfo->two_pass_quantize = TRUE;

-#else

-  cinfo->two_pass_quantize = FALSE;

-#endif

-  cinfo->desired_number_of_colors = 256;

-  cinfo->colormap = NULL;

-  /* Initialize for no mode change in buffered-image mode. */

-  cinfo->enable_1pass_quant = FALSE;

-  cinfo->enable_external_quant = FALSE;

-  cinfo->enable_2pass_quant = FALSE;

-}

-

-

-/*

- * Decompression startup: read start of JPEG datastream to see what's there.

- * Need only initialize JPEG object and supply a data source before calling.

- *

- * This routine will read as far as the first SOS marker (ie, actual start of

- * compressed data), and will save all tables and parameters in the JPEG

- * object.  It will also initialize the decompression parameters to default

- * values, and finally return JPEG_HEADER_OK.  On return, the application may

- * adjust the decompression parameters and then call jpeg_start_decompress.

- * (Or, if the application only wanted to determine the image parameters,

- * the data need not be decompressed.  In that case, call jpeg_abort or

- * jpeg_destroy to release any temporary space.)

- * If an abbreviated (tables only) datastream is presented, the routine will

- * return JPEG_HEADER_TABLES_ONLY upon reaching EOI.  The application may then

- * re-use the JPEG object to read the abbreviated image datastream(s).

- * It is unnecessary (but OK) to call jpeg_abort in this case.

- * The JPEG_SUSPENDED return code only occurs if the data source module

- * requests suspension of the decompressor.  In this case the application

- * should load more source data and then re-call jpeg_read_header to resume

- * processing.

- * If a non-suspending data source is used and require_image is TRUE, then the

- * return code need not be inspected since only JPEG_HEADER_OK is possible.

- *

- * This routine is now just a front end to jpeg_consume_input, with some

- * extra error checking.

- */

-

-GLOBAL(int)

-jpeg_read_header (j_decompress_ptr cinfo, boolean require_image)

-{

-  int retcode;

-

-  if (cinfo->global_state != DSTATE_START &&

-      cinfo->global_state != DSTATE_INHEADER)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  retcode = jpeg_consume_input(cinfo);

-

-  switch (retcode) {

-  case JPEG_REACHED_SOS:

-    retcode = JPEG_HEADER_OK;

-    break;

-  case JPEG_REACHED_EOI:

-    if (require_image)		/* Complain if application wanted an image */

-      ERREXIT(cinfo, JERR_NO_IMAGE);

-    /* Reset to start state; it would be safer to require the application to

-     * call jpeg_abort, but we can't change it now for compatibility reasons.

-     * A side effect is to free any temporary memory (there shouldn't be any).

-     */

-    jpeg_abort((j_common_ptr) cinfo); /* sets state = DSTATE_START */

-    retcode = JPEG_HEADER_TABLES_ONLY;

-    break;

-  case JPEG_SUSPENDED:

-    /* no work */

-    break;

-  }

-

-  return retcode;

-}

-

-

-/*

- * Consume data in advance of what the decompressor requires.

- * This can be called at any time once the decompressor object has

- * been created and a data source has been set up.

- *

- * This routine is essentially a state machine that handles a couple

- * of critical state-transition actions, namely initial setup and

- * transition from header scanning to ready-for-start_decompress.

- * All the actual input is done via the input controller's consume_input

- * method.

- */

-

-GLOBAL(int)

-jpeg_consume_input (j_decompress_ptr cinfo)

-{

-  int retcode = JPEG_SUSPENDED;

-

-  /* NB: every possible DSTATE value should be listed in this switch */

-  switch (cinfo->global_state) {

-  case DSTATE_START:

-    /* Start-of-datastream actions: reset appropriate modules */

-    (*cinfo->inputctl->reset_input_controller) (cinfo);

-    /* Initialize application's data source module */

-    (*cinfo->src->init_source) (cinfo);

-    cinfo->global_state = DSTATE_INHEADER;

-    /*FALLTHROUGH*/

-  case DSTATE_INHEADER:

-    retcode = (*cinfo->inputctl->consume_input) (cinfo);

-    if (retcode == JPEG_REACHED_SOS) { /* Found SOS, prepare to decompress */

-      /* Set up default parameters based on header data */

-      default_decompress_parms(cinfo);

-      /* Set global state: ready for start_decompress */

-      cinfo->global_state = DSTATE_READY;

-    }

-    break;

-  case DSTATE_READY:

-    /* Can't advance past first SOS until start_decompress is called */

-    retcode = JPEG_REACHED_SOS;

-    break;

-  case DSTATE_PRELOAD:

-  case DSTATE_PRESCAN:

-  case DSTATE_SCANNING:

-  case DSTATE_RAW_OK:

-  case DSTATE_BUFIMAGE:

-  case DSTATE_BUFPOST:

-  case DSTATE_STOPPING:

-    retcode = (*cinfo->inputctl->consume_input) (cinfo);

-    break;

-  default:

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  }

-  return retcode;

-}

-

-

-/*

- * Have we finished reading the input file?

- */

-

-GLOBAL(boolean)

-jpeg_input_complete (j_decompress_ptr cinfo)

-{

-  /* Check for valid jpeg object */

-  if (cinfo->global_state < DSTATE_START ||

-      cinfo->global_state > DSTATE_STOPPING)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  return cinfo->inputctl->eoi_reached;

-}

-

-

-/*

- * Is there more than one scan?

- */

-

-GLOBAL(boolean)

-jpeg_has_multiple_scans (j_decompress_ptr cinfo)

-{

-  /* Only valid after jpeg_read_header completes */

-  if (cinfo->global_state < DSTATE_READY ||

-      cinfo->global_state > DSTATE_STOPPING)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  return cinfo->inputctl->has_multiple_scans;

-}

-

-

-/*

- * Finish JPEG decompression.

- *

- * This will normally just verify the file trailer and release temp storage.

- *

- * Returns FALSE if suspended.  The return value need be inspected only if

- * a suspending data source is used.

- */

-

-GLOBAL(boolean)

-jpeg_finish_decompress (j_decompress_ptr cinfo)

-{

-  if ((cinfo->global_state == DSTATE_SCANNING ||

-       cinfo->global_state == DSTATE_RAW_OK) && ! cinfo->buffered_image) {

-    /* Terminate final pass of non-buffered mode */

-    if (cinfo->output_scanline < cinfo->output_height)

-      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);

-    (*cinfo->master->finish_output_pass) (cinfo);

-    cinfo->global_state = DSTATE_STOPPING;

-  } else if (cinfo->global_state == DSTATE_BUFIMAGE) {

-    /* Finishing after a buffered-image operation */

-    cinfo->global_state = DSTATE_STOPPING;

-  } else if (cinfo->global_state != DSTATE_STOPPING) {

-    /* STOPPING = repeat call after a suspension, anything else is error */

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  }

-  /* Read until EOI */

-  while (! cinfo->inputctl->eoi_reached) {

-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)

-      return FALSE;		/* Suspend, come back later */

-  }

-  /* Do final cleanup */

-  (*cinfo->src->term_source) (cinfo);

-  /* We can use jpeg_abort to release memory and reset global_state */

-  jpeg_abort((j_common_ptr) cinfo);

-  return TRUE;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdapistd.c b/plugins/AdvaImg/src/LibJPEG/jdapistd.c
deleted file mode 100644
index 6437dc562b..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdapistd.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*

- * jdapistd.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2002-2013 by Guido Vollbeding.

- * 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 decompression half

- * of the JPEG library.  These are the "standard" API routines that are

- * used in the normal full-decompression case.  They are not used by a

- * transcoding-only application.  Note that if an application links in

- * jpeg_start_decompress, it will end up linking in the entire decompressor.

- * We thus must separate this file from jdapimin.c to avoid linking the

- * whole decompression library into a transcoder.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Forward declarations */

-LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));

-

-

-/*

- * Decompression initialization.

- * jpeg_read_header must be completed before calling this.

- *

- * If a multipass operating mode was selected, this will do all but the

- * last pass, and thus may take a great deal of time.

- *

- * Returns FALSE if suspended.  The return value need be inspected only if

- * a suspending data source is used.

- */

-

-GLOBAL(boolean)

-jpeg_start_decompress (j_decompress_ptr cinfo)

-{

-  if (cinfo->global_state == DSTATE_READY) {

-    /* First call: initialize master control, select active modules */

-    jinit_master_decompress(cinfo);

-    if (cinfo->buffered_image) {

-      /* No more work here; expecting jpeg_start_output next */

-      cinfo->global_state = DSTATE_BUFIMAGE;

-      return TRUE;

-    }

-    cinfo->global_state = DSTATE_PRELOAD;

-  }

-  if (cinfo->global_state == DSTATE_PRELOAD) {

-    /* If file has multiple scans, absorb them all into the coef buffer */

-    if (cinfo->inputctl->has_multiple_scans) {

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-      for (;;) {

-	int retcode;

-	/* Call progress monitor hook if present */

-	if (cinfo->progress != NULL)

-	  (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-	/* Absorb some more input */

-	retcode = (*cinfo->inputctl->consume_input) (cinfo);

-	if (retcode == JPEG_SUSPENDED)

-	  return FALSE;

-	if (retcode == JPEG_REACHED_EOI)

-	  break;

-	/* Advance progress counter if appropriate */

-	if (cinfo->progress != NULL &&

-	    (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {

-	  if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {

-	    /* jdmaster underestimated number of scans; ratchet up one scan */

-	    cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;

-	  }

-	}

-      }

-#else

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif /* D_MULTISCAN_FILES_SUPPORTED */

-    }

-    cinfo->output_scan_number = cinfo->input_scan_number;

-  } else if (cinfo->global_state != DSTATE_PRESCAN)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  /* Perform any dummy output passes, and set up for the final pass */

-  return output_pass_setup(cinfo);

-}

-

-

-/*

- * Set up for an output pass, and perform any dummy pass(es) needed.

- * Common subroutine for jpeg_start_decompress and jpeg_start_output.

- * Entry: global_state = DSTATE_PRESCAN only if previously suspended.

- * Exit: If done, returns TRUE and sets global_state for proper output mode.

- *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.

- */

-

-LOCAL(boolean)

-output_pass_setup (j_decompress_ptr cinfo)

-{

-  if (cinfo->global_state != DSTATE_PRESCAN) {

-    /* First call: do pass setup */

-    (*cinfo->master->prepare_for_output_pass) (cinfo);

-    cinfo->output_scanline = 0;

-    cinfo->global_state = DSTATE_PRESCAN;

-  }

-  /* Loop over any required dummy passes */

-  while (cinfo->master->is_dummy_pass) {

-#ifdef QUANT_2PASS_SUPPORTED

-    /* Crank through the dummy pass */

-    while (cinfo->output_scanline < cinfo->output_height) {

-      JDIMENSION last_scanline;

-      /* Call progress monitor hook if present */

-      if (cinfo->progress != NULL) {

-	cinfo->progress->pass_counter = (long) cinfo->output_scanline;

-	cinfo->progress->pass_limit = (long) cinfo->output_height;

-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-      }

-      /* Process some data */

-      last_scanline = cinfo->output_scanline;

-      (*cinfo->main->process_data) (cinfo, (JSAMPARRAY) NULL,

-				    &cinfo->output_scanline, (JDIMENSION) 0);

-      if (cinfo->output_scanline == last_scanline)

-	return FALSE;		/* No progress made, must suspend */

-    }

-    /* Finish up dummy pass, and set up for another one */

-    (*cinfo->master->finish_output_pass) (cinfo);

-    (*cinfo->master->prepare_for_output_pass) (cinfo);

-    cinfo->output_scanline = 0;

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif /* QUANT_2PASS_SUPPORTED */

-  }

-  /* Ready for application to drive output pass through

-   * jpeg_read_scanlines or jpeg_read_raw_data.

-   */

-  cinfo->global_state = cinfo->raw_data_out ? DSTATE_RAW_OK : DSTATE_SCANNING;

-  return TRUE;

-}

-

-

-/*

- * Read some scanlines of data from the JPEG decompressor.

- *

- * The return value will be the number of lines actually read.

- * This may be less than the number requested in several cases,

- * including bottom of image, data source suspension, and operating

- * modes that emit multiple scanlines at a time.

- *

- * Note: we warn about excess calls to jpeg_read_scanlines() since

- * this likely signals an application programmer error.  However,

- * an oversize buffer (max_lines > scanlines remaining) is not an error.

- */

-

-GLOBAL(JDIMENSION)

-jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines,

-		     JDIMENSION max_lines)

-{

-  JDIMENSION row_ctr;

-

-  if (cinfo->global_state != DSTATE_SCANNING)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  if (cinfo->output_scanline >= cinfo->output_height) {

-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);

-    return 0;

-  }

-

-  /* Call progress monitor hook if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;

-    cinfo->progress->pass_limit = (long) cinfo->output_height;

-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-  }

-

-  /* Process some data */

-  row_ctr = 0;

-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, max_lines);

-  cinfo->output_scanline += row_ctr;

-  return row_ctr;

-}

-

-

-/*

- * Alternate entry point to read raw data.

- * Processes exactly one iMCU row per call, unless suspended.

- */

-

-GLOBAL(JDIMENSION)

-jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,

-		    JDIMENSION max_lines)

-{

-  JDIMENSION lines_per_iMCU_row;

-

-  if (cinfo->global_state != DSTATE_RAW_OK)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  if (cinfo->output_scanline >= cinfo->output_height) {

-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);

-    return 0;

-  }

-

-  /* Call progress monitor hook if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;

-    cinfo->progress->pass_limit = (long) cinfo->output_height;

-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-  }

-

-  /* Verify that at least one iMCU row can be returned. */

-  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_DCT_v_scaled_size;

-  if (max_lines < lines_per_iMCU_row)

-    ERREXIT(cinfo, JERR_BUFFER_SIZE);

-

-  /* Decompress directly into user's buffer. */

-  if (! (*cinfo->coef->decompress_data) (cinfo, data))

-    return 0;			/* suspension forced, can do nothing more */

-

-  /* OK, we processed one iMCU row. */

-  cinfo->output_scanline += lines_per_iMCU_row;

-  return lines_per_iMCU_row;

-}

-

-

-/* Additional entry points for buffered-image mode. */

-

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-

-/*

- * Initialize for an output pass in buffered-image mode.

- */

-

-GLOBAL(boolean)

-jpeg_start_output (j_decompress_ptr cinfo, int scan_number)

-{

-  if (cinfo->global_state != DSTATE_BUFIMAGE &&

-      cinfo->global_state != DSTATE_PRESCAN)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  /* Limit scan number to valid range */

-  if (scan_number <= 0)

-    scan_number = 1;

-  if (cinfo->inputctl->eoi_reached &&

-      scan_number > cinfo->input_scan_number)

-    scan_number = cinfo->input_scan_number;

-  cinfo->output_scan_number = scan_number;

-  /* Perform any dummy output passes, and set up for the real pass */

-  return output_pass_setup(cinfo);

-}

-

-

-/*

- * Finish up after an output pass in buffered-image mode.

- *

- * Returns FALSE if suspended.  The return value need be inspected only if

- * a suspending data source is used.

- */

-

-GLOBAL(boolean)

-jpeg_finish_output (j_decompress_ptr cinfo)

-{

-  if ((cinfo->global_state == DSTATE_SCANNING ||

-       cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) {

-    /* Terminate this pass. */

-    /* We do not require the whole pass to have been completed. */

-    (*cinfo->master->finish_output_pass) (cinfo);

-    cinfo->global_state = DSTATE_BUFPOST;

-  } else if (cinfo->global_state != DSTATE_BUFPOST) {

-    /* BUFPOST = repeat call after a suspension, anything else is error */

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  }

-  /* Read markers looking for SOS or EOI */

-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&

-	 ! cinfo->inputctl->eoi_reached) {

-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)

-      return FALSE;		/* Suspend, come back later */

-  }

-  cinfo->global_state = DSTATE_BUFIMAGE;

-  return TRUE;

-}

-

-#endif /* D_MULTISCAN_FILES_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jdarith.c b/plugins/AdvaImg/src/LibJPEG/jdarith.c
deleted file mode 100644
index 14ca7fe133..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdarith.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/*

- * jdarith.c

- *

- * Developed 1997-2015 by Guido Vollbeding.

- * 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 portable arithmetic entropy decoding routines for JPEG

- * (implementing the ISO/IEC IS 10918-1 and CCITT Recommendation ITU-T T.81).

- *

- * Both sequential and progressive modes are supported in this single module.

- *

- * Suspension is not currently supported in this module.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Expanded entropy decoder object for arithmetic decoding. */

-

-typedef struct {

-  struct jpeg_entropy_decoder pub; /* public fields */

-

-  INT32 c;       /* C register, base of coding interval + input bit buffer */

-  INT32 a;               /* A register, normalized size of coding interval */

-  int ct;     /* bit shift counter, # of bits left in bit buffer part of C */

-                                                         /* init: ct = -16 */

-                                                         /* run: ct = 0..7 */

-                                                         /* error: ct = -1 */

-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */

-  int dc_context[MAX_COMPS_IN_SCAN]; /* context index for DC conditioning */

-

-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */

-

-  /* Pointers to statistics areas (these workspaces have image lifespan) */

-  unsigned char * dc_stats[NUM_ARITH_TBLS];

-  unsigned char * ac_stats[NUM_ARITH_TBLS];

-

-  /* Statistics bin for coding with fixed probability 0.5 */

-  unsigned char fixed_bin[4];

-} arith_entropy_decoder;

-

-typedef arith_entropy_decoder * arith_entropy_ptr;

-

-/* The following two definitions specify the allocation chunk size

- * for the statistics area.

- * According to sections F.1.4.4.1.3 and F.1.4.4.2, we need at least

- * 49 statistics bins for DC, and 245 statistics bins for AC coding.

- *

- * We use a compact representation with 1 byte per statistics bin,

- * thus the numbers directly represent byte sizes.

- * This 1 byte per statistics bin contains the meaning of the MPS

- * (more probable symbol) in the highest bit (mask 0x80), and the

- * index into the probability estimation state machine table

- * in the lower bits (mask 0x7F).

- */

-

-#define DC_STAT_BINS 64

-#define AC_STAT_BINS 256

-

-

-LOCAL(int)

-get_byte (j_decompress_ptr cinfo)

-/* Read next input byte; we do not support suspension in this module. */

-{

-  struct jpeg_source_mgr * src = cinfo->src;

-

-  if (src->bytes_in_buffer == 0)

-    if (! (*src->fill_input_buffer) (cinfo))

-      ERREXIT(cinfo, JERR_CANT_SUSPEND);

-  src->bytes_in_buffer--;

-  return GETJOCTET(*src->next_input_byte++);

-}

-

-

-/*

- * The core arithmetic decoding routine (common in JPEG and JBIG).

- * This needs to go as fast as possible.

- * Machine-dependent optimization facilities

- * are not utilized in this portable implementation.

- * However, this code should be fairly efficient and

- * may be a good base for further optimizations anyway.

- *

- * Return value is 0 or 1 (binary decision).

- *

- * Note: I've changed the handling of the code base & bit

- * buffer register C compared to other implementations

- * based on the standards layout & procedures.

- * While it also contains both the actual base of the

- * coding interval (16 bits) and the next-bits buffer,

- * the cut-point between these two parts is floating

- * (instead of fixed) with the bit shift counter CT.

- * Thus, we also need only one (variable instead of

- * fixed size) shift for the LPS/MPS decision, and

- * we can do away with any renormalization update

- * of C (except for new data insertion, of course).

- *

- * I've also introduced a new scheme for accessing

- * the probability estimation state machine table,

- * derived from Markus Kuhn's JBIG implementation.

- */

-

-LOCAL(int)

-arith_decode (j_decompress_ptr cinfo, unsigned char *st)

-{

-  register arith_entropy_ptr e = (arith_entropy_ptr) cinfo->entropy;

-  register unsigned char nl, nm;

-  register INT32 qe, temp;

-  register int sv, data;

-

-  /* Renormalization & data input per section D.2.6 */

-  while (e->a < 0x8000L) {

-    if (--e->ct < 0) {

-      /* Need to fetch next data byte */

-      if (cinfo->unread_marker)

-	data = 0;		/* stuff zero data */

-      else {

-	data = get_byte(cinfo);	/* read next input byte */

-	if (data == 0xFF) {	/* zero stuff or marker code */

-	  do data = get_byte(cinfo);

-	  while (data == 0xFF);	/* swallow extra 0xFF bytes */

-	  if (data == 0)

-	    data = 0xFF;	/* discard stuffed zero byte */

-	  else {

-	    /* Note: Different from the Huffman decoder, hitting

-	     * a marker while processing the compressed data

-	     * segment is legal in arithmetic coding.

-	     * The convention is to supply zero data

-	     * then until decoding is complete.

-	     */

-	    cinfo->unread_marker = data;

-	    data = 0;

-	  }

-	}

-      }

-      e->c = (e->c << 8) | data; /* insert data into C register */

-      if ((e->ct += 8) < 0)	 /* update bit shift counter */

-	/* Need more initial bytes */

-	if (++e->ct == 0)

-	  /* Got 2 initial bytes -> re-init A and exit loop */

-	  e->a = 0x8000L; /* => e->a = 0x10000L after loop exit */

-    }

-    e->a <<= 1;

-  }

-

-  /* Fetch values from our compact representation of Table D.3(D.2):

-   * Qe values and probability estimation state machine

-   */

-  sv = *st;

-  qe = jpeg_aritab[sv & 0x7F];	/* => Qe_Value */

-  nl = qe & 0xFF; qe >>= 8;	/* Next_Index_LPS + Switch_MPS */

-  nm = qe & 0xFF; qe >>= 8;	/* Next_Index_MPS */

-

-  /* Decode & estimation procedures per sections D.2.4 & D.2.5 */

-  temp = e->a - qe;

-  e->a = temp;

-  temp <<= e->ct;

-  if (e->c >= temp) {

-    e->c -= temp;

-    /* Conditional LPS (less probable symbol) exchange */

-    if (e->a < qe) {

-      e->a = qe;

-      *st = (sv & 0x80) ^ nm;	/* Estimate_after_MPS */

-    } else {

-      e->a = qe;

-      *st = (sv & 0x80) ^ nl;	/* Estimate_after_LPS */

-      sv ^= 0x80;		/* Exchange LPS/MPS */

-    }

-  } else if (e->a < 0x8000L) {

-    /* Conditional MPS (more probable symbol) exchange */

-    if (e->a < qe) {

-      *st = (sv & 0x80) ^ nl;	/* Estimate_after_LPS */

-      sv ^= 0x80;		/* Exchange LPS/MPS */

-    } else {

-      *st = (sv & 0x80) ^ nm;	/* Estimate_after_MPS */

-    }

-  }

-

-  return sv >> 7;

-}

-

-

-/*

- * Check for a restart marker & resynchronize decoder.

- */

-

-LOCAL(void)

-process_restart (j_decompress_ptr cinfo)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  int ci;

-  jpeg_component_info * compptr;

-

-  /* Advance past the RSTn marker */

-  if (! (*cinfo->marker->read_restart_marker) (cinfo))

-    ERREXIT(cinfo, JERR_CANT_SUSPEND);

-

-  /* Re-initialize statistics areas */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    if (! cinfo->progressive_mode || (cinfo->Ss == 0 && cinfo->Ah == 0)) {

-      MEMZERO(entropy->dc_stats[compptr->dc_tbl_no], DC_STAT_BINS);

-      /* Reset DC predictions to 0 */

-      entropy->last_dc_val[ci] = 0;

-      entropy->dc_context[ci] = 0;

-    }

-    if ((! cinfo->progressive_mode && cinfo->lim_Se) ||

-	(cinfo->progressive_mode && cinfo->Ss)) {

-      MEMZERO(entropy->ac_stats[compptr->ac_tbl_no], AC_STAT_BINS);

-    }

-  }

-

-  /* Reset arithmetic decoding variables */

-  entropy->c = 0;

-  entropy->a = 0;

-  entropy->ct = -16;	/* force reading 2 initial bytes to fill C */

-

-  /* Reset restart counter */

-  entropy->restarts_to_go = cinfo->restart_interval;

-}

-

-

-/*

- * Arithmetic MCU decoding.

- * Each of these routines decodes and returns one MCU's worth of

- * arithmetic-compressed coefficients.

- * The coefficients are reordered from zigzag order into natural array order,

- * but are not dequantized.

- *

- * The i'th block of the MCU is stored into the block pointed to by

- * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.

- */

-

-/*

- * MCU decoding for DC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  JBLOCKROW block;

-  unsigned char *st;

-  int blkn, ci, tbl, sign;

-  int v, m;

-

-  /* Process restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      process_restart(cinfo);

-    entropy->restarts_to_go--;

-  }

-

-  if (entropy->ct == -1) return TRUE;	/* if error do nothing */

-

-  /* Outer loop handles each block in the MCU */

-

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    block = MCU_data[blkn];

-    ci = cinfo->MCU_membership[blkn];

-    tbl = cinfo->cur_comp_info[ci]->dc_tbl_no;

-

-    /* Sections F.2.4.1 & F.1.4.4.1: Decoding of DC coefficients */

-

-    /* Table F.4: Point to statistics bin S0 for DC coefficient coding */

-    st = entropy->dc_stats[tbl] + entropy->dc_context[ci];

-

-    /* Figure F.19: Decode_DC_DIFF */

-    if (arith_decode(cinfo, st) == 0)

-      entropy->dc_context[ci] = 0;

-    else {

-      /* Figure F.21: Decoding nonzero value v */

-      /* Figure F.22: Decoding the sign of v */

-      sign = arith_decode(cinfo, st + 1);

-      st += 2; st += sign;

-      /* Figure F.23: Decoding the magnitude category of v */

-      if ((m = arith_decode(cinfo, st)) != 0) {

-	st = entropy->dc_stats[tbl] + 20;	/* Table F.4: X1 = 20 */

-	while (arith_decode(cinfo, st)) {

-	  if ((m <<= 1) == 0x8000) {

-	    WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	    entropy->ct = -1;			/* magnitude overflow */

-	    return TRUE;

-	  }

-	  st += 1;

-	}

-      }

-      /* Section F.1.4.4.1.2: Establish dc_context conditioning category */

-      if (m < (int) ((1L << cinfo->arith_dc_L[tbl]) >> 1))

-	entropy->dc_context[ci] = 0;		   /* zero diff category */

-      else if (m > (int) ((1L << cinfo->arith_dc_U[tbl]) >> 1))

-	entropy->dc_context[ci] = 12 + (sign * 4); /* large diff category */

-      else

-	entropy->dc_context[ci] = 4 + (sign * 4);  /* small diff category */

-      v = m;

-      /* Figure F.24: Decoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	if (arith_decode(cinfo, st)) v |= m;

-      v += 1; if (sign) v = -v;

-      entropy->last_dc_val[ci] += v;

-    }

-

-    /* Scale and output the DC coefficient (assumes jpeg_natural_order[0]=0) */

-    (*block)[0] = (JCOEF) (entropy->last_dc_val[ci] << cinfo->Al);

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for AC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  JBLOCKROW block;

-  unsigned char *st;

-  int tbl, sign, k;

-  int v, m;

-  const int * natural_order;

-

-  /* Process restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      process_restart(cinfo);

-    entropy->restarts_to_go--;

-  }

-

-  if (entropy->ct == -1) return TRUE;	/* if error do nothing */

-

-  natural_order = cinfo->natural_order;

-

-  /* There is always only one block per MCU */

-  block = MCU_data[0];

-  tbl = cinfo->cur_comp_info[0]->ac_tbl_no;

-

-  /* Sections F.2.4.2 & F.1.4.4.2: Decoding of AC coefficients */

-

-  /* Figure F.20: Decode_AC_coefficients */

-  k = cinfo->Ss - 1;

-  do {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    if (arith_decode(cinfo, st)) break;		/* EOB flag */

-    for (;;) {

-      k++;

-      if (arith_decode(cinfo, st + 1)) break;

-      st += 3;

-      if (k >= cinfo->Se) {

-	WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	entropy->ct = -1;			/* spectral overflow */

-	return TRUE;

-      }

-    }

-    /* Figure F.21: Decoding nonzero value v */

-    /* Figure F.22: Decoding the sign of v */

-    sign = arith_decode(cinfo, entropy->fixed_bin);

-    st += 2;

-    /* Figure F.23: Decoding the magnitude category of v */

-    if ((m = arith_decode(cinfo, st)) != 0) {

-      if (arith_decode(cinfo, st)) {

-	m <<= 1;

-	st = entropy->ac_stats[tbl] +

-	     (k <= cinfo->arith_ac_K[tbl] ? 189 : 217);

-	while (arith_decode(cinfo, st)) {

-	  if ((m <<= 1) == 0x8000) {

-	    WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	    entropy->ct = -1;			/* magnitude overflow */

-	    return TRUE;

-	  }

-	  st += 1;

-	}

-      }

-    }

-    v = m;

-    /* Figure F.24: Decoding the magnitude bit pattern of v */

-    st += 14;

-    while (m >>= 1)

-      if (arith_decode(cinfo, st)) v |= m;

-    v += 1; if (sign) v = -v;

-    /* Scale and output coefficient in natural (dezigzagged) order */

-    (*block)[natural_order[k]] = (JCOEF) (v << cinfo->Al);

-  } while (k < cinfo->Se);

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for DC successive approximation refinement scan.

- * Note: we assume such scans can be multi-component,

- * although the spec is not very clear on the point.

- */

-

-METHODDEF(boolean)

-decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  unsigned char *st;

-  int p1, blkn;

-

-  /* Process restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      process_restart(cinfo);

-    entropy->restarts_to_go--;

-  }

-

-  st = entropy->fixed_bin;	/* use fixed probability estimation */

-  p1 = 1 << cinfo->Al;		/* 1 in the bit position being coded */

-

-  /* Outer loop handles each block in the MCU */

-

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    /* Encoded data is simply the next bit of the two's-complement DC value */

-    if (arith_decode(cinfo, st))

-      MCU_data[blkn][0][0] |= p1;

-  }

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for AC successive approximation refinement scan.

- */

-

-METHODDEF(boolean)

-decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  JBLOCKROW block;

-  JCOEFPTR thiscoef;

-  unsigned char *st;

-  int tbl, k, kex;

-  int p1, m1;

-  const int * natural_order;

-

-  /* Process restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      process_restart(cinfo);

-    entropy->restarts_to_go--;

-  }

-

-  if (entropy->ct == -1) return TRUE;	/* if error do nothing */

-

-  natural_order = cinfo->natural_order;

-

-  /* There is always only one block per MCU */

-  block = MCU_data[0];

-  tbl = cinfo->cur_comp_info[0]->ac_tbl_no;

-

-  p1 = 1 << cinfo->Al;		/* 1 in the bit position being coded */

-  m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */

-

-  /* Establish EOBx (previous stage end-of-block) index */

-  kex = cinfo->Se;

-  do {

-    if ((*block)[natural_order[kex]]) break;

-  } while (--kex);

-

-  k = cinfo->Ss - 1;

-  do {

-    st = entropy->ac_stats[tbl] + 3 * k;

-    if (k >= kex)

-      if (arith_decode(cinfo, st)) break;	/* EOB flag */

-    for (;;) {

-      thiscoef = *block + natural_order[++k];

-      if (*thiscoef) {				/* previously nonzero coef */

-	if (arith_decode(cinfo, st + 2)) {

-	  if (*thiscoef < 0)

-	    *thiscoef += m1;

-	  else

-	    *thiscoef += p1;

-	}

-	break;

-      }

-      if (arith_decode(cinfo, st + 1)) {	/* newly nonzero coef */

-	if (arith_decode(cinfo, entropy->fixed_bin))

-	  *thiscoef = m1;

-	else

-	  *thiscoef = p1;

-	break;

-      }

-      st += 3;

-      if (k >= cinfo->Se) {

-	WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	entropy->ct = -1;			/* spectral overflow */

-	return TRUE;

-      }

-    }

-  } while (k < cinfo->Se);

-

-  return TRUE;

-}

-

-

-/*

- * Decode one MCU's worth of arithmetic-compressed coefficients.

- */

-

-METHODDEF(boolean)

-decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  jpeg_component_info * compptr;

-  JBLOCKROW block;

-  unsigned char *st;

-  int blkn, ci, tbl, sign, k;

-  int v, m;

-  const int * natural_order;

-

-  /* Process restart marker if needed */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      process_restart(cinfo);

-    entropy->restarts_to_go--;

-  }

-

-  if (entropy->ct == -1) return TRUE;	/* if error do nothing */

-

-  natural_order = cinfo->natural_order;

-

-  /* Outer loop handles each block in the MCU */

-

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    block = MCU_data[blkn];

-    ci = cinfo->MCU_membership[blkn];

-    compptr = cinfo->cur_comp_info[ci];

-

-    /* Sections F.2.4.1 & F.1.4.4.1: Decoding of DC coefficients */

-

-    tbl = compptr->dc_tbl_no;

-

-    /* Table F.4: Point to statistics bin S0 for DC coefficient coding */

-    st = entropy->dc_stats[tbl] + entropy->dc_context[ci];

-

-    /* Figure F.19: Decode_DC_DIFF */

-    if (arith_decode(cinfo, st) == 0)

-      entropy->dc_context[ci] = 0;

-    else {

-      /* Figure F.21: Decoding nonzero value v */

-      /* Figure F.22: Decoding the sign of v */

-      sign = arith_decode(cinfo, st + 1);

-      st += 2; st += sign;

-      /* Figure F.23: Decoding the magnitude category of v */

-      if ((m = arith_decode(cinfo, st)) != 0) {

-	st = entropy->dc_stats[tbl] + 20;	/* Table F.4: X1 = 20 */

-	while (arith_decode(cinfo, st)) {

-	  if ((m <<= 1) == 0x8000) {

-	    WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	    entropy->ct = -1;			/* magnitude overflow */

-	    return TRUE;

-	  }

-	  st += 1;

-	}

-      }

-      /* Section F.1.4.4.1.2: Establish dc_context conditioning category */

-      if (m < (int) ((1L << cinfo->arith_dc_L[tbl]) >> 1))

-	entropy->dc_context[ci] = 0;		   /* zero diff category */

-      else if (m > (int) ((1L << cinfo->arith_dc_U[tbl]) >> 1))

-	entropy->dc_context[ci] = 12 + (sign * 4); /* large diff category */

-      else

-	entropy->dc_context[ci] = 4 + (sign * 4);  /* small diff category */

-      v = m;

-      /* Figure F.24: Decoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	if (arith_decode(cinfo, st)) v |= m;

-      v += 1; if (sign) v = -v;

-      entropy->last_dc_val[ci] += v;

-    }

-

-    (*block)[0] = (JCOEF) entropy->last_dc_val[ci];

-

-    /* Sections F.2.4.2 & F.1.4.4.2: Decoding of AC coefficients */

-

-    if (cinfo->lim_Se == 0) continue;

-    tbl = compptr->ac_tbl_no;

-    k = 0;

-

-    /* Figure F.20: Decode_AC_coefficients */

-    do {

-      st = entropy->ac_stats[tbl] + 3 * k;

-      if (arith_decode(cinfo, st)) break;	/* EOB flag */

-      for (;;) {

-	k++;

-	if (arith_decode(cinfo, st + 1)) break;

-	st += 3;

-	if (k >= cinfo->lim_Se) {

-	  WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	  entropy->ct = -1;			/* spectral overflow */

-	  return TRUE;

-	}

-      }

-      /* Figure F.21: Decoding nonzero value v */

-      /* Figure F.22: Decoding the sign of v */

-      sign = arith_decode(cinfo, entropy->fixed_bin);

-      st += 2;

-      /* Figure F.23: Decoding the magnitude category of v */

-      if ((m = arith_decode(cinfo, st)) != 0) {

-	if (arith_decode(cinfo, st)) {

-	  m <<= 1;

-	  st = entropy->ac_stats[tbl] +

-	       (k <= cinfo->arith_ac_K[tbl] ? 189 : 217);

-	  while (arith_decode(cinfo, st)) {

-	    if ((m <<= 1) == 0x8000) {

-	      WARNMS(cinfo, JWRN_ARITH_BAD_CODE);

-	      entropy->ct = -1;			/* magnitude overflow */

-	      return TRUE;

-	    }

-	    st += 1;

-	  }

-	}

-      }

-      v = m;

-      /* Figure F.24: Decoding the magnitude bit pattern of v */

-      st += 14;

-      while (m >>= 1)

-	if (arith_decode(cinfo, st)) v |= m;

-      v += 1; if (sign) v = -v;

-      (*block)[natural_order[k]] = (JCOEF) v;

-    } while (k < cinfo->lim_Se);

-  }

-

-  return TRUE;

-}

-

-

-/*

- * Initialize for an arithmetic-compressed scan.

- */

-

-METHODDEF(void)

-start_pass (j_decompress_ptr cinfo)

-{

-  arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;

-  int ci, tbl;

-  jpeg_component_info * compptr;

-

-  if (cinfo->progressive_mode) {

-    /* Validate progressive scan parameters */

-    if (cinfo->Ss == 0) {

-      if (cinfo->Se != 0)

-	goto bad;

-    } else {

-      /* need not check Ss/Se < 0 since they came from unsigned bytes */

-      if (cinfo->Se < cinfo->Ss || cinfo->Se > cinfo->lim_Se)

-	goto bad;

-      /* AC scans may have only one component */

-      if (cinfo->comps_in_scan != 1)

-	goto bad;

-    }

-    if (cinfo->Ah != 0) {

-      /* Successive approximation refinement scan: must have Al = Ah-1. */

-      if (cinfo->Ah-1 != cinfo->Al)

-	goto bad;

-    }

-    if (cinfo->Al > 13) {	/* need not check for < 0 */

-      bad:

-      ERREXIT4(cinfo, JERR_BAD_PROGRESSION,

-	       cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);

-    }

-    /* Update progression status, and verify that scan order is legal.

-     * Note that inter-scan inconsistencies are treated as warnings

-     * not fatal errors ... not clear if this is right way to behave.

-     */

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      int coefi, cindex = cinfo->cur_comp_info[ci]->component_index;

-      int *coef_bit_ptr = & cinfo->coef_bits[cindex][0];

-      if (cinfo->Ss && coef_bit_ptr[0] < 0) /* AC without prior DC scan */

-	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);

-      for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {

-	int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];

-	if (cinfo->Ah != expected)

-	  WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);

-	coef_bit_ptr[coefi] = cinfo->Al;

-      }

-    }

-    /* Select MCU decoding routine */

-    if (cinfo->Ah == 0) {

-      if (cinfo->Ss == 0)

-	entropy->pub.decode_mcu = decode_mcu_DC_first;

-      else

-	entropy->pub.decode_mcu = decode_mcu_AC_first;

-    } else {

-      if (cinfo->Ss == 0)

-	entropy->pub.decode_mcu = decode_mcu_DC_refine;

-      else

-	entropy->pub.decode_mcu = decode_mcu_AC_refine;

-    }

-  } else {

-    /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.

-     * This ought to be an error condition, but we make it a warning.

-     */

-    if (cinfo->Ss != 0 || cinfo->Ah != 0 || cinfo->Al != 0 ||

-	(cinfo->Se < DCTSIZE2 && cinfo->Se != cinfo->lim_Se))

-      WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);

-    /* Select MCU decoding routine */

-    entropy->pub.decode_mcu = decode_mcu;

-  }

-

-  /* Allocate & initialize requested statistics areas */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    if (! cinfo->progressive_mode || (cinfo->Ss == 0 && cinfo->Ah == 0)) {

-      tbl = compptr->dc_tbl_no;

-      if (tbl < 0 || tbl >= NUM_ARITH_TBLS)

-	ERREXIT1(cinfo, JERR_NO_ARITH_TABLE, tbl);

-      if (entropy->dc_stats[tbl] == NULL)

-	entropy->dc_stats[tbl] = (unsigned char *) (*cinfo->mem->alloc_small)

-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, DC_STAT_BINS);

-      MEMZERO(entropy->dc_stats[tbl], DC_STAT_BINS);

-      /* Initialize DC predictions to 0 */

-      entropy->last_dc_val[ci] = 0;

-      entropy->dc_context[ci] = 0;

-    }

-    if ((! cinfo->progressive_mode && cinfo->lim_Se) ||

-	(cinfo->progressive_mode && cinfo->Ss)) {

-      tbl = compptr->ac_tbl_no;

-      if (tbl < 0 || tbl >= NUM_ARITH_TBLS)

-	ERREXIT1(cinfo, JERR_NO_ARITH_TABLE, tbl);

-      if (entropy->ac_stats[tbl] == NULL)

-	entropy->ac_stats[tbl] = (unsigned char *) (*cinfo->mem->alloc_small)

-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, AC_STAT_BINS);

-      MEMZERO(entropy->ac_stats[tbl], AC_STAT_BINS);

-    }

-  }

-

-  /* Initialize arithmetic decoding variables */

-  entropy->c = 0;

-  entropy->a = 0;

-  entropy->ct = -16;	/* force reading 2 initial bytes to fill C */

-

-  /* Initialize restart counter */

-  entropy->restarts_to_go = cinfo->restart_interval;

-}

-

-

-/*

- * Finish up at the end of an arithmetic-compressed scan.

- */

-

-METHODDEF(void)

-finish_pass (j_decompress_ptr cinfo)

-{

-  /* no work necessary here */

-}

-

-

-/*

- * Module initialization routine for arithmetic entropy decoding.

- */

-

-GLOBAL(void)

-jinit_arith_decoder (j_decompress_ptr cinfo)

-{

-  arith_entropy_ptr entropy;

-  int i;

-

-  entropy = (arith_entropy_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(arith_entropy_decoder));

-  cinfo->entropy = &entropy->pub;

-  entropy->pub.start_pass = start_pass;

-  entropy->pub.finish_pass = finish_pass;

-

-  /* Mark tables unallocated */

-  for (i = 0; i < NUM_ARITH_TBLS; i++) {

-    entropy->dc_stats[i] = NULL;

-    entropy->ac_stats[i] = NULL;

-  }

-

-  /* Initialize index for fixed probability estimation */

-  entropy->fixed_bin[0] = 113;

-

-  if (cinfo->progressive_mode) {

-    /* Create progression status table */

-    int *coef_bit_ptr, ci;

-    cinfo->coef_bits = (int (*)[DCTSIZE2])

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  cinfo->num_components*DCTSIZE2*SIZEOF(int));

-    coef_bit_ptr = & cinfo->coef_bits[0][0];

-    for (ci = 0; ci < cinfo->num_components; ci++) 

-      for (i = 0; i < DCTSIZE2; i++)

-	*coef_bit_ptr++ = -1;

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdatadst.c b/plugins/AdvaImg/src/LibJPEG/jdatadst.c
deleted file mode 100644
index 677e46346b..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdatadst.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*

- * jdatadst.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2009-2012 by Guido Vollbeding.

- * 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 compression data destination routines for the case of

- * emitting JPEG data to memory or to a file (or any stdio stream).

- * While these routines are sufficient for most applications,

- * some will want to use a different destination manager.

- * IMPORTANT: we assume that fwrite() will correctly transcribe an array of

- * JOCTETs into 8-bit-wide elements on external storage.  If char is wider

- * than 8 bits on your machine, you may need to do some tweaking.

- */

-

-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jerror.h"

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */

-extern void * malloc JPP((size_t size));

-extern void free JPP((void *ptr));

-#endif

-

-

-/* Expanded data destination object for stdio output */

-

-typedef struct {

-  struct jpeg_destination_mgr pub; /* public fields */

-

-  FILE * outfile;		/* target stream */

-  JOCTET * buffer;		/* start of buffer */

-} my_destination_mgr;

-

-typedef my_destination_mgr * my_dest_ptr;

-

-#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */

-

-

-/* Expanded data destination object for memory output */

-

-typedef struct {

-  struct jpeg_destination_mgr pub; /* public fields */

-

-  unsigned char ** outbuffer;	/* target buffer */

-  unsigned long * outsize;

-  unsigned char * newbuffer;	/* newly allocated buffer */

-  JOCTET * buffer;		/* start of buffer */

-  size_t bufsize;

-} my_mem_destination_mgr;

-

-typedef my_mem_destination_mgr * my_mem_dest_ptr;

-

-

-/*

- * Initialize destination --- called by jpeg_start_compress

- * before any data is actually written.

- */

-

-METHODDEF(void)

-init_destination (j_compress_ptr cinfo)

-{

-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;

-

-  /* Allocate the output buffer --- it will be released when done with image */

-  dest->buffer = (JOCTET *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));

-

-  dest->pub.next_output_byte = dest->buffer;

-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;

-}

-

-METHODDEF(void)

-init_mem_destination (j_compress_ptr cinfo)

-{

-  /* no work necessary here */

-}

-

-

-/*

- * Empty the output buffer --- called whenever buffer fills up.

- *

- * In typical applications, this should write the entire output buffer

- * (ignoring the current state of next_output_byte & free_in_buffer),

- * reset the pointer & count to the start of the buffer, and return TRUE

- * indicating that the buffer has been dumped.

- *

- * In applications that need to be able to suspend compression due to output

- * overrun, a FALSE return indicates that the buffer cannot be emptied now.

- * In this situation, the compressor will return to its caller (possibly with

- * an indication that it has not accepted all the supplied scanlines).  The

- * application should resume compression after it has made more room in the

- * output buffer.  Note that there are substantial restrictions on the use of

- * suspension --- see the documentation.

- *

- * When suspending, the compressor will back up to a convenient restart point

- * (typically the start of the current MCU). next_output_byte & free_in_buffer

- * indicate where the restart point will be if the current call returns FALSE.

- * Data beyond this point will be regenerated after resumption, so do not

- * write it out when emptying the buffer externally.

- */

-

-METHODDEF(boolean)

-empty_output_buffer (j_compress_ptr cinfo)

-{

-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;

-

-  if (JFWRITE(dest->outfile, dest->buffer, OUTPUT_BUF_SIZE) !=

-      (size_t) OUTPUT_BUF_SIZE)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-

-  dest->pub.next_output_byte = dest->buffer;

-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;

-

-  return TRUE;

-}

-

-METHODDEF(boolean)

-empty_mem_output_buffer (j_compress_ptr cinfo)

-{

-  size_t nextsize;

-  JOCTET * nextbuffer;

-  my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;

-

-  /* Try to allocate new buffer with double size */

-  nextsize = dest->bufsize * 2;

-  nextbuffer = (JOCTET *) malloc(nextsize);

-

-  if (nextbuffer == NULL)

-    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10);

-

-  MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);

-

-  if (dest->newbuffer != NULL)

-    free(dest->newbuffer);

-

-  dest->newbuffer = nextbuffer;

-

-  dest->pub.next_output_byte = nextbuffer + dest->bufsize;

-  dest->pub.free_in_buffer = dest->bufsize;

-

-  dest->buffer = nextbuffer;

-  dest->bufsize = nextsize;

-

-  return TRUE;

-}

-

-

-/*

- * Terminate destination --- called by jpeg_finish_compress

- * after all data has been written.  Usually needs to flush buffer.

- *

- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding

- * application must deal with any cleanup that should happen even

- * for error exit.

- */

-

-METHODDEF(void)

-term_destination (j_compress_ptr cinfo)

-{

-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;

-  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;

-

-  /* Write any data remaining in the buffer */

-  if (datacount > 0) {

-    if (JFWRITE(dest->outfile, dest->buffer, datacount) != datacount)

-      ERREXIT(cinfo, JERR_FILE_WRITE);

-  }

-  fflush(dest->outfile);

-  /* Make sure we wrote the output file OK */

-  if (ferror(dest->outfile))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-METHODDEF(void)

-term_mem_destination (j_compress_ptr cinfo)

-{

-  my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;

-

-  *dest->outbuffer = dest->buffer;

-  *dest->outsize = dest->bufsize - dest->pub.free_in_buffer;

-}

-

-

-/*

- * Prepare for output to a stdio stream.

- * The caller must have already opened the stream, and is responsible

- * for closing it after finishing compression.

- */

-

-GLOBAL(void)

-jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile)

-{

-  my_dest_ptr dest;

-

-  /* The destination object is made permanent so that multiple JPEG images

-   * can be written to the same file without re-executing jpeg_stdio_dest.

-   * This makes it dangerous to use this manager and a different destination

-   * manager serially with the same JPEG object, because their private object

-   * sizes may be different.  Caveat programmer.

-   */

-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */

-    cinfo->dest = (struct jpeg_destination_mgr *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  SIZEOF(my_destination_mgr));

-  }

-

-  dest = (my_dest_ptr) cinfo->dest;

-  dest->pub.init_destination = init_destination;

-  dest->pub.empty_output_buffer = empty_output_buffer;

-  dest->pub.term_destination = term_destination;

-  dest->outfile = outfile;

-}

-

-

-/*

- * Prepare for output to a memory buffer.

- * The caller may supply an own initial buffer with appropriate size.

- * Otherwise, or when the actual data output exceeds the given size,

- * the library adapts the buffer size as necessary.

- * The standard library functions malloc/free are used for allocating

- * larger memory, so the buffer is available to the application after

- * finishing compression, and then the application is responsible for

- * freeing the requested memory.

- * Note:  An initial buffer supplied by the caller is expected to be

- * managed by the application.  The library does not free such buffer

- * when allocating a larger buffer.

- */

-

-GLOBAL(void)

-jpeg_mem_dest (j_compress_ptr cinfo,

-	       unsigned char ** outbuffer, unsigned long * outsize)

-{

-  my_mem_dest_ptr dest;

-

-  if (outbuffer == NULL || outsize == NULL)	/* sanity check */

-    ERREXIT(cinfo, JERR_BUFFER_SIZE);

-

-  /* The destination object is made permanent so that multiple JPEG images

-   * can be written to the same buffer without re-executing jpeg_mem_dest.

-   */

-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */

-    cinfo->dest = (struct jpeg_destination_mgr *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  SIZEOF(my_mem_destination_mgr));

-  }

-

-  dest = (my_mem_dest_ptr) cinfo->dest;

-  dest->pub.init_destination = init_mem_destination;

-  dest->pub.empty_output_buffer = empty_mem_output_buffer;

-  dest->pub.term_destination = term_mem_destination;

-  dest->outbuffer = outbuffer;

-  dest->outsize = outsize;

-  dest->newbuffer = NULL;

-

-  if (*outbuffer == NULL || *outsize == 0) {

-    /* Allocate initial buffer */

-    dest->newbuffer = *outbuffer = (unsigned char *) malloc(OUTPUT_BUF_SIZE);

-    if (dest->newbuffer == NULL)

-      ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10);

-    *outsize = OUTPUT_BUF_SIZE;

-  }

-

-  dest->pub.next_output_byte = dest->buffer = *outbuffer;

-  dest->pub.free_in_buffer = dest->bufsize = *outsize;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdatasrc.c b/plugins/AdvaImg/src/LibJPEG/jdatasrc.c
deleted file mode 100644
index c44d8d0ba7..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdatasrc.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * jdatasrc.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2009-2015 by Guido Vollbeding.

- * 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 decompression data source routines for the case of

- * reading JPEG data from memory or from a file (or any stdio stream).

- * While these routines are sufficient for most applications,

- * some will want to use a different source manager.

- * IMPORTANT: we assume that fread() will correctly transcribe an array of

- * JOCTETs from 8-bit-wide elements on external storage.  If char is wider

- * than 8 bits on your machine, you may need to do some tweaking.

- */

-

-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jerror.h"

-

-

-/* Expanded data source object for stdio input */

-

-typedef struct {

-  struct jpeg_source_mgr pub;	/* public fields */

-

-  FILE * infile;		/* source stream */

-  JOCTET * buffer;		/* start of buffer */

-  boolean start_of_file;	/* have we gotten any data yet? */

-} my_source_mgr;

-

-typedef my_source_mgr * my_src_ptr;

-

-#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */

-

-

-/*

- * Initialize source --- called by jpeg_read_header

- * before any data is actually read.

- */

-

-METHODDEF(void)

-init_source (j_decompress_ptr cinfo)

-{

-  my_src_ptr src = (my_src_ptr) cinfo->src;

-

-  /* We reset the empty-input-file flag for each image,

-   * but we don't clear the input buffer.

-   * This is correct behavior for reading a series of images from one source.

-   */

-  src->start_of_file = TRUE;

-}

-

-METHODDEF(void)

-init_mem_source (j_decompress_ptr cinfo)

-{

-  /* no work necessary here */

-}

-

-

-/*

- * Fill the input buffer --- called whenever buffer is emptied.

- *

- * In typical applications, this should read fresh data into the buffer

- * (ignoring the current state of next_input_byte & bytes_in_buffer),

- * reset the pointer & count to the start of the buffer, and return TRUE

- * indicating that the buffer has been reloaded.  It is not necessary to

- * fill the buffer entirely, only to obtain at least one more byte.

- *

- * There is no such thing as an EOF return.  If the end of the file has been

- * reached, the routine has a choice of ERREXIT() or inserting fake data into

- * the buffer.  In most cases, generating a warning message and inserting a

- * fake EOI marker is the best course of action --- this will allow the

- * decompressor to output however much of the image is there.  However,

- * the resulting error message is misleading if the real problem is an empty

- * input file, so we handle that case specially.

- *

- * In applications that need to be able to suspend compression due to input

- * not being available yet, a FALSE return indicates that no more data can be

- * obtained right now, but more may be forthcoming later.  In this situation,

- * the decompressor will return to its caller (with an indication of the

- * number of scanlines it has read, if any).  The application should resume

- * decompression after it has loaded more data into the input buffer.  Note

- * that there are substantial restrictions on the use of suspension --- see

- * the documentation.

- *

- * When suspending, the decompressor will back up to a convenient restart point

- * (typically the start of the current MCU). next_input_byte & bytes_in_buffer

- * indicate where the restart point will be if the current call returns FALSE.

- * Data beyond this point must be rescanned after resumption, so move it to

- * the front of the buffer rather than discarding it.

- */

-

-METHODDEF(boolean)

-fill_input_buffer (j_decompress_ptr cinfo)

-{

-  my_src_ptr src = (my_src_ptr) cinfo->src;

-  size_t nbytes;

-

-  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);

-

-  if (nbytes <= 0) {

-    if (src->start_of_file)	/* Treat empty input file as fatal error */

-      ERREXIT(cinfo, JERR_INPUT_EMPTY);

-    WARNMS(cinfo, JWRN_JPEG_EOF);

-    /* Insert a fake EOI marker */

-    src->buffer[0] = (JOCTET) 0xFF;

-    src->buffer[1] = (JOCTET) JPEG_EOI;

-    nbytes = 2;

-  }

-

-  src->pub.next_input_byte = src->buffer;

-  src->pub.bytes_in_buffer = nbytes;

-  src->start_of_file = FALSE;

-

-  return TRUE;

-}

-

-METHODDEF(boolean)

-fill_mem_input_buffer (j_decompress_ptr cinfo)

-{

-  static const JOCTET mybuffer[4] = {

-    (JOCTET) 0xFF, (JOCTET) JPEG_EOI, 0, 0

-  };

-

-  /* The whole JPEG data is expected to reside in the supplied memory

-   * buffer, so any request for more data beyond the given buffer size

-   * is treated as an error.

-   */

-  WARNMS(cinfo, JWRN_JPEG_EOF);

-

-  /* Insert a fake EOI marker */

-

-  cinfo->src->next_input_byte = mybuffer;

-  cinfo->src->bytes_in_buffer = 2;

-

-  return TRUE;

-}

-

-

-/*

- * Skip data --- used to skip over a potentially large amount of

- * uninteresting data (such as an APPn marker).

- *

- * Writers of suspendable-input applications must note that skip_input_data

- * is not granted the right to give a suspension return.  If the skip extends

- * beyond the data currently in the buffer, the buffer can be marked empty so

- * that the next read will cause a fill_input_buffer call that can suspend.

- * Arranging for additional bytes to be discarded before reloading the input

- * buffer is the application writer's problem.

- */

-

-METHODDEF(void)

-skip_input_data (j_decompress_ptr cinfo, long num_bytes)

-{

-  struct jpeg_source_mgr * src = cinfo->src;

-

-  /* Just a dumb implementation for now.  Could use fseek() except

-   * it doesn't work on pipes.  Not clear that being smart is worth

-   * any trouble anyway --- large skips are infrequent.

-   */

-  if (num_bytes > 0) {

-    while (num_bytes > (long) src->bytes_in_buffer) {

-      num_bytes -= (long) src->bytes_in_buffer;

-      (void) (*src->fill_input_buffer) (cinfo);

-      /* note we assume that fill_input_buffer will never return FALSE,

-       * so suspension need not be handled.

-       */

-    }

-    src->next_input_byte += (size_t) num_bytes;

-    src->bytes_in_buffer -= (size_t) num_bytes;

-  }

-}

-

-

-/*

- * An additional method that can be provided by data source modules is the

- * resync_to_restart method for error recovery in the presence of RST markers.

- * For the moment, this source module just uses the default resync method

- * provided by the JPEG library.  That method assumes that no backtracking

- * is possible.

- */

-

-

-/*

- * Terminate source --- called by jpeg_finish_decompress

- * after all data has been read.  Often a no-op.

- *

- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding

- * application must deal with any cleanup that should happen even

- * for error exit.

- */

-

-METHODDEF(void)

-term_source (j_decompress_ptr cinfo)

-{

-  /* no work necessary here */

-}

-

-

-/*

- * Prepare for input from a stdio stream.

- * The caller must have already opened the stream, and is responsible

- * for closing it after finishing decompression.

- */

-

-GLOBAL(void)

-jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)

-{

-  my_src_ptr src;

-

-  /* The source object and input buffer are made permanent so that a series

-   * of JPEG images can be read from the same file by calling jpeg_stdio_src

-   * only before the first one.  (If we discarded the buffer at the end of

-   * one image, we'd likely lose the start of the next one.)

-   * This makes it unsafe to use this manager and a different source

-   * manager serially with the same JPEG object.  Caveat programmer.

-   */

-  if (cinfo->src == NULL) {	/* first time for this JPEG object? */

-    cinfo->src = (struct jpeg_source_mgr *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  SIZEOF(my_source_mgr));

-    src = (my_src_ptr) cinfo->src;

-    src->buffer = (JOCTET *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  INPUT_BUF_SIZE * SIZEOF(JOCTET));

-  }

-

-  src = (my_src_ptr) cinfo->src;

-  src->pub.init_source = init_source;

-  src->pub.fill_input_buffer = fill_input_buffer;

-  src->pub.skip_input_data = skip_input_data;

-  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */

-  src->pub.term_source = term_source;

-  src->infile = infile;

-  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */

-  src->pub.next_input_byte = NULL; /* until buffer loaded */

-}

-

-

-/*

- * Prepare for input from a supplied memory buffer.

- * The buffer must contain the whole JPEG data.

- */

-

-GLOBAL(void)

-jpeg_mem_src (j_decompress_ptr cinfo,

-	      const unsigned char * inbuffer, unsigned long insize)

-{

-  struct jpeg_source_mgr * src;

-

-  if (inbuffer == NULL || insize == 0)	/* Treat empty input as fatal error */

-    ERREXIT(cinfo, JERR_INPUT_EMPTY);

-

-  /* The source object is made permanent so that a series of JPEG images

-   * can be read from the same buffer by calling jpeg_mem_src only before

-   * the first one.

-   */

-  if (cinfo->src == NULL) {	/* first time for this JPEG object? */

-    cinfo->src = (struct jpeg_source_mgr *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				  SIZEOF(struct jpeg_source_mgr));

-  }

-

-  src = cinfo->src;

-  src->init_source = init_mem_source;

-  src->fill_input_buffer = fill_mem_input_buffer;

-  src->skip_input_data = skip_input_data;

-  src->resync_to_restart = jpeg_resync_to_restart; /* use default method */

-  src->term_source = term_source;

-  src->bytes_in_buffer = (size_t) insize;

-  src->next_input_byte = (const JOCTET *) inbuffer;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdcoefct.c b/plugins/AdvaImg/src/LibJPEG/jdcoefct.c
deleted file mode 100644
index 75ee51f0f2..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdcoefct.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/*

- * jdcoefct.c

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 2002-2011 by Guido Vollbeding.

- * 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 the coefficient buffer controller for decompression.

- * This controller is the top level of the JPEG decompressor proper.

- * The coefficient buffer lies between entropy decoding and inverse-DCT steps.

- *

- * In buffered-image mode, this controller is the interface between

- * input-oriented processing and output-oriented processing.

- * Also, the input side (only) is used when reading a file for transcoding.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-/* Block smoothing is only applicable for progressive JPEG, so: */

-#ifndef D_PROGRESSIVE_SUPPORTED

-#undef BLOCK_SMOOTHING_SUPPORTED

-#endif

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_d_coef_controller pub; /* public fields */

-

-  /* These variables keep track of the current location of the input side. */

-  /* cinfo->input_iMCU_row is also used for this. */

-  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */

-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */

-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */

-

-  /* The output side's location is represented by cinfo->output_iMCU_row. */

-

-  /* In single-pass modes, it's sufficient to buffer just one MCU.

-   * We allocate a workspace of D_MAX_BLOCKS_IN_MCU coefficient blocks,

-   * and let the entropy decoder write into that workspace each time.

-   * (On 80x86, the workspace is FAR even though it's not really very big;

-   * this is to keep the module interfaces unchanged when a large coefficient

-   * buffer is necessary.)

-   * In multi-pass modes, this array points to the current MCU's blocks

-   * within the virtual arrays; it is used only by the input side.

-   */

-  JBLOCKROW MCU_buffer[D_MAX_BLOCKS_IN_MCU];

-

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-  /* In multi-pass modes, we need a virtual block array for each component. */

-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];

-#endif

-

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-  /* When doing block smoothing, we latch coefficient Al values here */

-  int * coef_bits_latch;

-#define SAVED_COEFS  6		/* we save coef_bits[0..5] */

-#endif

-} my_coef_controller;

-

-typedef my_coef_controller * my_coef_ptr;

-

-/* Forward declarations */

-METHODDEF(int) decompress_onepass

-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-METHODDEF(int) decompress_data

-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));

-#endif

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));

-METHODDEF(int) decompress_smooth_data

-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));

-#endif

-

-

-LOCAL(void)

-start_iMCU_row (j_decompress_ptr cinfo)

-/* Reset within-iMCU-row counters for a new row (input side) */

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  /* In an interleaved scan, an MCU row is the same as an iMCU row.

-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.

-   * But at the bottom of the image, process only what's left.

-   */

-  if (cinfo->comps_in_scan > 1) {

-    coef->MCU_rows_per_iMCU_row = 1;

-  } else {

-    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;

-    else

-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;

-  }

-

-  coef->MCU_ctr = 0;

-  coef->MCU_vert_offset = 0;

-}

-

-

-/*

- * Initialize for an input processing pass.

- */

-

-METHODDEF(void)

-start_input_pass (j_decompress_ptr cinfo)

-{

-  cinfo->input_iMCU_row = 0;

-  start_iMCU_row(cinfo);

-}

-

-

-/*

- * Initialize for an output processing pass.

- */

-

-METHODDEF(void)

-start_output_pass (j_decompress_ptr cinfo)

-{

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-

-  /* If multipass, check to see whether to use block smoothing on this pass */

-  if (coef->pub.coef_arrays != NULL) {

-    if (cinfo->do_block_smoothing && smoothing_ok(cinfo))

-      coef->pub.decompress_data = decompress_smooth_data;

-    else

-      coef->pub.decompress_data = decompress_data;

-  }

-#endif

-  cinfo->output_iMCU_row = 0;

-}

-

-

-/*

- * Decompress and return some data in the single-pass case.

- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).

- * Input and output must run in lockstep since we have only a one-MCU buffer.

- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.

- *

- * NB: output_buf contains a plane for each component in image,

- * which we index according to the component's SOF position.

- */

-

-METHODDEF(int)

-decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION MCU_col_num;	/* index of current MCU within row */

-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  int blkn, ci, xindex, yindex, yoffset, useful_width;

-  JSAMPARRAY output_ptr;

-  JDIMENSION start_col, output_col;

-  jpeg_component_info *compptr;

-  inverse_DCT_method_ptr inverse_DCT;

-

-  /* Loop to process as much as one whole iMCU row */

-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;

-       yoffset++) {

-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;

-	 MCU_col_num++) {

-      /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */

-      if (cinfo->lim_Se)	/* can bypass in DC only case */

-	FMEMZERO((void FAR *) coef->MCU_buffer[0],

-		 (size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));

-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {

-	/* Suspension forced; update state counters and exit */

-	coef->MCU_vert_offset = yoffset;

-	coef->MCU_ctr = MCU_col_num;

-	return JPEG_SUSPENDED;

-      }

-      /* Determine where data should go in output_buf and do the IDCT thing.

-       * We skip dummy blocks at the right and bottom edges (but blkn gets

-       * incremented past them!).  Note the inner loop relies on having

-       * allocated the MCU_buffer[] blocks sequentially.

-       */

-      blkn = 0;			/* index of current DCT block within MCU */

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-	compptr = cinfo->cur_comp_info[ci];

-	/* Don't bother to IDCT an uninteresting component. */

-	if (! compptr->component_needed) {

-	  blkn += compptr->MCU_blocks;

-	  continue;

-	}

-	inverse_DCT = cinfo->idct->inverse_DCT[compptr->component_index];

-	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width

-						    : compptr->last_col_width;

-	output_ptr = output_buf[compptr->component_index] +

-	  yoffset * compptr->DCT_v_scaled_size;

-	start_col = MCU_col_num * compptr->MCU_sample_width;

-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {

-	  if (cinfo->input_iMCU_row < last_iMCU_row ||

-	      yoffset+yindex < compptr->last_row_height) {

-	    output_col = start_col;

-	    for (xindex = 0; xindex < useful_width; xindex++) {

-	      (*inverse_DCT) (cinfo, compptr,

-			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],

-			      output_ptr, output_col);

-	      output_col += compptr->DCT_h_scaled_size;

-	    }

-	  }

-	  blkn += compptr->MCU_width;

-	  output_ptr += compptr->DCT_v_scaled_size;

-	}

-      }

-    }

-    /* Completed an MCU row, but perhaps not an iMCU row */

-    coef->MCU_ctr = 0;

-  }

-  /* Completed the iMCU row, advance counters for next one */

-  cinfo->output_iMCU_row++;

-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {

-    start_iMCU_row(cinfo);

-    return JPEG_ROW_COMPLETED;

-  }

-  /* Completed the scan */

-  (*cinfo->inputctl->finish_input_pass) (cinfo);

-  return JPEG_SCAN_COMPLETED;

-}

-

-

-/*

- * Dummy consume-input routine for single-pass operation.

- */

-

-METHODDEF(int)

-dummy_consume_data (j_decompress_ptr cinfo)

-{

-  return JPEG_SUSPENDED;	/* Always indicate nothing was done */

-}

-

-

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-

-/*

- * Consume input data and store it in the full-image coefficient buffer.

- * We read as much as one fully interleaved MCU row ("iMCU" row) per call,

- * ie, v_samp_factor block rows for each component in the scan.

- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.

- */

-

-METHODDEF(int)

-consume_data (j_decompress_ptr cinfo)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION MCU_col_num;	/* index of current MCU within row */

-  int blkn, ci, xindex, yindex, yoffset;

-  JDIMENSION start_col;

-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];

-  JBLOCKROW buffer_ptr;

-  jpeg_component_info *compptr;

-

-  /* Align the virtual buffers for the components used in this scan. */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    buffer[ci] = (*cinfo->mem->access_virt_barray)

-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],

-       cinfo->input_iMCU_row * compptr->v_samp_factor,

-       (JDIMENSION) compptr->v_samp_factor, TRUE);

-    /* Note: entropy decoder expects buffer to be zeroed,

-     * but this is handled automatically by the memory manager

-     * because we requested a pre-zeroed array.

-     */

-  }

-

-  /* Loop to process one whole iMCU row */

-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;

-       yoffset++) {

-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;

-	 MCU_col_num++) {

-      /* Construct list of pointers to DCT blocks belonging to this MCU */

-      blkn = 0;			/* index of current DCT block within MCU */

-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-	compptr = cinfo->cur_comp_info[ci];

-	start_col = MCU_col_num * compptr->MCU_width;

-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {

-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;

-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {

-	    coef->MCU_buffer[blkn++] = buffer_ptr++;

-	  }

-	}

-      }

-      /* Try to fetch the MCU. */

-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {

-	/* Suspension forced; update state counters and exit */

-	coef->MCU_vert_offset = yoffset;

-	coef->MCU_ctr = MCU_col_num;

-	return JPEG_SUSPENDED;

-      }

-    }

-    /* Completed an MCU row, but perhaps not an iMCU row */

-    coef->MCU_ctr = 0;

-  }

-  /* Completed the iMCU row, advance counters for next one */

-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {

-    start_iMCU_row(cinfo);

-    return JPEG_ROW_COMPLETED;

-  }

-  /* Completed the scan */

-  (*cinfo->inputctl->finish_input_pass) (cinfo);

-  return JPEG_SCAN_COMPLETED;

-}

-

-

-/*

- * Decompress and return some data in the multi-pass case.

- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).

- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.

- *

- * NB: output_buf contains a plane for each component in image.

- */

-

-METHODDEF(int)

-decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  JDIMENSION block_num;

-  int ci, block_row, block_rows;

-  JBLOCKARRAY buffer;

-  JBLOCKROW buffer_ptr;

-  JSAMPARRAY output_ptr;

-  JDIMENSION output_col;

-  jpeg_component_info *compptr;

-  inverse_DCT_method_ptr inverse_DCT;

-

-  /* Force some input to be done if we are getting ahead of the input. */

-  while (cinfo->input_scan_number < cinfo->output_scan_number ||

-	 (cinfo->input_scan_number == cinfo->output_scan_number &&

-	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {

-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)

-      return JPEG_SUSPENDED;

-  }

-

-  /* OK, output from the virtual arrays. */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Don't bother to IDCT an uninteresting component. */

-    if (! compptr->component_needed)

-      continue;

-    /* Align the virtual buffer for this component. */

-    buffer = (*cinfo->mem->access_virt_barray)

-      ((j_common_ptr) cinfo, coef->whole_image[ci],

-       cinfo->output_iMCU_row * compptr->v_samp_factor,

-       (JDIMENSION) compptr->v_samp_factor, FALSE);

-    /* Count non-dummy DCT block rows in this iMCU row. */

-    if (cinfo->output_iMCU_row < last_iMCU_row)

-      block_rows = compptr->v_samp_factor;

-    else {

-      /* NB: can't use last_row_height here; it is input-side-dependent! */

-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);

-      if (block_rows == 0) block_rows = compptr->v_samp_factor;

-    }

-    inverse_DCT = cinfo->idct->inverse_DCT[ci];

-    output_ptr = output_buf[ci];

-    /* Loop over all DCT blocks to be processed. */

-    for (block_row = 0; block_row < block_rows; block_row++) {

-      buffer_ptr = buffer[block_row];

-      output_col = 0;

-      for (block_num = 0; block_num < compptr->width_in_blocks; block_num++) {

-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,

-			output_ptr, output_col);

-	buffer_ptr++;

-	output_col += compptr->DCT_h_scaled_size;

-      }

-      output_ptr += compptr->DCT_v_scaled_size;

-    }

-  }

-

-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)

-    return JPEG_ROW_COMPLETED;

-  return JPEG_SCAN_COMPLETED;

-}

-

-#endif /* D_MULTISCAN_FILES_SUPPORTED */

-

-

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-

-/*

- * This code applies interblock smoothing as described by section K.8

- * of the JPEG standard: the first 5 AC coefficients are estimated from

- * the DC values of a DCT block and its 8 neighboring blocks.

- * We apply smoothing only for progressive JPEG decoding, and only if

- * the coefficients it can estimate are not yet known to full precision.

- */

-

-/* Natural-order array positions of the first 5 zigzag-order coefficients */

-#define Q01_POS  1

-#define Q10_POS  8

-#define Q20_POS  16

-#define Q11_POS  9

-#define Q02_POS  2

-

-/*

- * Determine whether block smoothing is applicable and safe.

- * We also latch the current states of the coef_bits[] entries for the

- * AC coefficients; otherwise, if the input side of the decompressor

- * advances into a new scan, we might think the coefficients are known

- * more accurately than they really are.

- */

-

-LOCAL(boolean)

-smoothing_ok (j_decompress_ptr cinfo)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  boolean smoothing_useful = FALSE;

-  int ci, coefi;

-  jpeg_component_info *compptr;

-  JQUANT_TBL * qtable;

-  int * coef_bits;

-  int * coef_bits_latch;

-

-  if (! cinfo->progressive_mode || cinfo->coef_bits == NULL)

-    return FALSE;

-

-  /* Allocate latch area if not already done */

-  if (coef->coef_bits_latch == NULL)

-    coef->coef_bits_latch = (int *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  cinfo->num_components *

-				  (SAVED_COEFS * SIZEOF(int)));

-  coef_bits_latch = coef->coef_bits_latch;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* All components' quantization values must already be latched. */

-    if ((qtable = compptr->quant_table) == NULL)

-      return FALSE;

-    /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */

-    if (qtable->quantval[0] == 0 ||

-	qtable->quantval[Q01_POS] == 0 ||

-	qtable->quantval[Q10_POS] == 0 ||

-	qtable->quantval[Q20_POS] == 0 ||

-	qtable->quantval[Q11_POS] == 0 ||

-	qtable->quantval[Q02_POS] == 0)

-      return FALSE;

-    /* DC values must be at least partly known for all components. */

-    coef_bits = cinfo->coef_bits[ci];

-    if (coef_bits[0] < 0)

-      return FALSE;

-    /* Block smoothing is helpful if some AC coefficients remain inaccurate. */

-    for (coefi = 1; coefi <= 5; coefi++) {

-      coef_bits_latch[coefi] = coef_bits[coefi];

-      if (coef_bits[coefi] != 0)

-	smoothing_useful = TRUE;

-    }

-    coef_bits_latch += SAVED_COEFS;

-  }

-

-  return smoothing_useful;

-}

-

-

-/*

- * Variant of decompress_data for use when doing block smoothing.

- */

-

-METHODDEF(int)

-decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)

-{

-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;

-  JDIMENSION block_num, last_block_column;

-  int ci, block_row, block_rows, access_rows;

-  JBLOCKARRAY buffer;

-  JBLOCKROW buffer_ptr, prev_block_row, next_block_row;

-  JSAMPARRAY output_ptr;

-  JDIMENSION output_col;

-  jpeg_component_info *compptr;

-  inverse_DCT_method_ptr inverse_DCT;

-  boolean first_row, last_row;

-  JBLOCK workspace;

-  int *coef_bits;

-  JQUANT_TBL *quanttbl;

-  INT32 Q00,Q01,Q02,Q10,Q11,Q20, num;

-  int DC1,DC2,DC3,DC4,DC5,DC6,DC7,DC8,DC9;

-  int Al, pred;

-

-  /* Force some input to be done if we are getting ahead of the input. */

-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&

-	 ! cinfo->inputctl->eoi_reached) {

-    if (cinfo->input_scan_number == cinfo->output_scan_number) {

-      /* If input is working on current scan, we ordinarily want it to

-       * have completed the current row.  But if input scan is DC,

-       * we want it to keep one row ahead so that next block row's DC

-       * values are up to date.

-       */

-      JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;

-      if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)

-	break;

-    }

-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)

-      return JPEG_SUSPENDED;

-  }

-

-  /* OK, output from the virtual arrays. */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Don't bother to IDCT an uninteresting component. */

-    if (! compptr->component_needed)

-      continue;

-    /* Count non-dummy DCT block rows in this iMCU row. */

-    if (cinfo->output_iMCU_row < last_iMCU_row) {

-      block_rows = compptr->v_samp_factor;

-      access_rows = block_rows * 2; /* this and next iMCU row */

-      last_row = FALSE;

-    } else {

-      /* NB: can't use last_row_height here; it is input-side-dependent! */

-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);

-      if (block_rows == 0) block_rows = compptr->v_samp_factor;

-      access_rows = block_rows; /* this iMCU row only */

-      last_row = TRUE;

-    }

-    /* Align the virtual buffer for this component. */

-    if (cinfo->output_iMCU_row > 0) {

-      access_rows += compptr->v_samp_factor; /* prior iMCU row too */

-      buffer = (*cinfo->mem->access_virt_barray)

-	((j_common_ptr) cinfo, coef->whole_image[ci],

-	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,

-	 (JDIMENSION) access_rows, FALSE);

-      buffer += compptr->v_samp_factor;	/* point to current iMCU row */

-      first_row = FALSE;

-    } else {

-      buffer = (*cinfo->mem->access_virt_barray)

-	((j_common_ptr) cinfo, coef->whole_image[ci],

-	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);

-      first_row = TRUE;

-    }

-    /* Fetch component-dependent info */

-    coef_bits = coef->coef_bits_latch + (ci * SAVED_COEFS);

-    quanttbl = compptr->quant_table;

-    Q00 = quanttbl->quantval[0];

-    Q01 = quanttbl->quantval[Q01_POS];

-    Q10 = quanttbl->quantval[Q10_POS];

-    Q20 = quanttbl->quantval[Q20_POS];

-    Q11 = quanttbl->quantval[Q11_POS];

-    Q02 = quanttbl->quantval[Q02_POS];

-    inverse_DCT = cinfo->idct->inverse_DCT[ci];

-    output_ptr = output_buf[ci];

-    /* Loop over all DCT blocks to be processed. */

-    for (block_row = 0; block_row < block_rows; block_row++) {

-      buffer_ptr = buffer[block_row];

-      if (first_row && block_row == 0)

-	prev_block_row = buffer_ptr;

-      else

-	prev_block_row = buffer[block_row-1];

-      if (last_row && block_row == block_rows-1)

-	next_block_row = buffer_ptr;

-      else

-	next_block_row = buffer[block_row+1];

-      /* We fetch the surrounding DC values using a sliding-register approach.

-       * Initialize all nine here so as to do the right thing on narrow pics.

-       */

-      DC1 = DC2 = DC3 = (int) prev_block_row[0][0];

-      DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];

-      DC7 = DC8 = DC9 = (int) next_block_row[0][0];

-      output_col = 0;

-      last_block_column = compptr->width_in_blocks - 1;

-      for (block_num = 0; block_num <= last_block_column; block_num++) {

-	/* Fetch current DCT block into workspace so we can modify it. */

-	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);

-	/* Update DC values */

-	if (block_num < last_block_column) {

-	  DC3 = (int) prev_block_row[1][0];

-	  DC6 = (int) buffer_ptr[1][0];

-	  DC9 = (int) next_block_row[1][0];

-	}

-	/* Compute coefficient estimates per K.8.

-	 * An estimate is applied only if coefficient is still zero,

-	 * and is not known to be fully accurate.

-	 */

-	/* AC01 */

-	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {

-	  num = 36 * Q00 * (DC4 - DC6);

-	  if (num >= 0) {

-	    pred = (int) (((Q01<<7) + num) / (Q01<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	  } else {

-	    pred = (int) (((Q01<<7) - num) / (Q01<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	    pred = -pred;

-	  }

-	  workspace[1] = (JCOEF) pred;

-	}

-	/* AC10 */

-	if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {

-	  num = 36 * Q00 * (DC2 - DC8);

-	  if (num >= 0) {

-	    pred = (int) (((Q10<<7) + num) / (Q10<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	  } else {

-	    pred = (int) (((Q10<<7) - num) / (Q10<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	    pred = -pred;

-	  }

-	  workspace[8] = (JCOEF) pred;

-	}

-	/* AC20 */

-	if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {

-	  num = 9 * Q00 * (DC2 + DC8 - 2*DC5);

-	  if (num >= 0) {

-	    pred = (int) (((Q20<<7) + num) / (Q20<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	  } else {

-	    pred = (int) (((Q20<<7) - num) / (Q20<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	    pred = -pred;

-	  }

-	  workspace[16] = (JCOEF) pred;

-	}

-	/* AC11 */

-	if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {

-	  num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);

-	  if (num >= 0) {

-	    pred = (int) (((Q11<<7) + num) / (Q11<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	  } else {

-	    pred = (int) (((Q11<<7) - num) / (Q11<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	    pred = -pred;

-	  }

-	  workspace[9] = (JCOEF) pred;

-	}

-	/* AC02 */

-	if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {

-	  num = 9 * Q00 * (DC4 + DC6 - 2*DC5);

-	  if (num >= 0) {

-	    pred = (int) (((Q02<<7) + num) / (Q02<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	  } else {

-	    pred = (int) (((Q02<<7) - num) / (Q02<<8));

-	    if (Al > 0 && pred >= (1<<Al))

-	      pred = (1<<Al)-1;

-	    pred = -pred;

-	  }

-	  workspace[2] = (JCOEF) pred;

-	}

-	/* OK, do the IDCT */

-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,

-			output_ptr, output_col);

-	/* Advance for next column */

-	DC1 = DC2; DC2 = DC3;

-	DC4 = DC5; DC5 = DC6;

-	DC7 = DC8; DC8 = DC9;

-	buffer_ptr++, prev_block_row++, next_block_row++;

-	output_col += compptr->DCT_h_scaled_size;

-      }

-      output_ptr += compptr->DCT_v_scaled_size;

-    }

-  }

-

-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)

-    return JPEG_ROW_COMPLETED;

-  return JPEG_SCAN_COMPLETED;

-}

-

-#endif /* BLOCK_SMOOTHING_SUPPORTED */

-

-

-/*

- * Initialize coefficient buffer controller.

- */

-

-GLOBAL(void)

-jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)

-{

-  my_coef_ptr coef;

-

-  coef = (my_coef_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_coef_controller));

-  cinfo->coef = (struct jpeg_d_coef_controller *) coef;

-  coef->pub.start_input_pass = start_input_pass;

-  coef->pub.start_output_pass = start_output_pass;

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-  coef->coef_bits_latch = NULL;

-#endif

-

-  /* Create the coefficient buffer. */

-  if (need_full_buffer) {

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-    /* Allocate a full-image virtual array for each component, */

-    /* padded to a multiple of samp_factor DCT blocks in each direction. */

-    /* Note we ask for a pre-zeroed array. */

-    int ci, access_rows;

-    jpeg_component_info *compptr;

-

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      access_rows = compptr->v_samp_factor;

-#ifdef BLOCK_SMOOTHING_SUPPORTED

-      /* If block smoothing could be used, need a bigger window */

-      if (cinfo->progressive_mode)

-	access_rows *= 3;

-#endif

-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,

-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,

-				(long) compptr->h_samp_factor),

-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,

-				(long) compptr->v_samp_factor),

-	 (JDIMENSION) access_rows);

-    }

-    coef->pub.consume_data = consume_data;

-    coef->pub.decompress_data = decompress_data;

-    coef->pub.coef_arrays = coef->whole_image; /* link to virtual arrays */

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-  } else {

-    /* We only need a single-MCU buffer. */

-    JBLOCKROW buffer;

-    int i;

-

-    buffer = (JBLOCKROW)

-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));

-    for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {

-      coef->MCU_buffer[i] = buffer + i;

-    }

-    if (cinfo->lim_Se == 0)	/* DC only case: want to bypass later */

-      FMEMZERO((void FAR *) buffer,

-	       (size_t) (D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK)));

-    coef->pub.consume_data = dummy_consume_data;

-    coef->pub.decompress_data = decompress_onepass;

-    coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdcolor.c b/plugins/AdvaImg/src/LibJPEG/jdcolor.c
deleted file mode 100644
index 92d3c1a584..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdcolor.c
+++ /dev/null
@@ -1,725 +0,0 @@
-/*

- * jdcolor.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2011-2015 by Guido Vollbeding.

- * 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 output colorspace conversion routines.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_color_deconverter pub; /* public fields */

-

-  /* Private state for YCbCr->RGB and BG_YCC->RGB conversion */

-  int * Cr_r_tab;		/* => table for Cr to R conversion */

-  int * Cb_b_tab;		/* => table for Cb to B conversion */

-  INT32 * Cr_g_tab;		/* => table for Cr to G conversion */

-  INT32 * Cb_g_tab;		/* => table for Cb to G conversion */

-

-  /* Private state for RGB->Y conversion */

-  INT32 * rgb_y_tab;		/* => table for RGB to Y conversion */

-} my_color_deconverter;

-

-typedef my_color_deconverter * my_cconvert_ptr;

-

-

-/***************  YCbCr -> RGB conversion: most common case **************/

-/*************** BG_YCC -> RGB conversion: less common case **************/

-/***************    RGB -> Y   conversion: less common case **************/

-

-/*

- * YCbCr is defined per Recommendation ITU-R BT.601-7 (03/2011),

- * previously known as Recommendation CCIR 601-1, except that Cb and Cr

- * are normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.

- * sRGB (standard RGB color space) is defined per IEC 61966-2-1:1999.

- * sYCC (standard luma-chroma-chroma color space with extended gamut)

- * is defined per IEC 61966-2-1:1999 Amendment A1:2003 Annex F.

- * bg-sRGB and bg-sYCC (big gamut standard color spaces)

- * are defined per IEC 61966-2-1:1999 Amendment A1:2003 Annex G.

- * Note that the derived conversion coefficients given in some of these

- * documents are imprecise.  The general conversion equations are

- *

- *	R = Y + K * (1 - Kr) * Cr

- *	G = Y - K * (Kb * (1 - Kb) * Cb + Kr * (1 - Kr) * Cr) / (1 - Kr - Kb)

- *	B = Y + K * (1 - Kb) * Cb

- *

- *	Y = Kr * R + (1 - Kr - Kb) * G + Kb * B

- *

- * With Kr = 0.299 and Kb = 0.114 (derived according to SMPTE RP 177-1993

- * from the 1953 FCC NTSC primaries and CIE Illuminant C), K = 2 for sYCC,

- * the conversion equations to be implemented are therefore

- *

- *	R = Y + 1.402 * Cr

- *	G = Y - 0.344136286 * Cb - 0.714136286 * Cr

- *	B = Y + 1.772 * Cb

- *

- *	Y = 0.299 * R + 0.587 * G + 0.114 * B

- *

- * where Cb and Cr represent the incoming values less CENTERJSAMPLE.

- * For bg-sYCC, with K = 4, the equations are

- *

- *	R = Y + 2.804 * Cr

- *	G = Y - 0.688272572 * Cb - 1.428272572 * Cr

- *	B = Y + 3.544 * Cb

- *

- * To avoid floating-point arithmetic, we represent the fractional constants

- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide

- * the products by 2^16, with appropriate rounding, to get the correct answer.

- * Notice that Y, being an integral input, does not contribute any fraction

- * so it need not participate in the rounding.

- *

- * For even more speed, we avoid doing any multiplications in the inner loop

- * by precalculating the constants times Cb and Cr for all possible values.

- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);

- * for 9-bit to 12-bit samples it is still acceptable.  It's not very

- * reasonable for 16-bit samples, but if you want lossless storage you

- * shouldn't be changing colorspace anyway.

- * The Cr=>R and Cb=>B values can be rounded to integers in advance; the

- * values for the G calculation are left scaled up, since we must add them

- * together before rounding.

- */

-

-#define SCALEBITS	16	/* speediest right-shift on some machines */

-#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))

-#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))

-

-/* We allocate one big table for RGB->Y conversion and divide it up into

- * three parts, instead of doing three alloc_small requests.  This lets us

- * use a single table base address, which can be held in a register in the

- * inner loops on many machines (more than can hold all three addresses,

- * anyway).

- */

-

-#define R_Y_OFF		0			/* offset to R => Y section */

-#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */

-#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */

-#define TABLE_SIZE	(3*(MAXJSAMPLE+1))

-

-

-/*

- * Initialize tables for YCbCr->RGB and BG_YCC->RGB colorspace conversion.

- */

-

-LOCAL(void)

-build_ycc_rgb_table (j_decompress_ptr cinfo)

-/* Normal case, sYCC */

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  int i;

-  INT32 x;

-  SHIFT_TEMPS

-

-  cconvert->Cr_r_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  cconvert->Cb_b_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  cconvert->Cr_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-  cconvert->Cb_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-

-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {

-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */

-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */

-    /* Cr=>R value is nearest int to 1.402 * x */

-    cconvert->Cr_r_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(1.402) * x + ONE_HALF, SCALEBITS);

-    /* Cb=>B value is nearest int to 1.772 * x */

-    cconvert->Cb_b_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(1.772) * x + ONE_HALF, SCALEBITS);

-    /* Cr=>G value is scaled-up -0.714136286 * x */

-    cconvert->Cr_g_tab[i] = (- FIX(0.714136286)) * x;

-    /* Cb=>G value is scaled-up -0.344136286 * x */

-    /* We also add in ONE_HALF so that need not do it in inner loop */

-    cconvert->Cb_g_tab[i] = (- FIX(0.344136286)) * x + ONE_HALF;

-  }

-}

-

-

-LOCAL(void)

-build_bg_ycc_rgb_table (j_decompress_ptr cinfo)

-/* Wide gamut case, bg-sYCC */

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  int i;

-  INT32 x;

-  SHIFT_TEMPS

-

-  cconvert->Cr_r_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  cconvert->Cb_b_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  cconvert->Cr_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-  cconvert->Cb_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-

-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {

-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */

-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */

-    /* Cr=>R value is nearest int to 2.804 * x */

-    cconvert->Cr_r_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(2.804) * x + ONE_HALF, SCALEBITS);

-    /* Cb=>B value is nearest int to 3.544 * x */

-    cconvert->Cb_b_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(3.544) * x + ONE_HALF, SCALEBITS);

-    /* Cr=>G value is scaled-up -1.428272572 * x */

-    cconvert->Cr_g_tab[i] = (- FIX(1.428272572)) * x;

-    /* Cb=>G value is scaled-up -0.688272572 * x */

-    /* We also add in ONE_HALF so that need not do it in inner loop */

-    cconvert->Cb_g_tab[i] = (- FIX(0.688272572)) * x + ONE_HALF;

-  }

-}

-

-

-/*

- * Convert some rows of samples to the output colorspace.

- *

- * Note that we change from noninterleaved, one-plane-per-component format

- * to interleaved-pixel format.  The output buffer is therefore three times

- * as wide as the input buffer.

- * A starting row offset is provided only for the input buffer.  The caller

- * can easily adjust the passed output_buf value to accommodate any row

- * offset required on that side.

- */

-

-METHODDEF(void)

-ycc_rgb_convert (j_decompress_ptr cinfo,

-		 JSAMPIMAGE input_buf, JDIMENSION input_row,

-		 JSAMPARRAY output_buf, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register int y, cb, cr;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-  /* copy these pointers into registers if possible */

-  register JSAMPLE * range_limit = cinfo->sample_range_limit;

-  register int * Crrtab = cconvert->Cr_r_tab;

-  register int * Cbbtab = cconvert->Cb_b_tab;

-  register INT32 * Crgtab = cconvert->Cr_g_tab;

-  register INT32 * Cbgtab = cconvert->Cb_g_tab;

-  SHIFT_TEMPS

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      y  = GETJSAMPLE(inptr0[col]);

-      cb = GETJSAMPLE(inptr1[col]);

-      cr = GETJSAMPLE(inptr2[col]);

-      /* Range-limiting is essential due to noise introduced by DCT losses,

-       * for extended gamut (sYCC) and wide gamut (bg-sYCC) encodings.

-       */

-      outptr[RGB_RED]   = range_limit[y + Crrtab[cr]];

-      outptr[RGB_GREEN] = range_limit[y +

-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],

-						 SCALEBITS))];

-      outptr[RGB_BLUE]  = range_limit[y + Cbbtab[cb]];

-      outptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/**************** Cases other than YCC -> RGB ****************/

-

-

-/*

- * Initialize for RGB->grayscale colorspace conversion.

- */

-

-LOCAL(void)

-build_rgb_y_table (j_decompress_ptr cinfo)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  INT32 * rgb_y_tab;

-  INT32 i;

-

-  /* Allocate and fill in the conversion tables. */

-  cconvert->rgb_y_tab = rgb_y_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(TABLE_SIZE * SIZEOF(INT32)));

-

-  for (i = 0; i <= MAXJSAMPLE; i++) {

-    rgb_y_tab[i+R_Y_OFF] = FIX(0.299) * i;

-    rgb_y_tab[i+G_Y_OFF] = FIX(0.587) * i;

-    rgb_y_tab[i+B_Y_OFF] = FIX(0.114) * i + ONE_HALF;

-  }

-}

-

-

-/*

- * Convert RGB to grayscale.

- */

-

-METHODDEF(void)

-rgb_gray_convert (j_decompress_ptr cinfo,

-		  JSAMPIMAGE input_buf, JDIMENSION input_row,

-		  JSAMPARRAY output_buf, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register INT32 * ctab = cconvert->rgb_y_tab;

-  register int r, g, b;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr0[col]);

-      g = GETJSAMPLE(inptr1[col]);

-      b = GETJSAMPLE(inptr2[col]);

-      /* Y */

-      outptr[col] = (JSAMPLE)

-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])

-		 >> SCALEBITS);

-    }

-  }

-}

-

-

-/*

- * [R-G,G,B-G] to [R,G,B] conversion with modulo calculation

- * (inverse color transform).

- * This can be seen as an adaption of the general YCbCr->RGB

- * conversion equation with Kr = Kb = 0, while replacing the

- * normalization by modulo calculation.

- */

-

-METHODDEF(void)

-rgb1_rgb_convert (j_decompress_ptr cinfo,

-		  JSAMPIMAGE input_buf, JDIMENSION input_row,

-		  JSAMPARRAY output_buf, int num_rows)

-{

-  register int r, g, b;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr0[col]);

-      g = GETJSAMPLE(inptr1[col]);

-      b = GETJSAMPLE(inptr2[col]);

-      /* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD

-       * (modulo) operator is equivalent to the bitmask operator AND.

-       */

-      outptr[RGB_RED]   = (JSAMPLE) ((r + g - CENTERJSAMPLE) & MAXJSAMPLE);

-      outptr[RGB_GREEN] = (JSAMPLE) g;

-      outptr[RGB_BLUE]  = (JSAMPLE) ((b + g - CENTERJSAMPLE) & MAXJSAMPLE);

-      outptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * [R-G,G,B-G] to grayscale conversion with modulo calculation

- * (inverse color transform).

- */

-

-METHODDEF(void)

-rgb1_gray_convert (j_decompress_ptr cinfo,

-		   JSAMPIMAGE input_buf, JDIMENSION input_row,

-		   JSAMPARRAY output_buf, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register INT32 * ctab = cconvert->rgb_y_tab;

-  register int r, g, b;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      r = GETJSAMPLE(inptr0[col]);

-      g = GETJSAMPLE(inptr1[col]);

-      b = GETJSAMPLE(inptr2[col]);

-      /* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD

-       * (modulo) operator is equivalent to the bitmask operator AND.

-       */

-      r = (r + g - CENTERJSAMPLE) & MAXJSAMPLE;

-      b = (b + g - CENTERJSAMPLE) & MAXJSAMPLE;

-      /* Y */

-      outptr[col] = (JSAMPLE)

-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])

-		 >> SCALEBITS);

-    }

-  }

-}

-

-

-/*

- * No colorspace change, but conversion from separate-planes

- * to interleaved representation.

- */

-

-METHODDEF(void)

-rgb_convert (j_decompress_ptr cinfo,

-	     JSAMPIMAGE input_buf, JDIMENSION input_row,

-	     JSAMPARRAY output_buf, int num_rows)

-{

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      /* We can dispense with GETJSAMPLE() here */

-      outptr[RGB_RED]   = inptr0[col];

-      outptr[RGB_GREEN] = inptr1[col];

-      outptr[RGB_BLUE]  = inptr2[col];

-      outptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * Color conversion for no colorspace change: just copy the data,

- * converting from separate-planes to interleaved representation.

- */

-

-METHODDEF(void)

-null_convert (j_decompress_ptr cinfo,

-	      JSAMPIMAGE input_buf, JDIMENSION input_row,

-	      JSAMPARRAY output_buf, int num_rows)

-{

-  int ci;

-  register int nc = cinfo->num_components;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    for (ci = 0; ci < nc; ci++) {

-      inptr = input_buf[ci][input_row];

-      outptr = output_buf[0] + ci;

-      for (col = 0; col < num_cols; col++) {

-	*outptr = *inptr++;	/* needn't bother with GETJSAMPLE() here */

-	outptr += nc;

-      }

-    }

-    input_row++;

-    output_buf++;

-  }

-}

-

-

-/*

- * Color conversion for grayscale: just copy the data.

- * This also works for YCC -> grayscale conversion, in which

- * we just copy the Y (luminance) component and ignore chrominance.

- */

-

-METHODDEF(void)

-grayscale_convert (j_decompress_ptr cinfo,

-		   JSAMPIMAGE input_buf, JDIMENSION input_row,

-		   JSAMPARRAY output_buf, int num_rows)

-{

-  jcopy_sample_rows(input_buf[0], (int) input_row, output_buf, 0,

-		    num_rows, cinfo->output_width);

-}

-

-

-/*

- * Convert grayscale to RGB: just duplicate the graylevel three times.

- * This is provided to support applications that don't want to cope

- * with grayscale as a separate case.

- */

-

-METHODDEF(void)

-gray_rgb_convert (j_decompress_ptr cinfo,

-		  JSAMPIMAGE input_buf, JDIMENSION input_row,

-		  JSAMPARRAY output_buf, int num_rows)

-{

-  register JSAMPROW outptr;

-  register JSAMPROW inptr;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-

-  while (--num_rows >= 0) {

-    inptr = input_buf[0][input_row++];

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      /* We can dispense with GETJSAMPLE() here */

-      outptr[RGB_RED] = outptr[RGB_GREEN] = outptr[RGB_BLUE] = inptr[col];

-      outptr += RGB_PIXELSIZE;

-    }

-  }

-}

-

-

-/*

- * Adobe-style YCCK->CMYK conversion.

- * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same

- * conversion as above, while passing K (black) unchanged.

- * We assume build_ycc_rgb_table has been called.

- */

-

-METHODDEF(void)

-ycck_cmyk_convert (j_decompress_ptr cinfo,

-		   JSAMPIMAGE input_buf, JDIMENSION input_row,

-		   JSAMPARRAY output_buf, int num_rows)

-{

-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  register int y, cb, cr;

-  register JSAMPROW outptr;

-  register JSAMPROW inptr0, inptr1, inptr2, inptr3;

-  register JDIMENSION col;

-  JDIMENSION num_cols = cinfo->output_width;

-  /* copy these pointers into registers if possible */

-  register JSAMPLE * range_limit = cinfo->sample_range_limit;

-  register int * Crrtab = cconvert->Cr_r_tab;

-  register int * Cbbtab = cconvert->Cb_b_tab;

-  register INT32 * Crgtab = cconvert->Cr_g_tab;

-  register INT32 * Cbgtab = cconvert->Cb_g_tab;

-  SHIFT_TEMPS

-

-  while (--num_rows >= 0) {

-    inptr0 = input_buf[0][input_row];

-    inptr1 = input_buf[1][input_row];

-    inptr2 = input_buf[2][input_row];

-    inptr3 = input_buf[3][input_row];

-    input_row++;

-    outptr = *output_buf++;

-    for (col = 0; col < num_cols; col++) {

-      y  = GETJSAMPLE(inptr0[col]);

-      cb = GETJSAMPLE(inptr1[col]);

-      cr = GETJSAMPLE(inptr2[col]);

-      /* Range-limiting is essential due to noise introduced by DCT losses,

-       * and for extended gamut encodings (sYCC).

-       */

-      outptr[0] = range_limit[MAXJSAMPLE - (y + Crrtab[cr])];	/* red */

-      outptr[1] = range_limit[MAXJSAMPLE - (y +			/* green */

-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],

-						 SCALEBITS)))];

-      outptr[2] = range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];	/* blue */

-      /* K passes through unchanged */

-      outptr[3] = inptr3[col];	/* don't need GETJSAMPLE here */

-      outptr += 4;

-    }

-  }

-}

-

-

-/*

- * Empty method for start_pass.

- */

-

-METHODDEF(void)

-start_pass_dcolor (j_decompress_ptr cinfo)

-{

-  /* no work needed */

-}

-

-

-/*

- * Module initialization routine for output colorspace conversion.

- */

-

-GLOBAL(void)

-jinit_color_deconverter (j_decompress_ptr cinfo)

-{

-  my_cconvert_ptr cconvert;

-  int ci;

-

-  cconvert = (my_cconvert_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_color_deconverter));

-  cinfo->cconvert = &cconvert->pub;

-  cconvert->pub.start_pass = start_pass_dcolor;

-

-  /* Make sure num_components agrees with jpeg_color_space */

-  switch (cinfo->jpeg_color_space) {

-  case JCS_GRAYSCALE:

-    if (cinfo->num_components != 1)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    break;

-

-  case JCS_RGB:

-  case JCS_YCbCr:

-  case JCS_BG_RGB:

-  case JCS_BG_YCC:

-    if (cinfo->num_components != 3)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    break;

-

-  case JCS_CMYK:

-  case JCS_YCCK:

-    if (cinfo->num_components != 4)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    break;

-

-  default:			/* JCS_UNKNOWN can be anything */

-    if (cinfo->num_components < 1)

-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);

-    break;

-  }

-

-  /* Support color transform only for RGB colorspaces */

-  if (cinfo->color_transform &&

-      cinfo->jpeg_color_space != JCS_RGB &&

-      cinfo->jpeg_color_space != JCS_BG_RGB)

-    ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-

-  /* Set out_color_components and conversion method based on requested space.

-   * Also clear the component_needed flags for any unused components,

-   * so that earlier pipeline stages can avoid useless computation.

-   */

-

-  switch (cinfo->out_color_space) {

-  case JCS_GRAYSCALE:

-    cinfo->out_color_components = 1;

-    switch (cinfo->jpeg_color_space) {

-    case JCS_GRAYSCALE:

-    case JCS_YCbCr:

-    case JCS_BG_YCC:

-      cconvert->pub.color_convert = grayscale_convert;

-      /* For color->grayscale conversion, only the Y (0) component is needed */

-      for (ci = 1; ci < cinfo->num_components; ci++)

-	cinfo->comp_info[ci].component_needed = FALSE;

-      break;

-    case JCS_RGB:

-      switch (cinfo->color_transform) {

-      case JCT_NONE:

-	cconvert->pub.color_convert = rgb_gray_convert;

-	break;

-      case JCT_SUBTRACT_GREEN:

-	cconvert->pub.color_convert = rgb1_gray_convert;

-	break;

-      default:

-	ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-      }

-      build_rgb_y_table(cinfo);

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  case JCS_RGB:

-    cinfo->out_color_components = RGB_PIXELSIZE;

-    switch (cinfo->jpeg_color_space) {

-    case JCS_GRAYSCALE:

-      cconvert->pub.color_convert = gray_rgb_convert;

-      break;

-    case JCS_YCbCr:

-      cconvert->pub.color_convert = ycc_rgb_convert;

-      build_ycc_rgb_table(cinfo);

-      break;

-    case JCS_BG_YCC:

-      cconvert->pub.color_convert = ycc_rgb_convert;

-      build_bg_ycc_rgb_table(cinfo);

-      break;

-    case JCS_RGB:

-      switch (cinfo->color_transform) {

-      case JCT_NONE:

-	cconvert->pub.color_convert = rgb_convert;

-	break;

-      case JCT_SUBTRACT_GREEN:

-	cconvert->pub.color_convert = rgb1_rgb_convert;

-	break;

-      default:

-	ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-      }

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  case JCS_BG_RGB:

-    cinfo->out_color_components = RGB_PIXELSIZE;

-    if (cinfo->jpeg_color_space == JCS_BG_RGB) {

-      switch (cinfo->color_transform) {

-      case JCT_NONE:

-	cconvert->pub.color_convert = rgb_convert;

-	break;

-      case JCT_SUBTRACT_GREEN:

-	cconvert->pub.color_convert = rgb1_rgb_convert;

-	break;

-      default:

-	ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-      }

-    } else

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    break;

-

-  case JCS_CMYK:

-    cinfo->out_color_components = 4;

-    switch (cinfo->jpeg_color_space) {

-    case JCS_YCCK:

-      cconvert->pub.color_convert = ycck_cmyk_convert;

-      build_ycc_rgb_table(cinfo);

-      break;

-    case JCS_CMYK:

-      cconvert->pub.color_convert = null_convert;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    }

-    break;

-

-  default:

-    /* Permit null conversion to same output space */

-    if (cinfo->out_color_space == cinfo->jpeg_color_space) {

-      cinfo->out_color_components = cinfo->num_components;

-      cconvert->pub.color_convert = null_convert;

-    } else			/* unsupported non-null conversion */

-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-    break;

-  }

-

-  if (cinfo->quantize_colors)

-    cinfo->output_components = 1; /* single colormapped output component */

-  else

-    cinfo->output_components = cinfo->out_color_components;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdct.h b/plugins/AdvaImg/src/LibJPEG/jdct.h
deleted file mode 100644
index 5f631f42e2..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdct.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*

- * jdct.h

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2002-2015 by Guido Vollbeding.

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

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

- *

- * This include file contains common declarations for the forward and

- * inverse DCT modules.  These declarations are private to the DCT managers

- * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms.

- * The individual DCT algorithms are kept in separate files to ease 

- * machine-dependent tuning (e.g., assembly coding).

- */

-

-

-/*

- * A forward DCT routine is given a pointer to an input sample array and

- * a pointer to a work area of type DCTELEM[]; the DCT is to be performed

- * in-place in that buffer.  Type DCTELEM is int for 8-bit samples, INT32

- * for 12-bit samples.  (NOTE: Floating-point DCT implementations use an

- * array of type FAST_FLOAT, instead.)

- * The input data is to be fetched from the sample array starting at a

- * specified column.  (Any row offset needed will be applied to the array

- * pointer before it is passed to the FDCT code.)

- * Note that the number of samples fetched by the FDCT routine is

- * DCT_h_scaled_size * DCT_v_scaled_size.

- * The DCT outputs are returned scaled up by a factor of 8; they therefore

- * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This

- * convention improves accuracy in integer implementations and saves some

- * work in floating-point ones.

- * Quantization of the output coefficients is done by jcdctmgr.c.

- */

-

-#if BITS_IN_JSAMPLE == 8

-typedef int DCTELEM;		/* 16 or 32 bits is fine */

-#else

-typedef INT32 DCTELEM;		/* must have 32 bits */

-#endif

-

-typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data,

-					       JSAMPARRAY sample_data,

-					       JDIMENSION start_col));

-typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data,

-					     JSAMPARRAY sample_data,

-					     JDIMENSION start_col));

-

-

-/*

- * An inverse DCT routine is given a pointer to the input JBLOCK and a pointer

- * to an output sample array.  The routine must dequantize the input data as

- * well as perform the IDCT; for dequantization, it uses the multiplier table

- * pointed to by compptr->dct_table.  The output data is to be placed into the

- * sample array starting at a specified column.  (Any row offset needed will

- * be applied to the array pointer before it is passed to the IDCT code.)

- * Note that the number of samples emitted by the IDCT routine is

- * DCT_h_scaled_size * DCT_v_scaled_size.

- */

-

-/* typedef inverse_DCT_method_ptr is declared in jpegint.h */

-

-/*

- * Each IDCT routine has its own ideas about the best dct_table element type.

- */

-

-typedef MULTIPLIER ISLOW_MULT_TYPE; /* short or int, whichever is faster */

-#if BITS_IN_JSAMPLE == 8

-typedef MULTIPLIER IFAST_MULT_TYPE; /* 16 bits is OK, use short if faster */

-#define IFAST_SCALE_BITS  2	/* fractional bits in scale factors */

-#else

-typedef INT32 IFAST_MULT_TYPE;	/* need 32 bits for scaled quantizers */

-#define IFAST_SCALE_BITS  13	/* fractional bits in scale factors */

-#endif

-typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */

-

-

-/*

- * Each IDCT routine is responsible for range-limiting its results and

- * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could

- * be quite far out of range if the input data is corrupt, so a bulletproof

- * range-limiting step is required.  We use a mask-and-table-lookup method

- * to do the combined operations quickly, assuming that MAXJSAMPLE+1

- * is a power of 2.  See the comments with prepare_range_limit_table

- * (in jdmaster.c) for more info.

- */

-

-#define RANGE_MASK  (MAXJSAMPLE * 4 + 3) /* 2 bits wider than legal samples */

-#define RANGE_CENTER  (MAXJSAMPLE * 2 + 2)

-#define RANGE_SUBSET  (RANGE_CENTER - CENTERJSAMPLE)

-

-#define IDCT_range_limit(cinfo)  ((cinfo)->sample_range_limit - RANGE_SUBSET)

-

-

-/* Short forms of external names for systems with brain-damaged linkers. */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jpeg_fdct_islow		jFDislow

-#define jpeg_fdct_ifast		jFDifast

-#define jpeg_fdct_float		jFDfloat

-#define jpeg_fdct_7x7		jFD7x7

-#define jpeg_fdct_6x6		jFD6x6

-#define jpeg_fdct_5x5		jFD5x5

-#define jpeg_fdct_4x4		jFD4x4

-#define jpeg_fdct_3x3		jFD3x3

-#define jpeg_fdct_2x2		jFD2x2

-#define jpeg_fdct_1x1		jFD1x1

-#define jpeg_fdct_9x9		jFD9x9

-#define jpeg_fdct_10x10		jFD10x10

-#define jpeg_fdct_11x11		jFD11x11

-#define jpeg_fdct_12x12		jFD12x12

-#define jpeg_fdct_13x13		jFD13x13

-#define jpeg_fdct_14x14		jFD14x14

-#define jpeg_fdct_15x15		jFD15x15

-#define jpeg_fdct_16x16		jFD16x16

-#define jpeg_fdct_16x8		jFD16x8

-#define jpeg_fdct_14x7		jFD14x7

-#define jpeg_fdct_12x6		jFD12x6

-#define jpeg_fdct_10x5		jFD10x5

-#define jpeg_fdct_8x4		jFD8x4

-#define jpeg_fdct_6x3		jFD6x3

-#define jpeg_fdct_4x2		jFD4x2

-#define jpeg_fdct_2x1		jFD2x1

-#define jpeg_fdct_8x16		jFD8x16

-#define jpeg_fdct_7x14		jFD7x14

-#define jpeg_fdct_6x12		jFD6x12

-#define jpeg_fdct_5x10		jFD5x10

-#define jpeg_fdct_4x8		jFD4x8

-#define jpeg_fdct_3x6		jFD3x6

-#define jpeg_fdct_2x4		jFD2x4

-#define jpeg_fdct_1x2		jFD1x2

-#define jpeg_idct_islow		jRDislow

-#define jpeg_idct_ifast		jRDifast

-#define jpeg_idct_float		jRDfloat

-#define jpeg_idct_7x7		jRD7x7

-#define jpeg_idct_6x6		jRD6x6

-#define jpeg_idct_5x5		jRD5x5

-#define jpeg_idct_4x4		jRD4x4

-#define jpeg_idct_3x3		jRD3x3

-#define jpeg_idct_2x2		jRD2x2

-#define jpeg_idct_1x1		jRD1x1

-#define jpeg_idct_9x9		jRD9x9

-#define jpeg_idct_10x10		jRD10x10

-#define jpeg_idct_11x11		jRD11x11

-#define jpeg_idct_12x12		jRD12x12

-#define jpeg_idct_13x13		jRD13x13

-#define jpeg_idct_14x14		jRD14x14

-#define jpeg_idct_15x15		jRD15x15

-#define jpeg_idct_16x16		jRD16x16

-#define jpeg_idct_16x8		jRD16x8

-#define jpeg_idct_14x7		jRD14x7

-#define jpeg_idct_12x6		jRD12x6

-#define jpeg_idct_10x5		jRD10x5

-#define jpeg_idct_8x4		jRD8x4

-#define jpeg_idct_6x3		jRD6x3

-#define jpeg_idct_4x2		jRD4x2

-#define jpeg_idct_2x1		jRD2x1

-#define jpeg_idct_8x16		jRD8x16

-#define jpeg_idct_7x14		jRD7x14

-#define jpeg_idct_6x12		jRD6x12

-#define jpeg_idct_5x10		jRD5x10

-#define jpeg_idct_4x8		jRD4x8

-#define jpeg_idct_3x6		jRD3x8

-#define jpeg_idct_2x4		jRD2x4

-#define jpeg_idct_1x2		jRD1x2

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-/* Extern declarations for the forward and inverse DCT routines. */

-

-EXTERN(void) jpeg_fdct_islow

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_ifast

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_float

-    JPP((FAST_FLOAT * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_7x7

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_6x6

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_5x5

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_4x4

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_3x3

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_2x2

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_1x1

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_9x9

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_10x10

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_11x11

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_12x12

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_13x13

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_14x14

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_15x15

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_16x16

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_16x8

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_14x7

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_12x6

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_10x5

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_8x4

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_6x3

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_4x2

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_2x1

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_8x16

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_7x14

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_6x12

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_5x10

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_4x8

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_3x6

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_2x4

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-EXTERN(void) jpeg_fdct_1x2

-    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));

-

-EXTERN(void) jpeg_idct_islow

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_ifast

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_float

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_7x7

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_6x6

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_5x5

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_4x4

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_3x3

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_2x2

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_1x1

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_9x9

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_10x10

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_11x11

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_12x12

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_13x13

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_14x14

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_15x15

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_16x16

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_16x8

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_14x7

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_12x6

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_10x5

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_8x4

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_6x3

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_4x2

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_2x1

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_8x16

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_7x14

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_6x12

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_5x10

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_4x8

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_3x6

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_2x4

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-EXTERN(void) jpeg_idct_1x2

-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));

-

-

-/*

- * Macros for handling fixed-point arithmetic; these are used by many

- * but not all of the DCT/IDCT modules.

- *

- * All values are expected to be of type INT32.

- * Fractional constants are scaled left by CONST_BITS bits.

- * CONST_BITS is defined within each module using these macros,

- * and may differ from one module to the next.

- */

-

-#define ONE	((INT32) 1)

-#define CONST_SCALE (ONE << CONST_BITS)

-

-/* Convert a positive real constant to an integer scaled by CONST_SCALE.

- * Caution: some C compilers fail to reduce "FIX(constant)" at compile time,

- * thus causing a lot of useless floating-point operations at run time.

- */

-

-#define FIX(x)	((INT32) ((x) * CONST_SCALE + 0.5))

-

-/* Descale and correctly round an INT32 value that's scaled by N bits.

- * We assume RIGHT_SHIFT rounds towards minus infinity, so adding

- * the fudge factor is correct for either sign of X.

- */

-

-#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)

-

-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.

- * This macro is used only when the two inputs will actually be no more than

- * 16 bits wide, so that a 16x16->32 bit multiply can be used instead of a

- * full 32x32 multiply.  This provides a useful speedup on many machines.

- * Unfortunately there is no way to specify a 16x16->32 multiply portably

- * in C, but some C compilers will do the right thing if you provide the

- * correct combination of casts.

- */

-

-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */

-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT16) (const)))

-#endif

-#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */

-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT32) (const)))

-#endif

-

-#ifndef MULTIPLY16C16		/* default definition */

-#define MULTIPLY16C16(var,const)  ((var) * (const))

-#endif

-

-/* Same except both inputs are variables. */

-

-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */

-#define MULTIPLY16V16(var1,var2)  (((INT16) (var1)) * ((INT16) (var2)))

-#endif

-

-#ifndef MULTIPLY16V16		/* default definition */

-#define MULTIPLY16V16(var1,var2)  ((var1) * (var2))

-#endif

-

-/* Like RIGHT_SHIFT, but applies to a DCTELEM.

- * We assume that int right shift is unsigned if INT32 right shift is.

- */

-

-#ifdef RIGHT_SHIFT_IS_UNSIGNED

-#define ISHIFT_TEMPS	DCTELEM ishift_temp;

-#if BITS_IN_JSAMPLE == 8

-#define DCTELEMBITS  16		/* DCTELEM may be 16 or 32 bits */

-#else

-#define DCTELEMBITS  32		/* DCTELEM must be 32 bits */

-#endif

-#define IRIGHT_SHIFT(x,shft)  \

-    ((ishift_temp = (x)) < 0 ? \

-     (ishift_temp >> (shft)) | ((~((DCTELEM) 0)) << (DCTELEMBITS-(shft))) : \

-     (ishift_temp >> (shft)))

-#else

-#define ISHIFT_TEMPS

-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))

-#endif

diff --git a/plugins/AdvaImg/src/LibJPEG/jddctmgr.c b/plugins/AdvaImg/src/LibJPEG/jddctmgr.c
deleted file mode 100644
index b2f5a36d96..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jddctmgr.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*

- * jddctmgr.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2002-2013 by Guido Vollbeding.

- * 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 the inverse-DCT management logic.

- * This code selects a particular IDCT implementation to be used,

- * and it performs related housekeeping chores.  No code in this file

- * is executed per IDCT step, only during output pass setup.

- *

- * Note that the IDCT routines are responsible for performing coefficient

- * dequantization as well as the IDCT proper.  This module sets up the

- * dequantization multiplier table needed by the IDCT routine.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-

-/*

- * The decompressor input side (jdinput.c) saves away the appropriate

- * quantization table for each component at the start of the first scan

- * involving that component.  (This is necessary in order to correctly

- * decode files that reuse Q-table slots.)

- * When we are ready to make an output pass, the saved Q-table is converted

- * to a multiplier table that will actually be used by the IDCT routine.

- * The multiplier table contents are IDCT-method-dependent.  To support

- * application changes in IDCT method between scans, we can remake the

- * multiplier tables if necessary.

- * In buffered-image mode, the first output pass may occur before any data

- * has been seen for some components, and thus before their Q-tables have

- * been saved away.  To handle this case, multiplier tables are preset

- * to zeroes; the result of the IDCT will be a neutral gray level.

- */

-

-

-/* Private subobject for this module */

-

-typedef struct {

-  struct jpeg_inverse_dct pub;	/* public fields */

-

-  /* This array contains the IDCT method code that each multiplier table

-   * is currently set up for, or -1 if it's not yet set up.

-   * The actual multiplier tables are pointed to by dct_table in the

-   * per-component comp_info structures.

-   */

-  int cur_method[MAX_COMPONENTS];

-} my_idct_controller;

-

-typedef my_idct_controller * my_idct_ptr;

-

-

-/* Allocated multiplier tables: big enough for any supported variant */

-

-typedef union {

-  ISLOW_MULT_TYPE islow_array[DCTSIZE2];

-#ifdef DCT_IFAST_SUPPORTED

-  IFAST_MULT_TYPE ifast_array[DCTSIZE2];

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-  FLOAT_MULT_TYPE float_array[DCTSIZE2];

-#endif

-} multiplier_table;

-

-

-/* The current scaled-IDCT routines require ISLOW-style multiplier tables,

- * so be sure to compile that code if either ISLOW or SCALING is requested.

- */

-#ifdef DCT_ISLOW_SUPPORTED

-#define PROVIDE_ISLOW_TABLES

-#else

-#ifdef IDCT_SCALING_SUPPORTED

-#define PROVIDE_ISLOW_TABLES

-#endif

-#endif

-

-

-/*

- * Prepare for an output pass.

- * Here we select the proper IDCT routine for each component and build

- * a matching multiplier table.

- */

-

-METHODDEF(void)

-start_pass (j_decompress_ptr cinfo)

-{

-  my_idct_ptr idct = (my_idct_ptr) cinfo->idct;

-  int ci, i;

-  jpeg_component_info *compptr;

-  int method = 0;

-  inverse_DCT_method_ptr method_ptr = NULL;

-  JQUANT_TBL * qtbl;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Select the proper IDCT routine for this component's scaling */

-    switch ((compptr->DCT_h_scaled_size << 8) + compptr->DCT_v_scaled_size) {

-#ifdef IDCT_SCALING_SUPPORTED

-    case ((1 << 8) + 1):

-      method_ptr = jpeg_idct_1x1;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((2 << 8) + 2):

-      method_ptr = jpeg_idct_2x2;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((3 << 8) + 3):

-      method_ptr = jpeg_idct_3x3;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((4 << 8) + 4):

-      method_ptr = jpeg_idct_4x4;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((5 << 8) + 5):

-      method_ptr = jpeg_idct_5x5;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((6 << 8) + 6):

-      method_ptr = jpeg_idct_6x6;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((7 << 8) + 7):

-      method_ptr = jpeg_idct_7x7;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((9 << 8) + 9):

-      method_ptr = jpeg_idct_9x9;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((10 << 8) + 10):

-      method_ptr = jpeg_idct_10x10;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((11 << 8) + 11):

-      method_ptr = jpeg_idct_11x11;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((12 << 8) + 12):

-      method_ptr = jpeg_idct_12x12;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((13 << 8) + 13):

-      method_ptr = jpeg_idct_13x13;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((14 << 8) + 14):

-      method_ptr = jpeg_idct_14x14;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((15 << 8) + 15):

-      method_ptr = jpeg_idct_15x15;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((16 << 8) + 16):

-      method_ptr = jpeg_idct_16x16;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((16 << 8) + 8):

-      method_ptr = jpeg_idct_16x8;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((14 << 8) + 7):

-      method_ptr = jpeg_idct_14x7;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((12 << 8) + 6):

-      method_ptr = jpeg_idct_12x6;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((10 << 8) + 5):

-      method_ptr = jpeg_idct_10x5;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((8 << 8) + 4):

-      method_ptr = jpeg_idct_8x4;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((6 << 8) + 3):

-      method_ptr = jpeg_idct_6x3;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((4 << 8) + 2):

-      method_ptr = jpeg_idct_4x2;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((2 << 8) + 1):

-      method_ptr = jpeg_idct_2x1;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((8 << 8) + 16):

-      method_ptr = jpeg_idct_8x16;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((7 << 8) + 14):

-      method_ptr = jpeg_idct_7x14;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((6 << 8) + 12):

-      method_ptr = jpeg_idct_6x12;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((5 << 8) + 10):

-      method_ptr = jpeg_idct_5x10;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((4 << 8) + 8):

-      method_ptr = jpeg_idct_4x8;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((3 << 8) + 6):

-      method_ptr = jpeg_idct_3x6;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((2 << 8) + 4):

-      method_ptr = jpeg_idct_2x4;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-    case ((1 << 8) + 2):

-      method_ptr = jpeg_idct_1x2;

-      method = JDCT_ISLOW;	/* jidctint uses islow-style table */

-      break;

-#endif

-    case ((DCTSIZE << 8) + DCTSIZE):

-      switch (cinfo->dct_method) {

-#ifdef DCT_ISLOW_SUPPORTED

-      case JDCT_ISLOW:

-	method_ptr = jpeg_idct_islow;

-	method = JDCT_ISLOW;

-	break;

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-      case JDCT_IFAST:

-	method_ptr = jpeg_idct_ifast;

-	method = JDCT_IFAST;

-	break;

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-      case JDCT_FLOAT:

-	method_ptr = jpeg_idct_float;

-	method = JDCT_FLOAT;

-	break;

-#endif

-      default:

-	ERREXIT(cinfo, JERR_NOT_COMPILED);

-	break;

-      }

-      break;

-    default:

-      ERREXIT2(cinfo, JERR_BAD_DCTSIZE,

-	       compptr->DCT_h_scaled_size, compptr->DCT_v_scaled_size);

-      break;

-    }

-    idct->pub.inverse_DCT[ci] = method_ptr;

-    /* Create multiplier table from quant table.

-     * However, we can skip this if the component is uninteresting

-     * or if we already built the table.  Also, if no quant table

-     * has yet been saved for the component, we leave the

-     * multiplier table all-zero; we'll be reading zeroes from the

-     * coefficient controller's buffer anyway.

-     */

-    if (! compptr->component_needed || idct->cur_method[ci] == method)

-      continue;

-    qtbl = compptr->quant_table;

-    if (qtbl == NULL)		/* happens if no data yet for component */

-      continue;

-    idct->cur_method[ci] = method;

-    switch (method) {

-#ifdef PROVIDE_ISLOW_TABLES

-    case JDCT_ISLOW:

-      {

-	/* For LL&M IDCT method, multipliers are equal to raw quantization

-	 * coefficients, but are stored as ints to ensure access efficiency.

-	 */

-	ISLOW_MULT_TYPE * ismtbl = (ISLOW_MULT_TYPE *) compptr->dct_table;

-	for (i = 0; i < DCTSIZE2; i++) {

-	  ismtbl[i] = (ISLOW_MULT_TYPE) qtbl->quantval[i];

-	}

-      }

-      break;

-#endif

-#ifdef DCT_IFAST_SUPPORTED

-    case JDCT_IFAST:

-      {

-	/* For AA&N IDCT method, multipliers are equal to quantization

-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where

-	 *   scalefactor[0] = 1

-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7

-	 * For integer operation, the multiplier table is to be scaled by

-	 * IFAST_SCALE_BITS.

-	 */

-	IFAST_MULT_TYPE * ifmtbl = (IFAST_MULT_TYPE *) compptr->dct_table;

-#define CONST_BITS 14

-	static const INT16 aanscales[DCTSIZE2] = {

-	  /* precomputed values scaled up by 14 bits */

-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,

-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,

-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,

-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,

-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,

-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,

-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,

-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247

-	};

-	SHIFT_TEMPS

-

-	for (i = 0; i < DCTSIZE2; i++) {

-	  ifmtbl[i] = (IFAST_MULT_TYPE)

-	    DESCALE(MULTIPLY16V16((INT32) qtbl->quantval[i],

-				  (INT32) aanscales[i]),

-		    CONST_BITS-IFAST_SCALE_BITS);

-	}

-      }

-      break;

-#endif

-#ifdef DCT_FLOAT_SUPPORTED

-    case JDCT_FLOAT:

-      {

-	/* For float AA&N IDCT method, multipliers are equal to quantization

-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where

-	 *   scalefactor[0] = 1

-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7

-	 * We apply a further scale factor of 1/8.

-	 */

-	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr->dct_table;

-	int row, col;

-	static const double aanscalefactor[DCTSIZE] = {

-	  1.0, 1.387039845, 1.306562965, 1.175875602,

-	  1.0, 0.785694958, 0.541196100, 0.275899379

-	};

-

-	i = 0;

-	for (row = 0; row < DCTSIZE; row++) {

-	  for (col = 0; col < DCTSIZE; col++) {

-	    fmtbl[i] = (FLOAT_MULT_TYPE)

-	      ((double) qtbl->quantval[i] *

-	       aanscalefactor[row] * aanscalefactor[col] * 0.125);

-	    i++;

-	  }

-	}

-      }

-      break;

-#endif

-    default:

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-      break;

-    }

-  }

-}

-

-

-/*

- * Initialize IDCT manager.

- */

-

-GLOBAL(void)

-jinit_inverse_dct (j_decompress_ptr cinfo)

-{

-  my_idct_ptr idct;

-  int ci;

-  jpeg_component_info *compptr;

-

-  idct = (my_idct_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_idct_controller));

-  cinfo->idct = &idct->pub;

-  idct->pub.start_pass = start_pass;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Allocate and pre-zero a multiplier table for each component */

-    compptr->dct_table =

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(multiplier_table));

-    MEMZERO(compptr->dct_table, SIZEOF(multiplier_table));

-    /* Mark multiplier table not yet set up for any method */

-    idct->cur_method[ci] = -1;

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdhuff.c b/plugins/AdvaImg/src/LibJPEG/jdhuff.c
deleted file mode 100644
index 85a98bd3ef..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdhuff.c
+++ /dev/null
@@ -1,1554 +0,0 @@
-/*

- * jdhuff.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2006-2013 by Guido Vollbeding.

- * 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 Huffman entropy decoding routines.

- * Both sequential and progressive modes are supported in this single module.

- *

- * Much of the complexity here has to do with supporting input suspension.

- * If the data source module demands suspension, we want to be able to back

- * up to the start of the current MCU.  To do this, we copy state variables

- * into local working storage, and update them back to the permanent

- * storage only upon successful completion of an MCU.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Derived data constructed for each Huffman table */

-

-#define HUFF_LOOKAHEAD	8	/* # of bits of lookahead */

-

-typedef struct {

-  /* Basic tables: (element [0] of each array is unused) */

-  INT32 maxcode[18];		/* largest code of length k (-1 if none) */

-  /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */

-  INT32 valoffset[17];		/* huffval[] offset for codes of length k */

-  /* valoffset[k] = huffval[] index of 1st symbol of code length k, less

-   * the smallest code of length k; so given a code of length k, the

-   * corresponding symbol is huffval[code + valoffset[k]]

-   */

-

-  /* Link to public Huffman table (needed only in jpeg_huff_decode) */

-  JHUFF_TBL *pub;

-

-  /* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of

-   * the input data stream.  If the next Huffman code is no more

-   * than HUFF_LOOKAHEAD bits long, we can obtain its length and

-   * the corresponding symbol directly from these tables.

-   */

-  int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */

-  UINT8 look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */

-} d_derived_tbl;

-

-

-/*

- * Fetching the next N bits from the input stream is a time-critical operation

- * for the Huffman decoders.  We implement it with a combination of inline

- * macros and out-of-line subroutines.  Note that N (the number of bits

- * demanded at one time) never exceeds 15 for JPEG use.

- *

- * We read source bytes into get_buffer and dole out bits as needed.

- * If get_buffer already contains enough bits, they are fetched in-line

- * by the macros CHECK_BIT_BUFFER and GET_BITS.  When there aren't enough

- * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer

- * as full as possible (not just to the number of bits needed; this

- * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer).

- * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension.

- * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains

- * at least the requested number of bits --- dummy zeroes are inserted if

- * necessary.

- */

-

-typedef INT32 bit_buf_type;	/* type of bit-extraction buffer */

-#define BIT_BUF_SIZE  32	/* size of buffer in bits */

-

-/* If long is > 32 bits on your machine, and shifting/masking longs is

- * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE

- * appropriately should be a win.  Unfortunately we can't define the size

- * with something like  #define BIT_BUF_SIZE (sizeof(bit_buf_type)*8)

- * because not all machines measure sizeof in 8-bit bytes.

- */

-

-typedef struct {		/* Bitreading state saved across MCUs */

-  bit_buf_type get_buffer;	/* current bit-extraction buffer */

-  int bits_left;		/* # of unused bits in it */

-} bitread_perm_state;

-

-typedef struct {		/* Bitreading working state within an MCU */

-  /* Current data source location */

-  /* We need a copy, rather than munging the original, in case of suspension */

-  const JOCTET * next_input_byte; /* => next byte to read from source */

-  size_t bytes_in_buffer;	/* # of bytes remaining in source buffer */

-  /* Bit input buffer --- note these values are kept in register variables,

-   * not in this struct, inside the inner loops.

-   */

-  bit_buf_type get_buffer;	/* current bit-extraction buffer */

-  int bits_left;		/* # of unused bits in it */

-  /* Pointer needed by jpeg_fill_bit_buffer. */

-  j_decompress_ptr cinfo;	/* back link to decompress master record */

-} bitread_working_state;

-

-/* Macros to declare and load/save bitread local variables. */

-#define BITREAD_STATE_VARS  \

-	register bit_buf_type get_buffer;  \

-	register int bits_left;  \

-	bitread_working_state br_state

-

-#define BITREAD_LOAD_STATE(cinfop,permstate)  \

-	br_state.cinfo = cinfop; \

-	br_state.next_input_byte = cinfop->src->next_input_byte; \

-	br_state.bytes_in_buffer = cinfop->src->bytes_in_buffer; \

-	get_buffer = permstate.get_buffer; \

-	bits_left = permstate.bits_left;

-

-#define BITREAD_SAVE_STATE(cinfop,permstate)  \

-	cinfop->src->next_input_byte = br_state.next_input_byte; \

-	cinfop->src->bytes_in_buffer = br_state.bytes_in_buffer; \

-	permstate.get_buffer = get_buffer; \

-	permstate.bits_left = bits_left

-

-/*

- * These macros provide the in-line portion of bit fetching.

- * Use CHECK_BIT_BUFFER to ensure there are N bits in get_buffer

- * before using GET_BITS, PEEK_BITS, or DROP_BITS.

- * The variables get_buffer and bits_left are assumed to be locals,

- * but the state struct might not be (jpeg_huff_decode needs this).

- *	CHECK_BIT_BUFFER(state,n,action);

- *		Ensure there are N bits in get_buffer; if suspend, take action.

- *      val = GET_BITS(n);

- *		Fetch next N bits.

- *      val = PEEK_BITS(n);

- *		Fetch next N bits without removing them from the buffer.

- *	DROP_BITS(n);

- *		Discard next N bits.

- * The value N should be a simple variable, not an expression, because it

- * is evaluated multiple times.

- */

-

-#define CHECK_BIT_BUFFER(state,nbits,action) \

-	{ if (bits_left < (nbits)) {  \

-	    if (! jpeg_fill_bit_buffer(&(state),get_buffer,bits_left,nbits))  \

-	      { action; }  \

-	    get_buffer = (state).get_buffer; bits_left = (state).bits_left; } }

-

-#define GET_BITS(nbits) \

-	(((int) (get_buffer >> (bits_left -= (nbits)))) & BIT_MASK(nbits))

-

-#define PEEK_BITS(nbits) \

-	(((int) (get_buffer >> (bits_left -  (nbits)))) & BIT_MASK(nbits))

-

-#define DROP_BITS(nbits) \

-	(bits_left -= (nbits))

-

-

-/*

- * Code for extracting next Huffman-coded symbol from input bit stream.

- * Again, this is time-critical and we make the main paths be macros.

- *

- * We use a lookahead table to process codes of up to HUFF_LOOKAHEAD bits

- * without looping.  Usually, more than 95% of the Huffman codes will be 8

- * or fewer bits long.  The few overlength codes are handled with a loop,

- * which need not be inline code.

- *

- * Notes about the HUFF_DECODE macro:

- * 1. Near the end of the data segment, we may fail to get enough bits

- *    for a lookahead.  In that case, we do it the hard way.

- * 2. If the lookahead table contains no entry, the next code must be

- *    more than HUFF_LOOKAHEAD bits long.

- * 3. jpeg_huff_decode returns -1 if forced to suspend.

- */

-

-#define HUFF_DECODE(result,state,htbl,failaction,slowlabel) \

-{ register int nb, look; \

-  if (bits_left < HUFF_LOOKAHEAD) { \

-    if (! jpeg_fill_bit_buffer(&state,get_buffer,bits_left, 0)) {failaction;} \

-    get_buffer = state.get_buffer; bits_left = state.bits_left; \

-    if (bits_left < HUFF_LOOKAHEAD) { \

-      nb = 1; goto slowlabel; \

-    } \

-  } \

-  look = PEEK_BITS(HUFF_LOOKAHEAD); \

-  if ((nb = htbl->look_nbits[look]) != 0) { \

-    DROP_BITS(nb); \

-    result = htbl->look_sym[look]; \

-  } else { \

-    nb = HUFF_LOOKAHEAD+1; \

-slowlabel: \

-    if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \

-	{ failaction; } \

-    get_buffer = state.get_buffer; bits_left = state.bits_left; \

-  } \

-}

-

-

-/*

- * Expanded entropy decoder object for Huffman decoding.

- *

- * The savable_state subrecord contains fields that change within an MCU,

- * but must not be updated permanently until we complete the MCU.

- */

-

-typedef struct {

-  unsigned int EOBRUN;			/* remaining EOBs in EOBRUN */

-  int last_dc_val[MAX_COMPS_IN_SCAN];	/* last DC coef for each component */

-} savable_state;

-

-/* This macro is to work around compilers with missing or broken

- * structure assignment.  You'll need to fix this code if you have

- * such a compiler and you change MAX_COMPS_IN_SCAN.

- */

-

-#ifndef NO_STRUCT_ASSIGN

-#define ASSIGN_STATE(dest,src)  ((dest) = (src))

-#else

-#if MAX_COMPS_IN_SCAN == 4

-#define ASSIGN_STATE(dest,src)  \

-	((dest).EOBRUN = (src).EOBRUN, \

-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \

-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \

-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \

-	 (dest).last_dc_val[3] = (src).last_dc_val[3])

-#endif

-#endif

-

-

-typedef struct {

-  struct jpeg_entropy_decoder pub; /* public fields */

-

-  /* These fields are loaded into local variables at start of each MCU.

-   * In case of suspension, we exit WITHOUT updating them.

-   */

-  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */

-  savable_state saved;		/* Other state at start of MCU */

-

-  /* These fields are NOT loaded into local working state. */

-  boolean insufficient_data;	/* set TRUE after emitting warning */

-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */

-

-  /* Following two fields used only in progressive mode */

-

-  /* Pointers to derived tables (these workspaces have image lifespan) */

-  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];

-

-  d_derived_tbl * ac_derived_tbl; /* active table during an AC scan */

-

-  /* Following fields used only in sequential mode */

-

-  /* Pointers to derived tables (these workspaces have image lifespan) */

-  d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];

-  d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];

-

-  /* Precalculated info set up by start_pass for use in decode_mcu: */

-

-  /* Pointers to derived tables to be used for each block within an MCU */

-  d_derived_tbl * dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];

-  d_derived_tbl * ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];

-  /* Whether we care about the DC and AC coefficient values for each block */

-  int coef_limit[D_MAX_BLOCKS_IN_MCU];

-} huff_entropy_decoder;

-

-typedef huff_entropy_decoder * huff_entropy_ptr;

-

-

-static const int jpeg_zigzag_order[8][8] = {

-  {  0,  1,  5,  6, 14, 15, 27, 28 },

-  {  2,  4,  7, 13, 16, 26, 29, 42 },

-  {  3,  8, 12, 17, 25, 30, 41, 43 },

-  {  9, 11, 18, 24, 31, 40, 44, 53 },

-  { 10, 19, 23, 32, 39, 45, 52, 54 },

-  { 20, 22, 33, 38, 46, 51, 55, 60 },

-  { 21, 34, 37, 47, 50, 56, 59, 61 },

-  { 35, 36, 48, 49, 57, 58, 62, 63 }

-};

-

-static const int jpeg_zigzag_order7[7][7] = {

-  {  0,  1,  5,  6, 14, 15, 27 },

-  {  2,  4,  7, 13, 16, 26, 28 },

-  {  3,  8, 12, 17, 25, 29, 38 },

-  {  9, 11, 18, 24, 30, 37, 39 },

-  { 10, 19, 23, 31, 36, 40, 45 },

-  { 20, 22, 32, 35, 41, 44, 46 },

-  { 21, 33, 34, 42, 43, 47, 48 }

-};

-

-static const int jpeg_zigzag_order6[6][6] = {

-  {  0,  1,  5,  6, 14, 15 },

-  {  2,  4,  7, 13, 16, 25 },

-  {  3,  8, 12, 17, 24, 26 },

-  {  9, 11, 18, 23, 27, 32 },

-  { 10, 19, 22, 28, 31, 33 },

-  { 20, 21, 29, 30, 34, 35 }

-};

-

-static const int jpeg_zigzag_order5[5][5] = {

-  {  0,  1,  5,  6, 14 },

-  {  2,  4,  7, 13, 15 },

-  {  3,  8, 12, 16, 21 },

-  {  9, 11, 17, 20, 22 },

-  { 10, 18, 19, 23, 24 }

-};

-

-static const int jpeg_zigzag_order4[4][4] = {

-  { 0,  1,  5,  6 },

-  { 2,  4,  7, 12 },

-  { 3,  8, 11, 13 },

-  { 9, 10, 14, 15 }

-};

-

-static const int jpeg_zigzag_order3[3][3] = {

-  { 0, 1, 5 },

-  { 2, 4, 6 },

-  { 3, 7, 8 }

-};

-

-static const int jpeg_zigzag_order2[2][2] = {

-  { 0, 1 },

-  { 2, 3 }

-};

-

-

-/*

- * Compute the derived values for a Huffman table.

- * This routine also performs some validation checks on the table.

- */

-

-LOCAL(void)

-jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

-			 d_derived_tbl ** pdtbl)

-{

-  JHUFF_TBL *htbl;

-  d_derived_tbl *dtbl;

-  int p, i, l, si, numsymbols;

-  int lookbits, ctr;

-  char huffsize[257];

-  unsigned int huffcode[257];

-  unsigned int code;

-

-  /* Note that huffsize[] and huffcode[] are filled in code-length order,

-   * paralleling the order of the symbols themselves in htbl->huffval[].

-   */

-

-  /* Find the input Huffman table */

-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)

-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);

-  htbl =

-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];

-  if (htbl == NULL)

-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);

-

-  /* Allocate a workspace if we haven't already done so. */

-  if (*pdtbl == NULL)

-    *pdtbl = (d_derived_tbl *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(d_derived_tbl));

-  dtbl = *pdtbl;

-  dtbl->pub = htbl;		/* fill in back link */

-  

-  /* Figure C.1: make table of Huffman code length for each symbol */

-

-  p = 0;

-  for (l = 1; l <= 16; l++) {

-    i = (int) htbl->bits[l];

-    if (i < 0 || p + i > 256)	/* protect against table overrun */

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    while (i--)

-      huffsize[p++] = (char) l;

-  }

-  huffsize[p] = 0;

-  numsymbols = p;

-  

-  /* Figure C.2: generate the codes themselves */

-  /* We also validate that the counts represent a legal Huffman code tree. */

-  

-  code = 0;

-  si = huffsize[0];

-  p = 0;

-  while (huffsize[p]) {

-    while (((int) huffsize[p]) == si) {

-      huffcode[p++] = code;

-      code++;

-    }

-    /* code is now 1 more than the last code used for codelength si; but

-     * it must still fit in si bits, since no code is allowed to be all ones.

-     */

-    if (((INT32) code) >= (((INT32) 1) << si))

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    code <<= 1;

-    si++;

-  }

-

-  /* Figure F.15: generate decoding tables for bit-sequential decoding */

-

-  p = 0;

-  for (l = 1; l <= 16; l++) {

-    if (htbl->bits[l]) {

-      /* valoffset[l] = huffval[] index of 1st symbol of code length l,

-       * minus the minimum code of length l

-       */

-      dtbl->valoffset[l] = (INT32) p - (INT32) huffcode[p];

-      p += htbl->bits[l];

-      dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */

-    } else {

-      dtbl->maxcode[l] = -1;	/* -1 if no codes of this length */

-    }

-  }

-  dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */

-

-  /* Compute lookahead tables to speed up decoding.

-   * First we set all the table entries to 0, indicating "too long";

-   * then we iterate through the Huffman codes that are short enough and

-   * fill in all the entries that correspond to bit sequences starting

-   * with that code.

-   */

-

-  MEMZERO(dtbl->look_nbits, SIZEOF(dtbl->look_nbits));

-

-  p = 0;

-  for (l = 1; l <= HUFF_LOOKAHEAD; l++) {

-    for (i = 1; i <= (int) htbl->bits[l]; i++, p++) {

-      /* l = current code's length, p = its index in huffcode[] & huffval[]. */

-      /* Generate left-justified code followed by all possible bit sequences */

-      lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);

-      for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {

-	dtbl->look_nbits[lookbits] = l;

-	dtbl->look_sym[lookbits] = htbl->huffval[p];

-	lookbits++;

-      }

-    }

-  }

-

-  /* Validate symbols as being reasonable.

-   * For AC tables, we make no check, but accept all byte values 0..255.

-   * For DC tables, we require the symbols to be in range 0..15.

-   * (Tighter bounds could be applied depending on the data depth and mode,

-   * but this is sufficient to ensure safe decoding.)

-   */

-  if (isDC) {

-    for (i = 0; i < numsymbols; i++) {

-      int sym = htbl->huffval[i];

-      if (sym < 0 || sym > 15)

-	ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-    }

-  }

-}

-

-

-/*

- * Out-of-line code for bit fetching.

- * Note: current values of get_buffer and bits_left are passed as parameters,

- * but are returned in the corresponding fields of the state struct.

- *

- * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width

- * of get_buffer to be used.  (On machines with wider words, an even larger

- * buffer could be used.)  However, on some machines 32-bit shifts are

- * quite slow and take time proportional to the number of places shifted.

- * (This is true with most PC compilers, for instance.)  In this case it may

- * be a win to set MIN_GET_BITS to the minimum value of 15.  This reduces the

- * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.

- */

-

-#ifdef SLOW_SHIFT_32

-#define MIN_GET_BITS  15	/* minimum allowable value */

-#else

-#define MIN_GET_BITS  (BIT_BUF_SIZE-7)

-#endif

-

-

-LOCAL(boolean)

-jpeg_fill_bit_buffer (bitread_working_state * state,

-		      register bit_buf_type get_buffer, register int bits_left,

-		      int nbits)

-/* Load up the bit buffer to a depth of at least nbits */

-{

-  /* Copy heavily used state fields into locals (hopefully registers) */

-  register const JOCTET * next_input_byte = state->next_input_byte;

-  register size_t bytes_in_buffer = state->bytes_in_buffer;

-  j_decompress_ptr cinfo = state->cinfo;

-

-  /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */

-  /* (It is assumed that no request will be for more than that many bits.) */

-  /* We fail to do so only if we hit a marker or are forced to suspend. */

-

-  if (cinfo->unread_marker == 0) {	/* cannot advance past a marker */

-    while (bits_left < MIN_GET_BITS) {

-      register int c;

-

-      /* Attempt to read a byte */

-      if (bytes_in_buffer == 0) {

-	if (! (*cinfo->src->fill_input_buffer) (cinfo))

-	  return FALSE;

-	next_input_byte = cinfo->src->next_input_byte;

-	bytes_in_buffer = cinfo->src->bytes_in_buffer;

-      }

-      bytes_in_buffer--;

-      c = GETJOCTET(*next_input_byte++);

-

-      /* If it's 0xFF, check and discard stuffed zero byte */

-      if (c == 0xFF) {

-	/* Loop here to discard any padding FF's on terminating marker,

-	 * so that we can save a valid unread_marker value.  NOTE: we will

-	 * accept multiple FF's followed by a 0 as meaning a single FF data

-	 * byte.  This data pattern is not valid according to the standard.

-	 */

-	do {

-	  if (bytes_in_buffer == 0) {

-	    if (! (*cinfo->src->fill_input_buffer) (cinfo))

-	      return FALSE;

-	    next_input_byte = cinfo->src->next_input_byte;

-	    bytes_in_buffer = cinfo->src->bytes_in_buffer;

-	  }

-	  bytes_in_buffer--;

-	  c = GETJOCTET(*next_input_byte++);

-	} while (c == 0xFF);

-

-	if (c == 0) {

-	  /* Found FF/00, which represents an FF data byte */

-	  c = 0xFF;

-	} else {

-	  /* Oops, it's actually a marker indicating end of compressed data.

-	   * Save the marker code for later use.

-	   * Fine point: it might appear that we should save the marker into

-	   * bitread working state, not straight into permanent state.  But

-	   * once we have hit a marker, we cannot need to suspend within the

-	   * current MCU, because we will read no more bytes from the data

-	   * source.  So it is OK to update permanent state right away.

-	   */

-	  cinfo->unread_marker = c;

-	  /* See if we need to insert some fake zero bits. */

-	  goto no_more_bytes;

-	}

-      }

-

-      /* OK, load c into get_buffer */

-      get_buffer = (get_buffer << 8) | c;

-      bits_left += 8;

-    } /* end while */

-  } else {

-  no_more_bytes:

-    /* We get here if we've read the marker that terminates the compressed

-     * data segment.  There should be enough bits in the buffer register

-     * to satisfy the request; if so, no problem.

-     */

-    if (nbits > bits_left) {

-      /* Uh-oh.  Report corrupted data to user and stuff zeroes into

-       * the data stream, so that we can produce some kind of image.

-       * We use a nonvolatile flag to ensure that only one warning message

-       * appears per data segment.

-       */

-      if (! ((huff_entropy_ptr) cinfo->entropy)->insufficient_data) {

-	WARNMS(cinfo, JWRN_HIT_MARKER);

-	((huff_entropy_ptr) cinfo->entropy)->insufficient_data = TRUE;

-      }

-      /* Fill the buffer with zero bits */

-      get_buffer <<= MIN_GET_BITS - bits_left;

-      bits_left = MIN_GET_BITS;

-    }

-  }

-

-  /* Unload the local registers */

-  state->next_input_byte = next_input_byte;

-  state->bytes_in_buffer = bytes_in_buffer;

-  state->get_buffer = get_buffer;

-  state->bits_left = bits_left;

-

-  return TRUE;

-}

-

-

-/*

- * Figure F.12: extend sign bit.

- * On some machines, a shift and sub will be faster than a table lookup.

- */

-

-#ifdef AVOID_TABLES

-

-#define BIT_MASK(nbits)   ((1<<(nbits))-1)

-#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) - ((1<<(s))-1) : (x))

-

-#else

-

-#define BIT_MASK(nbits)   bmask[nbits]

-#define HUFF_EXTEND(x,s)  ((x) <= bmask[(s) - 1] ? (x) - bmask[s] : (x))

-

-static const int bmask[16] =	/* bmask[n] is mask for n rightmost bits */

-  { 0, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF,

-    0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF };

-

-#endif /* AVOID_TABLES */

-

-

-/*

- * Out-of-line code for Huffman code decoding.

- */

-

-LOCAL(int)

-jpeg_huff_decode (bitread_working_state * state,

-		  register bit_buf_type get_buffer, register int bits_left,

-		  d_derived_tbl * htbl, int min_bits)

-{

-  register int l = min_bits;

-  register INT32 code;

-

-  /* HUFF_DECODE has determined that the code is at least min_bits */

-  /* bits long, so fetch that many bits in one swoop. */

-

-  CHECK_BIT_BUFFER(*state, l, return -1);

-  code = GET_BITS(l);

-

-  /* Collect the rest of the Huffman code one bit at a time. */

-  /* This is per Figure F.16 in the JPEG spec. */

-

-  while (code > htbl->maxcode[l]) {

-    code <<= 1;

-    CHECK_BIT_BUFFER(*state, 1, return -1);

-    code |= GET_BITS(1);

-    l++;

-  }

-

-  /* Unload the local registers */

-  state->get_buffer = get_buffer;

-  state->bits_left = bits_left;

-

-  /* With garbage input we may reach the sentinel value l = 17. */

-

-  if (l > 16) {

-    WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);

-    return 0;			/* fake a zero as the safest result */

-  }

-

-  return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];

-}

-

-

-/*

- * Finish up at the end of a Huffman-compressed scan.

- */

-

-METHODDEF(void)

-finish_pass_huff (j_decompress_ptr cinfo)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-

-  /* Throw away any unused bits remaining in bit buffer; */

-  /* include any full bytes in next_marker's count of discarded bytes */

-  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;

-  entropy->bitstate.bits_left = 0;

-}

-

-

-/*

- * Check for a restart marker & resynchronize decoder.

- * Returns FALSE if must suspend.

- */

-

-LOCAL(boolean)

-process_restart (j_decompress_ptr cinfo)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int ci;

-

-  finish_pass_huff(cinfo);

-

-  /* Advance past the RSTn marker */

-  if (! (*cinfo->marker->read_restart_marker) (cinfo))

-    return FALSE;

-

-  /* Re-initialize DC predictions to 0 */

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++)

-    entropy->saved.last_dc_val[ci] = 0;

-  /* Re-init EOB run count, too */

-  entropy->saved.EOBRUN = 0;

-

-  /* Reset restart counter */

-  entropy->restarts_to_go = cinfo->restart_interval;

-

-  /* Reset out-of-data flag, unless read_restart_marker left us smack up

-   * against a marker.  In that case we will end up treating the next data

-   * segment as empty, and we can avoid producing bogus output pixels by

-   * leaving the flag set.

-   */

-  if (cinfo->unread_marker == 0)

-    entropy->insufficient_data = FALSE;

-

-  return TRUE;

-}

-

-

-/*

- * Huffman MCU decoding.

- * Each of these routines decodes and returns one MCU's worth of

- * Huffman-compressed coefficients. 

- * The coefficients are reordered from zigzag order into natural array order,

- * but are not dequantized.

- *

- * The i'th block of the MCU is stored into the block pointed to by

- * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.

- * (Wholesale zeroing is usually a little faster than retail...)

- *

- * We return FALSE if data source requested suspension.  In that case no

- * changes have been made to permanent state.  (Exception: some output

- * coefficients may already have been assigned.  This is harmless for

- * spectral selection, since we'll just re-assign them on the next call.

- * Successive approximation AC refinement has to be more careful, however.)

- */

-

-/*

- * MCU decoding for DC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{   

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int Al = cinfo->Al;

-  register int s, r;

-  int blkn, ci;

-  JBLOCKROW block;

-  BITREAD_STATE_VARS;

-  savable_state state;

-  d_derived_tbl * tbl;

-  jpeg_component_info * compptr;

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* If we've run out of data, just leave the MCU set to zeroes.

-   * This way, we return uniform gray for the remainder of the segment.

-   */

-  if (! entropy->insufficient_data) {

-

-    /* Load up working state */

-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(state, entropy->saved);

-

-    /* Outer loop handles each block in the MCU */

-

-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-      block = MCU_data[blkn];

-      ci = cinfo->MCU_membership[blkn];

-      compptr = cinfo->cur_comp_info[ci];

-      tbl = entropy->derived_tbls[compptr->dc_tbl_no];

-

-      /* Decode a single block's worth of coefficients */

-

-      /* Section F.2.2.1: decode the DC coefficient difference */

-      HUFF_DECODE(s, br_state, tbl, return FALSE, label1);

-      if (s) {

-	CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	r = GET_BITS(s);

-	s = HUFF_EXTEND(r, s);

-      }

-

-      /* Convert DC difference to actual value, update last_dc_val */

-      s += state.last_dc_val[ci];

-      state.last_dc_val[ci] = s;

-      /* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */

-      (*block)[0] = (JCOEF) (s << Al);

-    }

-

-    /* Completed MCU, so update state */

-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(entropy->saved, state);

-  }

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for AC initial scan (either spectral selection,

- * or first pass of successive approximation).

- */

-

-METHODDEF(boolean)

-decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{   

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  register int s, k, r;

-  unsigned int EOBRUN;

-  int Se, Al;

-  const int * natural_order;

-  JBLOCKROW block;

-  BITREAD_STATE_VARS;

-  d_derived_tbl * tbl;

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* If we've run out of data, just leave the MCU set to zeroes.

-   * This way, we return uniform gray for the remainder of the segment.

-   */

-  if (! entropy->insufficient_data) {

-

-    Se = cinfo->Se;

-    Al = cinfo->Al;

-    natural_order = cinfo->natural_order;

-

-    /* Load up working state.

-     * We can avoid loading/saving bitread state if in an EOB run.

-     */

-    EOBRUN = entropy->saved.EOBRUN;	/* only part of saved state we need */

-

-    /* There is always only one block per MCU */

-

-    if (EOBRUN)			/* if it's a band of zeroes... */

-      EOBRUN--;			/* ...process it now (we do nothing) */

-    else {

-      BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-      block = MCU_data[0];

-      tbl = entropy->ac_derived_tbl;

-

-      for (k = cinfo->Ss; k <= Se; k++) {

-	HUFF_DECODE(s, br_state, tbl, return FALSE, label2);

-	r = s >> 4;

-	s &= 15;

-	if (s) {

-	  k += r;

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  r = GET_BITS(s);

-	  s = HUFF_EXTEND(r, s);

-	  /* Scale and output coefficient in natural (dezigzagged) order */

-	  (*block)[natural_order[k]] = (JCOEF) (s << Al);

-	} else {

-	  if (r != 15) {	/* EOBr, run length is 2^r + appended bits */

-	    if (r) {		/* EOBr, r > 0 */

-	      EOBRUN = 1 << r;

-	      CHECK_BIT_BUFFER(br_state, r, return FALSE);

-	      r = GET_BITS(r);

-	      EOBRUN += r;

-	      EOBRUN--;		/* this band is processed at this moment */

-	    }

-	    break;		/* force end-of-band */

-	  }

-	  k += 15;		/* ZRL: skip 15 zeroes in band */

-	}

-      }

-

-      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-    }

-

-    /* Completed MCU, so update state */

-    entropy->saved.EOBRUN = EOBRUN;	/* only part of saved state we need */

-  }

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for DC successive approximation refinement scan.

- * Note: we assume such scans can be multi-component,

- * although the spec is not very clear on the point.

- */

-

-METHODDEF(boolean)

-decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{   

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int p1, blkn;

-  BITREAD_STATE_VARS;

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* Not worth the cycles to check insufficient_data here,

-   * since we will not change the data anyway if we read zeroes.

-   */

-

-  /* Load up working state */

-  BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-

-  p1 = 1 << cinfo->Al;		/* 1 in the bit position being coded */

-

-  /* Outer loop handles each block in the MCU */

-

-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-    /* Encoded data is simply the next bit of the two's-complement DC value */

-    CHECK_BIT_BUFFER(br_state, 1, return FALSE);

-    if (GET_BITS(1))

-      MCU_data[blkn][0][0] |= p1;

-    /* Note: since we use |=, repeating the assignment later is safe */

-  }

-

-  /* Completed MCU, so update state */

-  BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-}

-

-

-/*

- * MCU decoding for AC successive approximation refinement scan.

- */

-

-METHODDEF(boolean)

-decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{   

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  register int s, k, r;

-  unsigned int EOBRUN;

-  int Se, p1, m1;

-  const int * natural_order;

-  JBLOCKROW block;

-  JCOEFPTR thiscoef;

-  BITREAD_STATE_VARS;

-  d_derived_tbl * tbl;

-  int num_newnz;

-  int newnz_pos[DCTSIZE2];

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* If we've run out of data, don't modify the MCU.

-   */

-  if (! entropy->insufficient_data) {

-

-    Se = cinfo->Se;

-    p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */

-    m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */

-    natural_order = cinfo->natural_order;

-

-    /* Load up working state */

-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-    EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */

-

-    /* There is always only one block per MCU */

-    block = MCU_data[0];

-    tbl = entropy->ac_derived_tbl;

-

-    /* If we are forced to suspend, we must undo the assignments to any newly

-     * nonzero coefficients in the block, because otherwise we'd get confused

-     * next time about which coefficients were already nonzero.

-     * But we need not undo addition of bits to already-nonzero coefficients;

-     * instead, we can test the current bit to see if we already did it.

-     */

-    num_newnz = 0;

-

-    /* initialize coefficient loop counter to start of band */

-    k = cinfo->Ss;

-

-    if (EOBRUN == 0) {

-      do {

-	HUFF_DECODE(s, br_state, tbl, goto undoit, label3);

-	r = s >> 4;

-	s &= 15;

-	if (s) {

-	  if (s != 1)		/* size of new coef should always be 1 */

-	    WARNMS(cinfo, JWRN_HUFF_BAD_CODE);

-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);

-	  if (GET_BITS(1))

-	    s = p1;		/* newly nonzero coef is positive */

-	  else

-	    s = m1;		/* newly nonzero coef is negative */

-	} else {

-	  if (r != 15) {

-	    EOBRUN = 1 << r;	/* EOBr, run length is 2^r + appended bits */

-	    if (r) {

-	      CHECK_BIT_BUFFER(br_state, r, goto undoit);

-	      r = GET_BITS(r);

-	      EOBRUN += r;

-	    }

-	    break;		/* rest of block is handled by EOB logic */

-	  }

-	  /* note s = 0 for processing ZRL */

-	}

-	/* Advance over already-nonzero coefs and r still-zero coefs,

-	 * appending correction bits to the nonzeroes.  A correction bit is 1

-	 * if the absolute value of the coefficient must be increased.

-	 */

-	do {

-	  thiscoef = *block + natural_order[k];

-	  if (*thiscoef) {

-	    CHECK_BIT_BUFFER(br_state, 1, goto undoit);

-	    if (GET_BITS(1)) {

-	      if ((*thiscoef & p1) == 0) { /* do nothing if already set it */

-		if (*thiscoef >= 0)

-		  *thiscoef += p1;

-		else

-		  *thiscoef += m1;

-	      }

-	    }

-	  } else {

-	    if (--r < 0)

-	      break;		/* reached target zero coefficient */

-	  }

-	  k++;

-	} while (k <= Se);

-	if (s) {

-	  int pos = natural_order[k];

-	  /* Output newly nonzero coefficient */

-	  (*block)[pos] = (JCOEF) s;

-	  /* Remember its position in case we have to suspend */

-	  newnz_pos[num_newnz++] = pos;

-	}

-	k++;

-      } while (k <= Se);

-    }

-

-    if (EOBRUN) {

-      /* Scan any remaining coefficient positions after the end-of-band

-       * (the last newly nonzero coefficient, if any).  Append a correction

-       * bit to each already-nonzero coefficient.  A correction bit is 1

-       * if the absolute value of the coefficient must be increased.

-       */

-      do {

-	thiscoef = *block + natural_order[k];

-	if (*thiscoef) {

-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);

-	  if (GET_BITS(1)) {

-	    if ((*thiscoef & p1) == 0) { /* do nothing if already changed it */

-	      if (*thiscoef >= 0)

-		*thiscoef += p1;

-	      else

-		*thiscoef += m1;

-	    }

-	  }

-	}

-	k++;

-      } while (k <= Se);

-      /* Count one block completed in EOB run */

-      EOBRUN--;

-    }

-

-    /* Completed MCU, so update state */

-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-    entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */

-  }

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-

-undoit:

-  /* Re-zero any output coefficients that we made newly nonzero */

-  while (num_newnz)

-    (*block)[newnz_pos[--num_newnz]] = 0;

-

-  return FALSE;

-}

-

-

-/*

- * Decode one MCU's worth of Huffman-compressed coefficients,

- * partial blocks.

- */

-

-METHODDEF(boolean)

-decode_mcu_sub (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  const int * natural_order;

-  int Se, blkn;

-  BITREAD_STATE_VARS;

-  savable_state state;

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* If we've run out of data, just leave the MCU set to zeroes.

-   * This way, we return uniform gray for the remainder of the segment.

-   */

-  if (! entropy->insufficient_data) {

-

-    natural_order = cinfo->natural_order;

-    Se = cinfo->lim_Se;

-

-    /* Load up working state */

-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(state, entropy->saved);

-

-    /* Outer loop handles each block in the MCU */

-

-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-      JBLOCKROW block = MCU_data[blkn];

-      d_derived_tbl * htbl;

-      register int s, k, r;

-      int coef_limit, ci;

-

-      /* Decode a single block's worth of coefficients */

-

-      /* Section F.2.2.1: decode the DC coefficient difference */

-      htbl = entropy->dc_cur_tbls[blkn];

-      HUFF_DECODE(s, br_state, htbl, return FALSE, label1);

-

-      htbl = entropy->ac_cur_tbls[blkn];

-      k = 1;

-      coef_limit = entropy->coef_limit[blkn];

-      if (coef_limit) {

-	/* Convert DC difference to actual value, update last_dc_val */

-	if (s) {

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  r = GET_BITS(s);

-	  s = HUFF_EXTEND(r, s);

-	}

-	ci = cinfo->MCU_membership[blkn];

-	s += state.last_dc_val[ci];

-	state.last_dc_val[ci] = s;

-	/* Output the DC coefficient */

-	(*block)[0] = (JCOEF) s;

-

-	/* Section F.2.2.2: decode the AC coefficients */

-	/* Since zeroes are skipped, output area must be cleared beforehand */

-	for (; k < coef_limit; k++) {

-	  HUFF_DECODE(s, br_state, htbl, return FALSE, label2);

-

-	  r = s >> 4;

-	  s &= 15;

-

-	  if (s) {

-	    k += r;

-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	    r = GET_BITS(s);

-	    s = HUFF_EXTEND(r, s);

-	    /* Output coefficient in natural (dezigzagged) order.

-	     * Note: the extra entries in natural_order[] will save us

-	     * if k > Se, which could happen if the data is corrupted.

-	     */

-	    (*block)[natural_order[k]] = (JCOEF) s;

-	  } else {

-	    if (r != 15)

-	      goto EndOfBlock;

-	    k += 15;

-	  }

-	}

-      } else {

-	if (s) {

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  DROP_BITS(s);

-	}

-      }

-

-      /* Section F.2.2.2: decode the AC coefficients */

-      /* In this path we just discard the values */

-      for (; k <= Se; k++) {

-	HUFF_DECODE(s, br_state, htbl, return FALSE, label3);

-

-	r = s >> 4;

-	s &= 15;

-

-	if (s) {

-	  k += r;

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  DROP_BITS(s);

-	} else {

-	  if (r != 15)

-	    break;

-	  k += 15;

-	}

-      }

-

-      EndOfBlock: ;

-    }

-

-    /* Completed MCU, so update state */

-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(entropy->saved, state);

-  }

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-}

-

-

-/*

- * Decode one MCU's worth of Huffman-compressed coefficients,

- * full-size blocks.

- */

-

-METHODDEF(boolean)

-decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int blkn;

-  BITREAD_STATE_VARS;

-  savable_state state;

-

-  /* Process restart marker if needed; may have to suspend */

-  if (cinfo->restart_interval) {

-    if (entropy->restarts_to_go == 0)

-      if (! process_restart(cinfo))

-	return FALSE;

-  }

-

-  /* If we've run out of data, just leave the MCU set to zeroes.

-   * This way, we return uniform gray for the remainder of the segment.

-   */

-  if (! entropy->insufficient_data) {

-

-    /* Load up working state */

-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(state, entropy->saved);

-

-    /* Outer loop handles each block in the MCU */

-

-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-      JBLOCKROW block = MCU_data[blkn];

-      d_derived_tbl * htbl;

-      register int s, k, r;

-      int coef_limit, ci;

-

-      /* Decode a single block's worth of coefficients */

-

-      /* Section F.2.2.1: decode the DC coefficient difference */

-      htbl = entropy->dc_cur_tbls[blkn];

-      HUFF_DECODE(s, br_state, htbl, return FALSE, label1);

-

-      htbl = entropy->ac_cur_tbls[blkn];

-      k = 1;

-      coef_limit = entropy->coef_limit[blkn];

-      if (coef_limit) {

-	/* Convert DC difference to actual value, update last_dc_val */

-	if (s) {

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  r = GET_BITS(s);

-	  s = HUFF_EXTEND(r, s);

-	}

-	ci = cinfo->MCU_membership[blkn];

-	s += state.last_dc_val[ci];

-	state.last_dc_val[ci] = s;

-	/* Output the DC coefficient */

-	(*block)[0] = (JCOEF) s;

-

-	/* Section F.2.2.2: decode the AC coefficients */

-	/* Since zeroes are skipped, output area must be cleared beforehand */

-	for (; k < coef_limit; k++) {

-	  HUFF_DECODE(s, br_state, htbl, return FALSE, label2);

-

-	  r = s >> 4;

-	  s &= 15;

-

-	  if (s) {

-	    k += r;

-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	    r = GET_BITS(s);

-	    s = HUFF_EXTEND(r, s);

-	    /* Output coefficient in natural (dezigzagged) order.

-	     * Note: the extra entries in jpeg_natural_order[] will save us

-	     * if k >= DCTSIZE2, which could happen if the data is corrupted.

-	     */

-	    (*block)[jpeg_natural_order[k]] = (JCOEF) s;

-	  } else {

-	    if (r != 15)

-	      goto EndOfBlock;

-	    k += 15;

-	  }

-	}

-      } else {

-	if (s) {

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  DROP_BITS(s);

-	}

-      }

-

-      /* Section F.2.2.2: decode the AC coefficients */

-      /* In this path we just discard the values */

-      for (; k < DCTSIZE2; k++) {

-	HUFF_DECODE(s, br_state, htbl, return FALSE, label3);

-

-	r = s >> 4;

-	s &= 15;

-

-	if (s) {

-	  k += r;

-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);

-	  DROP_BITS(s);

-	} else {

-	  if (r != 15)

-	    break;

-	  k += 15;

-	}

-      }

-

-      EndOfBlock: ;

-    }

-

-    /* Completed MCU, so update state */

-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);

-    ASSIGN_STATE(entropy->saved, state);

-  }

-

-  /* Account for restart interval (no-op if not using restarts) */

-  entropy->restarts_to_go--;

-

-  return TRUE;

-}

-

-

-/*

- * Initialize for a Huffman-compressed scan.

- */

-

-METHODDEF(void)

-start_pass_huff_decoder (j_decompress_ptr cinfo)

-{

-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

-  int ci, blkn, tbl, i;

-  jpeg_component_info * compptr;

-

-  if (cinfo->progressive_mode) {

-    /* Validate progressive scan parameters */

-    if (cinfo->Ss == 0) {

-      if (cinfo->Se != 0)

-	goto bad;

-    } else {

-      /* need not check Ss/Se < 0 since they came from unsigned bytes */

-      if (cinfo->Se < cinfo->Ss || cinfo->Se > cinfo->lim_Se)

-	goto bad;

-      /* AC scans may have only one component */

-      if (cinfo->comps_in_scan != 1)

-	goto bad;

-    }

-    if (cinfo->Ah != 0) {

-      /* Successive approximation refinement scan: must have Al = Ah-1. */

-      if (cinfo->Ah-1 != cinfo->Al)

-	goto bad;

-    }

-    if (cinfo->Al > 13) {	/* need not check for < 0 */

-      /* Arguably the maximum Al value should be less than 13 for 8-bit precision,

-       * but the spec doesn't say so, and we try to be liberal about what we

-       * accept.  Note: large Al values could result in out-of-range DC

-       * coefficients during early scans, leading to bizarre displays due to

-       * overflows in the IDCT math.  But we won't crash.

-       */

-      bad:

-      ERREXIT4(cinfo, JERR_BAD_PROGRESSION,

-	       cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);

-    }

-    /* Update progression status, and verify that scan order is legal.

-     * Note that inter-scan inconsistencies are treated as warnings

-     * not fatal errors ... not clear if this is right way to behave.

-     */

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      int coefi, cindex = cinfo->cur_comp_info[ci]->component_index;

-      int *coef_bit_ptr = & cinfo->coef_bits[cindex][0];

-      if (cinfo->Ss && coef_bit_ptr[0] < 0) /* AC without prior DC scan */

-	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);

-      for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {

-	int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];

-	if (cinfo->Ah != expected)

-	  WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);

-	coef_bit_ptr[coefi] = cinfo->Al;

-      }

-    }

-

-    /* Select MCU decoding routine */

-    if (cinfo->Ah == 0) {

-      if (cinfo->Ss == 0)

-	entropy->pub.decode_mcu = decode_mcu_DC_first;

-      else

-	entropy->pub.decode_mcu = decode_mcu_AC_first;

-    } else {

-      if (cinfo->Ss == 0)

-	entropy->pub.decode_mcu = decode_mcu_DC_refine;

-      else

-	entropy->pub.decode_mcu = decode_mcu_AC_refine;

-    }

-

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      compptr = cinfo->cur_comp_info[ci];

-      /* Make sure requested tables are present, and compute derived tables.

-       * We may build same derived table more than once, but it's not expensive.

-       */

-      if (cinfo->Ss == 0) {

-	if (cinfo->Ah == 0) {	/* DC refinement needs no table */

-	  tbl = compptr->dc_tbl_no;

-	  jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,

-				  & entropy->derived_tbls[tbl]);

-	}

-      } else {

-	tbl = compptr->ac_tbl_no;

-	jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,

-				& entropy->derived_tbls[tbl]);

-	/* remember the single active table */

-	entropy->ac_derived_tbl = entropy->derived_tbls[tbl];

-      }

-      /* Initialize DC predictions to 0 */

-      entropy->saved.last_dc_val[ci] = 0;

-    }

-

-    /* Initialize private state variables */

-    entropy->saved.EOBRUN = 0;

-  } else {

-    /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.

-     * This ought to be an error condition, but we make it a warning because

-     * there are some baseline files out there with all zeroes in these bytes.

-     */

-    if (cinfo->Ss != 0 || cinfo->Ah != 0 || cinfo->Al != 0 ||

-	((cinfo->is_baseline || cinfo->Se < DCTSIZE2) &&

-	cinfo->Se != cinfo->lim_Se))

-      WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);

-

-    /* Select MCU decoding routine */

-    /* We retain the hard-coded case for full-size blocks.

-     * This is not necessary, but it appears that this version is slightly

-     * more performant in the given implementation.

-     * With an improved implementation we would prefer a single optimized

-     * function.

-     */

-    if (cinfo->lim_Se != DCTSIZE2-1)

-      entropy->pub.decode_mcu = decode_mcu_sub;

-    else

-      entropy->pub.decode_mcu = decode_mcu;

-

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      compptr = cinfo->cur_comp_info[ci];

-      /* Compute derived values for Huffman tables */

-      /* We may do this more than once for a table, but it's not expensive */

-      tbl = compptr->dc_tbl_no;

-      jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,

-			      & entropy->dc_derived_tbls[tbl]);

-      if (cinfo->lim_Se) {	/* AC needs no table when not present */

-	tbl = compptr->ac_tbl_no;

-	jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,

-				& entropy->ac_derived_tbls[tbl]);

-      }

-      /* Initialize DC predictions to 0 */

-      entropy->saved.last_dc_val[ci] = 0;

-    }

-

-    /* Precalculate decoding info for each block in an MCU of this scan */

-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

-      ci = cinfo->MCU_membership[blkn];

-      compptr = cinfo->cur_comp_info[ci];

-      /* Precalculate which table to use for each block */

-      entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];

-      entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];

-      /* Decide whether we really care about the coefficient values */

-      if (compptr->component_needed) {

-	ci = compptr->DCT_v_scaled_size;

-	i = compptr->DCT_h_scaled_size;

-	switch (cinfo->lim_Se) {

-	case (1*1-1):

-	  entropy->coef_limit[blkn] = 1;

-	  break;

-	case (2*2-1):

-	  if (ci <= 0 || ci > 2) ci = 2;

-	  if (i <= 0 || i > 2) i = 2;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order2[ci - 1][i - 1];

-	  break;

-	case (3*3-1):

-	  if (ci <= 0 || ci > 3) ci = 3;

-	  if (i <= 0 || i > 3) i = 3;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order3[ci - 1][i - 1];

-	  break;

-	case (4*4-1):

-	  if (ci <= 0 || ci > 4) ci = 4;

-	  if (i <= 0 || i > 4) i = 4;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order4[ci - 1][i - 1];

-	  break;

-	case (5*5-1):

-	  if (ci <= 0 || ci > 5) ci = 5;

-	  if (i <= 0 || i > 5) i = 5;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order5[ci - 1][i - 1];

-	  break;

-	case (6*6-1):

-	  if (ci <= 0 || ci > 6) ci = 6;

-	  if (i <= 0 || i > 6) i = 6;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order6[ci - 1][i - 1];

-	  break;

-	case (7*7-1):

-	  if (ci <= 0 || ci > 7) ci = 7;

-	  if (i <= 0 || i > 7) i = 7;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order7[ci - 1][i - 1];

-	  break;

-	default:

-	  if (ci <= 0 || ci > 8) ci = 8;

-	  if (i <= 0 || i > 8) i = 8;

-	  entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order[ci - 1][i - 1];

-	  break;

-	}

-      } else {

-	entropy->coef_limit[blkn] = 0;

-      }

-    }

-  }

-

-  /* Initialize bitread state variables */

-  entropy->bitstate.bits_left = 0;

-  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */

-  entropy->insufficient_data = FALSE;

-

-  /* Initialize restart counter */

-  entropy->restarts_to_go = cinfo->restart_interval;

-}

-

-

-/*

- * Module initialization routine for Huffman entropy decoding.

- */

-

-GLOBAL(void)

-jinit_huff_decoder (j_decompress_ptr cinfo)

-{

-  huff_entropy_ptr entropy;

-  int i;

-

-  entropy = (huff_entropy_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(huff_entropy_decoder));

-  cinfo->entropy = &entropy->pub;

-  entropy->pub.start_pass = start_pass_huff_decoder;

-  entropy->pub.finish_pass = finish_pass_huff;

-

-  if (cinfo->progressive_mode) {

-    /* Create progression status table */

-    int *coef_bit_ptr, ci;

-    cinfo->coef_bits = (int (*)[DCTSIZE2])

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  cinfo->num_components*DCTSIZE2*SIZEOF(int));

-    coef_bit_ptr = & cinfo->coef_bits[0][0];

-    for (ci = 0; ci < cinfo->num_components; ci++)

-      for (i = 0; i < DCTSIZE2; i++)

-	*coef_bit_ptr++ = -1;

-

-    /* Mark derived tables unallocated */

-    for (i = 0; i < NUM_HUFF_TBLS; i++) {

-      entropy->derived_tbls[i] = NULL;

-    }

-  } else {

-    /* Mark tables unallocated */

-    for (i = 0; i < NUM_HUFF_TBLS; i++) {

-      entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;

-    }

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdinput.c b/plugins/AdvaImg/src/LibJPEG/jdinput.c
deleted file mode 100644
index 80bdef568a..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdinput.c
+++ /dev/null
@@ -1,662 +0,0 @@
-/*

- * jdinput.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2002-2013 by Guido Vollbeding.

- * 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 input control logic for the JPEG decompressor.

- * These routines are concerned with controlling the decompressor's input

- * processing (marker reading and coefficient decoding).  The actual input

- * reading is done in jdmarker.c, jdhuff.c, and jdarith.c.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private state */

-

-typedef struct {

-  struct jpeg_input_controller pub; /* public fields */

-

-  int inheaders;		/* Nonzero until first SOS is reached */

-} my_input_controller;

-

-typedef my_input_controller * my_inputctl_ptr;

-

-

-/* Forward declarations */

-METHODDEF(int) consume_markers JPP((j_decompress_ptr cinfo));

-

-

-/*

- * Routines to calculate various quantities related to the size of the image.

- */

-

-

-/*

- * Compute output image dimensions and related values.

- * NOTE: this is exported for possible use by application.

- * Hence it mustn't do anything that can't be done twice.

- */

-

-GLOBAL(void)

-jpeg_core_output_dimensions (j_decompress_ptr cinfo)

-/* Do computations that are needed before master selection phase.

- * This function is used for transcoding and full decompression.

- */

-{

-#ifdef IDCT_SCALING_SUPPORTED

-  int ci;

-  jpeg_component_info *compptr;

-

-  /* Compute actual output image dimensions and DCT scaling choices. */

-  if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom) {

-    /* Provide 1/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 1;

-    cinfo->min_DCT_v_scaled_size = 1;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 2) {

-    /* Provide 2/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 2L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 2L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 2;

-    cinfo->min_DCT_v_scaled_size = 2;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 3) {

-    /* Provide 3/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 3L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 3L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 3;

-    cinfo->min_DCT_v_scaled_size = 3;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 4) {

-    /* Provide 4/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 4L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 4L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 4;

-    cinfo->min_DCT_v_scaled_size = 4;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 5) {

-    /* Provide 5/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 5L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 5L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 5;

-    cinfo->min_DCT_v_scaled_size = 5;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 6) {

-    /* Provide 6/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 6L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 6L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 6;

-    cinfo->min_DCT_v_scaled_size = 6;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 7) {

-    /* Provide 7/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 7L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 7L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 7;

-    cinfo->min_DCT_v_scaled_size = 7;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 8) {

-    /* Provide 8/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 8L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 8L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 8;

-    cinfo->min_DCT_v_scaled_size = 8;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 9) {

-    /* Provide 9/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 9L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 9L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 9;

-    cinfo->min_DCT_v_scaled_size = 9;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 10) {

-    /* Provide 10/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 10L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 10L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 10;

-    cinfo->min_DCT_v_scaled_size = 10;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 11) {

-    /* Provide 11/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 11L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 11L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 11;

-    cinfo->min_DCT_v_scaled_size = 11;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 12) {

-    /* Provide 12/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 12L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 12L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 12;

-    cinfo->min_DCT_v_scaled_size = 12;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 13) {

-    /* Provide 13/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 13L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 13L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 13;

-    cinfo->min_DCT_v_scaled_size = 13;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 14) {

-    /* Provide 14/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 14L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 14L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 14;

-    cinfo->min_DCT_v_scaled_size = 14;

-  } else if (cinfo->scale_num * cinfo->block_size <= cinfo->scale_denom * 15) {

-    /* Provide 15/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 15L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 15L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 15;

-    cinfo->min_DCT_v_scaled_size = 15;

-  } else {

-    /* Provide 16/block_size scaling */

-    cinfo->output_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * 16L, (long) cinfo->block_size);

-    cinfo->output_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * 16L, (long) cinfo->block_size);

-    cinfo->min_DCT_h_scaled_size = 16;

-    cinfo->min_DCT_v_scaled_size = 16;

-  }

-

-  /* Recompute dimensions of components */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    compptr->DCT_h_scaled_size = cinfo->min_DCT_h_scaled_size;

-    compptr->DCT_v_scaled_size = cinfo->min_DCT_v_scaled_size;

-  }

-

-#else /* !IDCT_SCALING_SUPPORTED */

-

-  /* Hardwire it to "no scaling" */

-  cinfo->output_width = cinfo->image_width;

-  cinfo->output_height = cinfo->image_height;

-  /* initial_setup has already initialized DCT_scaled_size,

-   * and has computed unscaled downsampled_width and downsampled_height.

-   */

-

-#endif /* IDCT_SCALING_SUPPORTED */

-}

-

-

-LOCAL(void)

-initial_setup (j_decompress_ptr cinfo)

-/* Called once, when first SOS marker is reached */

-{

-  int ci;

-  jpeg_component_info *compptr;

-

-  /* Make sure image isn't bigger than I can handle */

-  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||

-      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)

-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);

-

-  /* Only 8 to 12 bits data precision are supported for DCT based JPEG */

-  if (cinfo->data_precision < 8 || cinfo->data_precision > 12)

-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);

-

-  /* Check that number of components won't exceed internal array sizes */

-  if (cinfo->num_components > MAX_COMPONENTS)

-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,

-	     MAX_COMPONENTS);

-

-  /* Compute maximum sampling factors; check factor validity */

-  cinfo->max_h_samp_factor = 1;

-  cinfo->max_v_samp_factor = 1;

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||

-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)

-      ERREXIT(cinfo, JERR_BAD_SAMPLING);

-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,

-				   compptr->h_samp_factor);

-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,

-				   compptr->v_samp_factor);

-  }

-

-  /* Derive block_size, natural_order, and lim_Se */

-  if (cinfo->is_baseline || (cinfo->progressive_mode &&

-      cinfo->comps_in_scan)) { /* no pseudo SOS marker */

-    cinfo->block_size = DCTSIZE;

-    cinfo->natural_order = jpeg_natural_order;

-    cinfo->lim_Se = DCTSIZE2-1;

-  } else

-    switch (cinfo->Se) {

-    case (1*1-1):

-      cinfo->block_size = 1;

-      cinfo->natural_order = jpeg_natural_order; /* not needed */

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (2*2-1):

-      cinfo->block_size = 2;

-      cinfo->natural_order = jpeg_natural_order2;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (3*3-1):

-      cinfo->block_size = 3;

-      cinfo->natural_order = jpeg_natural_order3;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (4*4-1):

-      cinfo->block_size = 4;

-      cinfo->natural_order = jpeg_natural_order4;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (5*5-1):

-      cinfo->block_size = 5;

-      cinfo->natural_order = jpeg_natural_order5;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (6*6-1):

-      cinfo->block_size = 6;

-      cinfo->natural_order = jpeg_natural_order6;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (7*7-1):

-      cinfo->block_size = 7;

-      cinfo->natural_order = jpeg_natural_order7;

-      cinfo->lim_Se = cinfo->Se;

-      break;

-    case (8*8-1):

-      cinfo->block_size = 8;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (9*9-1):

-      cinfo->block_size = 9;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (10*10-1):

-      cinfo->block_size = 10;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (11*11-1):

-      cinfo->block_size = 11;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (12*12-1):

-      cinfo->block_size = 12;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (13*13-1):

-      cinfo->block_size = 13;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (14*14-1):

-      cinfo->block_size = 14;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (15*15-1):

-      cinfo->block_size = 15;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    case (16*16-1):

-      cinfo->block_size = 16;

-      cinfo->natural_order = jpeg_natural_order;

-      cinfo->lim_Se = DCTSIZE2-1;

-      break;

-    default:

-      ERREXIT4(cinfo, JERR_BAD_PROGRESSION,

-	       cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);

-      break;

-    }

-

-  /* We initialize DCT_scaled_size and min_DCT_scaled_size to block_size.

-   * In the full decompressor,

-   * this will be overridden by jpeg_calc_output_dimensions in jdmaster.c;

-   * but in the transcoder,

-   * jpeg_calc_output_dimensions is not used, so we must do it here.

-   */

-  cinfo->min_DCT_h_scaled_size = cinfo->block_size;

-  cinfo->min_DCT_v_scaled_size = cinfo->block_size;

-

-  /* Compute dimensions of components */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    compptr->DCT_h_scaled_size = cinfo->block_size;

-    compptr->DCT_v_scaled_size = cinfo->block_size;

-    /* Size in DCT blocks */

-    compptr->width_in_blocks = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    compptr->height_in_blocks = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-    /* downsampled_width and downsampled_height will also be overridden by

-     * jdmaster.c if we are doing full decompression.  The transcoder library

-     * doesn't use these values, but the calling application might.

-     */

-    /* Size in samples */

-    compptr->downsampled_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,

-		    (long) cinfo->max_h_samp_factor);

-    compptr->downsampled_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,

-		    (long) cinfo->max_v_samp_factor);

-    /* Mark component needed, until color conversion says otherwise */

-    compptr->component_needed = TRUE;

-    /* Mark no quantization table yet saved for component */

-    compptr->quant_table = NULL;

-  }

-

-  /* Compute number of fully interleaved MCU rows. */

-  cinfo->total_iMCU_rows = (JDIMENSION)

-    jdiv_round_up((long) cinfo->image_height,

-	          (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-

-  /* Decide whether file contains multiple scans */

-  if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode)

-    cinfo->inputctl->has_multiple_scans = TRUE;

-  else

-    cinfo->inputctl->has_multiple_scans = FALSE;

-}

-

-

-LOCAL(void)

-per_scan_setup (j_decompress_ptr cinfo)

-/* Do computations that are needed before processing a JPEG scan */

-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] were set from SOS marker */

-{

-  int ci, mcublks, tmp;

-  jpeg_component_info *compptr;

-  

-  if (cinfo->comps_in_scan == 1) {

-    

-    /* Noninterleaved (single-component) scan */

-    compptr = cinfo->cur_comp_info[0];

-    

-    /* Overall image size in MCUs */

-    cinfo->MCUs_per_row = compptr->width_in_blocks;

-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;

-    

-    /* For noninterleaved scan, always one block per MCU */

-    compptr->MCU_width = 1;

-    compptr->MCU_height = 1;

-    compptr->MCU_blocks = 1;

-    compptr->MCU_sample_width = compptr->DCT_h_scaled_size;

-    compptr->last_col_width = 1;

-    /* For noninterleaved scans, it is convenient to define last_row_height

-     * as the number of block rows present in the last iMCU row.

-     */

-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);

-    if (tmp == 0) tmp = compptr->v_samp_factor;

-    compptr->last_row_height = tmp;

-    

-    /* Prepare array describing MCU composition */

-    cinfo->blocks_in_MCU = 1;

-    cinfo->MCU_membership[0] = 0;

-    

-  } else {

-    

-    /* Interleaved (multi-component) scan */

-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)

-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,

-	       MAX_COMPS_IN_SCAN);

-    

-    /* Overall image size in MCUs */

-    cinfo->MCUs_per_row = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width,

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    cinfo->MCU_rows_in_scan = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height,

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-    

-    cinfo->blocks_in_MCU = 0;

-    

-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-      compptr = cinfo->cur_comp_info[ci];

-      /* Sampling factors give # of blocks of component in each MCU */

-      compptr->MCU_width = compptr->h_samp_factor;

-      compptr->MCU_height = compptr->v_samp_factor;

-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;

-      compptr->MCU_sample_width = compptr->MCU_width * compptr->DCT_h_scaled_size;

-      /* Figure number of non-dummy blocks in last MCU column & row */

-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);

-      if (tmp == 0) tmp = compptr->MCU_width;

-      compptr->last_col_width = tmp;

-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);

-      if (tmp == 0) tmp = compptr->MCU_height;

-      compptr->last_row_height = tmp;

-      /* Prepare array describing MCU composition */

-      mcublks = compptr->MCU_blocks;

-      if (cinfo->blocks_in_MCU + mcublks > D_MAX_BLOCKS_IN_MCU)

-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);

-      while (mcublks-- > 0) {

-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;

-      }

-    }

-    

-  }

-}

-

-

-/*

- * Save away a copy of the Q-table referenced by each component present

- * in the current scan, unless already saved during a prior scan.

- *

- * In a multiple-scan JPEG file, the encoder could assign different components

- * the same Q-table slot number, but change table definitions between scans

- * so that each component uses a different Q-table.  (The IJG encoder is not

- * currently capable of doing this, but other encoders might.)  Since we want

- * to be able to dequantize all the components at the end of the file, this

- * means that we have to save away the table actually used for each component.

- * We do this by copying the table at the start of the first scan containing

- * the component.

- * The JPEG spec prohibits the encoder from changing the contents of a Q-table

- * slot between scans of a component using that slot.  If the encoder does so

- * anyway, this decoder will simply use the Q-table values that were current

- * at the start of the first scan for the component.

- *

- * The decompressor output side looks only at the saved quant tables,

- * not at the current Q-table slots.

- */

-

-LOCAL(void)

-latch_quant_tables (j_decompress_ptr cinfo)

-{

-  int ci, qtblno;

-  jpeg_component_info *compptr;

-  JQUANT_TBL * qtbl;

-

-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {

-    compptr = cinfo->cur_comp_info[ci];

-    /* No work if we already saved Q-table for this component */

-    if (compptr->quant_table != NULL)

-      continue;

-    /* Make sure specified quantization table is present */

-    qtblno = compptr->quant_tbl_no;

-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||

-	cinfo->quant_tbl_ptrs[qtblno] == NULL)

-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);

-    /* OK, save away the quantization table */

-    qtbl = (JQUANT_TBL *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(JQUANT_TBL));

-    MEMCOPY(qtbl, cinfo->quant_tbl_ptrs[qtblno], SIZEOF(JQUANT_TBL));

-    compptr->quant_table = qtbl;

-  }

-}

-

-

-/*

- * Initialize the input modules to read a scan of compressed data.

- * The first call to this is done by jdmaster.c after initializing

- * the entire decompressor (during jpeg_start_decompress).

- * Subsequent calls come from consume_markers, below.

- */

-

-METHODDEF(void)

-start_input_pass (j_decompress_ptr cinfo)

-{

-  per_scan_setup(cinfo);

-  latch_quant_tables(cinfo);

-  (*cinfo->entropy->start_pass) (cinfo);

-  (*cinfo->coef->start_input_pass) (cinfo);

-  cinfo->inputctl->consume_input = cinfo->coef->consume_data;

-}

-

-

-/*

- * Finish up after inputting a compressed-data scan.

- * This is called by the coefficient controller after it's read all

- * the expected data of the scan.

- */

-

-METHODDEF(void)

-finish_input_pass (j_decompress_ptr cinfo)

-{

-  (*cinfo->entropy->finish_pass) (cinfo);

-  cinfo->inputctl->consume_input = consume_markers;

-}

-

-

-/*

- * Read JPEG markers before, between, or after compressed-data scans.

- * Change state as necessary when a new scan is reached.

- * Return value is JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.

- *

- * The consume_input method pointer points either here or to the

- * coefficient controller's consume_data routine, depending on whether

- * we are reading a compressed data segment or inter-segment markers.

- *

- * Note: This function should NOT return a pseudo SOS marker (with zero

- * component number) to the caller.  A pseudo marker received by

- * read_markers is processed and then skipped for other markers.

- */

-

-METHODDEF(int)

-consume_markers (j_decompress_ptr cinfo)

-{

-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;

-  int val;

-

-  if (inputctl->pub.eoi_reached) /* After hitting EOI, read no further */

-    return JPEG_REACHED_EOI;

-

-  for (;;) {			/* Loop to pass pseudo SOS marker */

-    val = (*cinfo->marker->read_markers) (cinfo);

-

-    switch (val) {

-    case JPEG_REACHED_SOS:	/* Found SOS */

-      if (inputctl->inheaders) { /* 1st SOS */

-	if (inputctl->inheaders == 1)

-	  initial_setup(cinfo);

-	if (cinfo->comps_in_scan == 0) { /* pseudo SOS marker */

-	  inputctl->inheaders = 2;

-	  break;

-	}

-	inputctl->inheaders = 0;

-	/* Note: start_input_pass must be called by jdmaster.c

-	 * before any more input can be consumed.  jdapimin.c is

-	 * responsible for enforcing this sequencing.

-	 */

-      } else {			/* 2nd or later SOS marker */

-	if (! inputctl->pub.has_multiple_scans)

-	  ERREXIT(cinfo, JERR_EOI_EXPECTED); /* Oops, I wasn't expecting this! */

-	if (cinfo->comps_in_scan == 0) /* unexpected pseudo SOS marker */

-	  break;

-	start_input_pass(cinfo);

-      }

-      return val;

-    case JPEG_REACHED_EOI:	/* Found EOI */

-      inputctl->pub.eoi_reached = TRUE;

-      if (inputctl->inheaders) { /* Tables-only datastream, apparently */

-	if (cinfo->marker->saw_SOF)

-	  ERREXIT(cinfo, JERR_SOF_NO_SOS);

-      } else {

-	/* Prevent infinite loop in coef ctlr's decompress_data routine

-	 * if user set output_scan_number larger than number of scans.

-	 */

-	if (cinfo->output_scan_number > cinfo->input_scan_number)

-	  cinfo->output_scan_number = cinfo->input_scan_number;

-      }

-      return val;

-    case JPEG_SUSPENDED:

-      return val;

-    default:

-      return val;

-    }

-  }

-}

-

-

-/*

- * Reset state to begin a fresh datastream.

- */

-

-METHODDEF(void)

-reset_input_controller (j_decompress_ptr cinfo)

-{

-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;

-

-  inputctl->pub.consume_input = consume_markers;

-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */

-  inputctl->pub.eoi_reached = FALSE;

-  inputctl->inheaders = 1;

-  /* Reset other modules */

-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);

-  (*cinfo->marker->reset_marker_reader) (cinfo);

-  /* Reset progression state -- would be cleaner if entropy decoder did this */

-  cinfo->coef_bits = NULL;

-}

-

-

-/*

- * Initialize the input controller module.

- * This is called only once, when the decompression object is created.

- */

-

-GLOBAL(void)

-jinit_input_controller (j_decompress_ptr cinfo)

-{

-  my_inputctl_ptr inputctl;

-

-  /* Create subobject in permanent pool */

-  inputctl = (my_inputctl_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				SIZEOF(my_input_controller));

-  cinfo->inputctl = &inputctl->pub;

-  /* Initialize method pointers */

-  inputctl->pub.consume_input = consume_markers;

-  inputctl->pub.reset_input_controller = reset_input_controller;

-  inputctl->pub.start_input_pass = start_input_pass;

-  inputctl->pub.finish_input_pass = finish_input_pass;

-  /* Initialize state: can't use reset_input_controller since we don't

-   * want to try to reset other modules yet.

-   */

-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */

-  inputctl->pub.eoi_reached = FALSE;

-  inputctl->inheaders = 1;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdmainct.c b/plugins/AdvaImg/src/LibJPEG/jdmainct.c
deleted file mode 100644
index 7ced4386b2..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdmainct.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*

- * jdmainct.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2002-2012 by Guido Vollbeding.

- * 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 the main buffer controller for decompression.

- * The main buffer lies between the JPEG decompressor proper and the

- * post-processor; it holds downsampled data in the JPEG colorspace.

- *

- * Note that this code is bypassed in raw-data mode, since the application

- * supplies the equivalent of the main buffer in that case.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * In the current system design, the main buffer need never be a full-image

- * buffer; any full-height buffers will be found inside the coefficient or

- * postprocessing controllers.  Nonetheless, the main controller is not

- * trivial.  Its responsibility is to provide context rows for upsampling/

- * rescaling, and doing this in an efficient fashion is a bit tricky.

- *

- * Postprocessor input data is counted in "row groups".  A row group

- * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)

- * sample rows of each component.  (We require DCT_scaled_size values to be

- * chosen such that these numbers are integers.  In practice DCT_scaled_size

- * values will likely be powers of two, so we actually have the stronger

- * condition that DCT_scaled_size / min_DCT_scaled_size is an integer.)

- * Upsampling will typically produce max_v_samp_factor pixel rows from each

- * row group (times any additional scale factor that the upsampler is

- * applying).

- *

- * The coefficient controller will deliver data to us one iMCU row at a time;

- * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or

- * exactly min_DCT_scaled_size row groups.  (This amount of data corresponds

- * to one row of MCUs when the image is fully interleaved.)  Note that the

- * number of sample rows varies across components, but the number of row

- * groups does not.  Some garbage sample rows may be included in the last iMCU

- * row at the bottom of the image.

- *

- * Depending on the vertical scaling algorithm used, the upsampler may need

- * access to the sample row(s) above and below its current input row group.

- * The upsampler is required to set need_context_rows TRUE at global selection

- * time if so.  When need_context_rows is FALSE, this controller can simply

- * obtain one iMCU row at a time from the coefficient controller and dole it

- * out as row groups to the postprocessor.

- *

- * When need_context_rows is TRUE, this controller guarantees that the buffer

- * passed to postprocessing contains at least one row group's worth of samples

- * above and below the row group(s) being processed.  Note that the context

- * rows "above" the first passed row group appear at negative row offsets in

- * the passed buffer.  At the top and bottom of the image, the required

- * context rows are manufactured by duplicating the first or last real sample

- * row; this avoids having special cases in the upsampling inner loops.

- *

- * The amount of context is fixed at one row group just because that's a

- * convenient number for this controller to work with.  The existing

- * upsamplers really only need one sample row of context.  An upsampler

- * supporting arbitrary output rescaling might wish for more than one row

- * group of context when shrinking the image; tough, we don't handle that.

- * (This is justified by the assumption that downsizing will be handled mostly

- * by adjusting the DCT_scaled_size values, so that the actual scale factor at

- * the upsample step needn't be much less than one.)

- *

- * To provide the desired context, we have to retain the last two row groups

- * of one iMCU row while reading in the next iMCU row.  (The last row group

- * can't be processed until we have another row group for its below-context,

- * and so we have to save the next-to-last group too for its above-context.)

- * We could do this most simply by copying data around in our buffer, but

- * that'd be very slow.  We can avoid copying any data by creating a rather

- * strange pointer structure.  Here's how it works.  We allocate a workspace

- * consisting of M+2 row groups (where M = min_DCT_scaled_size is the number

- * of row groups per iMCU row).  We create two sets of redundant pointers to

- * the workspace.  Labeling the physical row groups 0 to M+1, the synthesized

- * pointer lists look like this:

- *                   M+1                          M-1

- * master pointer --> 0         master pointer --> 0

- *                    1                            1

- *                   ...                          ...

- *                   M-3                          M-3

- *                   M-2                           M

- *                   M-1                          M+1

- *                    M                           M-2

- *                   M+1                          M-1

- *                    0                            0

- * We read alternate iMCU rows using each master pointer; thus the last two

- * row groups of the previous iMCU row remain un-overwritten in the workspace.

- * The pointer lists are set up so that the required context rows appear to

- * be adjacent to the proper places when we pass the pointer lists to the

- * upsampler.

- *

- * The above pictures describe the normal state of the pointer lists.

- * At top and bottom of the image, we diddle the pointer lists to duplicate

- * the first or last sample row as necessary (this is cheaper than copying

- * sample rows around).

- *

- * This scheme breaks down if M < 2, ie, min_DCT_scaled_size is 1.  In that

- * situation each iMCU row provides only one row group so the buffering logic

- * must be different (eg, we must read two iMCU rows before we can emit the

- * first row group).  For now, we simply do not support providing context

- * rows when min_DCT_scaled_size is 1.  That combination seems unlikely to

- * be worth providing --- if someone wants a 1/8th-size preview, they probably

- * want it quick and dirty, so a context-free upsampler is sufficient.

- */

-

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_d_main_controller pub; /* public fields */

-

-  /* Pointer to allocated workspace (M or M+2 row groups). */

-  JSAMPARRAY buffer[MAX_COMPONENTS];

-

-  boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */

-  JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */

-

-  /* Remaining fields are only used in the context case. */

-

-  /* These are the master pointers to the funny-order pointer lists. */

-  JSAMPIMAGE xbuffer[2];	/* pointers to weird pointer lists */

-

-  int whichptr;			/* indicates which pointer set is now in use */

-  int context_state;		/* process_data state machine status */

-  JDIMENSION rowgroups_avail;	/* row groups available to postprocessor */

-  JDIMENSION iMCU_row_ctr;	/* counts iMCU rows to detect image top/bot */

-} my_main_controller;

-

-typedef my_main_controller * my_main_ptr;

-

-/* context_state values: */

-#define CTX_PREPARE_FOR_IMCU	0	/* need to prepare for MCU row */

-#define CTX_PROCESS_IMCU	1	/* feeding iMCU to postprocessor */

-#define CTX_POSTPONED_ROW	2	/* feeding postponed row group */

-

-

-/* Forward declarations */

-METHODDEF(void) process_data_simple_main

-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,

-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));

-METHODDEF(void) process_data_context_main

-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,

-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));

-#ifdef QUANT_2PASS_SUPPORTED

-METHODDEF(void) process_data_crank_post

-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,

-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));

-#endif

-

-

-LOCAL(void)

-alloc_funny_pointers (j_decompress_ptr cinfo)

-/* Allocate space for the funny pointer lists.

- * This is done only once, not once per pass.

- */

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  int ci, rgroup;

-  int M = cinfo->min_DCT_v_scaled_size;

-  jpeg_component_info *compptr;

-  JSAMPARRAY xbuf;

-

-  /* Get top-level space for component array pointers.

-   * We alloc both arrays with one call to save a few cycles.

-   */

-  mainp->xbuffer[0] = (JSAMPIMAGE)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				cinfo->num_components * 2 * SIZEOF(JSAMPARRAY));

-  mainp->xbuffer[1] = mainp->xbuffer[0] + cinfo->num_components;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    rgroup = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-      cinfo->min_DCT_v_scaled_size; /* height of a row group of component */

-    /* Get space for pointer lists --- M+4 row groups in each list.

-     * We alloc both pointer lists with one call to save a few cycles.

-     */

-    xbuf = (JSAMPARRAY)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  2 * (rgroup * (M + 4)) * SIZEOF(JSAMPROW));

-    xbuf += rgroup;		/* want one row group at negative offsets */

-    mainp->xbuffer[0][ci] = xbuf;

-    xbuf += rgroup * (M + 4);

-    mainp->xbuffer[1][ci] = xbuf;

-  }

-}

-

-

-LOCAL(void)

-make_funny_pointers (j_decompress_ptr cinfo)

-/* Create the funny pointer lists discussed in the comments above.

- * The actual workspace is already allocated (in main->buffer),

- * and the space for the pointer lists is allocated too.

- * This routine just fills in the curiously ordered lists.

- * This will be repeated at the beginning of each pass.

- */

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  int ci, i, rgroup;

-  int M = cinfo->min_DCT_v_scaled_size;

-  jpeg_component_info *compptr;

-  JSAMPARRAY buf, xbuf0, xbuf1;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    rgroup = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-      cinfo->min_DCT_v_scaled_size; /* height of a row group of component */

-    xbuf0 = mainp->xbuffer[0][ci];

-    xbuf1 = mainp->xbuffer[1][ci];

-    /* First copy the workspace pointers as-is */

-    buf = mainp->buffer[ci];

-    for (i = 0; i < rgroup * (M + 2); i++) {

-      xbuf0[i] = xbuf1[i] = buf[i];

-    }

-    /* In the second list, put the last four row groups in swapped order */

-    for (i = 0; i < rgroup * 2; i++) {

-      xbuf1[rgroup*(M-2) + i] = buf[rgroup*M + i];

-      xbuf1[rgroup*M + i] = buf[rgroup*(M-2) + i];

-    }

-    /* The wraparound pointers at top and bottom will be filled later

-     * (see set_wraparound_pointers, below).  Initially we want the "above"

-     * pointers to duplicate the first actual data line.  This only needs

-     * to happen in xbuffer[0].

-     */

-    for (i = 0; i < rgroup; i++) {

-      xbuf0[i - rgroup] = xbuf0[0];

-    }

-  }

-}

-

-

-LOCAL(void)

-set_wraparound_pointers (j_decompress_ptr cinfo)

-/* Set up the "wraparound" pointers at top and bottom of the pointer lists.

- * This changes the pointer list state from top-of-image to the normal state.

- */

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  int ci, i, rgroup;

-  int M = cinfo->min_DCT_v_scaled_size;

-  jpeg_component_info *compptr;

-  JSAMPARRAY xbuf0, xbuf1;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    rgroup = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-      cinfo->min_DCT_v_scaled_size; /* height of a row group of component */

-    xbuf0 = mainp->xbuffer[0][ci];

-    xbuf1 = mainp->xbuffer[1][ci];

-    for (i = 0; i < rgroup; i++) {

-      xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];

-      xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];

-      xbuf0[rgroup*(M+2) + i] = xbuf0[i];

-      xbuf1[rgroup*(M+2) + i] = xbuf1[i];

-    }

-  }

-}

-

-

-LOCAL(void)

-set_bottom_pointers (j_decompress_ptr cinfo)

-/* Change the pointer lists to duplicate the last sample row at the bottom

- * of the image.  whichptr indicates which xbuffer holds the final iMCU row.

- * Also sets rowgroups_avail to indicate number of nondummy row groups in row.

- */

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  int ci, i, rgroup, iMCUheight, rows_left;

-  jpeg_component_info *compptr;

-  JSAMPARRAY xbuf;

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Count sample rows in one iMCU row and in one row group */

-    iMCUheight = compptr->v_samp_factor * compptr->DCT_v_scaled_size;

-    rgroup = iMCUheight / cinfo->min_DCT_v_scaled_size;

-    /* Count nondummy sample rows remaining for this component */

-    rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight);

-    if (rows_left == 0) rows_left = iMCUheight;

-    /* Count nondummy row groups.  Should get same answer for each component,

-     * so we need only do it once.

-     */

-    if (ci == 0) {

-      mainp->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1);

-    }

-    /* Duplicate the last real sample row rgroup*2 times; this pads out the

-     * last partial rowgroup and ensures at least one full rowgroup of context.

-     */

-    xbuf = mainp->xbuffer[mainp->whichptr][ci];

-    for (i = 0; i < rgroup * 2; i++) {

-      xbuf[rows_left + i] = xbuf[rows_left-1];

-    }

-  }

-}

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-

-  switch (pass_mode) {

-  case JBUF_PASS_THRU:

-    if (cinfo->upsample->need_context_rows) {

-      mainp->pub.process_data = process_data_context_main;

-      make_funny_pointers(cinfo); /* Create the xbuffer[] lists */

-      mainp->whichptr = 0;	/* Read first iMCU row into xbuffer[0] */

-      mainp->context_state = CTX_PREPARE_FOR_IMCU;

-      mainp->iMCU_row_ctr = 0;

-    } else {

-      /* Simple case with no context needed */

-      mainp->pub.process_data = process_data_simple_main;

-    }

-    mainp->buffer_full = FALSE;	/* Mark buffer empty */

-    mainp->rowgroup_ctr = 0;

-    break;

-#ifdef QUANT_2PASS_SUPPORTED

-  case JBUF_CRANK_DEST:

-    /* For last pass of 2-pass quantization, just crank the postprocessor */

-    mainp->pub.process_data = process_data_crank_post;

-    break;

-#endif

-  default:

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    break;

-  }

-}

-

-

-/*

- * Process some data.

- * This handles the simple case where no context is required.

- */

-

-METHODDEF(void)

-process_data_simple_main (j_decompress_ptr cinfo,

-			  JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-			  JDIMENSION out_rows_avail)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-  JDIMENSION rowgroups_avail;

-

-  /* Read input data if we haven't filled the main buffer yet */

-  if (! mainp->buffer_full) {

-    if (! (*cinfo->coef->decompress_data) (cinfo, mainp->buffer))

-      return;			/* suspension forced, can do nothing more */

-    mainp->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */

-  }

-

-  /* There are always min_DCT_scaled_size row groups in an iMCU row. */

-  rowgroups_avail = (JDIMENSION) cinfo->min_DCT_v_scaled_size;

-  /* Note: at the bottom of the image, we may pass extra garbage row groups

-   * to the postprocessor.  The postprocessor has to check for bottom

-   * of image anyway (at row resolution), so no point in us doing it too.

-   */

-

-  /* Feed the postprocessor */

-  (*cinfo->post->post_process_data) (cinfo, mainp->buffer,

-				     &mainp->rowgroup_ctr, rowgroups_avail,

-				     output_buf, out_row_ctr, out_rows_avail);

-

-  /* Has postprocessor consumed all the data yet? If so, mark buffer empty */

-  if (mainp->rowgroup_ctr >= rowgroups_avail) {

-    mainp->buffer_full = FALSE;

-    mainp->rowgroup_ctr = 0;

-  }

-}

-

-

-/*

- * Process some data.

- * This handles the case where context rows must be provided.

- */

-

-METHODDEF(void)

-process_data_context_main (j_decompress_ptr cinfo,

-			   JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-			   JDIMENSION out_rows_avail)

-{

-  my_main_ptr mainp = (my_main_ptr) cinfo->main;

-

-  /* Read input data if we haven't filled the main buffer yet */

-  if (! mainp->buffer_full) {

-    if (! (*cinfo->coef->decompress_data) (cinfo,

-					   mainp->xbuffer[mainp->whichptr]))

-      return;			/* suspension forced, can do nothing more */

-    mainp->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */

-    mainp->iMCU_row_ctr++;	/* count rows received */

-  }

-

-  /* Postprocessor typically will not swallow all the input data it is handed

-   * in one call (due to filling the output buffer first).  Must be prepared

-   * to exit and restart.  This switch lets us keep track of how far we got.

-   * Note that each case falls through to the next on successful completion.

-   */

-  switch (mainp->context_state) {

-  case CTX_POSTPONED_ROW:

-    /* Call postprocessor using previously set pointers for postponed row */

-    (*cinfo->post->post_process_data) (cinfo, mainp->xbuffer[mainp->whichptr],

-			&mainp->rowgroup_ctr, mainp->rowgroups_avail,

-			output_buf, out_row_ctr, out_rows_avail);

-    if (mainp->rowgroup_ctr < mainp->rowgroups_avail)

-      return;			/* Need to suspend */

-    mainp->context_state = CTX_PREPARE_FOR_IMCU;

-    if (*out_row_ctr >= out_rows_avail)

-      return;			/* Postprocessor exactly filled output buf */

-    /*FALLTHROUGH*/

-  case CTX_PREPARE_FOR_IMCU:

-    /* Prepare to process first M-1 row groups of this iMCU row */

-    mainp->rowgroup_ctr = 0;

-    mainp->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_v_scaled_size - 1);

-    /* Check for bottom of image: if so, tweak pointers to "duplicate"

-     * the last sample row, and adjust rowgroups_avail to ignore padding rows.

-     */

-    if (mainp->iMCU_row_ctr == cinfo->total_iMCU_rows)

-      set_bottom_pointers(cinfo);

-    mainp->context_state = CTX_PROCESS_IMCU;

-    /*FALLTHROUGH*/

-  case CTX_PROCESS_IMCU:

-    /* Call postprocessor using previously set pointers */

-    (*cinfo->post->post_process_data) (cinfo, mainp->xbuffer[mainp->whichptr],

-			&mainp->rowgroup_ctr, mainp->rowgroups_avail,

-			output_buf, out_row_ctr, out_rows_avail);

-    if (mainp->rowgroup_ctr < mainp->rowgroups_avail)

-      return;			/* Need to suspend */

-    /* After the first iMCU, change wraparound pointers to normal state */

-    if (mainp->iMCU_row_ctr == 1)

-      set_wraparound_pointers(cinfo);

-    /* Prepare to load new iMCU row using other xbuffer list */

-    mainp->whichptr ^= 1;	/* 0=>1 or 1=>0 */

-    mainp->buffer_full = FALSE;

-    /* Still need to process last row group of this iMCU row, */

-    /* which is saved at index M+1 of the other xbuffer */

-    mainp->rowgroup_ctr = (JDIMENSION) (cinfo->min_DCT_v_scaled_size + 1);

-    mainp->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_v_scaled_size + 2);

-    mainp->context_state = CTX_POSTPONED_ROW;

-  }

-}

-

-

-/*

- * Process some data.

- * Final pass of two-pass quantization: just call the postprocessor.

- * Source data will be the postprocessor controller's internal buffer.

- */

-

-#ifdef QUANT_2PASS_SUPPORTED

-

-METHODDEF(void)

-process_data_crank_post (j_decompress_ptr cinfo,

-			 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-			 JDIMENSION out_rows_avail)

-{

-  (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,

-				     (JDIMENSION *) NULL, (JDIMENSION) 0,

-				     output_buf, out_row_ctr, out_rows_avail);

-}

-

-#endif /* QUANT_2PASS_SUPPORTED */

-

-

-/*

- * Initialize main buffer controller.

- */

-

-GLOBAL(void)

-jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)

-{

-  my_main_ptr mainp;

-  int ci, rgroup, ngroups;

-  jpeg_component_info *compptr;

-

-  mainp = (my_main_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_main_controller));

-  cinfo->main = &mainp->pub;

-  mainp->pub.start_pass = start_pass_main;

-

-  if (need_full_buffer)		/* shouldn't happen */

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-

-  /* Allocate the workspace.

-   * ngroups is the number of row groups we need.

-   */

-  if (cinfo->upsample->need_context_rows) {

-    if (cinfo->min_DCT_v_scaled_size < 2) /* unsupported, see comments above */

-      ERREXIT(cinfo, JERR_NOTIMPL);

-    alloc_funny_pointers(cinfo); /* Alloc space for xbuffer[] lists */

-    ngroups = cinfo->min_DCT_v_scaled_size + 2;

-  } else {

-    ngroups = cinfo->min_DCT_v_scaled_size;

-  }

-

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    rgroup = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-      cinfo->min_DCT_v_scaled_size; /* height of a row group of component */

-    mainp->buffer[ci] = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       compptr->width_in_blocks * ((JDIMENSION) compptr->DCT_h_scaled_size),

-       (JDIMENSION) (rgroup * ngroups));

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdmarker.c b/plugins/AdvaImg/src/LibJPEG/jdmarker.c
deleted file mode 100644
index b1faf88fb7..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdmarker.c
+++ /dev/null
@@ -1,1511 +0,0 @@
-/*

- * jdmarker.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2009-2013 by Guido Vollbeding.

- * 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 routines to decode JPEG datastream markers.

- * Most of the complexity arises from our desire to support input

- * suspension: if not all of the data for a marker is available,

- * we must exit back to the application.  On resumption, we reprocess

- * the marker.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-typedef enum {			/* JPEG marker codes */

-  M_SOF0  = 0xc0,

-  M_SOF1  = 0xc1,

-  M_SOF2  = 0xc2,

-  M_SOF3  = 0xc3,

-

-  M_SOF5  = 0xc5,

-  M_SOF6  = 0xc6,

-  M_SOF7  = 0xc7,

-

-  M_JPG   = 0xc8,

-  M_SOF9  = 0xc9,

-  M_SOF10 = 0xca,

-  M_SOF11 = 0xcb,

-

-  M_SOF13 = 0xcd,

-  M_SOF14 = 0xce,

-  M_SOF15 = 0xcf,

-

-  M_DHT   = 0xc4,

-

-  M_DAC   = 0xcc,

-

-  M_RST0  = 0xd0,

-  M_RST1  = 0xd1,

-  M_RST2  = 0xd2,

-  M_RST3  = 0xd3,

-  M_RST4  = 0xd4,

-  M_RST5  = 0xd5,

-  M_RST6  = 0xd6,

-  M_RST7  = 0xd7,

-

-  M_SOI   = 0xd8,

-  M_EOI   = 0xd9,

-  M_SOS   = 0xda,

-  M_DQT   = 0xdb,

-  M_DNL   = 0xdc,

-  M_DRI   = 0xdd,

-  M_DHP   = 0xde,

-  M_EXP   = 0xdf,

-

-  M_APP0  = 0xe0,

-  M_APP1  = 0xe1,

-  M_APP2  = 0xe2,

-  M_APP3  = 0xe3,

-  M_APP4  = 0xe4,

-  M_APP5  = 0xe5,

-  M_APP6  = 0xe6,

-  M_APP7  = 0xe7,

-  M_APP8  = 0xe8,

-  M_APP9  = 0xe9,

-  M_APP10 = 0xea,

-  M_APP11 = 0xeb,

-  M_APP12 = 0xec,

-  M_APP13 = 0xed,

-  M_APP14 = 0xee,

-  M_APP15 = 0xef,

-

-  M_JPG0  = 0xf0,

-  M_JPG8  = 0xf8,

-  M_JPG13 = 0xfd,

-  M_COM   = 0xfe,

-

-  M_TEM   = 0x01,

-

-  M_ERROR = 0x100

-} JPEG_MARKER;

-

-

-/* Private state */

-

-typedef struct {

-  struct jpeg_marker_reader pub; /* public fields */

-

-  /* Application-overridable marker processing methods */

-  jpeg_marker_parser_method process_COM;

-  jpeg_marker_parser_method process_APPn[16];

-

-  /* Limit on marker data length to save for each marker type */

-  unsigned int length_limit_COM;

-  unsigned int length_limit_APPn[16];

-

-  /* Status of COM/APPn marker saving */

-  jpeg_saved_marker_ptr cur_marker;	/* NULL if not processing a marker */

-  unsigned int bytes_read;		/* data bytes read so far in marker */

-  /* Note: cur_marker is not linked into marker_list until it's all read. */

-} my_marker_reader;

-

-typedef my_marker_reader * my_marker_ptr;

-

-

-/*

- * Macros for fetching data from the data source module.

- *

- * At all times, cinfo->src->next_input_byte and ->bytes_in_buffer reflect

- * the current restart point; we update them only when we have reached a

- * suitable place to restart if a suspension occurs.

- */

-

-/* Declare and initialize local copies of input pointer/count */

-#define INPUT_VARS(cinfo)  \

-	struct jpeg_source_mgr * datasrc = (cinfo)->src;  \

-	const JOCTET * next_input_byte = datasrc->next_input_byte;  \

-	size_t bytes_in_buffer = datasrc->bytes_in_buffer

-

-/* Unload the local copies --- do this only at a restart boundary */

-#define INPUT_SYNC(cinfo)  \

-	( datasrc->next_input_byte = next_input_byte,  \

-	  datasrc->bytes_in_buffer = bytes_in_buffer )

-

-/* Reload the local copies --- used only in MAKE_BYTE_AVAIL */

-#define INPUT_RELOAD(cinfo)  \

-	( next_input_byte = datasrc->next_input_byte,  \

-	  bytes_in_buffer = datasrc->bytes_in_buffer )

-

-/* Internal macro for INPUT_BYTE and INPUT_2BYTES: make a byte available.

- * Note we do *not* do INPUT_SYNC before calling fill_input_buffer,

- * but we must reload the local copies after a successful fill.

- */

-#define MAKE_BYTE_AVAIL(cinfo,action)  \

-	if (bytes_in_buffer == 0) {  \

-	  if (! (*datasrc->fill_input_buffer) (cinfo))  \

-	    { action; }  \

-	  INPUT_RELOAD(cinfo);  \

-	}

-

-/* Read a byte into variable V.

- * If must suspend, take the specified action (typically "return FALSE").

- */

-#define INPUT_BYTE(cinfo,V,action)  \

-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \

-		  bytes_in_buffer--; \

-		  V = GETJOCTET(*next_input_byte++); )

-

-/* As above, but read two bytes interpreted as an unsigned 16-bit integer.

- * V should be declared unsigned int or perhaps INT32.

- */

-#define INPUT_2BYTES(cinfo,V,action)  \

-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \

-		  bytes_in_buffer--; \

-		  V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \

-		  MAKE_BYTE_AVAIL(cinfo,action); \

-		  bytes_in_buffer--; \

-		  V += GETJOCTET(*next_input_byte++); )

-

-

-/*

- * Routines to process JPEG markers.

- *

- * Entry condition: JPEG marker itself has been read and its code saved

- *   in cinfo->unread_marker; input restart point is just after the marker.

- *

- * Exit: if return TRUE, have read and processed any parameters, and have

- *   updated the restart point to point after the parameters.

- *   If return FALSE, was forced to suspend before reaching end of

- *   marker parameters; restart point has not been moved.  Same routine

- *   will be called again after application supplies more input data.

- *

- * This approach to suspension assumes that all of a marker's parameters

- * can fit into a single input bufferload.  This should hold for "normal"

- * markers.  Some COM/APPn markers might have large parameter segments

- * that might not fit.  If we are simply dropping such a marker, we use

- * skip_input_data to get past it, and thereby put the problem on the

- * source manager's shoulders.  If we are saving the marker's contents

- * into memory, we use a slightly different convention: when forced to

- * suspend, the marker processor updates the restart point to the end of

- * what it's consumed (ie, the end of the buffer) before returning FALSE.

- * On resumption, cinfo->unread_marker still contains the marker code,

- * but the data source will point to the next chunk of marker data.

- * The marker processor must retain internal state to deal with this.

- *

- * Note that we don't bother to avoid duplicate trace messages if a

- * suspension occurs within marker parameters.  Other side effects

- * require more care.

- */

-

-

-LOCAL(boolean)

-get_soi (j_decompress_ptr cinfo)

-/* Process an SOI marker */

-{

-  int i;

-  

-  TRACEMS(cinfo, 1, JTRC_SOI);

-

-  if (cinfo->marker->saw_SOI)

-    ERREXIT(cinfo, JERR_SOI_DUPLICATE);

-

-  /* Reset all parameters that are defined to be reset by SOI */

-

-  for (i = 0; i < NUM_ARITH_TBLS; i++) {

-    cinfo->arith_dc_L[i] = 0;

-    cinfo->arith_dc_U[i] = 1;

-    cinfo->arith_ac_K[i] = 5;

-  }

-  cinfo->restart_interval = 0;

-

-  /* Set initial assumptions for colorspace etc */

-

-  cinfo->jpeg_color_space = JCS_UNKNOWN;

-  cinfo->color_transform = JCT_NONE;

-  cinfo->CCIR601_sampling = FALSE; /* Assume non-CCIR sampling??? */

-

-  cinfo->saw_JFIF_marker = FALSE;

-  cinfo->JFIF_major_version = 1; /* set default JFIF APP0 values */

-  cinfo->JFIF_minor_version = 1;

-  cinfo->density_unit = 0;

-  cinfo->X_density = 1;

-  cinfo->Y_density = 1;

-  cinfo->saw_Adobe_marker = FALSE;

-  cinfo->Adobe_transform = 0;

-

-  cinfo->marker->saw_SOI = TRUE;

-

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-get_sof (j_decompress_ptr cinfo, boolean is_baseline, boolean is_prog,

-	 boolean is_arith)

-/* Process a SOFn marker */

-{

-  INT32 length;

-  int c, ci, i;

-  jpeg_component_info * compptr;

-  INPUT_VARS(cinfo);

-

-  cinfo->is_baseline = is_baseline;

-  cinfo->progressive_mode = is_prog;

-  cinfo->arith_code = is_arith;

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-

-  INPUT_BYTE(cinfo, cinfo->data_precision, return FALSE);

-  INPUT_2BYTES(cinfo, cinfo->image_height, return FALSE);

-  INPUT_2BYTES(cinfo, cinfo->image_width, return FALSE);

-  INPUT_BYTE(cinfo, cinfo->num_components, return FALSE);

-

-  length -= 8;

-

-  TRACEMS4(cinfo, 1, JTRC_SOF, cinfo->unread_marker,

-	   (int) cinfo->image_width, (int) cinfo->image_height,

-	   cinfo->num_components);

-

-  if (cinfo->marker->saw_SOF)

-    ERREXIT(cinfo, JERR_SOF_DUPLICATE);

-

-  /* We don't support files in which the image height is initially specified */

-  /* as 0 and is later redefined by DNL.  As long as we have to check that,  */

-  /* might as well have a general sanity check. */

-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0 ||

-      cinfo->num_components <= 0)

-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);

-

-  if (length != (cinfo->num_components * 3))

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  if (cinfo->comp_info == NULL)	/* do only once, even if suspend */

-    cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small)

-			((j_common_ptr) cinfo, JPOOL_IMAGE,

-			 cinfo->num_components * SIZEOF(jpeg_component_info));

-

-  for (ci = 0; ci < cinfo->num_components; ci++) {

-    INPUT_BYTE(cinfo, c, return FALSE);

-    /* Check to see whether component id has already been seen   */

-    /* (in violation of the spec, but unfortunately seen in some */

-    /* files).  If so, create "fake" component id equal to the   */

-    /* max id seen so far + 1. */

-    for (i = 0, compptr = cinfo->comp_info; i < ci; i++, compptr++) {

-      if (c == compptr->component_id) {

-	compptr = cinfo->comp_info;

-	c = compptr->component_id;

-	compptr++;

-	for (i = 1; i < ci; i++, compptr++) {

-	  if (compptr->component_id > c) c = compptr->component_id;

-	}

-	c++;

-	break;

-      }

-    }

-    compptr->component_id = c;

-    compptr->component_index = ci;

-    INPUT_BYTE(cinfo, c, return FALSE);

-    compptr->h_samp_factor = (c >> 4) & 15;

-    compptr->v_samp_factor = (c     ) & 15;

-    INPUT_BYTE(cinfo, compptr->quant_tbl_no, return FALSE);

-

-    TRACEMS4(cinfo, 1, JTRC_SOF_COMPONENT,

-	     compptr->component_id, compptr->h_samp_factor,

-	     compptr->v_samp_factor, compptr->quant_tbl_no);

-  }

-

-  cinfo->marker->saw_SOF = TRUE;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-get_sos (j_decompress_ptr cinfo)

-/* Process a SOS marker */

-{

-  INT32 length;

-  int c, ci, i, n;

-  jpeg_component_info * compptr;

-  INPUT_VARS(cinfo);

-

-  if (! cinfo->marker->saw_SOF)

-    ERREXITS(cinfo, JERR_SOF_BEFORE, "SOS");

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-

-  INPUT_BYTE(cinfo, n, return FALSE); /* Number of components */

-

-  TRACEMS1(cinfo, 1, JTRC_SOS, n);

-

-  if (length != (n * 2 + 6) || n > MAX_COMPS_IN_SCAN ||

-      (n == 0 && !cinfo->progressive_mode))

-      /* pseudo SOS marker only allowed in progressive mode */

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  cinfo->comps_in_scan = n;

-

-  /* Collect the component-spec parameters */

-

-  for (i = 0; i < n; i++) {

-    INPUT_BYTE(cinfo, c, return FALSE);

-

-    /* Detect the case where component id's are not unique, and, if so, */

-    /* create a fake component id using the same logic as in get_sof.   */

-    /* Note:  This also ensures that all of the SOF components are      */

-    /* referenced in the single scan case, which prevents access to     */

-    /* uninitialized memory in later decoding stages. */

-    for (ci = 0; ci < i; ci++) {

-      if (c == cinfo->cur_comp_info[ci]->component_id) {

-	c = cinfo->cur_comp_info[0]->component_id;

-	for (ci = 1; ci < i; ci++) {

-	  compptr = cinfo->cur_comp_info[ci];

-	  if (compptr->component_id > c) c = compptr->component_id;

-	}

-	c++;

-	break;

-      }

-    }

-

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      if (c == compptr->component_id)

-	goto id_found;

-    }

-

-    ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, c);

-

-  id_found:

-

-    cinfo->cur_comp_info[i] = compptr;

-    INPUT_BYTE(cinfo, c, return FALSE);

-    compptr->dc_tbl_no = (c >> 4) & 15;

-    compptr->ac_tbl_no = (c     ) & 15;

-

-    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, compptr->component_id,

-	     compptr->dc_tbl_no, compptr->ac_tbl_no);

-  }

-

-  /* Collect the additional scan parameters Ss, Se, Ah/Al. */

-  INPUT_BYTE(cinfo, c, return FALSE);

-  cinfo->Ss = c;

-  INPUT_BYTE(cinfo, c, return FALSE);

-  cinfo->Se = c;

-  INPUT_BYTE(cinfo, c, return FALSE);

-  cinfo->Ah = (c >> 4) & 15;

-  cinfo->Al = (c     ) & 15;

-

-  TRACEMS4(cinfo, 1, JTRC_SOS_PARAMS, cinfo->Ss, cinfo->Se,

-	   cinfo->Ah, cinfo->Al);

-

-  /* Prepare to scan data & restart markers */

-  cinfo->marker->next_restart_num = 0;

-

-  /* Count another (non-pseudo) SOS marker */

-  if (n) cinfo->input_scan_number++;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-#ifdef D_ARITH_CODING_SUPPORTED

-

-LOCAL(boolean)

-get_dac (j_decompress_ptr cinfo)

-/* Process a DAC marker */

-{

-  INT32 length;

-  int index, val;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  length -= 2;

-  

-  while (length > 0) {

-    INPUT_BYTE(cinfo, index, return FALSE);

-    INPUT_BYTE(cinfo, val, return FALSE);

-

-    length -= 2;

-

-    TRACEMS2(cinfo, 1, JTRC_DAC, index, val);

-

-    if (index < 0 || index >= (2*NUM_ARITH_TBLS))

-      ERREXIT1(cinfo, JERR_DAC_INDEX, index);

-

-    if (index >= NUM_ARITH_TBLS) { /* define AC table */

-      cinfo->arith_ac_K[index-NUM_ARITH_TBLS] = (UINT8) val;

-    } else {			/* define DC table */

-      cinfo->arith_dc_L[index] = (UINT8) (val & 0x0F);

-      cinfo->arith_dc_U[index] = (UINT8) (val >> 4);

-      if (cinfo->arith_dc_L[index] > cinfo->arith_dc_U[index])

-	ERREXIT1(cinfo, JERR_DAC_VALUE, val);

-    }

-  }

-

-  if (length != 0)

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-#else /* ! D_ARITH_CODING_SUPPORTED */

-

-#define get_dac(cinfo)  skip_variable(cinfo)

-

-#endif /* D_ARITH_CODING_SUPPORTED */

-

-

-LOCAL(boolean)

-get_dht (j_decompress_ptr cinfo)

-/* Process a DHT marker */

-{

-  INT32 length;

-  UINT8 bits[17];

-  UINT8 huffval[256];

-  int i, index, count;

-  JHUFF_TBL **htblptr;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  length -= 2;

-  

-  while (length > 16) {

-    INPUT_BYTE(cinfo, index, return FALSE);

-

-    TRACEMS1(cinfo, 1, JTRC_DHT, index);

-      

-    bits[0] = 0;

-    count = 0;

-    for (i = 1; i <= 16; i++) {

-      INPUT_BYTE(cinfo, bits[i], return FALSE);

-      count += bits[i];

-    }

-

-    length -= 1 + 16;

-

-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,

-	     bits[1], bits[2], bits[3], bits[4],

-	     bits[5], bits[6], bits[7], bits[8]);

-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,

-	     bits[9], bits[10], bits[11], bits[12],

-	     bits[13], bits[14], bits[15], bits[16]);

-

-    /* Here we just do minimal validation of the counts to avoid walking

-     * off the end of our table space.  jdhuff.c will check more carefully.

-     */

-    if (count > 256 || ((INT32) count) > length)

-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

-

-    MEMZERO(huffval, SIZEOF(huffval)); /* pre-zero array for later copy */

-

-    for (i = 0; i < count; i++)

-      INPUT_BYTE(cinfo, huffval[i], return FALSE);

-

-    length -= count;

-

-    if (index & 0x10) {		/* AC table definition */

-      index -= 0x10;

-      htblptr = &cinfo->ac_huff_tbl_ptrs[index];

-    } else {			/* DC table definition */

-      htblptr = &cinfo->dc_huff_tbl_ptrs[index];

-    }

-

-    if (index < 0 || index >= NUM_HUFF_TBLS)

-      ERREXIT1(cinfo, JERR_DHT_INDEX, index);

-

-    if (*htblptr == NULL)

-      *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);

-  

-    MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));

-    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));

-  }

-

-  if (length != 0)

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-get_dqt (j_decompress_ptr cinfo)

-/* Process a DQT marker */

-{

-  INT32 length, count, i;

-  int n, prec;

-  unsigned int tmp;

-  JQUANT_TBL *quant_ptr;

-  const int *natural_order;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  length -= 2;

-

-  while (length > 0) {

-    length--;

-    INPUT_BYTE(cinfo, n, return FALSE);

-    prec = n >> 4;

-    n &= 0x0F;

-

-    TRACEMS2(cinfo, 1, JTRC_DQT, n, prec);

-

-    if (n >= NUM_QUANT_TBLS)

-      ERREXIT1(cinfo, JERR_DQT_INDEX, n);

-      

-    if (cinfo->quant_tbl_ptrs[n] == NULL)

-      cinfo->quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) cinfo);

-    quant_ptr = cinfo->quant_tbl_ptrs[n];

-

-    if (prec) {

-      if (length < DCTSIZE2 * 2) {

-	/* Initialize full table for safety. */

-	for (i = 0; i < DCTSIZE2; i++) {

-	  quant_ptr->quantval[i] = 1;

-	}

-	count = length >> 1;

-      } else

-	count = DCTSIZE2;

-    } else {

-      if (length < DCTSIZE2) {

-	/* Initialize full table for safety. */

-	for (i = 0; i < DCTSIZE2; i++) {

-	  quant_ptr->quantval[i] = 1;

-	}

-	count = length;

-      } else

-	count = DCTSIZE2;

-    }

-

-    switch (count) {

-    case (2*2): natural_order = jpeg_natural_order2; break;

-    case (3*3): natural_order = jpeg_natural_order3; break;

-    case (4*4): natural_order = jpeg_natural_order4; break;

-    case (5*5): natural_order = jpeg_natural_order5; break;

-    case (6*6): natural_order = jpeg_natural_order6; break;

-    case (7*7): natural_order = jpeg_natural_order7; break;

-    default:    natural_order = jpeg_natural_order;  break;

-    }

-

-    for (i = 0; i < count; i++) {

-      if (prec)

-	INPUT_2BYTES(cinfo, tmp, return FALSE);

-      else

-	INPUT_BYTE(cinfo, tmp, return FALSE);

-      /* We convert the zigzag-order table to natural array order. */

-      quant_ptr->quantval[natural_order[i]] = (UINT16) tmp;

-    }

-

-    if (cinfo->err->trace_level >= 2) {

-      for (i = 0; i < DCTSIZE2; i += 8) {

-	TRACEMS8(cinfo, 2, JTRC_QUANTVALS,

-		 quant_ptr->quantval[i],   quant_ptr->quantval[i+1],

-		 quant_ptr->quantval[i+2], quant_ptr->quantval[i+3],

-		 quant_ptr->quantval[i+4], quant_ptr->quantval[i+5],

-		 quant_ptr->quantval[i+6], quant_ptr->quantval[i+7]);

-      }

-    }

-

-    length -= count;

-    if (prec) length -= count;

-  }

-

-  if (length != 0)

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-get_dri (j_decompress_ptr cinfo)

-/* Process a DRI marker */

-{

-  INT32 length;

-  unsigned int tmp;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  

-  if (length != 4)

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-

-  TRACEMS1(cinfo, 1, JTRC_DRI, tmp);

-

-  cinfo->restart_interval = tmp;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-get_lse (j_decompress_ptr cinfo)

-/* Process an LSE marker */

-{

-  INT32 length;

-  unsigned int tmp;

-  int cid;

-  INPUT_VARS(cinfo);

-

-  if (! cinfo->marker->saw_SOF)

-    ERREXITS(cinfo, JERR_SOF_BEFORE, "LSE");

-

-  if (cinfo->num_components < 3) goto bad;

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-

-  if (length != 24)

-    ERREXIT(cinfo, JERR_BAD_LENGTH);

-

-  INPUT_BYTE(cinfo, tmp, return FALSE);

-  if (tmp != 0x0D)	/* ID inverse transform specification */

-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != MAXJSAMPLE) goto bad;		/* MAXTRANS */

-  INPUT_BYTE(cinfo, tmp, return FALSE);

-  if (tmp != 3) goto bad;			/* Nt=3 */

-  INPUT_BYTE(cinfo, cid, return FALSE);

-  if (cid != cinfo->comp_info[1].component_id) goto bad;

-  INPUT_BYTE(cinfo, cid, return FALSE);

-  if (cid != cinfo->comp_info[0].component_id) goto bad;

-  INPUT_BYTE(cinfo, cid, return FALSE);

-  if (cid != cinfo->comp_info[2].component_id) goto bad;

-  INPUT_BYTE(cinfo, tmp, return FALSE);

-  if (tmp != 0x80) goto bad;		/* F1: CENTER1=1, NORM1=0 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 0) goto bad;			/* A(1,1)=0 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 0) goto bad;			/* A(1,2)=0 */

-  INPUT_BYTE(cinfo, tmp, return FALSE);

-  if (tmp != 0) goto bad;		/* F2: CENTER2=0, NORM2=0 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 1) goto bad;			/* A(2,1)=1 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 0) goto bad;			/* A(2,2)=0 */

-  INPUT_BYTE(cinfo, tmp, return FALSE);

-  if (tmp != 0) goto bad;		/* F3: CENTER3=0, NORM3=0 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 1) goto bad;			/* A(3,1)=1 */

-  INPUT_2BYTES(cinfo, tmp, return FALSE);

-  if (tmp != 0) {				/* A(3,2)=0 */

-    bad:

-    ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);

-  }

-

-  /* OK, valid transform that we can handle. */

-  cinfo->color_transform = JCT_SUBTRACT_GREEN;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-/*

- * Routines for processing APPn and COM markers.

- * These are either saved in memory or discarded, per application request.

- * APP0 and APP14 are specially checked to see if they are

- * JFIF and Adobe markers, respectively.

- */

-

-#define APP0_DATA_LEN	14	/* Length of interesting data in APP0 */

-#define APP14_DATA_LEN	12	/* Length of interesting data in APP14 */

-#define APPN_DATA_LEN	14	/* Must be the largest of the above!! */

-

-

-LOCAL(void)

-examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,

-	      unsigned int datalen, INT32 remaining)

-/* Examine first few bytes from an APP0.

- * Take appropriate action if it is a JFIF marker.

- * datalen is # of bytes at data[], remaining is length of rest of marker data.

- */

-{

-  INT32 totallen = (INT32) datalen + remaining;

-

-  if (datalen >= APP0_DATA_LEN &&

-      GETJOCTET(data[0]) == 0x4A &&

-      GETJOCTET(data[1]) == 0x46 &&

-      GETJOCTET(data[2]) == 0x49 &&

-      GETJOCTET(data[3]) == 0x46 &&

-      GETJOCTET(data[4]) == 0) {

-    /* Found JFIF APP0 marker: save info */

-    cinfo->saw_JFIF_marker = TRUE;

-    cinfo->JFIF_major_version = GETJOCTET(data[5]);

-    cinfo->JFIF_minor_version = GETJOCTET(data[6]);

-    cinfo->density_unit = GETJOCTET(data[7]);

-    cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);

-    cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);

-    /* Check version.

-     * Major version must be 1 or 2, anything else signals an incompatible

-     * change.

-     * (We used to treat this as an error, but now it's a nonfatal warning,

-     * because some bozo at Hijaak couldn't read the spec.)

-     * Minor version should be 0..2, but process anyway if newer.

-     */

-    if (cinfo->JFIF_major_version != 1 && cinfo->JFIF_major_version != 2)

-      WARNMS2(cinfo, JWRN_JFIF_MAJOR,

-	      cinfo->JFIF_major_version, cinfo->JFIF_minor_version);

-    /* Generate trace messages */

-    TRACEMS5(cinfo, 1, JTRC_JFIF,

-	     cinfo->JFIF_major_version, cinfo->JFIF_minor_version,

-	     cinfo->X_density, cinfo->Y_density, cinfo->density_unit);

-    /* Validate thumbnail dimensions and issue appropriate messages */

-    if (GETJOCTET(data[12]) | GETJOCTET(data[13]))

-      TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,

-	       GETJOCTET(data[12]), GETJOCTET(data[13]));

-    totallen -= APP0_DATA_LEN;

-    if (totallen !=

-	((INT32)GETJOCTET(data[12]) * (INT32)GETJOCTET(data[13]) * (INT32) 3))

-      TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen);

-  } else if (datalen >= 6 &&

-      GETJOCTET(data[0]) == 0x4A &&

-      GETJOCTET(data[1]) == 0x46 &&

-      GETJOCTET(data[2]) == 0x58 &&

-      GETJOCTET(data[3]) == 0x58 &&

-      GETJOCTET(data[4]) == 0) {

-    /* Found JFIF "JFXX" extension APP0 marker */

-    /* The library doesn't actually do anything with these,

-     * but we try to produce a helpful trace message.

-     */

-    switch (GETJOCTET(data[5])) {

-    case 0x10:

-      TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int) totallen);

-      break;

-    case 0x11:

-      TRACEMS1(cinfo, 1, JTRC_THUMB_PALETTE, (int) totallen);

-      break;

-    case 0x13:

-      TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int) totallen);

-      break;

-    default:

-      TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,

-	       GETJOCTET(data[5]), (int) totallen);

-      break;

-    }

-  } else {

-    /* Start of APP0 does not match "JFIF" or "JFXX", or too short */

-    TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);

-  }

-}

-

-

-LOCAL(void)

-examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,

-	       unsigned int datalen, INT32 remaining)

-/* Examine first few bytes from an APP14.

- * Take appropriate action if it is an Adobe marker.

- * datalen is # of bytes at data[], remaining is length of rest of marker data.

- */

-{

-  unsigned int version, flags0, flags1, transform;

-

-  if (datalen >= APP14_DATA_LEN &&

-      GETJOCTET(data[0]) == 0x41 &&

-      GETJOCTET(data[1]) == 0x64 &&

-      GETJOCTET(data[2]) == 0x6F &&

-      GETJOCTET(data[3]) == 0x62 &&

-      GETJOCTET(data[4]) == 0x65) {

-    /* Found Adobe APP14 marker */

-    version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);

-    flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);

-    flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);

-    transform = GETJOCTET(data[11]);

-    TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);

-    cinfo->saw_Adobe_marker = TRUE;

-    cinfo->Adobe_transform = (UINT8) transform;

-  } else {

-    /* Start of APP14 does not match "Adobe", or too short */

-    TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));

-  }

-}

-

-

-METHODDEF(boolean)

-get_interesting_appn (j_decompress_ptr cinfo)

-/* Process an APP0 or APP14 marker without saving it */

-{

-  INT32 length;

-  JOCTET b[APPN_DATA_LEN];

-  unsigned int i, numtoread;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  length -= 2;

-

-  /* get the interesting part of the marker data */

-  if (length >= APPN_DATA_LEN)

-    numtoread = APPN_DATA_LEN;

-  else if (length > 0)

-    numtoread = (unsigned int) length;

-  else

-    numtoread = 0;

-  for (i = 0; i < numtoread; i++)

-    INPUT_BYTE(cinfo, b[i], return FALSE);

-  length -= numtoread;

-

-  /* process it */

-  switch (cinfo->unread_marker) {

-  case M_APP0:

-    examine_app0(cinfo, (JOCTET FAR *) b, numtoread, length);

-    break;

-  case M_APP14:

-    examine_app14(cinfo, (JOCTET FAR *) b, numtoread, length);

-    break;

-  default:

-    /* can't get here unless jpeg_save_markers chooses wrong processor */

-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);

-    break;

-  }

-

-  /* skip any remaining data -- could be lots */

-  INPUT_SYNC(cinfo);

-  if (length > 0)

-    (*cinfo->src->skip_input_data) (cinfo, (long) length);

-

-  return TRUE;

-}

-

-

-#ifdef SAVE_MARKERS_SUPPORTED

-

-METHODDEF(boolean)

-save_marker (j_decompress_ptr cinfo)

-/* Save an APPn or COM marker into the marker list */

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-  jpeg_saved_marker_ptr cur_marker = marker->cur_marker;

-  unsigned int bytes_read, data_length;

-  JOCTET FAR * data;

-  INT32 length = 0;

-  INPUT_VARS(cinfo);

-

-  if (cur_marker == NULL) {

-    /* begin reading a marker */

-    INPUT_2BYTES(cinfo, length, return FALSE);

-    length -= 2;

-    if (length >= 0) {		/* watch out for bogus length word */

-      /* figure out how much we want to save */

-      unsigned int limit;

-      if (cinfo->unread_marker == (int) M_COM)

-	limit = marker->length_limit_COM;

-      else

-	limit = marker->length_limit_APPn[cinfo->unread_marker - (int) M_APP0];

-      if ((unsigned int) length < limit)

-	limit = (unsigned int) length;

-      /* allocate and initialize the marker item */

-      cur_marker = (jpeg_saved_marker_ptr)

-	(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				    SIZEOF(struct jpeg_marker_struct) + limit);

-      cur_marker->next = NULL;

-      cur_marker->marker = (UINT8) cinfo->unread_marker;

-      cur_marker->original_length = (unsigned int) length;

-      cur_marker->data_length = limit;

-      /* data area is just beyond the jpeg_marker_struct */

-      data = cur_marker->data = (JOCTET FAR *) (cur_marker + 1);

-      marker->cur_marker = cur_marker;

-      marker->bytes_read = 0;

-      bytes_read = 0;

-      data_length = limit;

-    } else {

-      /* deal with bogus length word */

-      bytes_read = data_length = 0;

-      data = NULL;

-    }

-  } else {

-    /* resume reading a marker */

-    bytes_read = marker->bytes_read;

-    data_length = cur_marker->data_length;

-    data = cur_marker->data + bytes_read;

-  }

-

-  while (bytes_read < data_length) {

-    INPUT_SYNC(cinfo);		/* move the restart point to here */

-    marker->bytes_read = bytes_read;

-    /* If there's not at least one byte in buffer, suspend */

-    MAKE_BYTE_AVAIL(cinfo, return FALSE);

-    /* Copy bytes with reasonable rapidity */

-    while (bytes_read < data_length && bytes_in_buffer > 0) {

-      *data++ = *next_input_byte++;

-      bytes_in_buffer--;

-      bytes_read++;

-    }

-  }

-

-  /* Done reading what we want to read */

-  if (cur_marker != NULL) {	/* will be NULL if bogus length word */

-    /* Add new marker to end of list */

-    if (cinfo->marker_list == NULL) {

-      cinfo->marker_list = cur_marker;

-    } else {

-      jpeg_saved_marker_ptr prev = cinfo->marker_list;

-      while (prev->next != NULL)

-	prev = prev->next;

-      prev->next = cur_marker;

-    }

-    /* Reset pointer & calc remaining data length */

-    data = cur_marker->data;

-    length = cur_marker->original_length - data_length;

-  }

-  /* Reset to initial state for next marker */

-  marker->cur_marker = NULL;

-

-  /* Process the marker if interesting; else just make a generic trace msg */

-  switch (cinfo->unread_marker) {

-  case M_APP0:

-    examine_app0(cinfo, data, data_length, length);

-    break;

-  case M_APP14:

-    examine_app14(cinfo, data, data_length, length);

-    break;

-  default:

-    TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker,

-	     (int) (data_length + length));

-    break;

-  }

-

-  /* skip any remaining data -- could be lots */

-  INPUT_SYNC(cinfo);		/* do before skip_input_data */

-  if (length > 0)

-    (*cinfo->src->skip_input_data) (cinfo, (long) length);

-

-  return TRUE;

-}

-

-#endif /* SAVE_MARKERS_SUPPORTED */

-

-

-METHODDEF(boolean)

-skip_variable (j_decompress_ptr cinfo)

-/* Skip over an unknown or uninteresting variable-length marker */

-{

-  INT32 length;

-  INPUT_VARS(cinfo);

-

-  INPUT_2BYTES(cinfo, length, return FALSE);

-  length -= 2;

-  

-  TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) length);

-

-  INPUT_SYNC(cinfo);		/* do before skip_input_data */

-  if (length > 0)

-    (*cinfo->src->skip_input_data) (cinfo, (long) length);

-

-  return TRUE;

-}

-

-

-/*

- * Find the next JPEG marker, save it in cinfo->unread_marker.

- * Returns FALSE if had to suspend before reaching a marker;

- * in that case cinfo->unread_marker is unchanged.

- *

- * Note that the result might not be a valid marker code,

- * but it will never be 0 or FF.

- */

-

-LOCAL(boolean)

-next_marker (j_decompress_ptr cinfo)

-{

-  int c;

-  INPUT_VARS(cinfo);

-

-  for (;;) {

-    INPUT_BYTE(cinfo, c, return FALSE);

-    /* Skip any non-FF bytes.

-     * This may look a bit inefficient, but it will not occur in a valid file.

-     * We sync after each discarded byte so that a suspending data source

-     * can discard the byte from its buffer.

-     */

-    while (c != 0xFF) {

-      cinfo->marker->discarded_bytes++;

-      INPUT_SYNC(cinfo);

-      INPUT_BYTE(cinfo, c, return FALSE);

-    }

-    /* This loop swallows any duplicate FF bytes.  Extra FFs are legal as

-     * pad bytes, so don't count them in discarded_bytes.  We assume there

-     * will not be so many consecutive FF bytes as to overflow a suspending

-     * data source's input buffer.

-     */

-    do {

-      INPUT_BYTE(cinfo, c, return FALSE);

-    } while (c == 0xFF);

-    if (c != 0)

-      break;			/* found a valid marker, exit loop */

-    /* Reach here if we found a stuffed-zero data sequence (FF/00).

-     * Discard it and loop back to try again.

-     */

-    cinfo->marker->discarded_bytes += 2;

-    INPUT_SYNC(cinfo);

-  }

-

-  if (cinfo->marker->discarded_bytes != 0) {

-    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);

-    cinfo->marker->discarded_bytes = 0;

-  }

-

-  cinfo->unread_marker = c;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-LOCAL(boolean)

-first_marker (j_decompress_ptr cinfo)

-/* Like next_marker, but used to obtain the initial SOI marker. */

-/* For this marker, we do not allow preceding garbage or fill; otherwise,

- * we might well scan an entire input file before realizing it ain't JPEG.

- * If an application wants to process non-JFIF files, it must seek to the

- * SOI before calling the JPEG library.

- */

-{

-  int c, c2;

-  INPUT_VARS(cinfo);

-

-  INPUT_BYTE(cinfo, c, return FALSE);

-  INPUT_BYTE(cinfo, c2, return FALSE);

-  if (c != 0xFF || c2 != (int) M_SOI)

-    ERREXIT2(cinfo, JERR_NO_SOI, c, c2);

-

-  cinfo->unread_marker = c2;

-

-  INPUT_SYNC(cinfo);

-  return TRUE;

-}

-

-

-/*

- * Read markers until SOS or EOI.

- *

- * Returns same codes as are defined for jpeg_consume_input:

- * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.

- *

- * Note: This function may return a pseudo SOS marker (with zero

- * component number) for treat by input controller's consume_input.

- * consume_input itself should filter out (skip) the pseudo marker

- * after processing for the caller.

- */

-

-METHODDEF(int)

-read_markers (j_decompress_ptr cinfo)

-{

-  /* Outer loop repeats once for each marker. */

-  for (;;) {

-    /* Collect the marker proper, unless we already did. */

-    /* NB: first_marker() enforces the requirement that SOI appear first. */

-    if (cinfo->unread_marker == 0) {

-      if (! cinfo->marker->saw_SOI) {

-	if (! first_marker(cinfo))

-	  return JPEG_SUSPENDED;

-      } else {

-	if (! next_marker(cinfo))

-	  return JPEG_SUSPENDED;

-      }

-    }

-    /* At this point cinfo->unread_marker contains the marker code and the

-     * input point is just past the marker proper, but before any parameters.

-     * A suspension will cause us to return with this state still true.

-     */

-    switch (cinfo->unread_marker) {

-    case M_SOI:

-      if (! get_soi(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_SOF0:		/* Baseline */

-      if (! get_sof(cinfo, TRUE, FALSE, FALSE))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_SOF1:		/* Extended sequential, Huffman */

-      if (! get_sof(cinfo, FALSE, FALSE, FALSE))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_SOF2:		/* Progressive, Huffman */

-      if (! get_sof(cinfo, FALSE, TRUE, FALSE))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_SOF9:		/* Extended sequential, arithmetic */

-      if (! get_sof(cinfo, FALSE, FALSE, TRUE))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_SOF10:		/* Progressive, arithmetic */

-      if (! get_sof(cinfo, FALSE, TRUE, TRUE))

-	return JPEG_SUSPENDED;

-      break;

-

-    /* Currently unsupported SOFn types */

-    case M_SOF3:		/* Lossless, Huffman */

-    case M_SOF5:		/* Differential sequential, Huffman */

-    case M_SOF6:		/* Differential progressive, Huffman */

-    case M_SOF7:		/* Differential lossless, Huffman */

-    case M_JPG:			/* Reserved for JPEG extensions */

-    case M_SOF11:		/* Lossless, arithmetic */

-    case M_SOF13:		/* Differential sequential, arithmetic */

-    case M_SOF14:		/* Differential progressive, arithmetic */

-    case M_SOF15:		/* Differential lossless, arithmetic */

-      ERREXIT1(cinfo, JERR_SOF_UNSUPPORTED, cinfo->unread_marker);

-      break;

-

-    case M_SOS:

-      if (! get_sos(cinfo))

-	return JPEG_SUSPENDED;

-      cinfo->unread_marker = 0;	/* processed the marker */

-      return JPEG_REACHED_SOS;

-

-    case M_EOI:

-      TRACEMS(cinfo, 1, JTRC_EOI);

-      cinfo->unread_marker = 0;	/* processed the marker */

-      return JPEG_REACHED_EOI;

-

-    case M_DAC:

-      if (! get_dac(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_DHT:

-      if (! get_dht(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_DQT:

-      if (! get_dqt(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_DRI:

-      if (! get_dri(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_JPG8:

-      if (! get_lse(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_APP0:

-    case M_APP1:

-    case M_APP2:

-    case M_APP3:

-    case M_APP4:

-    case M_APP5:

-    case M_APP6:

-    case M_APP7:

-    case M_APP8:

-    case M_APP9:

-    case M_APP10:

-    case M_APP11:

-    case M_APP12:

-    case M_APP13:

-    case M_APP14:

-    case M_APP15:

-      if (! (*((my_marker_ptr) cinfo->marker)->process_APPn[

-		cinfo->unread_marker - (int) M_APP0]) (cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_COM:

-      if (! (*((my_marker_ptr) cinfo->marker)->process_COM) (cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    case M_RST0:		/* these are all parameterless */

-    case M_RST1:

-    case M_RST2:

-    case M_RST3:

-    case M_RST4:

-    case M_RST5:

-    case M_RST6:

-    case M_RST7:

-    case M_TEM:

-      TRACEMS1(cinfo, 1, JTRC_PARMLESS_MARKER, cinfo->unread_marker);

-      break;

-

-    case M_DNL:			/* Ignore DNL ... perhaps the wrong thing */

-      if (! skip_variable(cinfo))

-	return JPEG_SUSPENDED;

-      break;

-

-    default:			/* must be DHP, EXP, JPGn, or RESn */

-      /* For now, we treat the reserved markers as fatal errors since they are

-       * likely to be used to signal incompatible JPEG Part 3 extensions.

-       * Once the JPEG 3 version-number marker is well defined, this code

-       * ought to change!

-       */

-      ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);

-      break;

-    }

-    /* Successfully processed marker, so reset state variable */

-    cinfo->unread_marker = 0;

-  } /* end loop */

-}

-

-

-/*

- * Read a restart marker, which is expected to appear next in the datastream;

- * if the marker is not there, take appropriate recovery action.

- * Returns FALSE if suspension is required.

- *

- * This is called by the entropy decoder after it has read an appropriate

- * number of MCUs.  cinfo->unread_marker may be nonzero if the entropy decoder

- * has already read a marker from the data source.  Under normal conditions

- * cinfo->unread_marker will be reset to 0 before returning; if not reset,

- * it holds a marker which the decoder will be unable to read past.

- */

-

-METHODDEF(boolean)

-read_restart_marker (j_decompress_ptr cinfo)

-{

-  /* Obtain a marker unless we already did. */

-  /* Note that next_marker will complain if it skips any data. */

-  if (cinfo->unread_marker == 0) {

-    if (! next_marker(cinfo))

-      return FALSE;

-  }

-

-  if (cinfo->unread_marker ==

-      ((int) M_RST0 + cinfo->marker->next_restart_num)) {

-    /* Normal case --- swallow the marker and let entropy decoder continue */

-    TRACEMS1(cinfo, 3, JTRC_RST, cinfo->marker->next_restart_num);

-    cinfo->unread_marker = 0;

-  } else {

-    /* Uh-oh, the restart markers have been messed up. */

-    /* Let the data source manager determine how to resync. */

-    if (! (*cinfo->src->resync_to_restart) (cinfo,

-					    cinfo->marker->next_restart_num))

-      return FALSE;

-  }

-

-  /* Update next-restart state */

-  cinfo->marker->next_restart_num = (cinfo->marker->next_restart_num + 1) & 7;

-

-  return TRUE;

-}

-

-

-/*

- * This is the default resync_to_restart method for data source managers

- * to use if they don't have any better approach.  Some data source managers

- * may be able to back up, or may have additional knowledge about the data

- * which permits a more intelligent recovery strategy; such managers would

- * presumably supply their own resync method.

- *

- * read_restart_marker calls resync_to_restart if it finds a marker other than

- * the restart marker it was expecting.  (This code is *not* used unless

- * a nonzero restart interval has been declared.)  cinfo->unread_marker is

- * the marker code actually found (might be anything, except 0 or FF).

- * The desired restart marker number (0..7) is passed as a parameter.

- * This routine is supposed to apply whatever error recovery strategy seems

- * appropriate in order to position the input stream to the next data segment.

- * Note that cinfo->unread_marker is treated as a marker appearing before

- * the current data-source input point; usually it should be reset to zero

- * before returning.

- * Returns FALSE if suspension is required.

- *

- * This implementation is substantially constrained by wanting to treat the

- * input as a data stream; this means we can't back up.  Therefore, we have

- * only the following actions to work with:

- *   1. Simply discard the marker and let the entropy decoder resume at next

- *      byte of file.

- *   2. Read forward until we find another marker, discarding intervening

- *      data.  (In theory we could look ahead within the current bufferload,

- *      without having to discard data if we don't find the desired marker.

- *      This idea is not implemented here, in part because it makes behavior

- *      dependent on buffer size and chance buffer-boundary positions.)

- *   3. Leave the marker unread (by failing to zero cinfo->unread_marker).

- *      This will cause the entropy decoder to process an empty data segment,

- *      inserting dummy zeroes, and then we will reprocess the marker.

- *

- * #2 is appropriate if we think the desired marker lies ahead, while #3 is

- * appropriate if the found marker is a future restart marker (indicating

- * that we have missed the desired restart marker, probably because it got

- * corrupted).

- * We apply #2 or #3 if the found marker is a restart marker no more than

- * two counts behind or ahead of the expected one.  We also apply #2 if the

- * found marker is not a legal JPEG marker code (it's certainly bogus data).

- * If the found marker is a restart marker more than 2 counts away, we do #1

- * (too much risk that the marker is erroneous; with luck we will be able to

- * resync at some future point).

- * For any valid non-restart JPEG marker, we apply #3.  This keeps us from

- * overrunning the end of a scan.  An implementation limited to single-scan

- * files might find it better to apply #2 for markers other than EOI, since

- * any other marker would have to be bogus data in that case.

- */

-

-GLOBAL(boolean)

-jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)

-{

-  int marker = cinfo->unread_marker;

-  int action = 1;

-  

-  /* Always put up a warning. */

-  WARNMS2(cinfo, JWRN_MUST_RESYNC, marker, desired);

-  

-  /* Outer loop handles repeated decision after scanning forward. */

-  for (;;) {

-    if (marker < (int) M_SOF0)

-      action = 2;		/* invalid marker */

-    else if (marker < (int) M_RST0 || marker > (int) M_RST7)

-      action = 3;		/* valid non-restart marker */

-    else {

-      if (marker == ((int) M_RST0 + ((desired+1) & 7)) ||

-	  marker == ((int) M_RST0 + ((desired+2) & 7)))

-	action = 3;		/* one of the next two expected restarts */

-      else if (marker == ((int) M_RST0 + ((desired-1) & 7)) ||

-	       marker == ((int) M_RST0 + ((desired-2) & 7)))

-	action = 2;		/* a prior restart, so advance */

-      else

-	action = 1;		/* desired restart or too far away */

-    }

-    TRACEMS2(cinfo, 4, JTRC_RECOVERY_ACTION, marker, action);

-    switch (action) {

-    case 1:

-      /* Discard marker and let entropy decoder resume processing. */

-      cinfo->unread_marker = 0;

-      return TRUE;

-    case 2:

-      /* Scan to the next marker, and repeat the decision loop. */

-      if (! next_marker(cinfo))

-	return FALSE;

-      marker = cinfo->unread_marker;

-      break;

-    case 3:

-      /* Return without advancing past this marker. */

-      /* Entropy decoder will be forced to process an empty segment. */

-      return TRUE;

-    }

-  } /* end loop */

-}

-

-

-/*

- * Reset marker processing state to begin a fresh datastream.

- */

-

-METHODDEF(void)

-reset_marker_reader (j_decompress_ptr cinfo)

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-

-  cinfo->comp_info = NULL;		/* until allocated by get_sof */

-  cinfo->input_scan_number = 0;		/* no SOS seen yet */

-  cinfo->unread_marker = 0;		/* no pending marker */

-  marker->pub.saw_SOI = FALSE;		/* set internal state too */

-  marker->pub.saw_SOF = FALSE;

-  marker->pub.discarded_bytes = 0;

-  marker->cur_marker = NULL;

-}

-

-

-/*

- * Initialize the marker reader module.

- * This is called only once, when the decompression object is created.

- */

-

-GLOBAL(void)

-jinit_marker_reader (j_decompress_ptr cinfo)

-{

-  my_marker_ptr marker;

-  int i;

-

-  /* Create subobject in permanent pool */

-  marker = (my_marker_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,

-				SIZEOF(my_marker_reader));

-  cinfo->marker = &marker->pub;

-  /* Initialize public method pointers */

-  marker->pub.reset_marker_reader = reset_marker_reader;

-  marker->pub.read_markers = read_markers;

-  marker->pub.read_restart_marker = read_restart_marker;

-  /* Initialize COM/APPn processing.

-   * By default, we examine and then discard APP0 and APP14,

-   * but simply discard COM and all other APPn.

-   */

-  marker->process_COM = skip_variable;

-  marker->length_limit_COM = 0;

-  for (i = 0; i < 16; i++) {

-    marker->process_APPn[i] = skip_variable;

-    marker->length_limit_APPn[i] = 0;

-  }

-  marker->process_APPn[0] = get_interesting_appn;

-  marker->process_APPn[14] = get_interesting_appn;

-  /* Reset marker processing state */

-  reset_marker_reader(cinfo);

-}

-

-

-/*

- * Control saving of COM and APPn markers into marker_list.

- */

-

-#ifdef SAVE_MARKERS_SUPPORTED

-

-GLOBAL(void)

-jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,

-		   unsigned int length_limit)

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-  long maxlength;

-  jpeg_marker_parser_method processor;

-

-  /* Length limit mustn't be larger than what we can allocate

-   * (should only be a concern in a 16-bit environment).

-   */

-  maxlength = cinfo->mem->max_alloc_chunk - SIZEOF(struct jpeg_marker_struct);

-  if (((long) length_limit) > maxlength)

-    length_limit = (unsigned int) maxlength;

-

-  /* Choose processor routine to use.

-   * APP0/APP14 have special requirements.

-   */

-  if (length_limit) {

-    processor = save_marker;

-    /* If saving APP0/APP14, save at least enough for our internal use. */

-    if (marker_code == (int) M_APP0 && length_limit < APP0_DATA_LEN)

-      length_limit = APP0_DATA_LEN;

-    else if (marker_code == (int) M_APP14 && length_limit < APP14_DATA_LEN)

-      length_limit = APP14_DATA_LEN;

-  } else {

-    processor = skip_variable;

-    /* If discarding APP0/APP14, use our regular on-the-fly processor. */

-    if (marker_code == (int) M_APP0 || marker_code == (int) M_APP14)

-      processor = get_interesting_appn;

-  }

-

-  if (marker_code == (int) M_COM) {

-    marker->process_COM = processor;

-    marker->length_limit_COM = length_limit;

-  } else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15) {

-    marker->process_APPn[marker_code - (int) M_APP0] = processor;

-    marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;

-  } else

-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);

-}

-

-#endif /* SAVE_MARKERS_SUPPORTED */

-

-

-/*

- * Install a special processing method for COM or APPn markers.

- */

-

-GLOBAL(void)

-jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,

-			   jpeg_marker_parser_method routine)

-{

-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;

-

-  if (marker_code == (int) M_COM)

-    marker->process_COM = routine;

-  else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15)

-    marker->process_APPn[marker_code - (int) M_APP0] = routine;

-  else

-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdmaster.c b/plugins/AdvaImg/src/LibJPEG/jdmaster.c
deleted file mode 100644
index 0ece558cb2..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdmaster.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*

- * jdmaster.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2002-2015 by Guido Vollbeding.

- * 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 master control logic for the JPEG decompressor.

- * These routines are concerned with selecting the modules to be executed

- * and with determining the number of passes and the work to be done in each

- * pass.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private state */

-

-typedef struct {

-  struct jpeg_decomp_master pub; /* public fields */

-

-  int pass_number;		/* # of passes completed */

-

-  boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */

-

-  /* Saved references to initialized quantizer modules,

-   * in case we need to switch modes.

-   */

-  struct jpeg_color_quantizer * quantizer_1pass;

-  struct jpeg_color_quantizer * quantizer_2pass;

-} my_decomp_master;

-

-typedef my_decomp_master * my_master_ptr;

-

-

-/*

- * Determine whether merged upsample/color conversion should be used.

- * CRUCIAL: this must match the actual capabilities of jdmerge.c!

- */

-

-LOCAL(boolean)

-use_merged_upsample (j_decompress_ptr cinfo)

-{

-#ifdef UPSAMPLE_MERGING_SUPPORTED

-  /* Merging is the equivalent of plain box-filter upsampling. */

-  /* The following condition is only needed if fancy shall select

-   * a different upsampling method.  In our current implementation

-   * fancy only affects the DCT scaling, thus we can use fancy

-   * upsampling and merged upsample simultaneously, in particular

-   * with scaled DCT sizes larger than the default DCTSIZE.

-   */

-#if 0

-  if (cinfo->do_fancy_upsampling)

-    return FALSE;

-#endif

-  if (cinfo->CCIR601_sampling)

-    return FALSE;

-  /* jdmerge.c only supports YCC=>RGB color conversion */

-  if ((cinfo->jpeg_color_space != JCS_YCbCr &&

-       cinfo->jpeg_color_space != JCS_BG_YCC) ||

-      cinfo->num_components != 3 ||

-      cinfo->out_color_space != JCS_RGB ||

-      cinfo->out_color_components != RGB_PIXELSIZE ||

-      cinfo->color_transform)

-    return FALSE;

-  /* and it only handles 2h1v or 2h2v sampling ratios */

-  if (cinfo->comp_info[0].h_samp_factor != 2 ||

-      cinfo->comp_info[1].h_samp_factor != 1 ||

-      cinfo->comp_info[2].h_samp_factor != 1 ||

-      cinfo->comp_info[0].v_samp_factor >  2 ||

-      cinfo->comp_info[1].v_samp_factor != 1 ||

-      cinfo->comp_info[2].v_samp_factor != 1)

-    return FALSE;

-  /* furthermore, it doesn't work if we've scaled the IDCTs differently */

-  if (cinfo->comp_info[0].DCT_h_scaled_size != cinfo->min_DCT_h_scaled_size ||

-      cinfo->comp_info[1].DCT_h_scaled_size != cinfo->min_DCT_h_scaled_size ||

-      cinfo->comp_info[2].DCT_h_scaled_size != cinfo->min_DCT_h_scaled_size ||

-      cinfo->comp_info[0].DCT_v_scaled_size != cinfo->min_DCT_v_scaled_size ||

-      cinfo->comp_info[1].DCT_v_scaled_size != cinfo->min_DCT_v_scaled_size ||

-      cinfo->comp_info[2].DCT_v_scaled_size != cinfo->min_DCT_v_scaled_size)

-    return FALSE;

-  /* ??? also need to test for upsample-time rescaling, when & if supported */

-  return TRUE;			/* by golly, it'll work... */

-#else

-  return FALSE;

-#endif

-}

-

-

-/*

- * Compute output image dimensions and related values.

- * NOTE: this is exported for possible use by application.

- * Hence it mustn't do anything that can't be done twice.

- * Also note that it may be called before the master module is initialized!

- */

-

-GLOBAL(void)

-jpeg_calc_output_dimensions (j_decompress_ptr cinfo)

-/* Do computations that are needed before master selection phase.

- * This function is used for full decompression.

- */

-{

-#ifdef IDCT_SCALING_SUPPORTED

-  int ci;

-  jpeg_component_info *compptr;

-#endif

-

-  /* Prevent application from calling me at wrong times */

-  if (cinfo->global_state != DSTATE_READY)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  /* Compute core output image dimensions and DCT scaling choices. */

-  jpeg_core_output_dimensions(cinfo);

-

-#ifdef IDCT_SCALING_SUPPORTED

-

-  /* In selecting the actual DCT scaling for each component, we try to

-   * scale up the chroma components via IDCT scaling rather than upsampling.

-   * This saves time if the upsampler gets to use 1:1 scaling.

-   * Note this code adapts subsampling ratios which are powers of 2.

-   */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    int ssize = 1;

-    while (cinfo->min_DCT_h_scaled_size * ssize <=

-	   (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) &&

-	   (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == 0) {

-      ssize = ssize * 2;

-    }

-    compptr->DCT_h_scaled_size = cinfo->min_DCT_h_scaled_size * ssize;

-    ssize = 1;

-    while (cinfo->min_DCT_v_scaled_size * ssize <=

-	   (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) &&

-	   (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == 0) {

-      ssize = ssize * 2;

-    }

-    compptr->DCT_v_scaled_size = cinfo->min_DCT_v_scaled_size * ssize;

-

-    /* We don't support IDCT ratios larger than 2. */

-    if (compptr->DCT_h_scaled_size > compptr->DCT_v_scaled_size * 2)

-	compptr->DCT_h_scaled_size = compptr->DCT_v_scaled_size * 2;

-    else if (compptr->DCT_v_scaled_size > compptr->DCT_h_scaled_size * 2)

-	compptr->DCT_v_scaled_size = compptr->DCT_h_scaled_size * 2;

-  }

-

-  /* Recompute downsampled dimensions of components;

-   * application needs to know these if using raw downsampled data.

-   */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Size in samples, after IDCT scaling */

-    compptr->downsampled_width = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_width *

-		    (long) (compptr->h_samp_factor * compptr->DCT_h_scaled_size),

-		    (long) (cinfo->max_h_samp_factor * cinfo->block_size));

-    compptr->downsampled_height = (JDIMENSION)

-      jdiv_round_up((long) cinfo->image_height *

-		    (long) (compptr->v_samp_factor * compptr->DCT_v_scaled_size),

-		    (long) (cinfo->max_v_samp_factor * cinfo->block_size));

-  }

-

-#endif /* IDCT_SCALING_SUPPORTED */

-

-  /* Report number of components in selected colorspace. */

-  /* Probably this should be in the color conversion module... */

-  switch (cinfo->out_color_space) {

-  case JCS_GRAYSCALE:

-    cinfo->out_color_components = 1;

-    break;

-  case JCS_RGB:

-  case JCS_BG_RGB:

-    cinfo->out_color_components = RGB_PIXELSIZE;

-    break;

-  case JCS_YCbCr:

-  case JCS_BG_YCC:

-    cinfo->out_color_components = 3;

-    break;

-  case JCS_CMYK:

-  case JCS_YCCK:

-    cinfo->out_color_components = 4;

-    break;

-  default:			/* else must be same colorspace as in file */

-    cinfo->out_color_components = cinfo->num_components;

-    break;

-  }

-  cinfo->output_components = (cinfo->quantize_colors ? 1 :

-			      cinfo->out_color_components);

-

-  /* See if upsampler will want to emit more than one row at a time */

-  if (use_merged_upsample(cinfo))

-    cinfo->rec_outbuf_height = cinfo->max_v_samp_factor;

-  else

-    cinfo->rec_outbuf_height = 1;

-}

-

-

-/*

- * Several decompression processes need to range-limit values to the range

- * 0..MAXJSAMPLE; the input value may fall somewhat outside this range

- * due to noise introduced by quantization, roundoff error, etc.  These

- * processes are inner loops and need to be as fast as possible.  On most

- * machines, particularly CPUs with pipelines or instruction prefetch,

- * a (subscript-check-less) C table lookup

- *		x = sample_range_limit[x];

- * is faster than explicit tests

- *		if (x < 0)  x = 0;

- *		else if (x > MAXJSAMPLE)  x = MAXJSAMPLE;

- * These processes all use a common table prepared by the routine below.

- *

- * For most steps we can mathematically guarantee that the initial value

- * of x is within 2*(MAXJSAMPLE+1) of the legal range, so a table running

- * from -2*(MAXJSAMPLE+1) to 3*MAXJSAMPLE+2 is sufficient.  But for the

- * initial limiting step (just after the IDCT), a wildly out-of-range value

- * is possible if the input data is corrupt.  To avoid any chance of indexing

- * off the end of memory and getting a bad-pointer trap, we perform the

- * post-IDCT limiting thus:

- *		x = (sample_range_limit - SUBSET)[(x + CENTER) & MASK];

- * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit

- * samples.  Under normal circumstances this is more than enough range and

- * a correct output will be generated; with bogus input data the mask will

- * cause wraparound, and we will safely generate a bogus-but-in-range output.

- * For the post-IDCT step, we want to convert the data from signed to unsigned

- * representation by adding CENTERJSAMPLE at the same time that we limit it.

- * This is accomplished with SUBSET = CENTER - CENTERJSAMPLE.

- *

- * Note that the table is allocated in near data space on PCs; it's small

- * enough and used often enough to justify this.

- */

-

-LOCAL(void)

-prepare_range_limit_table (j_decompress_ptr cinfo)

-/* Allocate and fill in the sample_range_limit table */

-{

-  JSAMPLE * table;

-  int i;

-

-  table = (JSAMPLE *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				5 * (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));

-  /* First segment of range limit table: limit[x] = 0 for x < 0 */

-  MEMZERO(table, 2 * (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));

-  table += 2 * (MAXJSAMPLE+1);	/* allow negative subscripts of table */

-  cinfo->sample_range_limit = table;

-  /* Main part of range limit table: limit[x] = x */

-  for (i = 0; i <= MAXJSAMPLE; i++)

-    table[i] = (JSAMPLE) i;

-  /* End of range limit table: limit[x] = MAXJSAMPLE for x > MAXJSAMPLE */

-  for (; i < 3 * (MAXJSAMPLE+1); i++)

-    table[i] = MAXJSAMPLE;

-}

-

-

-/*

- * Master selection of decompression modules.

- * This is done once at jpeg_start_decompress time.  We determine

- * which modules will be used and give them appropriate initialization calls.

- * We also initialize the decompressor input side to begin consuming data.

- *

- * Since jpeg_read_header has finished, we know what is in the SOF

- * and (first) SOS markers.  We also have all the application parameter

- * settings.

- */

-

-LOCAL(void)

-master_selection (j_decompress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-  boolean use_c_buffer;

-  long samplesperrow;

-  JDIMENSION jd_samplesperrow;

-

-  /* For now, precision must match compiled-in value... */

-  if (cinfo->data_precision != BITS_IN_JSAMPLE)

-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);

-

-  /* Initialize dimensions and other stuff */

-  jpeg_calc_output_dimensions(cinfo);

-  prepare_range_limit_table(cinfo);

-

-  /* Sanity check on image dimensions */

-  if (cinfo->output_height <= 0 || cinfo->output_width <= 0 ||

-      cinfo->out_color_components <= 0)

-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);

-

-  /* Width of an output scanline must be representable as JDIMENSION. */

-  samplesperrow = (long) cinfo->output_width * (long) cinfo->out_color_components;

-  jd_samplesperrow = (JDIMENSION) samplesperrow;

-  if ((long) jd_samplesperrow != samplesperrow)

-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);

-

-  /* Initialize my private state */

-  master->pass_number = 0;

-  master->using_merged_upsample = use_merged_upsample(cinfo);

-

-  /* Color quantizer selection */

-  master->quantizer_1pass = NULL;

-  master->quantizer_2pass = NULL;

-  /* No mode changes if not using buffered-image mode. */

-  if (! cinfo->quantize_colors || ! cinfo->buffered_image) {

-    cinfo->enable_1pass_quant = FALSE;

-    cinfo->enable_external_quant = FALSE;

-    cinfo->enable_2pass_quant = FALSE;

-  }

-  if (cinfo->quantize_colors) {

-    if (cinfo->raw_data_out)

-      ERREXIT(cinfo, JERR_NOTIMPL);

-    /* 2-pass quantizer only works in 3-component color space. */

-    if (cinfo->out_color_components != 3) {

-      cinfo->enable_1pass_quant = TRUE;

-      cinfo->enable_external_quant = FALSE;

-      cinfo->enable_2pass_quant = FALSE;

-      cinfo->colormap = NULL;

-    } else if (cinfo->colormap != NULL) {

-      cinfo->enable_external_quant = TRUE;

-    } else if (cinfo->two_pass_quantize) {

-      cinfo->enable_2pass_quant = TRUE;

-    } else {

-      cinfo->enable_1pass_quant = TRUE;

-    }

-

-    if (cinfo->enable_1pass_quant) {

-#ifdef QUANT_1PASS_SUPPORTED

-      jinit_1pass_quantizer(cinfo);

-      master->quantizer_1pass = cinfo->cquantize;

-#else

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-    }

-

-    /* We use the 2-pass code to map to external colormaps. */

-    if (cinfo->enable_2pass_quant || cinfo->enable_external_quant) {

-#ifdef QUANT_2PASS_SUPPORTED

-      jinit_2pass_quantizer(cinfo);

-      master->quantizer_2pass = cinfo->cquantize;

-#else

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-    }

-    /* If both quantizers are initialized, the 2-pass one is left active;

-     * this is necessary for starting with quantization to an external map.

-     */

-  }

-

-  /* Post-processing: in particular, color conversion first */

-  if (! cinfo->raw_data_out) {

-    if (master->using_merged_upsample) {

-#ifdef UPSAMPLE_MERGING_SUPPORTED

-      jinit_merged_upsampler(cinfo); /* does color conversion too */

-#else

-      ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif

-    } else {

-      jinit_color_deconverter(cinfo);

-      jinit_upsampler(cinfo);

-    }

-    jinit_d_post_controller(cinfo, cinfo->enable_2pass_quant);

-  }

-  /* Inverse DCT */

-  jinit_inverse_dct(cinfo);

-  /* Entropy decoding: either Huffman or arithmetic coding. */

-  if (cinfo->arith_code)

-    jinit_arith_decoder(cinfo);

-  else {

-    jinit_huff_decoder(cinfo);

-  }

-

-  /* Initialize principal buffer controllers. */

-  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;

-  jinit_d_coef_controller(cinfo, use_c_buffer);

-

-  if (! cinfo->raw_data_out)

-    jinit_d_main_controller(cinfo, FALSE /* never need full buffer here */);

-

-  /* We can now tell the memory manager to allocate virtual arrays. */

-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);

-

-  /* Initialize input side of decompressor to consume first scan. */

-  (*cinfo->inputctl->start_input_pass) (cinfo);

-

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-  /* If jpeg_start_decompress will read the whole file, initialize

-   * progress monitoring appropriately.  The input step is counted

-   * as one pass.

-   */

-  if (cinfo->progress != NULL && ! cinfo->buffered_image &&

-      cinfo->inputctl->has_multiple_scans) {

-    int nscans;

-    /* Estimate number of scans to set pass_limit. */

-    if (cinfo->progressive_mode) {

-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */

-      nscans = 2 + 3 * cinfo->num_components;

-    } else {

-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */

-      nscans = cinfo->num_components;

-    }

-    cinfo->progress->pass_counter = 0L;

-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;

-    cinfo->progress->completed_passes = 0;

-    cinfo->progress->total_passes = (cinfo->enable_2pass_quant ? 3 : 2);

-    /* Count the input pass as done */

-    master->pass_number++;

-  }

-#endif /* D_MULTISCAN_FILES_SUPPORTED */

-}

-

-

-/*

- * Per-pass setup.

- * This is called at the beginning of each output pass.  We determine which

- * modules will be active during this pass and give them appropriate

- * start_pass calls.  We also set is_dummy_pass to indicate whether this

- * is a "real" output pass or a dummy pass for color quantization.

- * (In the latter case, jdapistd.c will crank the pass to completion.)

- */

-

-METHODDEF(void)

-prepare_for_output_pass (j_decompress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-

-  if (master->pub.is_dummy_pass) {

-#ifdef QUANT_2PASS_SUPPORTED

-    /* Final pass of 2-pass quantization */

-    master->pub.is_dummy_pass = FALSE;

-    (*cinfo->cquantize->start_pass) (cinfo, FALSE);

-    (*cinfo->post->start_pass) (cinfo, JBUF_CRANK_DEST);

-    (*cinfo->main->start_pass) (cinfo, JBUF_CRANK_DEST);

-#else

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-#endif /* QUANT_2PASS_SUPPORTED */

-  } else {

-    if (cinfo->quantize_colors && cinfo->colormap == NULL) {

-      /* Select new quantization method */

-      if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {

-	cinfo->cquantize = master->quantizer_2pass;

-	master->pub.is_dummy_pass = TRUE;

-      } else if (cinfo->enable_1pass_quant) {

-	cinfo->cquantize = master->quantizer_1pass;

-      } else {

-	ERREXIT(cinfo, JERR_MODE_CHANGE);

-      }

-    }

-    (*cinfo->idct->start_pass) (cinfo);

-    (*cinfo->coef->start_output_pass) (cinfo);

-    if (! cinfo->raw_data_out) {

-      if (! master->using_merged_upsample)

-	(*cinfo->cconvert->start_pass) (cinfo);

-      (*cinfo->upsample->start_pass) (cinfo);

-      if (cinfo->quantize_colors)

-	(*cinfo->cquantize->start_pass) (cinfo, master->pub.is_dummy_pass);

-      (*cinfo->post->start_pass) (cinfo,

-	    (master->pub.is_dummy_pass ? JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));

-      (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);

-    }

-  }

-

-  /* Set up progress monitor's pass info if present */

-  if (cinfo->progress != NULL) {

-    cinfo->progress->completed_passes = master->pass_number;

-    cinfo->progress->total_passes = master->pass_number +

-				    (master->pub.is_dummy_pass ? 2 : 1);

-    /* In buffered-image mode, we assume one more output pass if EOI not

-     * yet reached, but no more passes if EOI has been reached.

-     */

-    if (cinfo->buffered_image && ! cinfo->inputctl->eoi_reached) {

-      cinfo->progress->total_passes += (cinfo->enable_2pass_quant ? 2 : 1);

-    }

-  }

-}

-

-

-/*

- * Finish up at end of an output pass.

- */

-

-METHODDEF(void)

-finish_output_pass (j_decompress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-

-  if (cinfo->quantize_colors)

-    (*cinfo->cquantize->finish_pass) (cinfo);

-  master->pass_number++;

-}

-

-

-#ifdef D_MULTISCAN_FILES_SUPPORTED

-

-/*

- * Switch to a new external colormap between output passes.

- */

-

-GLOBAL(void)

-jpeg_new_colormap (j_decompress_ptr cinfo)

-{

-  my_master_ptr master = (my_master_ptr) cinfo->master;

-

-  /* Prevent application from calling me at wrong times */

-  if (cinfo->global_state != DSTATE_BUFIMAGE)

-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-

-  if (cinfo->quantize_colors && cinfo->enable_external_quant &&

-      cinfo->colormap != NULL) {

-    /* Select 2-pass quantizer for external colormap use */

-    cinfo->cquantize = master->quantizer_2pass;

-    /* Notify quantizer of colormap change */

-    (*cinfo->cquantize->new_color_map) (cinfo);

-    master->pub.is_dummy_pass = FALSE; /* just in case */

-  } else

-    ERREXIT(cinfo, JERR_MODE_CHANGE);

-}

-

-#endif /* D_MULTISCAN_FILES_SUPPORTED */

-

-

-/*

- * Initialize master decompression control and select active modules.

- * This is performed at the start of jpeg_start_decompress.

- */

-

-GLOBAL(void)

-jinit_master_decompress (j_decompress_ptr cinfo)

-{

-  my_master_ptr master;

-

-  master = (my_master_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(my_decomp_master));

-  cinfo->master = &master->pub;

-  master->pub.prepare_for_output_pass = prepare_for_output_pass;

-  master->pub.finish_output_pass = finish_output_pass;

-

-  master->pub.is_dummy_pass = FALSE;

-

-  master_selection(cinfo);

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdmerge.c b/plugins/AdvaImg/src/LibJPEG/jdmerge.c
deleted file mode 100644
index 368fa703aa..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdmerge.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*

- * jdmerge.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2013-2015 by Guido Vollbeding.

- * 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 code for merged upsampling/color conversion.

- *

- * This file combines functions from jdsample.c and jdcolor.c;

- * read those files first to understand what's going on.

- *

- * When the chroma components are to be upsampled by simple replication

- * (ie, box filtering), we can save some work in color conversion by

- * calculating all the output pixels corresponding to a pair of chroma

- * samples at one time.  In the conversion equations

- *	R = Y           + K1 * Cr

- *	G = Y + K2 * Cb + K3 * Cr

- *	B = Y + K4 * Cb

- * only the Y term varies among the group of pixels corresponding to a pair

- * of chroma samples, so the rest of the terms can be calculated just once.

- * At typical sampling ratios, this eliminates half or three-quarters of the

- * multiplications needed for color conversion.

- *

- * This file currently provides implementations for the following cases:

- *	YCC => RGB color conversion only (YCbCr or BG_YCC).

- *	Sampling ratios of 2h1v or 2h2v.

- *	No scaling needed at upsample time.

- *	Corner-aligned (non-CCIR601) sampling alignment.

- * Other special cases could be added, but in most applications these are

- * the only common cases.  (For uncommon cases we fall back on the more

- * general code in jdsample.c and jdcolor.c.)

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-#ifdef UPSAMPLE_MERGING_SUPPORTED

-

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_upsampler pub;	/* public fields */

-

-  /* Pointer to routine to do actual upsampling/conversion of one row group */

-  JMETHOD(void, upmethod, (j_decompress_ptr cinfo,

-			   JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,

-			   JSAMPARRAY output_buf));

-

-  /* Private state for YCC->RGB conversion */

-  int * Cr_r_tab;		/* => table for Cr to R conversion */

-  int * Cb_b_tab;		/* => table for Cb to B conversion */

-  INT32 * Cr_g_tab;		/* => table for Cr to G conversion */

-  INT32 * Cb_g_tab;		/* => table for Cb to G conversion */

-

-  /* For 2:1 vertical sampling, we produce two output rows at a time.

-   * We need a "spare" row buffer to hold the second output row if the

-   * application provides just a one-row buffer; we also use the spare

-   * to discard the dummy last row if the image height is odd.

-   */

-  JSAMPROW spare_row;

-  boolean spare_full;		/* T if spare buffer is occupied */

-

-  JDIMENSION out_row_width;	/* samples per output row */

-  JDIMENSION rows_to_go;	/* counts rows remaining in image */

-} my_upsampler;

-

-typedef my_upsampler * my_upsample_ptr;

-

-#define SCALEBITS	16	/* speediest right-shift on some machines */

-#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))

-#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))

-

-

-/*

- * Initialize tables for YCbCr->RGB and BG_YCC->RGB colorspace conversion.

- * This is taken directly from jdcolor.c; see that file for more info.

- */

-

-LOCAL(void)

-build_ycc_rgb_table (j_decompress_ptr cinfo)

-/* Normal case, sYCC */

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  int i;

-  INT32 x;

-  SHIFT_TEMPS

-

-  upsample->Cr_r_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  upsample->Cb_b_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  upsample->Cr_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-  upsample->Cb_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-

-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {

-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */

-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */

-    /* Cr=>R value is nearest int to 1.402 * x */

-    upsample->Cr_r_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(1.402) * x + ONE_HALF, SCALEBITS);

-    /* Cb=>B value is nearest int to 1.772 * x */

-    upsample->Cb_b_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(1.772) * x + ONE_HALF, SCALEBITS);

-    /* Cr=>G value is scaled-up -0.714136286 * x */

-    upsample->Cr_g_tab[i] = (- FIX(0.714136286)) * x;

-    /* Cb=>G value is scaled-up -0.344136286 * x */

-    /* We also add in ONE_HALF so that need not do it in inner loop */

-    upsample->Cb_g_tab[i] = (- FIX(0.344136286)) * x + ONE_HALF;

-  }

-}

-

-

-LOCAL(void)

-build_bg_ycc_rgb_table (j_decompress_ptr cinfo)

-/* Wide gamut case, bg-sYCC */

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  int i;

-  INT32 x;

-  SHIFT_TEMPS

-

-  upsample->Cr_r_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  upsample->Cb_b_tab = (int *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(int));

-  upsample->Cr_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-  upsample->Cb_g_tab = (INT32 *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(MAXJSAMPLE+1) * SIZEOF(INT32));

-

-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {

-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */

-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */

-    /* Cr=>R value is nearest int to 2.804 * x */

-    upsample->Cr_r_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(2.804) * x + ONE_HALF, SCALEBITS);

-    /* Cb=>B value is nearest int to 3.544 * x */

-    upsample->Cb_b_tab[i] = (int)

-		    RIGHT_SHIFT(FIX(3.544) * x + ONE_HALF, SCALEBITS);

-    /* Cr=>G value is scaled-up -1.428272572 * x */

-    upsample->Cr_g_tab[i] = (- FIX(1.428272572)) * x;

-    /* Cb=>G value is scaled-up -0.688272572 * x */

-    /* We also add in ONE_HALF so that need not do it in inner loop */

-    upsample->Cb_g_tab[i] = (- FIX(0.688272572)) * x + ONE_HALF;

-  }

-}

-

-

-/*

- * Initialize for an upsampling pass.

- */

-

-METHODDEF(void)

-start_pass_merged_upsample (j_decompress_ptr cinfo)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-

-  /* Mark the spare buffer empty */

-  upsample->spare_full = FALSE;

-  /* Initialize total-height counter for detecting bottom of image */

-  upsample->rows_to_go = cinfo->output_height;

-}

-

-

-/*

- * Control routine to do upsampling (and color conversion).

- *

- * The control routine just handles the row buffering considerations.

- */

-

-METHODDEF(void)

-merged_2v_upsample (j_decompress_ptr cinfo,

-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-		    JDIMENSION in_row_groups_avail,

-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-		    JDIMENSION out_rows_avail)

-/* 2:1 vertical sampling case: may need a spare row. */

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  JSAMPROW work_ptrs[2];

-  JDIMENSION num_rows;		/* number of rows returned to caller */

-

-  if (upsample->spare_full) {

-    /* If we have a spare row saved from a previous cycle, just return it. */

-    jcopy_sample_rows(& upsample->spare_row, 0, output_buf + *out_row_ctr, 0,

-		      1, upsample->out_row_width);

-    num_rows = 1;

-    upsample->spare_full = FALSE;

-  } else {

-    /* Figure number of rows to return to caller. */

-    num_rows = 2;

-    /* Not more than the distance to the end of the image. */

-    if (num_rows > upsample->rows_to_go)

-      num_rows = upsample->rows_to_go;

-    /* And not more than what the client can accept: */

-    out_rows_avail -= *out_row_ctr;

-    if (num_rows > out_rows_avail)

-      num_rows = out_rows_avail;

-    /* Create output pointer array for upsampler. */

-    work_ptrs[0] = output_buf[*out_row_ctr];

-    if (num_rows > 1) {

-      work_ptrs[1] = output_buf[*out_row_ctr + 1];

-    } else {

-      work_ptrs[1] = upsample->spare_row;

-      upsample->spare_full = TRUE;

-    }

-    /* Now do the upsampling. */

-    (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr, work_ptrs);

-  }

-

-  /* Adjust counts */

-  *out_row_ctr += num_rows;

-  upsample->rows_to_go -= num_rows;

-  /* When the buffer is emptied, declare this input row group consumed */

-  if (! upsample->spare_full)

-    (*in_row_group_ctr)++;

-}

-

-

-METHODDEF(void)

-merged_1v_upsample (j_decompress_ptr cinfo,

-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-		    JDIMENSION in_row_groups_avail,

-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-		    JDIMENSION out_rows_avail)

-/* 1:1 vertical sampling case: much easier, never need a spare row. */

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-

-  /* Just do the upsampling. */

-  (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,

-			 output_buf + *out_row_ctr);

-  /* Adjust counts */

-  (*out_row_ctr)++;

-  (*in_row_group_ctr)++;

-}

-

-

-/*

- * These are the routines invoked by the control routines to do

- * the actual upsampling/conversion.  One row group is processed per call.

- *

- * Note: since we may be writing directly into application-supplied buffers,

- * we have to be honest about the output width; we can't assume the buffer

- * has been rounded up to an even width.

- */

-

-

-/*

- * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.

- */

-

-METHODDEF(void)

-h2v1_merged_upsample (j_decompress_ptr cinfo,

-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,

-		      JSAMPARRAY output_buf)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  register int y, cred, cgreen, cblue;

-  int cb, cr;

-  register JSAMPROW outptr;

-  JSAMPROW inptr0, inptr1, inptr2;

-  JDIMENSION col;

-  /* copy these pointers into registers if possible */

-  register JSAMPLE * range_limit = cinfo->sample_range_limit;

-  int * Crrtab = upsample->Cr_r_tab;

-  int * Cbbtab = upsample->Cb_b_tab;

-  INT32 * Crgtab = upsample->Cr_g_tab;

-  INT32 * Cbgtab = upsample->Cb_g_tab;

-  SHIFT_TEMPS

-

-  inptr0 = input_buf[0][in_row_group_ctr];

-  inptr1 = input_buf[1][in_row_group_ctr];

-  inptr2 = input_buf[2][in_row_group_ctr];

-  outptr = output_buf[0];

-  /* Loop for each pair of output pixels */

-  for (col = cinfo->output_width >> 1; col > 0; col--) {

-    /* Do the chroma part of the calculation */

-    cb = GETJSAMPLE(*inptr1++);

-    cr = GETJSAMPLE(*inptr2++);

-    cred   = Crrtab[cr];

-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);

-    cblue  = Cbbtab[cb];

-    /* Fetch 2 Y values and emit 2 pixels */

-    y  = GETJSAMPLE(*inptr0++);

-    outptr[RGB_RED]   = range_limit[y + cred];

-    outptr[RGB_GREEN] = range_limit[y + cgreen];

-    outptr[RGB_BLUE]  = range_limit[y + cblue];

-    outptr += RGB_PIXELSIZE;

-    y  = GETJSAMPLE(*inptr0++);

-    outptr[RGB_RED]   = range_limit[y + cred];

-    outptr[RGB_GREEN] = range_limit[y + cgreen];

-    outptr[RGB_BLUE]  = range_limit[y + cblue];

-    outptr += RGB_PIXELSIZE;

-  }

-  /* If image width is odd, do the last output column separately */

-  if (cinfo->output_width & 1) {

-    cb = GETJSAMPLE(*inptr1);

-    cr = GETJSAMPLE(*inptr2);

-    cred   = Crrtab[cr];

-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);

-    cblue  = Cbbtab[cb];

-    y  = GETJSAMPLE(*inptr0);

-    outptr[RGB_RED]   = range_limit[y + cred];

-    outptr[RGB_GREEN] = range_limit[y + cgreen];

-    outptr[RGB_BLUE]  = range_limit[y + cblue];

-  }

-}

-

-

-/*

- * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.

- */

-

-METHODDEF(void)

-h2v2_merged_upsample (j_decompress_ptr cinfo,

-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,

-		      JSAMPARRAY output_buf)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  register int y, cred, cgreen, cblue;

-  int cb, cr;

-  register JSAMPROW outptr0, outptr1;

-  JSAMPROW inptr00, inptr01, inptr1, inptr2;

-  JDIMENSION col;

-  /* copy these pointers into registers if possible */

-  register JSAMPLE * range_limit = cinfo->sample_range_limit;

-  int * Crrtab = upsample->Cr_r_tab;

-  int * Cbbtab = upsample->Cb_b_tab;

-  INT32 * Crgtab = upsample->Cr_g_tab;

-  INT32 * Cbgtab = upsample->Cb_g_tab;

-  SHIFT_TEMPS

-

-  inptr00 = input_buf[0][in_row_group_ctr*2];

-  inptr01 = input_buf[0][in_row_group_ctr*2 + 1];

-  inptr1 = input_buf[1][in_row_group_ctr];

-  inptr2 = input_buf[2][in_row_group_ctr];

-  outptr0 = output_buf[0];

-  outptr1 = output_buf[1];

-  /* Loop for each group of output pixels */

-  for (col = cinfo->output_width >> 1; col > 0; col--) {

-    /* Do the chroma part of the calculation */

-    cb = GETJSAMPLE(*inptr1++);

-    cr = GETJSAMPLE(*inptr2++);

-    cred   = Crrtab[cr];

-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);

-    cblue  = Cbbtab[cb];

-    /* Fetch 4 Y values and emit 4 pixels */

-    y  = GETJSAMPLE(*inptr00++);

-    outptr0[RGB_RED]   = range_limit[y + cred];

-    outptr0[RGB_GREEN] = range_limit[y + cgreen];

-    outptr0[RGB_BLUE]  = range_limit[y + cblue];

-    outptr0 += RGB_PIXELSIZE;

-    y  = GETJSAMPLE(*inptr00++);

-    outptr0[RGB_RED]   = range_limit[y + cred];

-    outptr0[RGB_GREEN] = range_limit[y + cgreen];

-    outptr0[RGB_BLUE]  = range_limit[y + cblue];

-    outptr0 += RGB_PIXELSIZE;

-    y  = GETJSAMPLE(*inptr01++);

-    outptr1[RGB_RED]   = range_limit[y + cred];

-    outptr1[RGB_GREEN] = range_limit[y + cgreen];

-    outptr1[RGB_BLUE]  = range_limit[y + cblue];

-    outptr1 += RGB_PIXELSIZE;

-    y  = GETJSAMPLE(*inptr01++);

-    outptr1[RGB_RED]   = range_limit[y + cred];

-    outptr1[RGB_GREEN] = range_limit[y + cgreen];

-    outptr1[RGB_BLUE]  = range_limit[y + cblue];

-    outptr1 += RGB_PIXELSIZE;

-  }

-  /* If image width is odd, do the last output column separately */

-  if (cinfo->output_width & 1) {

-    cb = GETJSAMPLE(*inptr1);

-    cr = GETJSAMPLE(*inptr2);

-    cred   = Crrtab[cr];

-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);

-    cblue  = Cbbtab[cb];

-    y  = GETJSAMPLE(*inptr00);

-    outptr0[RGB_RED]   = range_limit[y + cred];

-    outptr0[RGB_GREEN] = range_limit[y + cgreen];

-    outptr0[RGB_BLUE]  = range_limit[y + cblue];

-    y  = GETJSAMPLE(*inptr01);

-    outptr1[RGB_RED]   = range_limit[y + cred];

-    outptr1[RGB_GREEN] = range_limit[y + cgreen];

-    outptr1[RGB_BLUE]  = range_limit[y + cblue];

-  }

-}

-

-

-/*

- * Module initialization routine for merged upsampling/color conversion.

- *

- * NB: this is called under the conditions determined by use_merged_upsample()

- * in jdmaster.c.  That routine MUST correspond to the actual capabilities

- * of this module; no safety checks are made here.

- */

-

-GLOBAL(void)

-jinit_merged_upsampler (j_decompress_ptr cinfo)

-{

-  my_upsample_ptr upsample;

-

-  upsample = (my_upsample_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_upsampler));

-  cinfo->upsample = &upsample->pub;

-  upsample->pub.start_pass = start_pass_merged_upsample;

-  upsample->pub.need_context_rows = FALSE;

-

-  upsample->out_row_width = cinfo->output_width * cinfo->out_color_components;

-

-  if (cinfo->max_v_samp_factor == 2) {

-    upsample->pub.upsample = merged_2v_upsample;

-    upsample->upmethod = h2v2_merged_upsample;

-    /* Allocate a spare row buffer */

-    upsample->spare_row = (JSAMPROW)

-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-		(size_t) (upsample->out_row_width * SIZEOF(JSAMPLE)));

-  } else {

-    upsample->pub.upsample = merged_1v_upsample;

-    upsample->upmethod = h2v1_merged_upsample;

-    /* No spare row needed */

-    upsample->spare_row = NULL;

-  }

-

-  if (cinfo->jpeg_color_space == JCS_BG_YCC)

-    build_bg_ycc_rgb_table(cinfo);

-  else

-    build_ycc_rgb_table(cinfo);

-}

-

-#endif /* UPSAMPLE_MERGING_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jdosaobj.txt b/plugins/AdvaImg/src/LibJPEG/jdosaobj.txt
deleted file mode 100644
index 4318362ec4..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdosaobj.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-This archive contains already-assembled object files for JMEMDOSA.ASM
-of the Independent JPEG Group's JPEG package.  These files will be helpful
-if you want to compile the IJG code for DOS, but don't have an assembler.
-
-These files were prepared from the 3/13/1992 version of JMEMDOSA.ASM,
-which is still unchanged as of mid-1998.  You can use these files with
-releases 3 through 6 of the IJG code, and probably future releases too.
-
-To use these files, copy the proper version to JMEMDOSA.OBJ.  Make sure
-this file has a newer date than JMEMDOSA.ASM.  Then compile the code as
-usual.
-
-Object files included:
-
-JDOSAMSC.OBJ	For Microsoft C version 5 or later.
-JDOSABCC.OBJ	For Borland C version 3.0 or later.
diff --git a/plugins/AdvaImg/src/LibJPEG/jdpostct.c b/plugins/AdvaImg/src/LibJPEG/jdpostct.c
deleted file mode 100644
index 7ba9eed52e..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdpostct.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*

- * jdpostct.c

- *

- * Copyright (C) 1994-1996, 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 the decompression postprocessing controller.

- * This controller manages the upsampling, color conversion, and color

- * quantization/reduction steps; specifically, it controls the buffering

- * between upsample/color conversion and color quantization/reduction.

- *

- * If no color quantization/reduction is required, then this module has no

- * work to do, and it just hands off to the upsample/color conversion code.

- * An integrated upsample/convert/quantize process would replace this module

- * entirely.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Private buffer controller object */

-

-typedef struct {

-  struct jpeg_d_post_controller pub; /* public fields */

-

-  /* Color quantization source buffer: this holds output data from

-   * the upsample/color conversion step to be passed to the quantizer.

-   * For two-pass color quantization, we need a full-image buffer;

-   * for one-pass operation, a strip buffer is sufficient.

-   */

-  jvirt_sarray_ptr whole_image;	/* virtual array, or NULL if one-pass */

-  JSAMPARRAY buffer;		/* strip buffer, or current strip of virtual */

-  JDIMENSION strip_height;	/* buffer size in rows */

-  /* for two-pass mode only: */

-  JDIMENSION starting_row;	/* row # of first row in current strip */

-  JDIMENSION next_row;		/* index of next row to fill/empty in strip */

-} my_post_controller;

-

-typedef my_post_controller * my_post_ptr;

-

-

-/* Forward declarations */

-METHODDEF(void) post_process_1pass

-	JPP((j_decompress_ptr cinfo,

-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-	     JDIMENSION in_row_groups_avail,

-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-	     JDIMENSION out_rows_avail));

-#ifdef QUANT_2PASS_SUPPORTED

-METHODDEF(void) post_process_prepass

-	JPP((j_decompress_ptr cinfo,

-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-	     JDIMENSION in_row_groups_avail,

-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-	     JDIMENSION out_rows_avail));

-METHODDEF(void) post_process_2pass

-	JPP((j_decompress_ptr cinfo,

-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-	     JDIMENSION in_row_groups_avail,

-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-	     JDIMENSION out_rows_avail));

-#endif

-

-

-/*

- * Initialize for a processing pass.

- */

-

-METHODDEF(void)

-start_pass_dpost (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)

-{

-  my_post_ptr post = (my_post_ptr) cinfo->post;

-

-  switch (pass_mode) {

-  case JBUF_PASS_THRU:

-    if (cinfo->quantize_colors) {

-      /* Single-pass processing with color quantization. */

-      post->pub.post_process_data = post_process_1pass;

-      /* We could be doing buffered-image output before starting a 2-pass

-       * color quantization; in that case, jinit_d_post_controller did not

-       * allocate a strip buffer.  Use the virtual-array buffer as workspace.

-       */

-      if (post->buffer == NULL) {

-	post->buffer = (*cinfo->mem->access_virt_sarray)

-	  ((j_common_ptr) cinfo, post->whole_image,

-	   (JDIMENSION) 0, post->strip_height, TRUE);

-      }

-    } else {

-      /* For single-pass processing without color quantization,

-       * I have no work to do; just call the upsampler directly.

-       */

-      post->pub.post_process_data = cinfo->upsample->upsample;

-    }

-    break;

-#ifdef QUANT_2PASS_SUPPORTED

-  case JBUF_SAVE_AND_PASS:

-    /* First pass of 2-pass quantization */

-    if (post->whole_image == NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    post->pub.post_process_data = post_process_prepass;

-    break;

-  case JBUF_CRANK_DEST:

-    /* Second pass of 2-pass quantization */

-    if (post->whole_image == NULL)

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    post->pub.post_process_data = post_process_2pass;

-    break;

-#endif /* QUANT_2PASS_SUPPORTED */

-  default:

-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-    break;

-  }

-  post->starting_row = post->next_row = 0;

-}

-

-

-/*

- * Process some data in the one-pass (strip buffer) case.

- * This is used for color precision reduction as well as one-pass quantization.

- */

-

-METHODDEF(void)

-post_process_1pass (j_decompress_ptr cinfo,

-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-		    JDIMENSION in_row_groups_avail,

-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-		    JDIMENSION out_rows_avail)

-{

-  my_post_ptr post = (my_post_ptr) cinfo->post;

-  JDIMENSION num_rows, max_rows;

-

-  /* Fill the buffer, but not more than what we can dump out in one go. */

-  /* Note we rely on the upsampler to detect bottom of image. */

-  max_rows = out_rows_avail - *out_row_ctr;

-  if (max_rows > post->strip_height)

-    max_rows = post->strip_height;

-  num_rows = 0;

-  (*cinfo->upsample->upsample) (cinfo,

-		input_buf, in_row_group_ctr, in_row_groups_avail,

-		post->buffer, &num_rows, max_rows);

-  /* Quantize and emit data. */

-  (*cinfo->cquantize->color_quantize) (cinfo,

-		post->buffer, output_buf + *out_row_ctr, (int) num_rows);

-  *out_row_ctr += num_rows;

-}

-

-

-#ifdef QUANT_2PASS_SUPPORTED

-

-/*

- * Process some data in the first pass of 2-pass quantization.

- */

-

-METHODDEF(void)

-post_process_prepass (j_decompress_ptr cinfo,

-		      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-		      JDIMENSION in_row_groups_avail,

-		      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-		      JDIMENSION out_rows_avail)

-{

-  my_post_ptr post = (my_post_ptr) cinfo->post;

-  JDIMENSION old_next_row, num_rows;

-

-  /* Reposition virtual buffer if at start of strip. */

-  if (post->next_row == 0) {

-    post->buffer = (*cinfo->mem->access_virt_sarray)

-	((j_common_ptr) cinfo, post->whole_image,

-	 post->starting_row, post->strip_height, TRUE);

-  }

-

-  /* Upsample some data (up to a strip height's worth). */

-  old_next_row = post->next_row;

-  (*cinfo->upsample->upsample) (cinfo,

-		input_buf, in_row_group_ctr, in_row_groups_avail,

-		post->buffer, &post->next_row, post->strip_height);

-

-  /* Allow quantizer to scan new data.  No data is emitted, */

-  /* but we advance out_row_ctr so outer loop can tell when we're done. */

-  if (post->next_row > old_next_row) {

-    num_rows = post->next_row - old_next_row;

-    (*cinfo->cquantize->color_quantize) (cinfo, post->buffer + old_next_row,

-					 (JSAMPARRAY) NULL, (int) num_rows);

-    *out_row_ctr += num_rows;

-  }

-

-  /* Advance if we filled the strip. */

-  if (post->next_row >= post->strip_height) {

-    post->starting_row += post->strip_height;

-    post->next_row = 0;

-  }

-}

-

-

-/*

- * Process some data in the second pass of 2-pass quantization.

- */

-

-METHODDEF(void)

-post_process_2pass (j_decompress_ptr cinfo,

-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-		    JDIMENSION in_row_groups_avail,

-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-		    JDIMENSION out_rows_avail)

-{

-  my_post_ptr post = (my_post_ptr) cinfo->post;

-  JDIMENSION num_rows, max_rows;

-

-  /* Reposition virtual buffer if at start of strip. */

-  if (post->next_row == 0) {

-    post->buffer = (*cinfo->mem->access_virt_sarray)

-	((j_common_ptr) cinfo, post->whole_image,

-	 post->starting_row, post->strip_height, FALSE);

-  }

-

-  /* Determine number of rows to emit. */

-  num_rows = post->strip_height - post->next_row; /* available in strip */

-  max_rows = out_rows_avail - *out_row_ctr; /* available in output area */

-  if (num_rows > max_rows)

-    num_rows = max_rows;

-  /* We have to check bottom of image here, can't depend on upsampler. */

-  max_rows = cinfo->output_height - post->starting_row;

-  if (num_rows > max_rows)

-    num_rows = max_rows;

-

-  /* Quantize and emit data. */

-  (*cinfo->cquantize->color_quantize) (cinfo,

-		post->buffer + post->next_row, output_buf + *out_row_ctr,

-		(int) num_rows);

-  *out_row_ctr += num_rows;

-

-  /* Advance if we filled the strip. */

-  post->next_row += num_rows;

-  if (post->next_row >= post->strip_height) {

-    post->starting_row += post->strip_height;

-    post->next_row = 0;

-  }

-}

-

-#endif /* QUANT_2PASS_SUPPORTED */

-

-

-/*

- * Initialize postprocessing controller.

- */

-

-GLOBAL(void)

-jinit_d_post_controller (j_decompress_ptr cinfo, boolean need_full_buffer)

-{

-  my_post_ptr post;

-

-  post = (my_post_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_post_controller));

-  cinfo->post = (struct jpeg_d_post_controller *) post;

-  post->pub.start_pass = start_pass_dpost;

-  post->whole_image = NULL;	/* flag for no virtual arrays */

-  post->buffer = NULL;		/* flag for no strip buffer */

-

-  /* Create the quantization buffer, if needed */

-  if (cinfo->quantize_colors) {

-    /* The buffer strip height is max_v_samp_factor, which is typically

-     * an efficient number of rows for upsampling to return.

-     * (In the presence of output rescaling, we might want to be smarter?)

-     */

-    post->strip_height = (JDIMENSION) cinfo->max_v_samp_factor;

-    if (need_full_buffer) {

-      /* Two-pass color quantization: need full-image storage. */

-      /* We round up the number of rows to a multiple of the strip height. */

-#ifdef QUANT_2PASS_SUPPORTED

-      post->whole_image = (*cinfo->mem->request_virt_sarray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-	 cinfo->output_width * cinfo->out_color_components,

-	 (JDIMENSION) jround_up((long) cinfo->output_height,

-				(long) post->strip_height),

-	 post->strip_height);

-#else

-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);

-#endif /* QUANT_2PASS_SUPPORTED */

-    } else {

-      /* One-pass color quantization: just make a strip buffer. */

-      post->buffer = (*cinfo->mem->alloc_sarray)

-	((j_common_ptr) cinfo, JPOOL_IMAGE,

-	 cinfo->output_width * cinfo->out_color_components,

-	 post->strip_height);

-    }

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdsample.c b/plugins/AdvaImg/src/LibJPEG/jdsample.c
deleted file mode 100644
index 83d6332c3b..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdsample.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*

- * jdsample.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2002-2015 by Guido Vollbeding.

- * 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 upsampling routines.

- *

- * Upsampling input data is counted in "row groups".  A row group

- * is defined to be (v_samp_factor * DCT_v_scaled_size / min_DCT_v_scaled_size)

- * sample rows of each component.  Upsampling will normally produce

- * max_v_samp_factor pixel rows from each row group (but this could vary

- * if the upsampler is applying a scale factor of its own).

- *

- * An excellent reference for image resampling is

- *   Digital Image Warping, George Wolberg, 1990.

- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Pointer to routine to upsample a single component */

-typedef JMETHOD(void, upsample1_ptr,

-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr));

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_upsampler pub;	/* public fields */

-

-  /* Color conversion buffer.  When using separate upsampling and color

-   * conversion steps, this buffer holds one upsampled row group until it

-   * has been color converted and output.

-   * Note: we do not allocate any storage for component(s) which are full-size,

-   * ie do not need rescaling.  The corresponding entry of color_buf[] is

-   * simply set to point to the input data array, thereby avoiding copying.

-   */

-  JSAMPARRAY color_buf[MAX_COMPONENTS];

-

-  /* Per-component upsampling method pointers */

-  upsample1_ptr methods[MAX_COMPONENTS];

-

-  int next_row_out;		/* counts rows emitted from color_buf */

-  JDIMENSION rows_to_go;	/* counts rows remaining in image */

-

-  /* Height of an input row group for each component. */

-  int rowgroup_height[MAX_COMPONENTS];

-

-  /* These arrays save pixel expansion factors so that int_expand need not

-   * recompute them each time.  They are unused for other upsampling methods.

-   */

-  UINT8 h_expand[MAX_COMPONENTS];

-  UINT8 v_expand[MAX_COMPONENTS];

-} my_upsampler;

-

-typedef my_upsampler * my_upsample_ptr;

-

-

-/*

- * Initialize for an upsampling pass.

- */

-

-METHODDEF(void)

-start_pass_upsample (j_decompress_ptr cinfo)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-

-  /* Mark the conversion buffer empty */

-  upsample->next_row_out = cinfo->max_v_samp_factor;

-  /* Initialize total-height counter for detecting bottom of image */

-  upsample->rows_to_go = cinfo->output_height;

-}

-

-

-/*

- * Control routine to do upsampling (and color conversion).

- *

- * In this version we upsample each component independently.

- * We upsample one row group into the conversion buffer, then apply

- * color conversion a row at a time.

- */

-

-METHODDEF(void)

-sep_upsample (j_decompress_ptr cinfo,

-	      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,

-	      JDIMENSION in_row_groups_avail,

-	      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-	      JDIMENSION out_rows_avail)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  int ci;

-  jpeg_component_info * compptr;

-  JDIMENSION num_rows;

-

-  /* Fill the conversion buffer, if it's empty */

-  if (upsample->next_row_out >= cinfo->max_v_samp_factor) {

-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-	 ci++, compptr++) {

-      /* Invoke per-component upsample method.  Notice we pass a POINTER

-       * to color_buf[ci], so that fullsize_upsample can change it.

-       */

-      (*upsample->methods[ci]) (cinfo, compptr,

-	input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]),

-	upsample->color_buf + ci);

-    }

-    upsample->next_row_out = 0;

-  }

-

-  /* Color-convert and emit rows */

-

-  /* How many we have in the buffer: */

-  num_rows = (JDIMENSION) (cinfo->max_v_samp_factor - upsample->next_row_out);

-  /* Not more than the distance to the end of the image.  Need this test

-   * in case the image height is not a multiple of max_v_samp_factor:

-   */

-  if (num_rows > upsample->rows_to_go) 

-    num_rows = upsample->rows_to_go;

-  /* And not more than what the client can accept: */

-  out_rows_avail -= *out_row_ctr;

-  if (num_rows > out_rows_avail)

-    num_rows = out_rows_avail;

-

-  (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf,

-				     (JDIMENSION) upsample->next_row_out,

-				     output_buf + *out_row_ctr,

-				     (int) num_rows);

-

-  /* Adjust counts */

-  *out_row_ctr += num_rows;

-  upsample->rows_to_go -= num_rows;

-  upsample->next_row_out += num_rows;

-  /* When the buffer is emptied, declare this input row group consumed */

-  if (upsample->next_row_out >= cinfo->max_v_samp_factor)

-    (*in_row_group_ctr)++;

-}

-

-

-/*

- * These are the routines invoked by sep_upsample to upsample pixel values

- * of a single component.  One row group is processed per call.

- */

-

-

-/*

- * For full-size components, we just make color_buf[ci] point at the

- * input buffer, and thus avoid copying any data.  Note that this is

- * safe only because sep_upsample doesn't declare the input row group

- * "consumed" until we are done color converting and emitting it.

- */

-

-METHODDEF(void)

-fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		   JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)

-{

-  *output_data_ptr = input_data;

-}

-

-

-/*

- * This is a no-op version used for "uninteresting" components.

- * These components will not be referenced by color conversion.

- */

-

-METHODDEF(void)

-noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)

-{

-  *output_data_ptr = NULL;	/* safety check */

-}

-

-

-/*

- * This version handles any integral sampling ratios.

- * This is not used for typical JPEG files, so it need not be fast.

- * Nor, for that matter, is it particularly accurate: the algorithm is

- * simple replication of the input pixel onto the corresponding output

- * pixels.  The hi-falutin sampling literature refers to this as a

- * "box filter".  A box filter tends to introduce visible artifacts,

- * so if you are actually going to use 3:1 or 4:1 sampling ratios

- * you would be well advised to improve this code.

- */

-

-METHODDEF(void)

-int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	      JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)

-{

-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;

-  JSAMPARRAY output_data = *output_data_ptr;

-  register JSAMPROW inptr, outptr;

-  register JSAMPLE invalue;

-  register int h;

-  JSAMPROW outend;

-  int h_expand, v_expand;

-  int inrow, outrow;

-

-  h_expand = upsample->h_expand[compptr->component_index];

-  v_expand = upsample->v_expand[compptr->component_index];

-

-  inrow = outrow = 0;

-  while (outrow < cinfo->max_v_samp_factor) {

-    /* Generate one output row with proper horizontal expansion */

-    inptr = input_data[inrow];

-    outptr = output_data[outrow];

-    outend = outptr + cinfo->output_width;

-    while (outptr < outend) {

-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */

-      for (h = h_expand; h > 0; h--) {

-	*outptr++ = invalue;

-      }

-    }

-    /* Generate any additional output rows by duplicating the first one */

-    if (v_expand > 1) {

-      jcopy_sample_rows(output_data, outrow, output_data, outrow+1,

-			v_expand-1, cinfo->output_width);

-    }

-    inrow++;

-    outrow += v_expand;

-  }

-}

-

-

-/*

- * Fast processing for the common case of 2:1 horizontal and 1:1 vertical.

- * It's still a box filter.

- */

-

-METHODDEF(void)

-h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)

-{

-  JSAMPARRAY output_data = *output_data_ptr;

-  register JSAMPROW inptr, outptr;

-  register JSAMPLE invalue;

-  JSAMPROW outend;

-  int outrow;

-

-  for (outrow = 0; outrow < cinfo->max_v_samp_factor; outrow++) {

-    inptr = input_data[outrow];

-    outptr = output_data[outrow];

-    outend = outptr + cinfo->output_width;

-    while (outptr < outend) {

-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */

-      *outptr++ = invalue;

-      *outptr++ = invalue;

-    }

-  }

-}

-

-

-/*

- * Fast processing for the common case of 2:1 horizontal and 2:1 vertical.

- * It's still a box filter.

- */

-

-METHODDEF(void)

-h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)

-{

-  JSAMPARRAY output_data = *output_data_ptr;

-  register JSAMPROW inptr, outptr;

-  register JSAMPLE invalue;

-  JSAMPROW outend;

-  int inrow, outrow;

-

-  inrow = outrow = 0;

-  while (outrow < cinfo->max_v_samp_factor) {

-    inptr = input_data[inrow];

-    outptr = output_data[outrow];

-    outend = outptr + cinfo->output_width;

-    while (outptr < outend) {

-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */

-      *outptr++ = invalue;

-      *outptr++ = invalue;

-    }

-    jcopy_sample_rows(output_data, outrow, output_data, outrow+1,

-		      1, cinfo->output_width);

-    inrow++;

-    outrow += 2;

-  }

-}

-

-

-/*

- * Module initialization routine for upsampling.

- */

-

-GLOBAL(void)

-jinit_upsampler (j_decompress_ptr cinfo)

-{

-  my_upsample_ptr upsample;

-  int ci;

-  jpeg_component_info * compptr;

-  int h_in_group, v_in_group, h_out_group, v_out_group;

-

-  upsample = (my_upsample_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_upsampler));

-  cinfo->upsample = &upsample->pub;

-  upsample->pub.start_pass = start_pass_upsample;

-  upsample->pub.upsample = sep_upsample;

-  upsample->pub.need_context_rows = FALSE; /* until we find out differently */

-

-  if (cinfo->CCIR601_sampling)	/* this isn't supported */

-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);

-

-  /* Verify we can handle the sampling factors, select per-component methods,

-   * and create storage as needed.

-   */

-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;

-       ci++, compptr++) {

-    /* Compute size of an "input group" after IDCT scaling.  This many samples

-     * are to be converted to max_h_samp_factor * max_v_samp_factor pixels.

-     */

-    h_in_group = (compptr->h_samp_factor * compptr->DCT_h_scaled_size) /

-		 cinfo->min_DCT_h_scaled_size;

-    v_in_group = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /

-		 cinfo->min_DCT_v_scaled_size;

-    h_out_group = cinfo->max_h_samp_factor;

-    v_out_group = cinfo->max_v_samp_factor;

-    upsample->rowgroup_height[ci] = v_in_group; /* save for use later */

-    if (! compptr->component_needed) {

-      /* Don't bother to upsample an uninteresting component. */

-      upsample->methods[ci] = noop_upsample;

-      continue;		/* don't need to allocate buffer */

-    }

-    if (h_in_group == h_out_group && v_in_group == v_out_group) {

-      /* Fullsize components can be processed without any work. */

-      upsample->methods[ci] = fullsize_upsample;

-      continue;		/* don't need to allocate buffer */

-    }

-    if (h_in_group * 2 == h_out_group && v_in_group == v_out_group) {

-      /* Special case for 2h1v upsampling */

-      upsample->methods[ci] = h2v1_upsample;

-    } else if (h_in_group * 2 == h_out_group &&

-	       v_in_group * 2 == v_out_group) {

-      /* Special case for 2h2v upsampling */

-      upsample->methods[ci] = h2v2_upsample;

-    } else if ((h_out_group % h_in_group) == 0 &&

-	       (v_out_group % v_in_group) == 0) {

-      /* Generic integral-factors upsampling method */

-      upsample->methods[ci] = int_upsample;

-      upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group);

-      upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group);

-    } else

-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);

-    upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) jround_up((long) cinfo->output_width,

-			      (long) cinfo->max_h_samp_factor),

-       (JDIMENSION) cinfo->max_v_samp_factor);

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jdtrans.c b/plugins/AdvaImg/src/LibJPEG/jdtrans.c
deleted file mode 100644
index a51d69de44..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jdtrans.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*

- * jdtrans.c

- *

- * Copyright (C) 1995-1997, Thomas G. Lane.

- * Modified 2000-2009 by Guido Vollbeding.

- * 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 library routines for transcoding decompression,

- * that is, reading raw DCT coefficient arrays from an input JPEG file.

- * The routines in jdapimin.c will also be needed by a transcoder.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/* Forward declarations */

-LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));

-

-

-/*

- * Read the coefficient arrays from a JPEG file.

- * jpeg_read_header must be completed before calling this.

- *

- * The entire image is read into a set of virtual coefficient-block arrays,

- * one per component.  The return value is a pointer to the array of

- * virtual-array descriptors.  These can be manipulated directly via the

- * JPEG memory manager, or handed off to jpeg_write_coefficients().

- * To release the memory occupied by the virtual arrays, call

- * jpeg_finish_decompress() when done with the data.

- *

- * An alternative usage is to simply obtain access to the coefficient arrays

- * during a buffered-image-mode decompression operation.  This is allowed

- * after any jpeg_finish_output() call.  The arrays can be accessed until

- * jpeg_finish_decompress() is called.  (Note that any call to the library

- * may reposition the arrays, so don't rely on access_virt_barray() results

- * to stay valid across library calls.)

- *

- * Returns NULL if suspended.  This case need be checked only if

- * a suspending data source is used.

- */

-

-GLOBAL(jvirt_barray_ptr *)

-jpeg_read_coefficients (j_decompress_ptr cinfo)

-{

-  if (cinfo->global_state == DSTATE_READY) {

-    /* First call: initialize active modules */

-    transdecode_master_selection(cinfo);

-    cinfo->global_state = DSTATE_RDCOEFS;

-  }

-  if (cinfo->global_state == DSTATE_RDCOEFS) {

-    /* Absorb whole file into the coef buffer */

-    for (;;) {

-      int retcode;

-      /* Call progress monitor hook if present */

-      if (cinfo->progress != NULL)

-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);

-      /* Absorb some more input */

-      retcode = (*cinfo->inputctl->consume_input) (cinfo);

-      if (retcode == JPEG_SUSPENDED)

-	return NULL;

-      if (retcode == JPEG_REACHED_EOI)

-	break;

-      /* Advance progress counter if appropriate */

-      if (cinfo->progress != NULL &&

-	  (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {

-	if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {

-	  /* startup underestimated number of scans; ratchet up one scan */

-	  cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;

-	}

-      }

-    }

-    /* Set state so that jpeg_finish_decompress does the right thing */

-    cinfo->global_state = DSTATE_STOPPING;

-  }

-  /* At this point we should be in state DSTATE_STOPPING if being used

-   * standalone, or in state DSTATE_BUFIMAGE if being invoked to get access

-   * to the coefficients during a full buffered-image-mode decompression.

-   */

-  if ((cinfo->global_state == DSTATE_STOPPING ||

-       cinfo->global_state == DSTATE_BUFIMAGE) && cinfo->buffered_image) {

-    return cinfo->coef->coef_arrays;

-  }

-  /* Oops, improper usage */

-  ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);

-  return NULL;			/* keep compiler happy */

-}

-

-

-/*

- * Master selection of decompression modules for transcoding.

- * This substitutes for jdmaster.c's initialization of the full decompressor.

- */

-

-LOCAL(void)

-transdecode_master_selection (j_decompress_ptr cinfo)

-{

-  /* This is effectively a buffered-image operation. */

-  cinfo->buffered_image = TRUE;

-

-  /* Compute output image dimensions and related values. */

-  jpeg_core_output_dimensions(cinfo);

-

-  /* Entropy decoding: either Huffman or arithmetic coding. */

-  if (cinfo->arith_code)

-    jinit_arith_decoder(cinfo);

-  else {

-    jinit_huff_decoder(cinfo);

-  }

-

-  /* Always get a full-image coefficient buffer. */

-  jinit_d_coef_controller(cinfo, TRUE);

-

-  /* We can now tell the memory manager to allocate virtual arrays. */

-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);

-

-  /* Initialize input side of decompressor to consume first scan. */

-  (*cinfo->inputctl->start_input_pass) (cinfo);

-

-  /* Initialize progress monitoring. */

-  if (cinfo->progress != NULL) {

-    int nscans;

-    /* Estimate number of scans to set pass_limit. */

-    if (cinfo->progressive_mode) {

-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */

-      nscans = 2 + 3 * cinfo->num_components;

-    } else if (cinfo->inputctl->has_multiple_scans) {

-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */

-      nscans = cinfo->num_components;

-    } else {

-      nscans = 1;

-    }

-    cinfo->progress->pass_counter = 0L;

-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;

-    cinfo->progress->completed_passes = 0;

-    cinfo->progress->total_passes = 1;

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jerror.c b/plugins/AdvaImg/src/LibJPEG/jerror.c
deleted file mode 100644
index cfaf083a39..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jerror.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*

- * jerror.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2012-2015 by Guido Vollbeding.

- * 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 simple error-reporting and trace-message routines.

- * These are suitable for Unix-like systems and others where writing to

- * stderr is the right thing to do.  Many applications will want to replace

- * some or all of these routines.

- *

- * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile,

- * you get a Windows-specific hack to display error messages in a dialog box.

- * It ain't much, but it beats dropping error messages into the bit bucket,

- * which is what happens to output to stderr under most Windows C compilers.

- *

- * These routines are used by both the compression and decompression code.

- */

-

-#ifdef USE_WINDOWS_MESSAGEBOX

-#include <windows.h>

-#endif

-

-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jversion.h"

-#include "jerror.h"

-

-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */

-#define EXIT_FAILURE  1

-#endif

-

-

-/*

- * Create the message string table.

- * We do this from the master message list in jerror.h by re-reading

- * jerror.h with a suitable definition for macro JMESSAGE.

- * The message table is made an external symbol just in case any applications

- * want to refer to it directly.

- */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jpeg_std_message_table	jMsgTable

-#endif

-

-#define JMESSAGE(code,string)	string ,

-

-const char * const jpeg_std_message_table[] = {

-#include "jerror.h"

-  NULL

-};

-

-

-/*

- * Error exit handler: must not return to caller.

- *

- * Applications may override this if they want to get control back after

- * an error.  Typically one would longjmp somewhere instead of exiting.

- * The setjmp buffer can be made a private field within an expanded error

- * handler object.  Note that the info needed to generate an error message

- * is stored in the error object, so you can generate the message now or

- * later, at your convenience.

- * You should make sure that the JPEG object is cleaned up (with jpeg_abort

- * or jpeg_destroy) at some point.

- */

-

-METHODDEF(noreturn_t)

-error_exit (j_common_ptr cinfo)

-{

-  /* Always display the message */

-  (*cinfo->err->output_message) (cinfo);

-

-  /* Let the memory manager delete any temp files before we die */

-  jpeg_destroy(cinfo);

-

-  exit(EXIT_FAILURE);

-}

-

-

-/*

- * Actual output of an error or trace message.

- * Applications may override this method to send JPEG messages somewhere

- * other than stderr.

- *

- * On Windows, printing to stderr is generally completely useless,

- * so we provide optional code to produce an error-dialog popup.

- * Most Windows applications will still prefer to override this routine,

- * but if they don't, it'll do something at least marginally useful.

- *

- * NOTE: to use the library in an environment that doesn't support the

- * C stdio library, you may have to delete the call to fprintf() entirely,

- * not just not use this routine.

- */

-

-METHODDEF(void)

-output_message (j_common_ptr cinfo)

-{

-  char buffer[JMSG_LENGTH_MAX];

-

-  /* Create the message */

-  (*cinfo->err->format_message) (cinfo, buffer);

-

-#ifdef USE_WINDOWS_MESSAGEBOX

-  /* Display it in a message dialog box */

-  MessageBox(GetActiveWindow(), buffer, "JPEG Library Error",

-	     MB_OK | MB_ICONERROR);

-#else

-  /* Send it to stderr, adding a newline */

-  fprintf(stderr, "%s\n", buffer);

-#endif

-}

-

-

-/*

- * Decide whether to emit a trace or warning message.

- * msg_level is one of:

- *   -1: recoverable corrupt-data warning, may want to abort.

- *    0: important advisory messages (always display to user).

- *    1: first level of tracing detail.

- *    2,3,...: successively more detailed tracing messages.

- * An application might override this method if it wanted to abort on warnings

- * or change the policy about which messages to display.

- */

-

-METHODDEF(void)

-emit_message (j_common_ptr cinfo, int msg_level)

-{

-  struct jpeg_error_mgr * err = cinfo->err;

-

-  if (msg_level < 0) {

-    /* It's a warning message.  Since corrupt files may generate many warnings,

-     * the policy implemented here is to show only the first warning,

-     * unless trace_level >= 3.

-     */

-    if (err->num_warnings == 0 || err->trace_level >= 3)

-      (*err->output_message) (cinfo);

-    /* Always count warnings in num_warnings. */

-    err->num_warnings++;

-  } else {

-    /* It's a trace message.  Show it if trace_level >= msg_level. */

-    if (err->trace_level >= msg_level)

-      (*err->output_message) (cinfo);

-  }

-}

-

-

-/*

- * Format a message string for the most recent JPEG error or message.

- * The message is stored into buffer, which should be at least JMSG_LENGTH_MAX

- * characters.  Note that no '\n' character is added to the string.

- * Few applications should need to override this method.

- */

-

-METHODDEF(void)

-format_message (j_common_ptr cinfo, char * buffer)

-{

-  struct jpeg_error_mgr * err = cinfo->err;

-  int msg_code = err->msg_code;

-  const char * msgtext = NULL;

-  const char * msgptr;

-  char ch;

-  boolean isstring;

-

-  /* Look up message string in proper table */

-  if (msg_code > 0 && msg_code <= err->last_jpeg_message) {

-    msgtext = err->jpeg_message_table[msg_code];

-  } else if (err->addon_message_table != NULL &&

-	     msg_code >= err->first_addon_message &&

-	     msg_code <= err->last_addon_message) {

-    msgtext = err->addon_message_table[msg_code - err->first_addon_message];

-  }

-

-  /* Defend against bogus message number */

-  if (msgtext == NULL) {

-    err->msg_parm.i[0] = msg_code;

-    msgtext = err->jpeg_message_table[0];

-  }

-

-  /* Check for string parameter, as indicated by %s in the message text */

-  isstring = FALSE;

-  msgptr = msgtext;

-  while ((ch = *msgptr++) != '\0') {

-    if (ch == '%') {

-      if (*msgptr == 's') isstring = TRUE;

-      break;

-    }

-  }

-

-  /* Format the message into the passed buffer */

-  if (isstring)

-    sprintf(buffer, msgtext, err->msg_parm.s);

-  else

-    sprintf(buffer, msgtext,

-	    err->msg_parm.i[0], err->msg_parm.i[1],

-	    err->msg_parm.i[2], err->msg_parm.i[3],

-	    err->msg_parm.i[4], err->msg_parm.i[5],

-	    err->msg_parm.i[6], err->msg_parm.i[7]);

-}

-

-

-/*

- * Reset error state variables at start of a new image.

- * This is called during compression startup to reset trace/error

- * processing to default state, without losing any application-specific

- * method pointers.  An application might possibly want to override

- * this method if it has additional error processing state.

- */

-

-METHODDEF(void)

-reset_error_mgr (j_common_ptr cinfo)

-{

-  cinfo->err->num_warnings = 0;

-  /* trace_level is not reset since it is an application-supplied parameter */

-  cinfo->err->msg_code = 0;	/* may be useful as a flag for "no error" */

-}

-

-

-/*

- * Fill in the standard error-handling methods in a jpeg_error_mgr object.

- * Typical call is:

- *	struct jpeg_compress_struct cinfo;

- *	struct jpeg_error_mgr err;

- *

- *	cinfo.err = jpeg_std_error(&err);

- * after which the application may override some of the methods.

- */

-

-GLOBAL(struct jpeg_error_mgr *)

-jpeg_std_error (struct jpeg_error_mgr * err)

-{

-  err->error_exit = error_exit;

-  err->emit_message = emit_message;

-  err->output_message = output_message;

-  err->format_message = format_message;

-  err->reset_error_mgr = reset_error_mgr;

-

-  err->trace_level = 0;		/* default = no tracing */

-  err->num_warnings = 0;	/* no warnings emitted yet */

-  err->msg_code = 0;		/* may be useful as a flag for "no error" */

-

-  /* Initialize message table pointers */

-  err->jpeg_message_table = jpeg_std_message_table;

-  err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;

-

-  err->addon_message_table = NULL;

-  err->first_addon_message = 0;	/* for safety */

-  err->last_addon_message = 0;

-

-  return err;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jerror.h b/plugins/AdvaImg/src/LibJPEG/jerror.h
deleted file mode 100644
index b32da9a5ad..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jerror.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*

- * jerror.h

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 1997-2012 by Guido Vollbeding.

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

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

- *

- * This file defines the error and message codes for the JPEG library.

- * Edit this file to add new codes, or to translate the message strings to

- * some other language.

- * A set of error-reporting macros are defined too.  Some applications using

- * the JPEG library may wish to include this file to get the error codes

- * and/or the macros.

- */

-

-/*

- * To define the enum list of message codes, include this file without

- * defining macro JMESSAGE.  To create a message string table, include it

- * again with a suitable JMESSAGE definition (see jerror.c for an example).

- */

-#ifndef JMESSAGE

-#ifndef JERROR_H

-/* First time through, define the enum list */

-#define JMAKE_ENUM_LIST

-#else

-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */

-#define JMESSAGE(code,string)

-#endif /* JERROR_H */

-#endif /* JMESSAGE */

-

-#ifdef JMAKE_ENUM_LIST

-

-typedef enum {

-

-#define JMESSAGE(code,string)	code ,

-

-#endif /* JMAKE_ENUM_LIST */

-

-JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */

-

-/* For maintenance convenience, list is alphabetical by message code name */

-JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")

-JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")

-JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")

-JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")

-JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request")

-JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")

-JMESSAGE(JERR_BAD_DCTSIZE, "DCT scaled block size %dx%d not supported")

-JMESSAGE(JERR_BAD_DROP_SAMPLING,

-	 "Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c")

-JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")

-JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")

-JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")

-JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")

-JMESSAGE(JERR_BAD_LIB_VERSION,

-	 "Wrong JPEG library version: library is %d, caller expects %d")

-JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")

-JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")

-JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")

-JMESSAGE(JERR_BAD_PROGRESSION,

-	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")

-JMESSAGE(JERR_BAD_PROG_SCRIPT,

-	 "Invalid progressive parameters at scan script entry %d")

-JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")

-JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")

-JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")

-JMESSAGE(JERR_BAD_STRUCT_SIZE,

-	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")

-JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")

-JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")

-JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")

-JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")

-JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")

-JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")

-JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")

-JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")

-JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")

-JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")

-JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")

-JMESSAGE(JERR_EMS_READ, "Read from EMS failed")

-JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")

-JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")

-JMESSAGE(JERR_FILE_READ, "Input file read error")

-JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")

-JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")

-JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")

-JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")

-JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")

-JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")

-JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")

-JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,

-	 "Cannot transcode due to multiple use of quantization table %d")

-JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")

-JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")

-JMESSAGE(JERR_NOTIMPL, "Not implemented yet")

-JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")

-JMESSAGE(JERR_NO_ARITH_TABLE, "Arithmetic table 0x%02x was not defined")

-JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")

-JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")

-JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")

-JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")

-JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")

-JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")

-JMESSAGE(JERR_QUANT_COMPONENTS,

-	 "Cannot quantize more than %d color components")

-JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")

-JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")

-JMESSAGE(JERR_SOF_BEFORE, "Invalid JPEG file structure: %s before SOF")

-JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")

-JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")

-JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")

-JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")

-JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")

-JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")

-JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")

-JMESSAGE(JERR_TFILE_WRITE,

-	 "Write failed on temporary file --- out of disk space?")

-JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")

-JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")

-JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")

-JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")

-JMESSAGE(JERR_XMS_READ, "Read from XMS failed")

-JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")

-JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)

-JMESSAGE(JMSG_VERSION, JVERSION)

-JMESSAGE(JTRC_16BIT_TABLES,

-	 "Caution: quantization tables are too coarse for baseline JPEG")

-JMESSAGE(JTRC_ADOBE,

-	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")

-JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")

-JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")

-JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")

-JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")

-JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")

-JMESSAGE(JTRC_DRI, "Define Restart Interval %u")

-JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")

-JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")

-JMESSAGE(JTRC_EOI, "End Of Image")

-JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")

-JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")

-JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,

-	 "Warning: thumbnail image size does not match data length %u")

-JMESSAGE(JTRC_JFIF_EXTENSION,

-	 "JFIF extension marker: type 0x%02x, length %u")

-JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")

-JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")

-JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")

-JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")

-JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")

-JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")

-JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")

-JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")

-JMESSAGE(JTRC_RST, "RST%d")

-JMESSAGE(JTRC_SMOOTH_NOTIMPL,

-	 "Smoothing not supported with nonstandard sampling ratios")

-JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")

-JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")

-JMESSAGE(JTRC_SOI, "Start of Image")

-JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")

-JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")

-JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")

-JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")

-JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")

-JMESSAGE(JTRC_THUMB_JPEG,

-	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")

-JMESSAGE(JTRC_THUMB_PALETTE,

-	 "JFIF extension marker: palette thumbnail image, length %u")

-JMESSAGE(JTRC_THUMB_RGB,

-	 "JFIF extension marker: RGB thumbnail image, length %u")

-JMESSAGE(JTRC_UNKNOWN_IDS,

-	 "Unrecognized component IDs %d %d %d, assuming YCbCr")

-JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")

-JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")

-JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")

-JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code")

-JMESSAGE(JWRN_BOGUS_PROGRESSION,

-	 "Inconsistent progression sequence for component %d coefficient %d")

-JMESSAGE(JWRN_EXTRANEOUS_DATA,

-	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")

-JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")

-JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")

-JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")

-JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")

-JMESSAGE(JWRN_MUST_RESYNC,

-	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")

-JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")

-JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")

-

-#ifdef JMAKE_ENUM_LIST

-

-  JMSG_LASTMSGCODE

-} J_MESSAGE_CODE;

-

-#undef JMAKE_ENUM_LIST

-#endif /* JMAKE_ENUM_LIST */

-

-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */

-#undef JMESSAGE

-

-

-#ifndef JERROR_H

-#define JERROR_H

-

-/* Macros to simplify using the error and trace message stuff */

-/* The first parameter is either type of cinfo pointer */

-

-/* Fatal errors (print message and exit) */

-#define ERREXIT(cinfo,code)  \

-  ((cinfo)->err->msg_code = (code), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXIT1(cinfo,code,p1)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXIT2(cinfo,code,p1,p2)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXIT3(cinfo,code,p1,p2,p3)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (cinfo)->err->msg_parm.i[2] = (p3), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (cinfo)->err->msg_parm.i[2] = (p3), \

-   (cinfo)->err->msg_parm.i[3] = (p4), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXIT6(cinfo,code,p1,p2,p3,p4,p5,p6)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (cinfo)->err->msg_parm.i[2] = (p3), \

-   (cinfo)->err->msg_parm.i[3] = (p4), \

-   (cinfo)->err->msg_parm.i[4] = (p5), \

-   (cinfo)->err->msg_parm.i[5] = (p6), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-#define ERREXITS(cinfo,code,str)  \

-  ((cinfo)->err->msg_code = (code), \

-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \

-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))

-

-#define MAKESTMT(stuff)		do { stuff } while (0)

-

-/* Nonfatal errors (we can keep going, but the data is probably corrupt) */

-#define WARNMS(cinfo,code)  \

-  ((cinfo)->err->msg_code = (code), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))

-#define WARNMS1(cinfo,code,p1)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))

-#define WARNMS2(cinfo,code,p1,p2)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))

-

-/* Informational/debugging messages */

-#define TRACEMS(cinfo,lvl,code)  \

-  ((cinfo)->err->msg_code = (code), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))

-#define TRACEMS1(cinfo,lvl,code,p1)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))

-#define TRACEMS2(cinfo,lvl,code,p1,p2)  \

-  ((cinfo)->err->msg_code = (code), \

-   (cinfo)->err->msg_parm.i[0] = (p1), \

-   (cinfo)->err->msg_parm.i[1] = (p2), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))

-#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \

-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \

-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \

-	   (cinfo)->err->msg_code = (code); \

-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )

-#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \

-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \

-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \

-	   (cinfo)->err->msg_code = (code); \

-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )

-#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \

-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \

-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \

-	   _mp[4] = (p5); \

-	   (cinfo)->err->msg_code = (code); \

-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )

-#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \

-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \

-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \

-	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \

-	   (cinfo)->err->msg_code = (code); \

-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )

-#define TRACEMSS(cinfo,lvl,code,str)  \

-  ((cinfo)->err->msg_code = (code), \

-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \

-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))

-

-#endif /* JERROR_H */

diff --git a/plugins/AdvaImg/src/LibJPEG/jfdctflt.c b/plugins/AdvaImg/src/LibJPEG/jfdctflt.c
deleted file mode 100644
index 0cc054074f..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jfdctflt.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*

- * jfdctflt.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2003-2015 by Guido Vollbeding.

- * 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 a floating-point implementation of the

- * forward DCT (Discrete Cosine Transform).

- *

- * This implementation should be more accurate than either of the integer

- * DCT implementations.  However, it may not give the same results on all

- * machines because of differences in roundoff behavior.  Speed will depend

- * on the hardware's floating point capacity.

- *

- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT

- * on each column.  Direct algorithms are also available, but they are

- * much more complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on Arai, Agui, and Nakajima's algorithm for

- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in

- * Japanese, but the algorithm is described in the Pennebaker & Mitchell

- * JPEG textbook (see REFERENCES section in file README).  The following code

- * is based directly on figure 4-8 in P&M.

- * While an 8-point DCT cannot be done in less than 11 multiplies, it is

- * possible to arrange the computation so that many of the multiplies are

- * simple scalings of the final outputs.  These multiplies can then be

- * folded into the multiplications or divisions by the JPEG quantization

- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds

- * to be done in the DCT itself.

- * The primary disadvantage of this method is that with a fixed-point

- * implementation, accuracy is lost due to imprecise representation of the

- * scaled quantization values.  However, that problem does not arise if

- * we use floating point arithmetic.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_FLOAT_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */

-#endif

-

-

-/*

- * Perform the forward DCT on one block of samples.

- *

- * cK represents cos(K*pi/16).

- */

-

-GLOBAL(void)

-jpeg_fdct_float (FAST_FLOAT * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;

-  FAST_FLOAT z1, z2, z3, z4, z5, z11, z13;

-  FAST_FLOAT *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-

-  /* Pass 1: process rows. */

-

-  dataptr = data;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Load data into workspace */

-    tmp0 = (FAST_FLOAT) (GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[7]));

-    tmp7 = (FAST_FLOAT) (GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[7]));

-    tmp1 = (FAST_FLOAT) (GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[6]));

-    tmp6 = (FAST_FLOAT) (GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[6]));

-    tmp2 = (FAST_FLOAT) (GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[5]));

-    tmp5 = (FAST_FLOAT) (GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[5]));

-    tmp3 = (FAST_FLOAT) (GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[4]));

-    tmp4 = (FAST_FLOAT) (GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[4]));

-

-    /* Even part */

-

-    tmp10 = tmp0 + tmp3;	/* phase 2 */

-    tmp13 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp12 = tmp1 - tmp2;

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = tmp10 + tmp11 - 8 * CENTERJSAMPLE; /* phase 3 */

-    dataptr[4] = tmp10 - tmp11;

-

-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */

-    dataptr[2] = tmp13 + z1;	/* phase 5 */

-    dataptr[6] = tmp13 - z1;

-

-    /* Odd part */

-

-    tmp10 = tmp4 + tmp5;	/* phase 2 */

-    tmp11 = tmp5 + tmp6;

-    tmp12 = tmp6 + tmp7;

-

-    /* The rotator is modified from fig 4-8 to avoid extra negations. */

-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */

-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */

-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */

-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */

-

-    z11 = tmp7 + z3;		/* phase 5 */

-    z13 = tmp7 - z3;

-

-    dataptr[5] = z13 + z2;	/* phase 6 */

-    dataptr[3] = z13 - z2;

-    dataptr[1] = z11 + z4;

-    dataptr[7] = z11 - z4;

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns. */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];

-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];

-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];

-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];

-

-    /* Even part */

-

-    tmp10 = tmp0 + tmp3;	/* phase 2 */

-    tmp13 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp12 = tmp1 - tmp2;

-

-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */

-    dataptr[DCTSIZE*4] = tmp10 - tmp11;

-

-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */

-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */

-    dataptr[DCTSIZE*6] = tmp13 - z1;

-

-    /* Odd part */

-

-    tmp10 = tmp4 + tmp5;	/* phase 2 */

-    tmp11 = tmp5 + tmp6;

-    tmp12 = tmp6 + tmp7;

-

-    /* The rotator is modified from fig 4-8 to avoid extra negations. */

-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */

-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */

-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */

-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */

-

-    z11 = tmp7 + z3;		/* phase 5 */

-    z13 = tmp7 - z3;

-

-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */

-    dataptr[DCTSIZE*3] = z13 - z2;

-    dataptr[DCTSIZE*1] = z11 + z4;

-    dataptr[DCTSIZE*7] = z11 - z4;

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-#endif /* DCT_FLOAT_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jfdctfst.c b/plugins/AdvaImg/src/LibJPEG/jfdctfst.c
deleted file mode 100644
index 173d0d6fce..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jfdctfst.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*

- * jfdctfst.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2003-2015 by Guido Vollbeding.

- * 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 a fast, not so accurate integer implementation of the

- * forward DCT (Discrete Cosine Transform).

- *

- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT

- * on each column.  Direct algorithms are also available, but they are

- * much more complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on Arai, Agui, and Nakajima's algorithm for

- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in

- * Japanese, but the algorithm is described in the Pennebaker & Mitchell

- * JPEG textbook (see REFERENCES section in file README).  The following code

- * is based directly on figure 4-8 in P&M.

- * While an 8-point DCT cannot be done in less than 11 multiplies, it is

- * possible to arrange the computation so that many of the multiplies are

- * simple scalings of the final outputs.  These multiplies can then be

- * folded into the multiplications or divisions by the JPEG quantization

- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds

- * to be done in the DCT itself.

- * The primary disadvantage of this method is that with fixed-point math,

- * accuracy is lost due to imprecise representation of the scaled

- * quantization values.  The smaller the quantization table entry, the less

- * precise the scaled value, so this implementation does worse with high-

- * quality-setting files than with low-quality ones.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_IFAST_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */

-#endif

-

-

-/* Scaling decisions are generally the same as in the LL&M algorithm;

- * see jfdctint.c for more details.  However, we choose to descale

- * (right shift) multiplication products as soon as they are formed,

- * rather than carrying additional fractional bits into subsequent additions.

- * This compromises accuracy slightly, but it lets us save a few shifts.

- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)

- * everywhere except in the multiplications proper; this saves a good deal

- * of work on 16-bit-int machines.

- *

- * Again to save a few shifts, the intermediate results between pass 1 and

- * pass 2 are not upscaled, but are represented only to integral precision.

- *

- * A final compromise is to represent the multiplicative constants to only

- * 8 fractional bits, rather than 13.  This saves some shifting work on some

- * machines, and may also reduce the cost of multiplication (since there

- * are fewer one-bits in the constants).

- */

-

-#define CONST_BITS  8

-

-

-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus

- * causing a lot of useless floating-point operations at run time.

- * To get around this we use the following pre-calculated constants.

- * If you change CONST_BITS you may want to add appropriate values.

- * (With a reasonable C compiler, you can just rely on the FIX() macro...)

- */

-

-#if CONST_BITS == 8

-#define FIX_0_382683433  ((INT32)   98)		/* FIX(0.382683433) */

-#define FIX_0_541196100  ((INT32)  139)		/* FIX(0.541196100) */

-#define FIX_0_707106781  ((INT32)  181)		/* FIX(0.707106781) */

-#define FIX_1_306562965  ((INT32)  334)		/* FIX(1.306562965) */

-#else

-#define FIX_0_382683433  FIX(0.382683433)

-#define FIX_0_541196100  FIX(0.541196100)

-#define FIX_0_707106781  FIX(0.707106781)

-#define FIX_1_306562965  FIX(1.306562965)

-#endif

-

-

-/* We can gain a little more speed, with a further compromise in accuracy,

- * by omitting the addition in a descaling shift.  This yields an incorrectly

- * rounded result half the time...

- */

-

-#ifndef USE_ACCURATE_ROUNDING

-#undef DESCALE

-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)

-#endif

-

-

-/* Multiply a DCTELEM variable by an INT32 constant, and immediately

- * descale to yield a DCTELEM result.

- */

-

-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))

-

-

-/*

- * Perform the forward DCT on one block of samples.

- *

- * cK represents cos(K*pi/16).

- */

-

-GLOBAL(void)

-jpeg_fdct_ifast (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  DCTELEM tmp10, tmp11, tmp12, tmp13;

-  DCTELEM z1, z2, z3, z4, z5, z11, z13;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows. */

-

-  dataptr = data;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Load data into workspace */

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[7]);

-    tmp7 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[6]);

-    tmp6 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[5]);

-    tmp5 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[4]);

-    tmp4 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[4]);

-

-    /* Even part */

-

-    tmp10 = tmp0 + tmp3;	/* phase 2 */

-    tmp13 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp12 = tmp1 - tmp2;

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = tmp10 + tmp11 - 8 * CENTERJSAMPLE; /* phase 3 */

-    dataptr[4] = tmp10 - tmp11;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */

-    dataptr[2] = tmp13 + z1;	/* phase 5 */

-    dataptr[6] = tmp13 - z1;

-

-    /* Odd part */

-

-    tmp10 = tmp4 + tmp5;	/* phase 2 */

-    tmp11 = tmp5 + tmp6;

-    tmp12 = tmp6 + tmp7;

-

-    /* The rotator is modified from fig 4-8 to avoid extra negations. */

-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */

-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */

-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */

-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */

-

-    z11 = tmp7 + z3;		/* phase 5 */

-    z13 = tmp7 - z3;

-

-    dataptr[5] = z13 + z2;	/* phase 6 */

-    dataptr[3] = z13 - z2;

-    dataptr[1] = z11 + z4;

-    dataptr[7] = z11 - z4;

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns. */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];

-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];

-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];

-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];

-

-    /* Even part */

-

-    tmp10 = tmp0 + tmp3;	/* phase 2 */

-    tmp13 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp12 = tmp1 - tmp2;

-

-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */

-    dataptr[DCTSIZE*4] = tmp10 - tmp11;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */

-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */

-    dataptr[DCTSIZE*6] = tmp13 - z1;

-

-    /* Odd part */

-

-    tmp10 = tmp4 + tmp5;	/* phase 2 */

-    tmp11 = tmp5 + tmp6;

-    tmp12 = tmp6 + tmp7;

-

-    /* The rotator is modified from fig 4-8 to avoid extra negations. */

-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */

-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */

-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */

-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */

-

-    z11 = tmp7 + z3;		/* phase 5 */

-    z13 = tmp7 - z3;

-

-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */

-    dataptr[DCTSIZE*3] = z13 - z2;

-    dataptr[DCTSIZE*1] = z11 + z4;

-    dataptr[DCTSIZE*7] = z11 - z4;

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-#endif /* DCT_IFAST_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jfdctint.c b/plugins/AdvaImg/src/LibJPEG/jfdctint.c
deleted file mode 100644
index 6700fdde2f..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jfdctint.c
+++ /dev/null
@@ -1,4409 +0,0 @@
-/*

- * jfdctint.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modification developed 2003-2015 by Guido Vollbeding.

- * 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 a slow-but-accurate integer implementation of the

- * forward DCT (Discrete Cosine Transform).

- *

- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT

- * on each column.  Direct algorithms are also available, but they are

- * much more complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on an algorithm described in

- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT

- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,

- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.

- * The primary algorithm described there uses 11 multiplies and 29 adds.

- * We use their alternate method with 12 multiplies and 32 adds.

- * The advantage of this method is that no data path contains more than one

- * multiplication; this allows a very simple and accurate implementation in

- * scaled fixed-point arithmetic, with a minimal number of shifts.

- *

- * We also provide FDCT routines with various input sample block sizes for

- * direct resolution reduction or enlargement and for direct resolving the

- * common 2x1 and 1x2 subsampling cases without additional resampling: NxN

- * (N=1...16), 2NxN, and Nx2N (N=1...8) pixels for one 8x8 output DCT block.

- *

- * For N<8 we fill the remaining block coefficients with zero.

- * For N>8 we apply a partial N-point FDCT on the input samples, computing

- * just the lower 8 frequency coefficients and discarding the rest.

- *

- * We must scale the output coefficients of the N-point FDCT appropriately

- * to the standard 8-point FDCT level by 8/N per 1-D pass.  This scaling

- * is folded into the constant multipliers (pass 2) and/or final/initial

- * shifting.

- *

- * CAUTION: We rely on the FIX() macro except for the N=1,2,4,8 cases

- * since there would be too many additional constants to pre-calculate.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_ISLOW_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCT blocks. /* deliberate syntax err */

-#endif

-

-

-/*

- * The poop on this scaling stuff is as follows:

- *

- * Each 1-D DCT step produces outputs which are a factor of sqrt(N)

- * larger than the true DCT outputs.  The final outputs are therefore

- * a factor of N larger than desired; since N=8 this can be cured by

- * a simple right shift at the end of the algorithm.  The advantage of

- * this arrangement is that we save two multiplications per 1-D DCT,

- * because the y0 and y4 outputs need not be divided by sqrt(N).

- * In the IJG code, this factor of 8 is removed by the quantization step

- * (in jcdctmgr.c), NOT in this module.

- *

- * We have to do addition and subtraction of the integer inputs, which

- * is no problem, and multiplication by fractional constants, which is

- * a problem to do in integer arithmetic.  We multiply all the constants

- * by CONST_SCALE and convert them to integer constants (thus retaining

- * CONST_BITS bits of precision in the constants).  After doing a

- * multiplication we have to divide the product by CONST_SCALE, with proper

- * rounding, to produce the correct output.  This division can be done

- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting

- * as long as possible so that partial sums can be added together with

- * full fractional precision.

- *

- * The outputs of the first pass are scaled up by PASS1_BITS bits so that

- * they are represented to better-than-integral precision.  These outputs

- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word

- * with the recommended scaling.  (For 12-bit sample data, the intermediate

- * array is INT32 anyway.)

- *

- * To avoid overflow of the 32-bit intermediate results in pass 2, we must

- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis

- * shows that the values given below are the most effective.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define CONST_BITS  13

-#define PASS1_BITS  2

-#else

-#define CONST_BITS  13

-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */

-#endif

-

-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus

- * causing a lot of useless floating-point operations at run time.

- * To get around this we use the following pre-calculated constants.

- * If you change CONST_BITS you may want to add appropriate values.

- * (With a reasonable C compiler, you can just rely on the FIX() macro...)

- */

-

-#if CONST_BITS == 13

-#define FIX_0_298631336  ((INT32)  2446)	/* FIX(0.298631336) */

-#define FIX_0_390180644  ((INT32)  3196)	/* FIX(0.390180644) */

-#define FIX_0_541196100  ((INT32)  4433)	/* FIX(0.541196100) */

-#define FIX_0_765366865  ((INT32)  6270)	/* FIX(0.765366865) */

-#define FIX_0_899976223  ((INT32)  7373)	/* FIX(0.899976223) */

-#define FIX_1_175875602  ((INT32)  9633)	/* FIX(1.175875602) */

-#define FIX_1_501321110  ((INT32)  12299)	/* FIX(1.501321110) */

-#define FIX_1_847759065  ((INT32)  15137)	/* FIX(1.847759065) */

-#define FIX_1_961570560  ((INT32)  16069)	/* FIX(1.961570560) */

-#define FIX_2_053119869  ((INT32)  16819)	/* FIX(2.053119869) */

-#define FIX_2_562915447  ((INT32)  20995)	/* FIX(2.562915447) */

-#define FIX_3_072711026  ((INT32)  25172)	/* FIX(3.072711026) */

-#else

-#define FIX_0_298631336  FIX(0.298631336)

-#define FIX_0_390180644  FIX(0.390180644)

-#define FIX_0_541196100  FIX(0.541196100)

-#define FIX_0_765366865  FIX(0.765366865)

-#define FIX_0_899976223  FIX(0.899976223)

-#define FIX_1_175875602  FIX(1.175875602)

-#define FIX_1_501321110  FIX(1.501321110)

-#define FIX_1_847759065  FIX(1.847759065)

-#define FIX_1_961570560  FIX(1.961570560)

-#define FIX_2_053119869  FIX(2.053119869)

-#define FIX_2_562915447  FIX(2.562915447)

-#define FIX_3_072711026  FIX(3.072711026)

-#endif

-

-

-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.

- * For 8-bit samples with the recommended scaling, all the variable

- * and constant values involved are no more than 16 bits wide, so a

- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.

- * For 12-bit samples, a full 32-bit multiplication will be needed.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)

-#else

-#define MULTIPLY(var,const)  ((var) * (const))

-#endif

-

-

-/*

- * Perform the forward DCT on one block of samples.

- */

-

-GLOBAL(void)

-jpeg_fdct_islow (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[4]);

-

-    tmp10 = tmp0 + tmp3;

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[4]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) ((tmp10 + tmp11 - 8 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    dataptr[2] = (DCTELEM)

-      RIGHT_SHIFT(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      RIGHT_SHIFT(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS-PASS1_BITS);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);       /*  c3 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);          /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);          /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);       /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);              /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);              /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);       /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);              /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);              /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[1] = (DCTELEM) RIGHT_SHIFT(tmp0, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) RIGHT_SHIFT(tmp1, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) RIGHT_SHIFT(tmp2, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) RIGHT_SHIFT(tmp3, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];

-

-    /* Add fudge factor here for final descale. */

-    tmp10 = tmp0 + tmp3 + (ONE << (PASS1_BITS-1));

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp10 + tmp11, PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM) RIGHT_SHIFT(tmp10 - tmp11, PASS1_BITS);

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      RIGHT_SHIFT(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      RIGHT_SHIFT(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS+PASS1_BITS);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);       /*  c3 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);          /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);          /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);       /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);              /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);              /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);       /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);              /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);              /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[DCTSIZE*1] = (DCTELEM) RIGHT_SHIFT(tmp0, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM) RIGHT_SHIFT(tmp1, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM) RIGHT_SHIFT(tmp2, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*7] = (DCTELEM) RIGHT_SHIFT(tmp3, CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-#ifdef DCT_SCALING_SUPPORTED

-

-

-/*

- * Perform the forward DCT on a 7x7 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_7x7 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12;

-  INT32 z1, z2, z3;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * cK represents sqrt(2) * cos(K*pi/14).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 7; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[6]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[5]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[4]);

-    tmp3 = GETJSAMPLE(elemptr[3]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[6]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[5]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[4]);

-

-    z1 = tmp0 + tmp2;

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((z1 + tmp1 + tmp3 - 7 * CENTERJSAMPLE) << PASS1_BITS);

-    tmp3 += tmp3;

-    z1 -= tmp3;

-    z1 -= tmp3;

-    z1 = MULTIPLY(z1, FIX(0.353553391));                /* (c2+c6-c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp2, FIX(0.920609002));       /* (c2+c4-c6)/2 */

-    z3 = MULTIPLY(tmp1 - tmp2, FIX(0.314692123));       /* c6 */

-    dataptr[2] = (DCTELEM) DESCALE(z1 + z2 + z3, CONST_BITS-PASS1_BITS);

-    z1 -= z2;

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(0.881747734));       /* c4 */

-    dataptr[4] = (DCTELEM)

-      DESCALE(z2 + z3 - MULTIPLY(tmp1 - tmp3, FIX(0.707106781)), /* c2+c6-c4 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(0.935414347));   /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(tmp10 - tmp11, FIX(0.170262339));   /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(tmp11 + tmp12, - FIX(1.378756276)); /* -c1 */

-    tmp1 += tmp2;

-    tmp3 = MULTIPLY(tmp10 + tmp12, FIX(0.613604268));   /* c5 */

-    tmp0 += tmp3;

-    tmp2 += tmp3 + MULTIPLY(tmp12, FIX(1.870828693));   /* c3+c1-c5 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/7)**2 = 64/49, which we fold

-   * into the constant multipliers:

-   * cK now represents sqrt(2) * cos(K*pi/14) * 64/49.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 7; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*6];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*5];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*4];

-    tmp3 = dataptr[DCTSIZE*3];

-

-    tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*6];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*5];

-    tmp12 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*4];

-

-    z1 = tmp0 + tmp2;

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 + tmp1 + tmp3, FIX(1.306122449)), /* 64/49 */

-	      CONST_BITS+PASS1_BITS);

-    tmp3 += tmp3;

-    z1 -= tmp3;

-    z1 -= tmp3;

-    z1 = MULTIPLY(z1, FIX(0.461784020));                /* (c2+c6-c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp2, FIX(1.202428084));       /* (c2+c4-c6)/2 */

-    z3 = MULTIPLY(tmp1 - tmp2, FIX(0.411026446));       /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + z2 + z3, CONST_BITS+PASS1_BITS);

-    z1 -= z2;

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(1.151670509));       /* c4 */

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(z2 + z3 - MULTIPLY(tmp1 - tmp3, FIX(0.923568041)), /* c2+c6-c4 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.221765677));   /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(tmp10 - tmp11, FIX(0.222383464));   /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(tmp11 + tmp12, - FIX(1.800824523)); /* -c1 */

-    tmp1 += tmp2;

-    tmp3 = MULTIPLY(tmp10 + tmp12, FIX(0.801442310));   /* c5 */

-    tmp0 += tmp3;

-    tmp2 += tmp3 + MULTIPLY(tmp12, FIX(2.443531355));   /* c3+c1-c5 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 6x6 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_6x6 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2;

-  INT32 tmp10, tmp11, tmp12;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 6; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[5]);

-    tmp11 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[3]);

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[5]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[3]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 - 6 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(1.224744871)),                 /* c2 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(0.707106781)), /* c4 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = DESCALE(MULTIPLY(tmp0 + tmp2, FIX(0.366025404)),     /* c5 */

-		    CONST_BITS-PASS1_BITS);

-

-    dataptr[1] = (DCTELEM) (tmp10 + ((tmp0 + tmp1) << PASS1_BITS));

-    dataptr[3] = (DCTELEM) ((tmp0 - tmp1 - tmp2) << PASS1_BITS);

-    dataptr[5] = (DCTELEM) (tmp10 + ((tmp2 - tmp1) << PASS1_BITS));

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/6)**2 = 16/9, which we fold

-   * into the constant multipliers:

-   * cK now represents sqrt(2) * cos(K*pi/12) * 16/9.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 6; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*5];

-    tmp11 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*3];

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*3];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11, FIX(1.777777778)),         /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(2.177324216)),                 /* c2 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(1.257078722)), /* c4 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp2, FIX(0.650711829));             /* c5 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0 + tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp2, FIX(1.777777778)),    /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp2 - tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 5x5 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_5x5 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2;

-  INT32 tmp10, tmp11;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * cK represents sqrt(2) * cos(K*pi/10).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 5; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[4]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[3]);

-    tmp2 = GETJSAMPLE(elemptr[2]);

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[4]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[3]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp2 - 5 * CENTERJSAMPLE) << (PASS1_BITS+1));

-    tmp11 = MULTIPLY(tmp11, FIX(0.790569415));          /* (c2+c4)/2 */

-    tmp10 -= tmp2 << 2;

-    tmp10 = MULTIPLY(tmp10, FIX(0.353553391));          /* (c2-c4)/2 */

-    dataptr[2] = (DCTELEM) DESCALE(tmp11 + tmp10, CONST_BITS-PASS1_BITS-1);

-    dataptr[4] = (DCTELEM) DESCALE(tmp11 - tmp10, CONST_BITS-PASS1_BITS-1);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp1, FIX(0.831253876));    /* c3 */

-

-    dataptr[1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0, FIX(0.513743148)), /* c1-c3 */

-	      CONST_BITS-PASS1_BITS-1);

-    dataptr[3] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp1, FIX(2.176250899)), /* c1+c3 */

-	      CONST_BITS-PASS1_BITS-1);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/5)**2 = 64/25, which we partially

-   * fold into the constant multipliers (other part was done in pass 1):

-   * cK now represents sqrt(2) * cos(K*pi/10) * 32/25.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 5; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*4];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*3];

-    tmp2 = dataptr[DCTSIZE*2];

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*4];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*3];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp2, FIX(1.28)),        /* 32/25 */

-	      CONST_BITS+PASS1_BITS);

-    tmp11 = MULTIPLY(tmp11, FIX(1.011928851));          /* (c2+c4)/2 */

-    tmp10 -= tmp2 << 2;

-    tmp10 = MULTIPLY(tmp10, FIX(0.452548340));          /* (c2-c4)/2 */

-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(tmp11 + tmp10, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp11 - tmp10, CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp1, FIX(1.064004961));    /* c3 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0, FIX(0.657591230)), /* c1-c3 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp1, FIX(2.785601151)), /* c1+c3 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 4x4 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_4x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1;

-  INT32 tmp10, tmp11;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We must also scale the output by (8/4)**2 = 2**2, which we add here.

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 - 4 * CENTERJSAMPLE) << (PASS1_BITS+2));

-    dataptr[2] = (DCTELEM) ((tmp0 - tmp1) << (PASS1_BITS+2));

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-3);

-

-    dataptr[1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS-PASS1_BITS-2);

-    dataptr[3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS-PASS1_BITS-2);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    /* Even part */

-

-    /* Add fudge factor here for final descale. */

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*3] + (ONE << (PASS1_BITS-1));

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*2];

-

-    tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*3];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*2];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp0 + tmp1, PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM) RIGHT_SHIFT(tmp0 - tmp1, PASS1_BITS);

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 3x3 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_3x3 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We scale the results further by 2**2 as part of output adaption

-   * scaling for different DCT size.

-   * cK represents sqrt(2) * cos(K*pi/6).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 3; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[2]);

-    tmp1 = GETJSAMPLE(elemptr[1]);

-

-    tmp2 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[2]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 - 3 * CENTERJSAMPLE) << (PASS1_BITS+2));

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp1, FIX(0.707106781)), /* c2 */

-	      CONST_BITS-PASS1_BITS-2);

-

-    /* Odd part */

-

-    dataptr[1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2, FIX(1.224744871)),               /* c1 */

-	      CONST_BITS-PASS1_BITS-2);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/3)**2 = 64/9, which we partially

-   * fold into the constant multipliers (other part was done in pass 1):

-   * cK now represents sqrt(2) * cos(K*pi/6) * 16/9.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 3; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*2];

-    tmp1 = dataptr[DCTSIZE*1];

-

-    tmp2 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*2];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 + tmp1, FIX(1.777777778)),        /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp1, FIX(1.257078722)), /* c2 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2, FIX(2.177324216)),               /* c1 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 2x2 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_2x2 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  DCTELEM tmp0, tmp1, tmp2, tmp3;

-  JSAMPROW elemptr;

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   */

-

-  /* Row 0 */

-  elemptr = sample_data[0] + start_col;

-

-  tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[1]);

-  tmp1 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[1]);

-

-  /* Row 1 */

-  elemptr = sample_data[1] + start_col;

-

-  tmp2 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[1]);

-  tmp3 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[1]);

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/2)**2 = 2**4.

-   */

-

-  /* Column 0 */

-  /* Apply unsigned->signed conversion. */

-  data[DCTSIZE*0] = (tmp0 + tmp2 - 4 * CENTERJSAMPLE) << 4;

-  data[DCTSIZE*1] = (tmp0 - tmp2) << 4;

-

-  /* Column 1 */

-  data[DCTSIZE*0+1] = (tmp1 + tmp3) << 4;

-  data[DCTSIZE*1+1] = (tmp1 - tmp3) << 4;

-}

-

-

-/*

- * Perform the forward DCT on a 1x1 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_1x1 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  DCTELEM dcval;

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  dcval = GETJSAMPLE(sample_data[0][start_col]);

-

-  /* We leave the result scaled up by an overall factor of 8. */

-  /* We must also scale the output by (8/1)**2 = 2**6. */

-  /* Apply unsigned->signed conversion. */

-  data[0] = (dcval - CENTERJSAMPLE) << 6;

-}

-

-

-/*

- * Perform the forward DCT on a 9x9 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_9x9 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1, z2;

-  DCTELEM workspace[8];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * we scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * cK represents sqrt(2) * cos(K*pi/18).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[8]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[7]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[6]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[5]);

-    tmp4 = GETJSAMPLE(elemptr[4]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[8]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[7]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[6]);

-    tmp13 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[5]);

-

-    z1 = tmp0 + tmp2 + tmp3;

-    z2 = tmp1 + tmp4;

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) ((z1 + z2 - 9 * CENTERJSAMPLE) << 1);

-    dataptr[6] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 - z2 - z2, FIX(0.707106781)),  /* c6 */

-	      CONST_BITS-1);

-    z1 = MULTIPLY(tmp0 - tmp2, FIX(1.328926049));        /* c2 */

-    z2 = MULTIPLY(tmp1 - tmp4 - tmp4, FIX(0.707106781)); /* c6 */

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2 - tmp3, FIX(1.083350441))    /* c4 */

-	      + z1 + z2, CONST_BITS-1);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp3 - tmp0, FIX(0.245575608))    /* c8 */

-	      + z1 - z2, CONST_BITS-1);

-

-    /* Odd part */

-

-    dataptr[3] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12 - tmp13, FIX(1.224744871)), /* c3 */

-	      CONST_BITS-1);

-

-    tmp11 = MULTIPLY(tmp11, FIX(1.224744871));        /* c3 */

-    tmp0 = MULTIPLY(tmp10 + tmp12, FIX(0.909038955)); /* c5 */

-    tmp1 = MULTIPLY(tmp10 + tmp13, FIX(0.483689525)); /* c7 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp11 + tmp0 + tmp1, CONST_BITS-1);

-

-    tmp2 = MULTIPLY(tmp12 - tmp13, FIX(1.392728481)); /* c1 */

-

-    dataptr[5] = (DCTELEM) DESCALE(tmp0 - tmp11 - tmp2, CONST_BITS-1);

-    dataptr[7] = (DCTELEM) DESCALE(tmp1 - tmp11 + tmp2, CONST_BITS-1);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 9)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/9)**2 = 64/81, which we partially

-   * fold into the constant multipliers and final/initial shifting:

-   * cK now represents sqrt(2) * cos(K*pi/18) * 128/81.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*0];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*7];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*6];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*5];

-    tmp4 = dataptr[DCTSIZE*4];

-

-    tmp10 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*0];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*7];

-    tmp12 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*6];

-    tmp13 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*5];

-

-    z1 = tmp0 + tmp2 + tmp3;

-    z2 = tmp1 + tmp4;

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 + z2, FIX(1.580246914)),       /* 128/81 */

-	      CONST_BITS+2);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 - z2 - z2, FIX(1.117403309)),  /* c6 */

-	      CONST_BITS+2);

-    z1 = MULTIPLY(tmp0 - tmp2, FIX(2.100031287));        /* c2 */

-    z2 = MULTIPLY(tmp1 - tmp4 - tmp4, FIX(1.117403309)); /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2 - tmp3, FIX(1.711961190))    /* c4 */

-	      + z1 + z2, CONST_BITS+2);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp3 - tmp0, FIX(0.388070096))    /* c8 */

-	      + z1 - z2, CONST_BITS+2);

-

-    /* Odd part */

-

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12 - tmp13, FIX(1.935399303)), /* c3 */

-	      CONST_BITS+2);

-

-    tmp11 = MULTIPLY(tmp11, FIX(1.935399303));        /* c3 */

-    tmp0 = MULTIPLY(tmp10 + tmp12, FIX(1.436506004)); /* c5 */

-    tmp1 = MULTIPLY(tmp10 + tmp13, FIX(0.764348879)); /* c7 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp11 + tmp0 + tmp1, CONST_BITS+2);

-

-    tmp2 = MULTIPLY(tmp12 - tmp13, FIX(2.200854883)); /* c1 */

-

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp0 - tmp11 - tmp2, CONST_BITS+2);

-    dataptr[DCTSIZE*7] = (DCTELEM)

-      DESCALE(tmp1 - tmp11 + tmp2, CONST_BITS+2);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 10x10 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_10x10 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  DCTELEM workspace[8*2];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * we scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * cK represents sqrt(2) * cos(K*pi/20).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[9]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[8]);

-    tmp12 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[7]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[6]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[5]);

-

-    tmp10 = tmp0 + tmp4;

-    tmp13 = tmp0 - tmp4;

-    tmp11 = tmp1 + tmp3;

-    tmp14 = tmp1 - tmp3;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[9]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[8]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[7]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[6]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[5]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 - 10 * CENTERJSAMPLE) << 1);

-    tmp12 += tmp12;

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.144122806)) - /* c4 */

-	      MULTIPLY(tmp11 - tmp12, FIX(0.437016024)),  /* c8 */

-	      CONST_BITS-1);

-    tmp10 = MULTIPLY(tmp13 + tmp14, FIX(0.831253876));    /* c6 */

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp13, FIX(0.513743148)),  /* c2-c6 */

-	      CONST_BITS-1);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(2.176250899)),  /* c2+c6 */

-	      CONST_BITS-1);

-

-    /* Odd part */

-

-    tmp10 = tmp0 + tmp4;

-    tmp11 = tmp1 - tmp3;

-    dataptr[5] = (DCTELEM) ((tmp10 - tmp11 - tmp2) << 1);

-    tmp2 <<= CONST_BITS;

-    dataptr[1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.396802247)) +          /* c1 */

-	      MULTIPLY(tmp1, FIX(1.260073511)) + tmp2 +   /* c3 */

-	      MULTIPLY(tmp3, FIX(0.642039522)) +          /* c7 */

-	      MULTIPLY(tmp4, FIX(0.221231742)),           /* c9 */

-	      CONST_BITS-1);

-    tmp12 = MULTIPLY(tmp0 - tmp4, FIX(0.951056516)) -     /* (c3+c7)/2 */

-	    MULTIPLY(tmp1 + tmp3, FIX(0.587785252));      /* (c1-c9)/2 */

-    tmp13 = MULTIPLY(tmp10 + tmp11, FIX(0.309016994)) +   /* (c3-c7)/2 */

-	    (tmp11 << (CONST_BITS - 1)) - tmp2;

-    dataptr[3] = (DCTELEM) DESCALE(tmp12 + tmp13, CONST_BITS-1);

-    dataptr[7] = (DCTELEM) DESCALE(tmp12 - tmp13, CONST_BITS-1);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 10)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/10)**2 = 16/25, which we partially

-   * fold into the constant multipliers and final/initial shifting:

-   * cK now represents sqrt(2) * cos(K*pi/20) * 32/25.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*1];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*0];

-    tmp12 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*7];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*6];

-    tmp4 = dataptr[DCTSIZE*4] + dataptr[DCTSIZE*5];

-

-    tmp10 = tmp0 + tmp4;

-    tmp13 = tmp0 - tmp4;

-    tmp11 = tmp1 + tmp3;

-    tmp14 = tmp1 - tmp3;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*1];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*0];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*7];

-    tmp3 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*6];

-    tmp4 = dataptr[DCTSIZE*4] - dataptr[DCTSIZE*5];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12, FIX(1.28)), /* 32/25 */

-	      CONST_BITS+2);

-    tmp12 += tmp12;

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.464477191)) - /* c4 */

-	      MULTIPLY(tmp11 - tmp12, FIX(0.559380511)),  /* c8 */

-	      CONST_BITS+2);

-    tmp10 = MULTIPLY(tmp13 + tmp14, FIX(1.064004961));    /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp13, FIX(0.657591230)),  /* c2-c6 */

-	      CONST_BITS+2);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(2.785601151)),  /* c2+c6 */

-	      CONST_BITS+2);

-

-    /* Odd part */

-

-    tmp10 = tmp0 + tmp4;

-    tmp11 = tmp1 - tmp3;

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp2, FIX(1.28)),  /* 32/25 */

-	      CONST_BITS+2);

-    tmp2 = MULTIPLY(tmp2, FIX(1.28));                     /* 32/25 */

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.787906876)) +          /* c1 */

-	      MULTIPLY(tmp1, FIX(1.612894094)) + tmp2 +   /* c3 */

-	      MULTIPLY(tmp3, FIX(0.821810588)) +          /* c7 */

-	      MULTIPLY(tmp4, FIX(0.283176630)),           /* c9 */

-	      CONST_BITS+2);

-    tmp12 = MULTIPLY(tmp0 - tmp4, FIX(1.217352341)) -     /* (c3+c7)/2 */

-	    MULTIPLY(tmp1 + tmp3, FIX(0.752365123));      /* (c1-c9)/2 */

-    tmp13 = MULTIPLY(tmp10 + tmp11, FIX(0.395541753)) +   /* (c3-c7)/2 */

-	    MULTIPLY(tmp11, FIX(0.64)) - tmp2;            /* 16/25 */

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp12 + tmp13, CONST_BITS+2);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp12 - tmp13, CONST_BITS+2);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on an 11x11 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_11x11 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 z1, z2, z3;

-  DCTELEM workspace[8*3];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * we scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * cK represents sqrt(2) * cos(K*pi/22).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[10]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[9]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[8]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[7]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[6]);

-    tmp5 = GETJSAMPLE(elemptr[5]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[10]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[9]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[8]);

-    tmp13 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[7]);

-    tmp14 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[6]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 + tmp2 + tmp3 + tmp4 + tmp5 - 11 * CENTERJSAMPLE) << 1);

-    tmp5 += tmp5;

-    tmp0 -= tmp5;

-    tmp1 -= tmp5;

-    tmp2 -= tmp5;

-    tmp3 -= tmp5;

-    tmp4 -= tmp5;

-    z1 = MULTIPLY(tmp0 + tmp3, FIX(1.356927976)) +       /* c2 */

-	 MULTIPLY(tmp2 + tmp4, FIX(0.201263574));        /* c10 */

-    z2 = MULTIPLY(tmp1 - tmp3, FIX(0.926112931));        /* c6 */

-    z3 = MULTIPLY(tmp0 - tmp1, FIX(1.189712156));        /* c4 */

-    dataptr[2] = (DCTELEM)

-      DESCALE(z1 + z2 - MULTIPLY(tmp3, FIX(1.018300590)) /* c2+c8-c6 */

-	      - MULTIPLY(tmp4, FIX(1.390975730)),        /* c4+c10 */

-	      CONST_BITS-1);

-    dataptr[4] = (DCTELEM)

-      DESCALE(z2 + z3 + MULTIPLY(tmp1, FIX(0.062335650)) /* c4-c6-c10 */

-	      - MULTIPLY(tmp2, FIX(1.356927976))         /* c2 */

-	      + MULTIPLY(tmp4, FIX(0.587485545)),        /* c8 */

-	      CONST_BITS-1);

-    dataptr[6] = (DCTELEM)

-      DESCALE(z1 + z3 - MULTIPLY(tmp0, FIX(1.620527200)) /* c2+c4-c6 */

-	      - MULTIPLY(tmp2, FIX(0.788749120)),        /* c8+c10 */

-	      CONST_BITS-1);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.286413905));    /* c3 */

-    tmp2 = MULTIPLY(tmp10 + tmp12, FIX(1.068791298));    /* c5 */

-    tmp3 = MULTIPLY(tmp10 + tmp13, FIX(0.764581576));    /* c7 */

-    tmp0 = tmp1 + tmp2 + tmp3 - MULTIPLY(tmp10, FIX(1.719967871)) /* c7+c5+c3-c1 */

-	   + MULTIPLY(tmp14, FIX(0.398430003));          /* c9 */

-    tmp4 = MULTIPLY(tmp11 + tmp12, - FIX(0.764581576));  /* -c7 */

-    tmp5 = MULTIPLY(tmp11 + tmp13, - FIX(1.399818907));  /* -c1 */

-    tmp1 += tmp4 + tmp5 + MULTIPLY(tmp11, FIX(1.276416582)) /* c9+c7+c1-c3 */

-	    - MULTIPLY(tmp14, FIX(1.068791298));         /* c5 */

-    tmp10 = MULTIPLY(tmp12 + tmp13, FIX(0.398430003));   /* c9 */

-    tmp2 += tmp4 + tmp10 - MULTIPLY(tmp12, FIX(1.989053629)) /* c9+c5+c3-c7 */

-	    + MULTIPLY(tmp14, FIX(1.399818907));         /* c1 */

-    tmp3 += tmp5 + tmp10 + MULTIPLY(tmp13, FIX(1.305598626)) /* c1+c5-c9-c7 */

-	    - MULTIPLY(tmp14, FIX(1.286413905));         /* c3 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS-1);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS-1);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS-1);

-    dataptr[7] = (DCTELEM) DESCALE(tmp3, CONST_BITS-1);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 11)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/11)**2 = 64/121, which we partially

-   * fold into the constant multipliers and final/initial shifting:

-   * cK now represents sqrt(2) * cos(K*pi/22) * 128/121.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*2];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*1];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*0];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*7];

-    tmp4 = dataptr[DCTSIZE*4] + dataptr[DCTSIZE*6];

-    tmp5 = dataptr[DCTSIZE*5];

-

-    tmp10 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*2];

-    tmp11 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*1];

-    tmp12 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*0];

-    tmp13 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*7];

-    tmp14 = dataptr[DCTSIZE*4] - dataptr[DCTSIZE*6];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 + tmp1 + tmp2 + tmp3 + tmp4 + tmp5,

-		       FIX(1.057851240)),                /* 128/121 */

-	      CONST_BITS+2);

-    tmp5 += tmp5;

-    tmp0 -= tmp5;

-    tmp1 -= tmp5;

-    tmp2 -= tmp5;

-    tmp3 -= tmp5;

-    tmp4 -= tmp5;

-    z1 = MULTIPLY(tmp0 + tmp3, FIX(1.435427942)) +       /* c2 */

-	 MULTIPLY(tmp2 + tmp4, FIX(0.212906922));        /* c10 */

-    z2 = MULTIPLY(tmp1 - tmp3, FIX(0.979689713));        /* c6 */

-    z3 = MULTIPLY(tmp0 - tmp1, FIX(1.258538479));        /* c4 */

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(z1 + z2 - MULTIPLY(tmp3, FIX(1.077210542)) /* c2+c8-c6 */

-	      - MULTIPLY(tmp4, FIX(1.471445400)),        /* c4+c10 */

-	      CONST_BITS+2);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(z2 + z3 + MULTIPLY(tmp1, FIX(0.065941844)) /* c4-c6-c10 */

-	      - MULTIPLY(tmp2, FIX(1.435427942))         /* c2 */

-	      + MULTIPLY(tmp4, FIX(0.621472312)),        /* c8 */

-	      CONST_BITS+2);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(z1 + z3 - MULTIPLY(tmp0, FIX(1.714276708)) /* c2+c4-c6 */

-	      - MULTIPLY(tmp2, FIX(0.834379234)),        /* c8+c10 */

-	      CONST_BITS+2);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.360834544));    /* c3 */

-    tmp2 = MULTIPLY(tmp10 + tmp12, FIX(1.130622199));    /* c5 */

-    tmp3 = MULTIPLY(tmp10 + tmp13, FIX(0.808813568));    /* c7 */

-    tmp0 = tmp1 + tmp2 + tmp3 - MULTIPLY(tmp10, FIX(1.819470145)) /* c7+c5+c3-c1 */

-	   + MULTIPLY(tmp14, FIX(0.421479672));          /* c9 */

-    tmp4 = MULTIPLY(tmp11 + tmp12, - FIX(0.808813568));  /* -c7 */

-    tmp5 = MULTIPLY(tmp11 + tmp13, - FIX(1.480800167));  /* -c1 */

-    tmp1 += tmp4 + tmp5 + MULTIPLY(tmp11, FIX(1.350258864)) /* c9+c7+c1-c3 */

-	    - MULTIPLY(tmp14, FIX(1.130622199));         /* c5 */

-    tmp10 = MULTIPLY(tmp12 + tmp13, FIX(0.421479672));   /* c9 */

-    tmp2 += tmp4 + tmp10 - MULTIPLY(tmp12, FIX(2.104122847)) /* c9+c5+c3-c7 */

-	    + MULTIPLY(tmp14, FIX(1.480800167));         /* c1 */

-    tmp3 += tmp5 + tmp10 + MULTIPLY(tmp13, FIX(1.381129125)) /* c1+c5-c9-c7 */

-	    - MULTIPLY(tmp14, FIX(1.360834544));         /* c3 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+2);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+2);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+2);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp3, CONST_BITS+2);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 12x12 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_12x12 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  DCTELEM workspace[8*4];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   * cK represents sqrt(2) * cos(K*pi/24).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[11]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[10]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[9]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[8]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[7]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[6]);

-

-    tmp10 = tmp0 + tmp5;

-    tmp13 = tmp0 - tmp5;

-    tmp11 = tmp1 + tmp4;

-    tmp14 = tmp1 - tmp4;

-    tmp12 = tmp2 + tmp3;

-    tmp15 = tmp2 - tmp3;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[11]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[10]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[9]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[8]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[7]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[6]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) (tmp10 + tmp11 + tmp12 - 12 * CENTERJSAMPLE);

-    dataptr[6] = (DCTELEM) (tmp13 - tmp14 - tmp15);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.224744871)), /* c4 */

-	      CONST_BITS);

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp14 - tmp15 + MULTIPLY(tmp13 + tmp15, FIX(1.366025404)), /* c2 */

-	      CONST_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp1 + tmp4, FIX_0_541196100);    /* c9 */

-    tmp14 = tmp10 + MULTIPLY(tmp1, FIX_0_765366865);   /* c3-c9 */

-    tmp15 = tmp10 - MULTIPLY(tmp4, FIX_1_847759065);   /* c3+c9 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.121971054));   /* c5 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(0.860918669));   /* c7 */

-    tmp10 = tmp12 + tmp13 + tmp14 - MULTIPLY(tmp0, FIX(0.580774953)) /* c5+c7-c1 */

-	    + MULTIPLY(tmp5, FIX(0.184591911));        /* c11 */

-    tmp11 = MULTIPLY(tmp2 + tmp3, - FIX(0.184591911)); /* -c11 */

-    tmp12 += tmp11 - tmp15 - MULTIPLY(tmp2, FIX(2.339493912)) /* c1+c5-c11 */

-	    + MULTIPLY(tmp5, FIX(0.860918669));        /* c7 */

-    tmp13 += tmp11 - tmp14 + MULTIPLY(tmp3, FIX(0.725788011)) /* c1+c11-c7 */

-	    - MULTIPLY(tmp5, FIX(1.121971054));        /* c5 */

-    tmp11 = tmp15 + MULTIPLY(tmp0 - tmp3, FIX(1.306562965)) /* c3 */

-	    - MULTIPLY(tmp2 + tmp5, FIX_0_541196100);  /* c9 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp10, CONST_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp11, CONST_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp12, CONST_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp13, CONST_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 12)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/12)**2 = 4/9, which we partially

-   * fold into the constant multipliers and final shifting:

-   * cK now represents sqrt(2) * cos(K*pi/24) * 8/9.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*3];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*2];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*1];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*0];

-    tmp4 = dataptr[DCTSIZE*4] + dataptr[DCTSIZE*7];

-    tmp5 = dataptr[DCTSIZE*5] + dataptr[DCTSIZE*6];

-

-    tmp10 = tmp0 + tmp5;

-    tmp13 = tmp0 - tmp5;

-    tmp11 = tmp1 + tmp4;

-    tmp14 = tmp1 - tmp4;

-    tmp12 = tmp2 + tmp3;

-    tmp15 = tmp2 - tmp3;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*3];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*2];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*1];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*0];

-    tmp4 = dataptr[DCTSIZE*4] - dataptr[DCTSIZE*7];

-    tmp5 = dataptr[DCTSIZE*5] - dataptr[DCTSIZE*6];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12, FIX(0.888888889)), /* 8/9 */

-	      CONST_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp13 - tmp14 - tmp15, FIX(0.888888889)), /* 8/9 */

-	      CONST_BITS+1);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.088662108)),         /* c4 */

-	      CONST_BITS+1);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp14 - tmp15, FIX(0.888888889)) +        /* 8/9 */

-	      MULTIPLY(tmp13 + tmp15, FIX(1.214244803)),         /* c2 */

-	      CONST_BITS+1);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp1 + tmp4, FIX(0.481063200));   /* c9 */

-    tmp14 = tmp10 + MULTIPLY(tmp1, FIX(0.680326102));  /* c3-c9 */

-    tmp15 = tmp10 - MULTIPLY(tmp4, FIX(1.642452502));  /* c3+c9 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(0.997307603));   /* c5 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(0.765261039));   /* c7 */

-    tmp10 = tmp12 + tmp13 + tmp14 - MULTIPLY(tmp0, FIX(0.516244403)) /* c5+c7-c1 */

-	    + MULTIPLY(tmp5, FIX(0.164081699));        /* c11 */

-    tmp11 = MULTIPLY(tmp2 + tmp3, - FIX(0.164081699)); /* -c11 */

-    tmp12 += tmp11 - tmp15 - MULTIPLY(tmp2, FIX(2.079550144)) /* c1+c5-c11 */

-	    + MULTIPLY(tmp5, FIX(0.765261039));        /* c7 */

-    tmp13 += tmp11 - tmp14 + MULTIPLY(tmp3, FIX(0.645144899)) /* c1+c11-c7 */

-	    - MULTIPLY(tmp5, FIX(0.997307603));        /* c5 */

-    tmp11 = tmp15 + MULTIPLY(tmp0 - tmp3, FIX(1.161389302)) /* c3 */

-	    - MULTIPLY(tmp2 + tmp5, FIX(0.481063200)); /* c9 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp10, CONST_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp11, CONST_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12, CONST_BITS+1);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp13, CONST_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 13x13 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_13x13 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  INT32 z1, z2;

-  DCTELEM workspace[8*5];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   * cK represents sqrt(2) * cos(K*pi/26).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[12]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[11]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[10]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[9]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[8]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[7]);

-    tmp6 = GETJSAMPLE(elemptr[6]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[12]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[11]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[10]);

-    tmp13 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[9]);

-    tmp14 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[8]);

-    tmp15 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[7]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      (tmp0 + tmp1 + tmp2 + tmp3 + tmp4 + tmp5 + tmp6 - 13 * CENTERJSAMPLE);

-    tmp6 += tmp6;

-    tmp0 -= tmp6;

-    tmp1 -= tmp6;

-    tmp2 -= tmp6;

-    tmp3 -= tmp6;

-    tmp4 -= tmp6;

-    tmp5 -= tmp6;

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.373119086)) +   /* c2 */

-	      MULTIPLY(tmp1, FIX(1.058554052)) +   /* c6 */

-	      MULTIPLY(tmp2, FIX(0.501487041)) -   /* c10 */

-	      MULTIPLY(tmp3, FIX(0.170464608)) -   /* c12 */

-	      MULTIPLY(tmp4, FIX(0.803364869)) -   /* c8 */

-	      MULTIPLY(tmp5, FIX(1.252223920)),    /* c4 */

-	      CONST_BITS);

-    z1 = MULTIPLY(tmp0 - tmp2, FIX(1.155388986)) - /* (c4+c6)/2 */

-	 MULTIPLY(tmp3 - tmp4, FIX(0.435816023)) - /* (c2-c10)/2 */

-	 MULTIPLY(tmp1 - tmp5, FIX(0.316450131));  /* (c8-c12)/2 */

-    z2 = MULTIPLY(tmp0 + tmp2, FIX(0.096834934)) - /* (c4-c6)/2 */

-	 MULTIPLY(tmp3 + tmp4, FIX(0.937303064)) + /* (c2+c10)/2 */

-	 MULTIPLY(tmp1 + tmp5, FIX(0.486914739));  /* (c8+c12)/2 */

-

-    dataptr[4] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS);

-    dataptr[6] = (DCTELEM) DESCALE(z1 - z2, CONST_BITS);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.322312651));   /* c3 */

-    tmp2 = MULTIPLY(tmp10 + tmp12, FIX(1.163874945));   /* c5 */

-    tmp3 = MULTIPLY(tmp10 + tmp13, FIX(0.937797057)) +  /* c7 */

-	   MULTIPLY(tmp14 + tmp15, FIX(0.338443458));   /* c11 */

-    tmp0 = tmp1 + tmp2 + tmp3 -

-	   MULTIPLY(tmp10, FIX(2.020082300)) +          /* c3+c5+c7-c1 */

-	   MULTIPLY(tmp14, FIX(0.318774355));           /* c9-c11 */

-    tmp4 = MULTIPLY(tmp14 - tmp15, FIX(0.937797057)) -  /* c7 */

-	   MULTIPLY(tmp11 + tmp12, FIX(0.338443458));   /* c11 */

-    tmp5 = MULTIPLY(tmp11 + tmp13, - FIX(1.163874945)); /* -c5 */

-    tmp1 += tmp4 + tmp5 +

-	    MULTIPLY(tmp11, FIX(0.837223564)) -         /* c5+c9+c11-c3 */

-	    MULTIPLY(tmp14, FIX(2.341699410));          /* c1+c7 */

-    tmp6 = MULTIPLY(tmp12 + tmp13, - FIX(0.657217813)); /* -c9 */

-    tmp2 += tmp4 + tmp6 -

-	    MULTIPLY(tmp12, FIX(1.572116027)) +         /* c1+c5-c9-c11 */

-	    MULTIPLY(tmp15, FIX(2.260109708));          /* c3+c7 */

-    tmp3 += tmp5 + tmp6 +

-	    MULTIPLY(tmp13, FIX(2.205608352)) -         /* c3+c5+c9-c7 */

-	    MULTIPLY(tmp15, FIX(1.742345811));          /* c1+c11 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp3, CONST_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 13)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/13)**2 = 64/169, which we partially

-   * fold into the constant multipliers and final shifting:

-   * cK now represents sqrt(2) * cos(K*pi/26) * 128/169.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*4];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*3];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*2];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*1];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*0];

-    tmp5 = dataptr[DCTSIZE*5] + dataptr[DCTSIZE*7];

-    tmp6 = dataptr[DCTSIZE*6];

-

-    tmp10 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*4];

-    tmp11 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*3];

-    tmp12 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*2];

-    tmp13 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*1];

-    tmp14 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*0];

-    tmp15 = dataptr[DCTSIZE*5] - dataptr[DCTSIZE*7];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 + tmp1 + tmp2 + tmp3 + tmp4 + tmp5 + tmp6,

-		       FIX(0.757396450)),          /* 128/169 */

-	      CONST_BITS+1);

-    tmp6 += tmp6;

-    tmp0 -= tmp6;

-    tmp1 -= tmp6;

-    tmp2 -= tmp6;

-    tmp3 -= tmp6;

-    tmp4 -= tmp6;

-    tmp5 -= tmp6;

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.039995521)) +   /* c2 */

-	      MULTIPLY(tmp1, FIX(0.801745081)) +   /* c6 */

-	      MULTIPLY(tmp2, FIX(0.379824504)) -   /* c10 */

-	      MULTIPLY(tmp3, FIX(0.129109289)) -   /* c12 */

-	      MULTIPLY(tmp4, FIX(0.608465700)) -   /* c8 */

-	      MULTIPLY(tmp5, FIX(0.948429952)),    /* c4 */

-	      CONST_BITS+1);

-    z1 = MULTIPLY(tmp0 - tmp2, FIX(0.875087516)) - /* (c4+c6)/2 */

-	 MULTIPLY(tmp3 - tmp4, FIX(0.330085509)) - /* (c2-c10)/2 */

-	 MULTIPLY(tmp1 - tmp5, FIX(0.239678205));  /* (c8-c12)/2 */

-    z2 = MULTIPLY(tmp0 + tmp2, FIX(0.073342435)) - /* (c4-c6)/2 */

-	 MULTIPLY(tmp3 + tmp4, FIX(0.709910013)) + /* (c2+c10)/2 */

-	 MULTIPLY(tmp1 + tmp5, FIX(0.368787494));  /* (c8+c12)/2 */

-

-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 - z2, CONST_BITS+1);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.001514908));   /* c3 */

-    tmp2 = MULTIPLY(tmp10 + tmp12, FIX(0.881514751));   /* c5 */

-    tmp3 = MULTIPLY(tmp10 + tmp13, FIX(0.710284161)) +  /* c7 */

-	   MULTIPLY(tmp14 + tmp15, FIX(0.256335874));   /* c11 */

-    tmp0 = tmp1 + tmp2 + tmp3 -

-	   MULTIPLY(tmp10, FIX(1.530003162)) +          /* c3+c5+c7-c1 */

-	   MULTIPLY(tmp14, FIX(0.241438564));           /* c9-c11 */

-    tmp4 = MULTIPLY(tmp14 - tmp15, FIX(0.710284161)) -  /* c7 */

-	   MULTIPLY(tmp11 + tmp12, FIX(0.256335874));   /* c11 */

-    tmp5 = MULTIPLY(tmp11 + tmp13, - FIX(0.881514751)); /* -c5 */

-    tmp1 += tmp4 + tmp5 +

-	    MULTIPLY(tmp11, FIX(0.634110155)) -         /* c5+c9+c11-c3 */

-	    MULTIPLY(tmp14, FIX(1.773594819));          /* c1+c7 */

-    tmp6 = MULTIPLY(tmp12 + tmp13, - FIX(0.497774438)); /* -c9 */

-    tmp2 += tmp4 + tmp6 -

-	    MULTIPLY(tmp12, FIX(1.190715098)) +         /* c1+c5-c9-c11 */

-	    MULTIPLY(tmp15, FIX(1.711799069));          /* c3+c7 */

-    tmp3 += tmp5 + tmp6 +

-	    MULTIPLY(tmp13, FIX(1.670519935)) -         /* c3+c5+c9-c7 */

-	    MULTIPLY(tmp15, FIX(1.319646532));          /* c1+c11 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+1);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp3, CONST_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 14x14 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_14x14 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  DCTELEM workspace[8*6];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   * cK represents sqrt(2) * cos(K*pi/28).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[13]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[12]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[11]);

-    tmp13 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[10]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[9]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[8]);

-    tmp6 = GETJSAMPLE(elemptr[6]) + GETJSAMPLE(elemptr[7]);

-

-    tmp10 = tmp0 + tmp6;

-    tmp14 = tmp0 - tmp6;

-    tmp11 = tmp1 + tmp5;

-    tmp15 = tmp1 - tmp5;

-    tmp12 = tmp2 + tmp4;

-    tmp16 = tmp2 - tmp4;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[13]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[12]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[11]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[10]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[9]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[8]);

-    tmp6 = GETJSAMPLE(elemptr[6]) - GETJSAMPLE(elemptr[7]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      (tmp10 + tmp11 + tmp12 + tmp13 - 14 * CENTERJSAMPLE);

-    tmp13 += tmp13;

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.274162392)) + /* c4 */

-	      MULTIPLY(tmp11 - tmp13, FIX(0.314692123)) - /* c12 */

-	      MULTIPLY(tmp12 - tmp13, FIX(0.881747734)),  /* c8 */

-	      CONST_BITS);

-

-    tmp10 = MULTIPLY(tmp14 + tmp15, FIX(1.105676686));    /* c6 */

-

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp14, FIX(0.273079590))   /* c2-c6 */

-	      + MULTIPLY(tmp16, FIX(0.613604268)),        /* c10 */

-	      CONST_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp15, FIX(1.719280954))   /* c6+c10 */

-	      - MULTIPLY(tmp16, FIX(1.378756276)),        /* c2 */

-	      CONST_BITS);

-

-    /* Odd part */

-

-    tmp10 = tmp1 + tmp2;

-    tmp11 = tmp5 - tmp4;

-    dataptr[7] = (DCTELEM) (tmp0 - tmp10 + tmp3 - tmp11 - tmp6);

-    tmp3 <<= CONST_BITS;

-    tmp10 = MULTIPLY(tmp10, - FIX(0.158341681));          /* -c13 */

-    tmp11 = MULTIPLY(tmp11, FIX(1.405321284));            /* c1 */

-    tmp10 += tmp11 - tmp3;

-    tmp11 = MULTIPLY(tmp0 + tmp2, FIX(1.197448846)) +     /* c5 */

-	    MULTIPLY(tmp4 + tmp6, FIX(0.752406978));      /* c9 */

-    dataptr[5] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 - MULTIPLY(tmp2, FIX(2.373959773)) /* c3+c5-c13 */

-	      + MULTIPLY(tmp4, FIX(1.119999435)),         /* c1+c11-c9 */

-	      CONST_BITS);

-    tmp12 = MULTIPLY(tmp0 + tmp1, FIX(1.334852607)) +     /* c3 */

-	    MULTIPLY(tmp5 - tmp6, FIX(0.467085129));      /* c11 */

-    dataptr[3] = (DCTELEM)

-      DESCALE(tmp10 + tmp12 - MULTIPLY(tmp1, FIX(0.424103948)) /* c3-c9-c13 */

-	      - MULTIPLY(tmp5, FIX(3.069855259)),         /* c1+c5+c11 */

-	      CONST_BITS);

-    dataptr[1] = (DCTELEM)

-      DESCALE(tmp11 + tmp12 + tmp3 + tmp6 -

-	      MULTIPLY(tmp0 + tmp6, FIX(1.126980169)),    /* c3+c5-c1 */

-	      CONST_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 14)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/14)**2 = 16/49, which we partially

-   * fold into the constant multipliers and final shifting:

-   * cK now represents sqrt(2) * cos(K*pi/28) * 32/49.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*3];

-    tmp13 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*2];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*1];

-    tmp5 = dataptr[DCTSIZE*5] + wsptr[DCTSIZE*0];

-    tmp6 = dataptr[DCTSIZE*6] + dataptr[DCTSIZE*7];

-

-    tmp10 = tmp0 + tmp6;

-    tmp14 = tmp0 - tmp6;

-    tmp11 = tmp1 + tmp5;

-    tmp15 = tmp1 - tmp5;

-    tmp12 = tmp2 + tmp4;

-    tmp16 = tmp2 - tmp4;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*3];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*2];

-    tmp4 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*1];

-    tmp5 = dataptr[DCTSIZE*5] - wsptr[DCTSIZE*0];

-    tmp6 = dataptr[DCTSIZE*6] - dataptr[DCTSIZE*7];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12 + tmp13,

-		       FIX(0.653061224)),                 /* 32/49 */

-	      CONST_BITS+1);

-    tmp13 += tmp13;

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(0.832106052)) + /* c4 */

-	      MULTIPLY(tmp11 - tmp13, FIX(0.205513223)) - /* c12 */

-	      MULTIPLY(tmp12 - tmp13, FIX(0.575835255)),  /* c8 */

-	      CONST_BITS+1);

-

-    tmp10 = MULTIPLY(tmp14 + tmp15, FIX(0.722074570));    /* c6 */

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp14, FIX(0.178337691))   /* c2-c6 */

-	      + MULTIPLY(tmp16, FIX(0.400721155)),        /* c10 */

-	      CONST_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp15, FIX(1.122795725))   /* c6+c10 */

-	      - MULTIPLY(tmp16, FIX(0.900412262)),        /* c2 */

-	      CONST_BITS+1);

-

-    /* Odd part */

-

-    tmp10 = tmp1 + tmp2;

-    tmp11 = tmp5 - tmp4;

-    dataptr[DCTSIZE*7] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp10 + tmp3 - tmp11 - tmp6,

-		       FIX(0.653061224)),                 /* 32/49 */

-	      CONST_BITS+1);

-    tmp3  = MULTIPLY(tmp3 , FIX(0.653061224));            /* 32/49 */

-    tmp10 = MULTIPLY(tmp10, - FIX(0.103406812));          /* -c13 */

-    tmp11 = MULTIPLY(tmp11, FIX(0.917760839));            /* c1 */

-    tmp10 += tmp11 - tmp3;

-    tmp11 = MULTIPLY(tmp0 + tmp2, FIX(0.782007410)) +     /* c5 */

-	    MULTIPLY(tmp4 + tmp6, FIX(0.491367823));      /* c9 */

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 - MULTIPLY(tmp2, FIX(1.550341076)) /* c3+c5-c13 */

-	      + MULTIPLY(tmp4, FIX(0.731428202)),         /* c1+c11-c9 */

-	      CONST_BITS+1);

-    tmp12 = MULTIPLY(tmp0 + tmp1, FIX(0.871740478)) +     /* c3 */

-	    MULTIPLY(tmp5 - tmp6, FIX(0.305035186));      /* c11 */

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(tmp10 + tmp12 - MULTIPLY(tmp1, FIX(0.276965844)) /* c3-c9-c13 */

-	      - MULTIPLY(tmp5, FIX(2.004803435)),         /* c1+c5+c11 */

-	      CONST_BITS+1);

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp11 + tmp12 + tmp3

-	      - MULTIPLY(tmp0, FIX(0.735987049))          /* c3+c5-c1 */

-	      - MULTIPLY(tmp6, FIX(0.082925825)),         /* c9-c11-c13 */

-	      CONST_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 15x15 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_15x15 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 z1, z2, z3;

-  DCTELEM workspace[8*7];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   * cK represents sqrt(2) * cos(K*pi/30).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[14]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[13]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[12]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[11]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[10]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[9]);

-    tmp6 = GETJSAMPLE(elemptr[6]) + GETJSAMPLE(elemptr[8]);

-    tmp7 = GETJSAMPLE(elemptr[7]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[14]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[13]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[12]);

-    tmp13 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[11]);

-    tmp14 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[10]);

-    tmp15 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[9]);

-    tmp16 = GETJSAMPLE(elemptr[6]) - GETJSAMPLE(elemptr[8]);

-

-    z1 = tmp0 + tmp4 + tmp5;

-    z2 = tmp1 + tmp3 + tmp6;

-    z3 = tmp2 + tmp7;

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) (z1 + z2 + z3 - 15 * CENTERJSAMPLE);

-    z3 += z3;

-    dataptr[6] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 - z3, FIX(1.144122806)) - /* c6 */

-	      MULTIPLY(z2 - z3, FIX(0.437016024)),  /* c12 */

-	      CONST_BITS);

-    tmp2 += ((tmp1 + tmp4) >> 1) - tmp7 - tmp7;

-    z1 = MULTIPLY(tmp3 - tmp2, FIX(1.531135173)) -  /* c2+c14 */

-         MULTIPLY(tmp6 - tmp2, FIX(2.238241955));   /* c4+c8 */

-    z2 = MULTIPLY(tmp5 - tmp2, FIX(0.798468008)) -  /* c8-c14 */

-	 MULTIPLY(tmp0 - tmp2, FIX(0.091361227));   /* c2-c4 */

-    z3 = MULTIPLY(tmp0 - tmp3, FIX(1.383309603)) +  /* c2 */

-	 MULTIPLY(tmp6 - tmp5, FIX(0.946293579)) +  /* c8 */

-	 MULTIPLY(tmp1 - tmp4, FIX(0.790569415));   /* (c6+c12)/2 */

-

-    dataptr[2] = (DCTELEM) DESCALE(z1 + z3, CONST_BITS);

-    dataptr[4] = (DCTELEM) DESCALE(z2 + z3, CONST_BITS);

-

-    /* Odd part */

-

-    tmp2 = MULTIPLY(tmp10 - tmp12 - tmp13 + tmp15 + tmp16,

-		    FIX(1.224744871));                         /* c5 */

-    tmp1 = MULTIPLY(tmp10 - tmp14 - tmp15, FIX(1.344997024)) + /* c3 */

-	   MULTIPLY(tmp11 - tmp13 - tmp16, FIX(0.831253876));  /* c9 */

-    tmp12 = MULTIPLY(tmp12, FIX(1.224744871));                 /* c5 */

-    tmp4 = MULTIPLY(tmp10 - tmp16, FIX(1.406466353)) +         /* c1 */

-	   MULTIPLY(tmp11 + tmp14, FIX(1.344997024)) +         /* c3 */

-	   MULTIPLY(tmp13 + tmp15, FIX(0.575212477));          /* c11 */

-    tmp0 = MULTIPLY(tmp13, FIX(0.475753014)) -                 /* c7-c11 */

-	   MULTIPLY(tmp14, FIX(0.513743148)) +                 /* c3-c9 */

-	   MULTIPLY(tmp16, FIX(1.700497885)) + tmp4 + tmp12;   /* c1+c13 */

-    tmp3 = MULTIPLY(tmp10, - FIX(0.355500862)) -               /* -(c1-c7) */

-	   MULTIPLY(tmp11, FIX(2.176250899)) -                 /* c3+c9 */

-	   MULTIPLY(tmp15, FIX(0.869244010)) + tmp4 - tmp12;   /* c11+c13 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp3, CONST_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 15)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/15)**2 = 64/225, which we partially

-   * fold into the constant multipliers and final shifting:

-   * cK now represents sqrt(2) * cos(K*pi/30) * 256/225.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*6];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*5];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*4];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*3];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*2];

-    tmp5 = dataptr[DCTSIZE*5] + wsptr[DCTSIZE*1];

-    tmp6 = dataptr[DCTSIZE*6] + wsptr[DCTSIZE*0];

-    tmp7 = dataptr[DCTSIZE*7];

-

-    tmp10 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*6];

-    tmp11 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*5];

-    tmp12 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*4];

-    tmp13 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*3];

-    tmp14 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*2];

-    tmp15 = dataptr[DCTSIZE*5] - wsptr[DCTSIZE*1];

-    tmp16 = dataptr[DCTSIZE*6] - wsptr[DCTSIZE*0];

-

-    z1 = tmp0 + tmp4 + tmp5;

-    z2 = tmp1 + tmp3 + tmp6;

-    z3 = tmp2 + tmp7;

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 + z2 + z3, FIX(1.137777778)), /* 256/225 */

-	      CONST_BITS+2);

-    z3 += z3;

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 - z3, FIX(1.301757503)) - /* c6 */

-	      MULTIPLY(z2 - z3, FIX(0.497227121)),  /* c12 */

-	      CONST_BITS+2);

-    tmp2 += ((tmp1 + tmp4) >> 1) - tmp7 - tmp7;

-    z1 = MULTIPLY(tmp3 - tmp2, FIX(1.742091575)) -  /* c2+c14 */

-         MULTIPLY(tmp6 - tmp2, FIX(2.546621957));   /* c4+c8 */

-    z2 = MULTIPLY(tmp5 - tmp2, FIX(0.908479156)) -  /* c8-c14 */

-	 MULTIPLY(tmp0 - tmp2, FIX(0.103948774));   /* c2-c4 */

-    z3 = MULTIPLY(tmp0 - tmp3, FIX(1.573898926)) +  /* c2 */

-	 MULTIPLY(tmp6 - tmp5, FIX(1.076671805)) +  /* c8 */

-	 MULTIPLY(tmp1 - tmp4, FIX(0.899492312));   /* (c6+c12)/2 */

-

-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + z3, CONST_BITS+2);

-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(z2 + z3, CONST_BITS+2);

-

-    /* Odd part */

-

-    tmp2 = MULTIPLY(tmp10 - tmp12 - tmp13 + tmp15 + tmp16,

-		    FIX(1.393487498));                         /* c5 */

-    tmp1 = MULTIPLY(tmp10 - tmp14 - tmp15, FIX(1.530307725)) + /* c3 */

-	   MULTIPLY(tmp11 - tmp13 - tmp16, FIX(0.945782187));  /* c9 */

-    tmp12 = MULTIPLY(tmp12, FIX(1.393487498));                 /* c5 */

-    tmp4 = MULTIPLY(tmp10 - tmp16, FIX(1.600246161)) +         /* c1 */

-	   MULTIPLY(tmp11 + tmp14, FIX(1.530307725)) +         /* c3 */

-	   MULTIPLY(tmp13 + tmp15, FIX(0.654463974));          /* c11 */

-    tmp0 = MULTIPLY(tmp13, FIX(0.541301207)) -                 /* c7-c11 */

-	   MULTIPLY(tmp14, FIX(0.584525538)) +                 /* c3-c9 */

-	   MULTIPLY(tmp16, FIX(1.934788705)) + tmp4 + tmp12;   /* c1+c13 */

-    tmp3 = MULTIPLY(tmp10, - FIX(0.404480980)) -               /* -(c1-c7) */

-	   MULTIPLY(tmp11, FIX(2.476089912)) -                 /* c3+c9 */

-	   MULTIPLY(tmp15, FIX(0.989006518)) + tmp4 - tmp12;   /* c11+c13 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+2);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+2);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+2);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp3, CONST_BITS+2);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 16x16 sample block.

- */

-

-GLOBAL(void)

-jpeg_fdct_16x16 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16, tmp17;

-  DCTELEM workspace[DCTSIZE2];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[15]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[14]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[13]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[12]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[11]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[10]);

-    tmp6 = GETJSAMPLE(elemptr[6]) + GETJSAMPLE(elemptr[9]);

-    tmp7 = GETJSAMPLE(elemptr[7]) + GETJSAMPLE(elemptr[8]);

-

-    tmp10 = tmp0 + tmp7;

-    tmp14 = tmp0 - tmp7;

-    tmp11 = tmp1 + tmp6;

-    tmp15 = tmp1 - tmp6;

-    tmp12 = tmp2 + tmp5;

-    tmp16 = tmp2 - tmp5;

-    tmp13 = tmp3 + tmp4;

-    tmp17 = tmp3 - tmp4;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[15]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[14]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[13]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[12]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[11]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[10]);

-    tmp6 = GETJSAMPLE(elemptr[6]) - GETJSAMPLE(elemptr[9]);

-    tmp7 = GETJSAMPLE(elemptr[7]) - GETJSAMPLE(elemptr[8]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 + tmp13 - 16 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.306562965)) + /* c4[16] = c2[8] */

-	      MULTIPLY(tmp11 - tmp12, FIX_0_541196100),   /* c12[16] = c6[8] */

-	      CONST_BITS-PASS1_BITS);

-

-    tmp10 = MULTIPLY(tmp17 - tmp15, FIX(0.275899379)) +   /* c14[16] = c7[8] */

-	    MULTIPLY(tmp14 - tmp16, FIX(1.387039845));    /* c2[16] = c1[8] */

-

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp15, FIX(1.451774982))   /* c6+c14 */

-	      + MULTIPLY(tmp16, FIX(2.172734804)),        /* c2+c10 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(0.211164243))   /* c2-c6 */

-	      - MULTIPLY(tmp17, FIX(1.061594338)),        /* c10+c14 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp11 = MULTIPLY(tmp0 + tmp1, FIX(1.353318001)) +         /* c3 */

-	    MULTIPLY(tmp6 - tmp7, FIX(0.410524528));          /* c13 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.247225013)) +         /* c5 */

-	    MULTIPLY(tmp5 + tmp7, FIX(0.666655658));          /* c11 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(1.093201867)) +         /* c7 */

-	    MULTIPLY(tmp4 - tmp7, FIX(0.897167586));          /* c9 */

-    tmp14 = MULTIPLY(tmp1 + tmp2, FIX(0.138617169)) +         /* c15 */

-	    MULTIPLY(tmp6 - tmp5, FIX(1.407403738));          /* c1 */

-    tmp15 = MULTIPLY(tmp1 + tmp3, - FIX(0.666655658)) +       /* -c11 */

-	    MULTIPLY(tmp4 + tmp6, - FIX(1.247225013));        /* -c5 */

-    tmp16 = MULTIPLY(tmp2 + tmp3, - FIX(1.353318001)) +       /* -c3 */

-	    MULTIPLY(tmp5 - tmp4, FIX(0.410524528));          /* c13 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(tmp0, FIX(2.286341144)) +                /* c7+c5+c3-c1 */

-	    MULTIPLY(tmp7, FIX(0.779653625));                 /* c15+c13-c11+c9 */

-    tmp11 += tmp14 + tmp15 + MULTIPLY(tmp1, FIX(0.071888074)) /* c9-c3-c15+c11 */

-	     - MULTIPLY(tmp6, FIX(1.663905119));              /* c7+c13+c1-c5 */

-    tmp12 += tmp14 + tmp16 - MULTIPLY(tmp2, FIX(1.125726048)) /* c7+c5+c15-c3 */

-	     + MULTIPLY(tmp5, FIX(1.227391138));              /* c9-c11+c1-c13 */

-    tmp13 += tmp15 + tmp16 + MULTIPLY(tmp3, FIX(1.065388962)) /* c15+c3+c11-c7 */

-	     + MULTIPLY(tmp4, FIX(2.167985692));              /* c1+c13+c5-c9 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp10, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp11, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp12, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp13, CONST_BITS-PASS1_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == DCTSIZE * 2)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/16)**2 = 1/2**2.

-   * cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*3];

-    tmp5 = dataptr[DCTSIZE*5] + wsptr[DCTSIZE*2];

-    tmp6 = dataptr[DCTSIZE*6] + wsptr[DCTSIZE*1];

-    tmp7 = dataptr[DCTSIZE*7] + wsptr[DCTSIZE*0];

-

-    tmp10 = tmp0 + tmp7;

-    tmp14 = tmp0 - tmp7;

-    tmp11 = tmp1 + tmp6;

-    tmp15 = tmp1 - tmp6;

-    tmp12 = tmp2 + tmp5;

-    tmp16 = tmp2 - tmp5;

-    tmp13 = tmp3 + tmp4;

-    tmp17 = tmp3 - tmp4;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*3];

-    tmp5 = dataptr[DCTSIZE*5] - wsptr[DCTSIZE*2];

-    tmp6 = dataptr[DCTSIZE*6] - wsptr[DCTSIZE*1];

-    tmp7 = dataptr[DCTSIZE*7] - wsptr[DCTSIZE*0];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 + tmp12 + tmp13, PASS1_BITS+2);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.306562965)) + /* c4[16] = c2[8] */

-	      MULTIPLY(tmp11 - tmp12, FIX_0_541196100),   /* c12[16] = c6[8] */

-	      CONST_BITS+PASS1_BITS+2);

-

-    tmp10 = MULTIPLY(tmp17 - tmp15, FIX(0.275899379)) +   /* c14[16] = c7[8] */

-	    MULTIPLY(tmp14 - tmp16, FIX(1.387039845));    /* c2[16] = c1[8] */

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp15, FIX(1.451774982))   /* c6+c14 */

-	      + MULTIPLY(tmp16, FIX(2.172734804)),        /* c2+10 */

-	      CONST_BITS+PASS1_BITS+2);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(0.211164243))   /* c2-c6 */

-	      - MULTIPLY(tmp17, FIX(1.061594338)),        /* c10+c14 */

-	      CONST_BITS+PASS1_BITS+2);

-

-    /* Odd part */

-

-    tmp11 = MULTIPLY(tmp0 + tmp1, FIX(1.353318001)) +         /* c3 */

-	    MULTIPLY(tmp6 - tmp7, FIX(0.410524528));          /* c13 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.247225013)) +         /* c5 */

-	    MULTIPLY(tmp5 + tmp7, FIX(0.666655658));          /* c11 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(1.093201867)) +         /* c7 */

-	    MULTIPLY(tmp4 - tmp7, FIX(0.897167586));          /* c9 */

-    tmp14 = MULTIPLY(tmp1 + tmp2, FIX(0.138617169)) +         /* c15 */

-	    MULTIPLY(tmp6 - tmp5, FIX(1.407403738));          /* c1 */

-    tmp15 = MULTIPLY(tmp1 + tmp3, - FIX(0.666655658)) +       /* -c11 */

-	    MULTIPLY(tmp4 + tmp6, - FIX(1.247225013));        /* -c5 */

-    tmp16 = MULTIPLY(tmp2 + tmp3, - FIX(1.353318001)) +       /* -c3 */

-	    MULTIPLY(tmp5 - tmp4, FIX(0.410524528));          /* c13 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(tmp0, FIX(2.286341144)) +                /* c7+c5+c3-c1 */

-	    MULTIPLY(tmp7, FIX(0.779653625));                 /* c15+c13-c11+c9 */

-    tmp11 += tmp14 + tmp15 + MULTIPLY(tmp1, FIX(0.071888074)) /* c9-c3-c15+c11 */

-	     - MULTIPLY(tmp6, FIX(1.663905119));              /* c7+c13+c1-c5 */

-    tmp12 += tmp14 + tmp16 - MULTIPLY(tmp2, FIX(1.125726048)) /* c7+c5+c15-c3 */

-	     + MULTIPLY(tmp5, FIX(1.227391138));              /* c9-c11+c1-c13 */

-    tmp13 += tmp15 + tmp16 + MULTIPLY(tmp3, FIX(1.065388962)) /* c15+c3+c11-c7 */

-	     + MULTIPLY(tmp4, FIX(2.167985692));              /* c1+c13+c5-c9 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp10, CONST_BITS+PASS1_BITS+2);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp11, CONST_BITS+PASS1_BITS+2);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12, CONST_BITS+PASS1_BITS+2);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp13, CONST_BITS+PASS1_BITS+2);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 16x8 sample block.

- *

- * 16-point FDCT in pass 1 (rows), 8-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_16x8 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16, tmp17;

-  INT32 z1;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 16-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[15]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[14]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[13]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[12]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[11]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[10]);

-    tmp6 = GETJSAMPLE(elemptr[6]) + GETJSAMPLE(elemptr[9]);

-    tmp7 = GETJSAMPLE(elemptr[7]) + GETJSAMPLE(elemptr[8]);

-

-    tmp10 = tmp0 + tmp7;

-    tmp14 = tmp0 - tmp7;

-    tmp11 = tmp1 + tmp6;

-    tmp15 = tmp1 - tmp6;

-    tmp12 = tmp2 + tmp5;

-    tmp16 = tmp2 - tmp5;

-    tmp13 = tmp3 + tmp4;

-    tmp17 = tmp3 - tmp4;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[15]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[14]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[13]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[12]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[11]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[10]);

-    tmp6 = GETJSAMPLE(elemptr[6]) - GETJSAMPLE(elemptr[9]);

-    tmp7 = GETJSAMPLE(elemptr[7]) - GETJSAMPLE(elemptr[8]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 + tmp13 - 16 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.306562965)) + /* c4[16] = c2[8] */

-	      MULTIPLY(tmp11 - tmp12, FIX_0_541196100),   /* c12[16] = c6[8] */

-	      CONST_BITS-PASS1_BITS);

-

-    tmp10 = MULTIPLY(tmp17 - tmp15, FIX(0.275899379)) +   /* c14[16] = c7[8] */

-	    MULTIPLY(tmp14 - tmp16, FIX(1.387039845));    /* c2[16] = c1[8] */

-

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp15, FIX(1.451774982))   /* c6+c14 */

-	      + MULTIPLY(tmp16, FIX(2.172734804)),        /* c2+c10 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(0.211164243))   /* c2-c6 */

-	      - MULTIPLY(tmp17, FIX(1.061594338)),        /* c10+c14 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp11 = MULTIPLY(tmp0 + tmp1, FIX(1.353318001)) +         /* c3 */

-	    MULTIPLY(tmp6 - tmp7, FIX(0.410524528));          /* c13 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.247225013)) +         /* c5 */

-	    MULTIPLY(tmp5 + tmp7, FIX(0.666655658));          /* c11 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(1.093201867)) +         /* c7 */

-	    MULTIPLY(tmp4 - tmp7, FIX(0.897167586));          /* c9 */

-    tmp14 = MULTIPLY(tmp1 + tmp2, FIX(0.138617169)) +         /* c15 */

-	    MULTIPLY(tmp6 - tmp5, FIX(1.407403738));          /* c1 */

-    tmp15 = MULTIPLY(tmp1 + tmp3, - FIX(0.666655658)) +       /* -c11 */

-	    MULTIPLY(tmp4 + tmp6, - FIX(1.247225013));        /* -c5 */

-    tmp16 = MULTIPLY(tmp2 + tmp3, - FIX(1.353318001)) +       /* -c3 */

-	    MULTIPLY(tmp5 - tmp4, FIX(0.410524528));          /* c13 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(tmp0, FIX(2.286341144)) +                /* c7+c5+c3-c1 */

-	    MULTIPLY(tmp7, FIX(0.779653625));                 /* c15+c13-c11+c9 */

-    tmp11 += tmp14 + tmp15 + MULTIPLY(tmp1, FIX(0.071888074)) /* c9-c3-c15+c11 */

-	     - MULTIPLY(tmp6, FIX(1.663905119));              /* c7+c13+c1-c5 */

-    tmp12 += tmp14 + tmp16 - MULTIPLY(tmp2, FIX(1.125726048)) /* c7+c5+c15-c3 */

-	     + MULTIPLY(tmp5, FIX(1.227391138));              /* c9-c11+c1-c13 */

-    tmp13 += tmp15 + tmp16 + MULTIPLY(tmp3, FIX(1.065388962)) /* c15+c3+c11-c7 */

-	     + MULTIPLY(tmp4, FIX(2.167985692));              /* c1+c13+c5-c9 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp10, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp11, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp12, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp13, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by 8/16 = 1/2.

-   * 8-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];

-

-    tmp10 = tmp0 + tmp3;

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp11, PASS1_BITS+1);

-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp10 - tmp11, PASS1_BITS+1);

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);   /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-	      CONST_BITS+PASS1_BITS+1);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);   /*  c3 */

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);      /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);      /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);   /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);          /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);          /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);   /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);          /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);          /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp3, CONST_BITS+PASS1_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 14x7 sample block.

- *

- * 14-point FDCT in pass 1 (rows), 7-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_14x7 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 z1, z2, z3;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Zero bottom row of output coefficient block. */

-  MEMZERO(&data[DCTSIZE*7], SIZEOF(DCTELEM) * DCTSIZE);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 14-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/28).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 7; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[13]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[12]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[11]);

-    tmp13 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[10]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[9]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[8]);

-    tmp6 = GETJSAMPLE(elemptr[6]) + GETJSAMPLE(elemptr[7]);

-

-    tmp10 = tmp0 + tmp6;

-    tmp14 = tmp0 - tmp6;

-    tmp11 = tmp1 + tmp5;

-    tmp15 = tmp1 - tmp5;

-    tmp12 = tmp2 + tmp4;

-    tmp16 = tmp2 - tmp4;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[13]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[12]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[11]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[10]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[9]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[8]);

-    tmp6 = GETJSAMPLE(elemptr[6]) - GETJSAMPLE(elemptr[7]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 + tmp13 - 14 * CENTERJSAMPLE) << PASS1_BITS);

-    tmp13 += tmp13;

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.274162392)) + /* c4 */

-	      MULTIPLY(tmp11 - tmp13, FIX(0.314692123)) - /* c12 */

-	      MULTIPLY(tmp12 - tmp13, FIX(0.881747734)),  /* c8 */

-	      CONST_BITS-PASS1_BITS);

-

-    tmp10 = MULTIPLY(tmp14 + tmp15, FIX(1.105676686));    /* c6 */

-

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp14, FIX(0.273079590))   /* c2-c6 */

-	      + MULTIPLY(tmp16, FIX(0.613604268)),        /* c10 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp15, FIX(1.719280954))   /* c6+c10 */

-	      - MULTIPLY(tmp16, FIX(1.378756276)),        /* c2 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = tmp1 + tmp2;

-    tmp11 = tmp5 - tmp4;

-    dataptr[7] = (DCTELEM) ((tmp0 - tmp10 + tmp3 - tmp11 - tmp6) << PASS1_BITS);

-    tmp3 <<= CONST_BITS;

-    tmp10 = MULTIPLY(tmp10, - FIX(0.158341681));          /* -c13 */

-    tmp11 = MULTIPLY(tmp11, FIX(1.405321284));            /* c1 */

-    tmp10 += tmp11 - tmp3;

-    tmp11 = MULTIPLY(tmp0 + tmp2, FIX(1.197448846)) +     /* c5 */

-	    MULTIPLY(tmp4 + tmp6, FIX(0.752406978));      /* c9 */

-    dataptr[5] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 - MULTIPLY(tmp2, FIX(2.373959773)) /* c3+c5-c13 */

-	      + MULTIPLY(tmp4, FIX(1.119999435)),         /* c1+c11-c9 */

-	      CONST_BITS-PASS1_BITS);

-    tmp12 = MULTIPLY(tmp0 + tmp1, FIX(1.334852607)) +     /* c3 */

-	    MULTIPLY(tmp5 - tmp6, FIX(0.467085129));      /* c11 */

-    dataptr[3] = (DCTELEM)

-      DESCALE(tmp10 + tmp12 - MULTIPLY(tmp1, FIX(0.424103948)) /* c3-c9-c13 */

-	      - MULTIPLY(tmp5, FIX(3.069855259)),         /* c1+c5+c11 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[1] = (DCTELEM)

-      DESCALE(tmp11 + tmp12 + tmp3 + tmp6 -

-	      MULTIPLY(tmp0 + tmp6, FIX(1.126980169)),    /* c3+c5-c1 */

-	      CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/14)*(8/7) = 32/49, which we

-   * partially fold into the constant multipliers and final shifting:

-   * 7-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/14) * 64/49.

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*6];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*5];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*4];

-    tmp3 = dataptr[DCTSIZE*3];

-

-    tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*6];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*5];

-    tmp12 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*4];

-

-    z1 = tmp0 + tmp2;

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(z1 + tmp1 + tmp3, FIX(1.306122449)), /* 64/49 */

-	      CONST_BITS+PASS1_BITS+1);

-    tmp3 += tmp3;

-    z1 -= tmp3;

-    z1 -= tmp3;

-    z1 = MULTIPLY(z1, FIX(0.461784020));                /* (c2+c6-c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp2, FIX(1.202428084));       /* (c2+c4-c6)/2 */

-    z3 = MULTIPLY(tmp1 - tmp2, FIX(0.411026446));       /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + z2 + z3, CONST_BITS+PASS1_BITS+1);

-    z1 -= z2;

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(1.151670509));       /* c4 */

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(z2 + z3 - MULTIPLY(tmp1 - tmp3, FIX(0.923568041)), /* c2+c6-c4 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS+PASS1_BITS+1);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(1.221765677));   /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(tmp10 - tmp11, FIX(0.222383464));   /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(tmp11 + tmp12, - FIX(1.800824523)); /* -c1 */

-    tmp1 += tmp2;

-    tmp3 = MULTIPLY(tmp10 + tmp12, FIX(0.801442310));   /* c5 */

-    tmp0 += tmp3;

-    tmp2 += tmp3 + MULTIPLY(tmp12, FIX(2.443531355));   /* c3+c1-c5 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp0, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp1, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp2, CONST_BITS+PASS1_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 12x6 sample block.

- *

- * 12-point FDCT in pass 1 (rows), 6-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_12x6 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Zero 2 bottom rows of output coefficient block. */

-  MEMZERO(&data[DCTSIZE*6], SIZEOF(DCTELEM) * DCTSIZE * 2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 12-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/24).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 6; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[11]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[10]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[9]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[8]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[7]);

-    tmp5 = GETJSAMPLE(elemptr[5]) + GETJSAMPLE(elemptr[6]);

-

-    tmp10 = tmp0 + tmp5;

-    tmp13 = tmp0 - tmp5;

-    tmp11 = tmp1 + tmp4;

-    tmp14 = tmp1 - tmp4;

-    tmp12 = tmp2 + tmp3;

-    tmp15 = tmp2 - tmp3;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[11]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[10]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[9]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[8]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[7]);

-    tmp5 = GETJSAMPLE(elemptr[5]) - GETJSAMPLE(elemptr[6]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 - 12 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[6] = (DCTELEM) ((tmp13 - tmp14 - tmp15) << PASS1_BITS);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.224744871)), /* c4 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp14 - tmp15 + MULTIPLY(tmp13 + tmp15, FIX(1.366025404)), /* c2 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp1 + tmp4, FIX_0_541196100);    /* c9 */

-    tmp14 = tmp10 + MULTIPLY(tmp1, FIX_0_765366865);   /* c3-c9 */

-    tmp15 = tmp10 - MULTIPLY(tmp4, FIX_1_847759065);   /* c3+c9 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.121971054));   /* c5 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(0.860918669));   /* c7 */

-    tmp10 = tmp12 + tmp13 + tmp14 - MULTIPLY(tmp0, FIX(0.580774953)) /* c5+c7-c1 */

-	    + MULTIPLY(tmp5, FIX(0.184591911));        /* c11 */

-    tmp11 = MULTIPLY(tmp2 + tmp3, - FIX(0.184591911)); /* -c11 */

-    tmp12 += tmp11 - tmp15 - MULTIPLY(tmp2, FIX(2.339493912)) /* c1+c5-c11 */

-	    + MULTIPLY(tmp5, FIX(0.860918669));        /* c7 */

-    tmp13 += tmp11 - tmp14 + MULTIPLY(tmp3, FIX(0.725788011)) /* c1+c11-c7 */

-	    - MULTIPLY(tmp5, FIX(1.121971054));        /* c5 */

-    tmp11 = tmp15 + MULTIPLY(tmp0 - tmp3, FIX(1.306562965)) /* c3 */

-	    - MULTIPLY(tmp2 + tmp5, FIX_0_541196100);  /* c9 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp10, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp11, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp12, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp13, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/12)*(8/6) = 8/9, which we

-   * partially fold into the constant multipliers and final shifting:

-   * 6-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/12) * 16/9.

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*5];

-    tmp11 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*3];

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*3];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11, FIX(1.777777778)),         /* 16/9 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(2.177324216)),                 /* c2 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(1.257078722)), /* c4 */

-	      CONST_BITS+PASS1_BITS+1);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp2, FIX(0.650711829));             /* c5 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0 + tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp2, FIX(1.777777778)),    /* 16/9 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp2 - tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 10x5 sample block.

- *

- * 10-point FDCT in pass 1 (rows), 5-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_10x5 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Zero 3 bottom rows of output coefficient block. */

-  MEMZERO(&data[DCTSIZE*5], SIZEOF(DCTELEM) * DCTSIZE * 3);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 10-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/20).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 5; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[9]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[8]);

-    tmp12 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[7]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[6]);

-    tmp4 = GETJSAMPLE(elemptr[4]) + GETJSAMPLE(elemptr[5]);

-

-    tmp10 = tmp0 + tmp4;

-    tmp13 = tmp0 - tmp4;

-    tmp11 = tmp1 + tmp3;

-    tmp14 = tmp1 - tmp3;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[9]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[8]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[7]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[6]);

-    tmp4 = GETJSAMPLE(elemptr[4]) - GETJSAMPLE(elemptr[5]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 + tmp12 - 10 * CENTERJSAMPLE) << PASS1_BITS);

-    tmp12 += tmp12;

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.144122806)) - /* c4 */

-	      MULTIPLY(tmp11 - tmp12, FIX(0.437016024)),  /* c8 */

-	      CONST_BITS-PASS1_BITS);

-    tmp10 = MULTIPLY(tmp13 + tmp14, FIX(0.831253876));    /* c6 */

-    dataptr[2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp13, FIX(0.513743148)),  /* c2-c6 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(2.176250899)),  /* c2+c6 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = tmp0 + tmp4;

-    tmp11 = tmp1 - tmp3;

-    dataptr[5] = (DCTELEM) ((tmp10 - tmp11 - tmp2) << PASS1_BITS);

-    tmp2 <<= CONST_BITS;

-    dataptr[1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.396802247)) +          /* c1 */

-	      MULTIPLY(tmp1, FIX(1.260073511)) + tmp2 +   /* c3 */

-	      MULTIPLY(tmp3, FIX(0.642039522)) +          /* c7 */

-	      MULTIPLY(tmp4, FIX(0.221231742)),           /* c9 */

-	      CONST_BITS-PASS1_BITS);

-    tmp12 = MULTIPLY(tmp0 - tmp4, FIX(0.951056516)) -     /* (c3+c7)/2 */

-	    MULTIPLY(tmp1 + tmp3, FIX(0.587785252));      /* (c1-c9)/2 */

-    tmp13 = MULTIPLY(tmp10 + tmp11, FIX(0.309016994)) +   /* (c3-c7)/2 */

-	    (tmp11 << (CONST_BITS - 1)) - tmp2;

-    dataptr[3] = (DCTELEM) DESCALE(tmp12 + tmp13, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp12 - tmp13, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/10)*(8/5) = 32/25, which we

-   * fold into the constant multipliers:

-   * 5-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/10) * 32/25.

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*4];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*3];

-    tmp2 = dataptr[DCTSIZE*2];

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*4];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*3];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp2, FIX(1.28)),        /* 32/25 */

-	      CONST_BITS+PASS1_BITS);

-    tmp11 = MULTIPLY(tmp11, FIX(1.011928851));          /* (c2+c4)/2 */

-    tmp10 -= tmp2 << 2;

-    tmp10 = MULTIPLY(tmp10, FIX(0.452548340));          /* (c2-c4)/2 */

-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(tmp11 + tmp10, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp11 - tmp10, CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp1, FIX(1.064004961));    /* c3 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0, FIX(0.657591230)), /* c1-c3 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp1, FIX(2.785601151)), /* c1+c3 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on an 8x4 sample block.

- *

- * 8-point FDCT in pass 1 (rows), 4-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_8x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Zero 4 bottom rows of output coefficient block. */

-  MEMZERO(&data[DCTSIZE*4], SIZEOF(DCTELEM) * DCTSIZE * 4);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We must also scale the output by 8/4 = 2, which we add here.

-   * 8-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[4]);

-

-    tmp10 = tmp0 + tmp3;

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[4]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 - 8 * CENTERJSAMPLE) << (PASS1_BITS+1));

-    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << (PASS1_BITS+1));

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-2);

-

-    dataptr[2] = (DCTELEM)

-      RIGHT_SHIFT(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS-PASS1_BITS-1);

-    dataptr[6] = (DCTELEM)

-      RIGHT_SHIFT(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS-PASS1_BITS-1);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);       /*  c3 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-2);

-

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);          /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);          /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);       /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);              /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);              /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);       /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);              /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);              /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[1] = (DCTELEM) RIGHT_SHIFT(tmp0, CONST_BITS-PASS1_BITS-1);

-    dataptr[3] = (DCTELEM) RIGHT_SHIFT(tmp1, CONST_BITS-PASS1_BITS-1);

-    dataptr[5] = (DCTELEM) RIGHT_SHIFT(tmp2, CONST_BITS-PASS1_BITS-1);

-    dataptr[7] = (DCTELEM) RIGHT_SHIFT(tmp3, CONST_BITS-PASS1_BITS-1);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * 4-point FDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    /* Add fudge factor here for final descale. */

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*3] + (ONE << (PASS1_BITS-1));

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*2];

-

-    tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*3];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*2];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp0 + tmp1, PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM) RIGHT_SHIFT(tmp0 - tmp1, PASS1_BITS);

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 6x3 sample block.

- *

- * 6-point FDCT in pass 1 (rows), 3-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_6x3 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2;

-  INT32 tmp10, tmp11, tmp12;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * 6-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 3; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[5]);

-    tmp11 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[3]);

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[5]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[3]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 - 6 * CENTERJSAMPLE) << (PASS1_BITS+1));

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(1.224744871)),                 /* c2 */

-	      CONST_BITS-PASS1_BITS-1);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(0.707106781)), /* c4 */

-	      CONST_BITS-PASS1_BITS-1);

-

-    /* Odd part */

-

-    tmp10 = DESCALE(MULTIPLY(tmp0 + tmp2, FIX(0.366025404)),     /* c5 */

-		    CONST_BITS-PASS1_BITS-1);

-

-    dataptr[1] = (DCTELEM) (tmp10 + ((tmp0 + tmp1) << (PASS1_BITS+1)));

-    dataptr[3] = (DCTELEM) ((tmp0 - tmp1 - tmp2) << (PASS1_BITS+1));

-    dataptr[5] = (DCTELEM) (tmp10 + ((tmp2 - tmp1) << (PASS1_BITS+1)));

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/6)*(8/3) = 32/9, which we partially

-   * fold into the constant multipliers (other part was done in pass 1):

-   * 3-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/6) * 16/9.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 6; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*2];

-    tmp1 = dataptr[DCTSIZE*1];

-

-    tmp2 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*2];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 + tmp1, FIX(1.777777778)),        /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp1, FIX(1.257078722)), /* c2 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2, FIX(2.177324216)),               /* c1 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 4x2 sample block.

- *

- * 4-point FDCT in pass 1 (rows), 2-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_4x2 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1;

-  INT32 tmp10, tmp11;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We must also scale the output by (8/4)*(8/2) = 2**3, which we add here.

-   * 4-point FDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 2; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 - 4 * CENTERJSAMPLE) << (PASS1_BITS+3));

-    dataptr[2] = (DCTELEM) ((tmp0 - tmp1) << (PASS1_BITS+3));

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-4);

-

-    dataptr[1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS-PASS1_BITS-3);

-    dataptr[3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS-PASS1_BITS-3);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    /* Even part */

-

-    /* Add fudge factor here for final descale. */

-    tmp0 = dataptr[DCTSIZE*0] + (ONE << (PASS1_BITS-1));

-    tmp1 = dataptr[DCTSIZE*1];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp0 + tmp1, PASS1_BITS);

-

-    /* Odd part */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) RIGHT_SHIFT(tmp0 - tmp1, PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 2x1 sample block.

- *

- * 2-point FDCT in pass 1 (rows), 1-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_2x1 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  DCTELEM tmp0, tmp1;

-  JSAMPROW elemptr;

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  elemptr = sample_data[0] + start_col;

-

-  tmp0 = GETJSAMPLE(elemptr[0]);

-  tmp1 = GETJSAMPLE(elemptr[1]);

-

-  /* We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/2)*(8/1) = 2**5.

-   */

-

-  /* Even part */

-

-  /* Apply unsigned->signed conversion. */

-  data[0] = (tmp0 + tmp1 - 2 * CENTERJSAMPLE) << 5;

-

-  /* Odd part */

-

-  data[1] = (tmp0 - tmp1) << 5;

-}

-

-

-/*

- * Perform the forward DCT on an 8x16 sample block.

- *

- * 8-point FDCT in pass 1 (rows), 16-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_8x16 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16, tmp17;

-  INT32 z1;

-  DCTELEM workspace[DCTSIZE2];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 8-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) + GETJSAMPLE(elemptr[4]);

-

-    tmp10 = tmp0 + tmp3;

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[7]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[6]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[5]);

-    tmp3 = GETJSAMPLE(elemptr[3]) - GETJSAMPLE(elemptr[4]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) ((tmp10 + tmp11 - 8 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);   /* c6 */

-    dataptr[2] = (DCTELEM)

-      DESCALE(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM)

-      DESCALE(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);   /*  c3 */

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);      /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);      /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);   /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);          /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);          /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);   /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);          /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);          /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS-PASS1_BITS);

-    dataptr[7] = (DCTELEM) DESCALE(tmp3, CONST_BITS-PASS1_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == DCTSIZE * 2)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by 8/16 = 1/2.

-   * 16-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*3];

-    tmp5 = dataptr[DCTSIZE*5] + wsptr[DCTSIZE*2];

-    tmp6 = dataptr[DCTSIZE*6] + wsptr[DCTSIZE*1];

-    tmp7 = dataptr[DCTSIZE*7] + wsptr[DCTSIZE*0];

-

-    tmp10 = tmp0 + tmp7;

-    tmp14 = tmp0 - tmp7;

-    tmp11 = tmp1 + tmp6;

-    tmp15 = tmp1 - tmp6;

-    tmp12 = tmp2 + tmp5;

-    tmp16 = tmp2 - tmp5;

-    tmp13 = tmp3 + tmp4;

-    tmp17 = tmp3 - tmp4;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*4];

-    tmp4 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*3];

-    tmp5 = dataptr[DCTSIZE*5] - wsptr[DCTSIZE*2];

-    tmp6 = dataptr[DCTSIZE*6] - wsptr[DCTSIZE*1];

-    tmp7 = dataptr[DCTSIZE*7] - wsptr[DCTSIZE*0];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 + tmp12 + tmp13, PASS1_BITS+1);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(1.306562965)) + /* c4[16] = c2[8] */

-	      MULTIPLY(tmp11 - tmp12, FIX_0_541196100),   /* c12[16] = c6[8] */

-	      CONST_BITS+PASS1_BITS+1);

-

-    tmp10 = MULTIPLY(tmp17 - tmp15, FIX(0.275899379)) +   /* c14[16] = c7[8] */

-	    MULTIPLY(tmp14 - tmp16, FIX(1.387039845));    /* c2[16] = c1[8] */

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp15, FIX(1.451774982))   /* c6+c14 */

-	      + MULTIPLY(tmp16, FIX(2.172734804)),        /* c2+c10 */

-	      CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(0.211164243))   /* c2-c6 */

-	      - MULTIPLY(tmp17, FIX(1.061594338)),        /* c10+c14 */

-	      CONST_BITS+PASS1_BITS+1);

-

-    /* Odd part */

-

-    tmp11 = MULTIPLY(tmp0 + tmp1, FIX(1.353318001)) +         /* c3 */

-	    MULTIPLY(tmp6 - tmp7, FIX(0.410524528));          /* c13 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(1.247225013)) +         /* c5 */

-	    MULTIPLY(tmp5 + tmp7, FIX(0.666655658));          /* c11 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(1.093201867)) +         /* c7 */

-	    MULTIPLY(tmp4 - tmp7, FIX(0.897167586));          /* c9 */

-    tmp14 = MULTIPLY(tmp1 + tmp2, FIX(0.138617169)) +         /* c15 */

-	    MULTIPLY(tmp6 - tmp5, FIX(1.407403738));          /* c1 */

-    tmp15 = MULTIPLY(tmp1 + tmp3, - FIX(0.666655658)) +       /* -c11 */

-	    MULTIPLY(tmp4 + tmp6, - FIX(1.247225013));        /* -c5 */

-    tmp16 = MULTIPLY(tmp2 + tmp3, - FIX(1.353318001)) +       /* -c3 */

-	    MULTIPLY(tmp5 - tmp4, FIX(0.410524528));          /* c13 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(tmp0, FIX(2.286341144)) +                /* c7+c5+c3-c1 */

-	    MULTIPLY(tmp7, FIX(0.779653625));                 /* c15+c13-c11+c9 */

-    tmp11 += tmp14 + tmp15 + MULTIPLY(tmp1, FIX(0.071888074)) /* c9-c3-c15+c11 */

-	     - MULTIPLY(tmp6, FIX(1.663905119));              /* c7+c13+c1-c5 */

-    tmp12 += tmp14 + tmp16 - MULTIPLY(tmp2, FIX(1.125726048)) /* c7+c5+c15-c3 */

-	     + MULTIPLY(tmp5, FIX(1.227391138));              /* c9-c11+c1-c13 */

-    tmp13 += tmp15 + tmp16 + MULTIPLY(tmp3, FIX(1.065388962)) /* c15+c3+c11-c7 */

-	     + MULTIPLY(tmp4, FIX(2.167985692));              /* c1+c13+c5-c9 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp10, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp11, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12, CONST_BITS+PASS1_BITS+1);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp13, CONST_BITS+PASS1_BITS+1);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 7x14 sample block.

- *

- * 7-point FDCT in pass 1 (rows), 14-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_7x14 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 z1, z2, z3;

-  DCTELEM workspace[8*6];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 7-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/14).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[6]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[5]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[4]);

-    tmp3 = GETJSAMPLE(elemptr[3]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[6]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[5]);

-    tmp12 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[4]);

-

-    z1 = tmp0 + tmp2;

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((z1 + tmp1 + tmp3 - 7 * CENTERJSAMPLE) << PASS1_BITS);

-    tmp3 += tmp3;

-    z1 -= tmp3;

-    z1 -= tmp3;

-    z1 = MULTIPLY(z1, FIX(0.353553391));                /* (c2+c6-c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp2, FIX(0.920609002));       /* (c2+c4-c6)/2 */

-    z3 = MULTIPLY(tmp1 - tmp2, FIX(0.314692123));       /* c6 */

-    dataptr[2] = (DCTELEM) DESCALE(z1 + z2 + z3, CONST_BITS-PASS1_BITS);

-    z1 -= z2;

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(0.881747734));       /* c4 */

-    dataptr[4] = (DCTELEM)

-      DESCALE(z2 + z3 - MULTIPLY(tmp1 - tmp3, FIX(0.707106781)), /* c2+c6-c4 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[6] = (DCTELEM) DESCALE(z1 + z2, CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp1 = MULTIPLY(tmp10 + tmp11, FIX(0.935414347));   /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(tmp10 - tmp11, FIX(0.170262339));   /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(tmp11 + tmp12, - FIX(1.378756276)); /* -c1 */

-    tmp1 += tmp2;

-    tmp3 = MULTIPLY(tmp10 + tmp12, FIX(0.613604268));   /* c5 */

-    tmp0 += tmp3;

-    tmp2 += tmp3 + MULTIPLY(tmp12, FIX(1.870828693));   /* c3+c1-c5 */

-

-    dataptr[1] = (DCTELEM) DESCALE(tmp0, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp1, CONST_BITS-PASS1_BITS);

-    dataptr[5] = (DCTELEM) DESCALE(tmp2, CONST_BITS-PASS1_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 14)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/7)*(8/14) = 32/49, which we

-   * fold into the constant multipliers:

-   * 14-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/28) * 32/49.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 7; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*3];

-    tmp13 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*2];

-    tmp4 = dataptr[DCTSIZE*4] + wsptr[DCTSIZE*1];

-    tmp5 = dataptr[DCTSIZE*5] + wsptr[DCTSIZE*0];

-    tmp6 = dataptr[DCTSIZE*6] + dataptr[DCTSIZE*7];

-

-    tmp10 = tmp0 + tmp6;

-    tmp14 = tmp0 - tmp6;

-    tmp11 = tmp1 + tmp5;

-    tmp15 = tmp1 - tmp5;

-    tmp12 = tmp2 + tmp4;

-    tmp16 = tmp2 - tmp4;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*3];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*2];

-    tmp4 = dataptr[DCTSIZE*4] - wsptr[DCTSIZE*1];

-    tmp5 = dataptr[DCTSIZE*5] - wsptr[DCTSIZE*0];

-    tmp6 = dataptr[DCTSIZE*6] - dataptr[DCTSIZE*7];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12 + tmp13,

-		       FIX(0.653061224)),                 /* 32/49 */

-	      CONST_BITS+PASS1_BITS);

-    tmp13 += tmp13;

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp13, FIX(0.832106052)) + /* c4 */

-	      MULTIPLY(tmp11 - tmp13, FIX(0.205513223)) - /* c12 */

-	      MULTIPLY(tmp12 - tmp13, FIX(0.575835255)),  /* c8 */

-	      CONST_BITS+PASS1_BITS);

-

-    tmp10 = MULTIPLY(tmp14 + tmp15, FIX(0.722074570));    /* c6 */

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp14, FIX(0.178337691))   /* c2-c6 */

-	      + MULTIPLY(tmp16, FIX(0.400721155)),        /* c10 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp15, FIX(1.122795725))   /* c6+c10 */

-	      - MULTIPLY(tmp16, FIX(0.900412262)),        /* c2 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = tmp1 + tmp2;

-    tmp11 = tmp5 - tmp4;

-    dataptr[DCTSIZE*7] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp10 + tmp3 - tmp11 - tmp6,

-		       FIX(0.653061224)),                 /* 32/49 */

-	      CONST_BITS+PASS1_BITS);

-    tmp3  = MULTIPLY(tmp3 , FIX(0.653061224));            /* 32/49 */

-    tmp10 = MULTIPLY(tmp10, - FIX(0.103406812));          /* -c13 */

-    tmp11 = MULTIPLY(tmp11, FIX(0.917760839));            /* c1 */

-    tmp10 += tmp11 - tmp3;

-    tmp11 = MULTIPLY(tmp0 + tmp2, FIX(0.782007410)) +     /* c5 */

-	    MULTIPLY(tmp4 + tmp6, FIX(0.491367823));      /* c9 */

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp10 + tmp11 - MULTIPLY(tmp2, FIX(1.550341076)) /* c3+c5-c13 */

-	      + MULTIPLY(tmp4, FIX(0.731428202)),         /* c1+c11-c9 */

-	      CONST_BITS+PASS1_BITS);

-    tmp12 = MULTIPLY(tmp0 + tmp1, FIX(0.871740478)) +     /* c3 */

-	    MULTIPLY(tmp5 - tmp6, FIX(0.305035186));      /* c11 */

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(tmp10 + tmp12 - MULTIPLY(tmp1, FIX(0.276965844)) /* c3-c9-c13 */

-	      - MULTIPLY(tmp5, FIX(2.004803435)),         /* c1+c5+c11 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp11 + tmp12 + tmp3

-	      - MULTIPLY(tmp0, FIX(0.735987049))          /* c3+c5-c1 */

-	      - MULTIPLY(tmp6, FIX(0.082925825)),         /* c9-c11-c13 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 6x12 sample block.

- *

- * 6-point FDCT in pass 1 (rows), 12-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_6x12 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  DCTELEM workspace[8*4];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 6-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[5]);

-    tmp11 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) + GETJSAMPLE(elemptr[3]);

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[5]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[4]);

-    tmp2 = GETJSAMPLE(elemptr[2]) - GETJSAMPLE(elemptr[3]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp11 - 6 * CENTERJSAMPLE) << PASS1_BITS);

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(1.224744871)),                 /* c2 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(0.707106781)), /* c4 */

-	      CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = DESCALE(MULTIPLY(tmp0 + tmp2, FIX(0.366025404)),     /* c5 */

-		    CONST_BITS-PASS1_BITS);

-

-    dataptr[1] = (DCTELEM) (tmp10 + ((tmp0 + tmp1) << PASS1_BITS));

-    dataptr[3] = (DCTELEM) ((tmp0 - tmp1 - tmp2) << PASS1_BITS);

-    dataptr[5] = (DCTELEM) (tmp10 + ((tmp2 - tmp1) << PASS1_BITS));

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 12)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/6)*(8/12) = 8/9, which we

-   * fold into the constant multipliers:

-   * 12-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/24) * 8/9.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*3];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*2];

-    tmp2 = dataptr[DCTSIZE*2] + wsptr[DCTSIZE*1];

-    tmp3 = dataptr[DCTSIZE*3] + wsptr[DCTSIZE*0];

-    tmp4 = dataptr[DCTSIZE*4] + dataptr[DCTSIZE*7];

-    tmp5 = dataptr[DCTSIZE*5] + dataptr[DCTSIZE*6];

-

-    tmp10 = tmp0 + tmp5;

-    tmp13 = tmp0 - tmp5;

-    tmp11 = tmp1 + tmp4;

-    tmp14 = tmp1 - tmp4;

-    tmp12 = tmp2 + tmp3;

-    tmp15 = tmp2 - tmp3;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*3];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*2];

-    tmp2 = dataptr[DCTSIZE*2] - wsptr[DCTSIZE*1];

-    tmp3 = dataptr[DCTSIZE*3] - wsptr[DCTSIZE*0];

-    tmp4 = dataptr[DCTSIZE*4] - dataptr[DCTSIZE*7];

-    tmp5 = dataptr[DCTSIZE*5] - dataptr[DCTSIZE*6];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12, FIX(0.888888889)), /* 8/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp13 - tmp14 - tmp15, FIX(0.888888889)), /* 8/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.088662108)),         /* c4 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp14 - tmp15, FIX(0.888888889)) +        /* 8/9 */

-	      MULTIPLY(tmp13 + tmp15, FIX(1.214244803)),         /* c2 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp1 + tmp4, FIX(0.481063200));   /* c9 */

-    tmp14 = tmp10 + MULTIPLY(tmp1, FIX(0.680326102));  /* c3-c9 */

-    tmp15 = tmp10 - MULTIPLY(tmp4, FIX(1.642452502));  /* c3+c9 */

-    tmp12 = MULTIPLY(tmp0 + tmp2, FIX(0.997307603));   /* c5 */

-    tmp13 = MULTIPLY(tmp0 + tmp3, FIX(0.765261039));   /* c7 */

-    tmp10 = tmp12 + tmp13 + tmp14 - MULTIPLY(tmp0, FIX(0.516244403)) /* c5+c7-c1 */

-	    + MULTIPLY(tmp5, FIX(0.164081699));        /* c11 */

-    tmp11 = MULTIPLY(tmp2 + tmp3, - FIX(0.164081699)); /* -c11 */

-    tmp12 += tmp11 - tmp15 - MULTIPLY(tmp2, FIX(2.079550144)) /* c1+c5-c11 */

-	    + MULTIPLY(tmp5, FIX(0.765261039));        /* c7 */

-    tmp13 += tmp11 - tmp14 + MULTIPLY(tmp3, FIX(0.645144899)) /* c1+c11-c7 */

-	    - MULTIPLY(tmp5, FIX(0.997307603));        /* c5 */

-    tmp11 = tmp15 + MULTIPLY(tmp0 - tmp3, FIX(1.161389302)) /* c3 */

-	    - MULTIPLY(tmp2 + tmp5, FIX(0.481063200)); /* c9 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp10, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp11, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp13, CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 5x10 sample block.

- *

- * 5-point FDCT in pass 1 (rows), 10-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_5x10 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4;

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  DCTELEM workspace[8*2];

-  DCTELEM *dataptr;

-  DCTELEM *wsptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 5-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/10).

-   */

-

-  dataptr = data;

-  ctr = 0;

-  for (;;) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[4]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[3]);

-    tmp2 = GETJSAMPLE(elemptr[2]);

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-

-    tmp0 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[4]);

-    tmp1 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[3]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp10 + tmp2 - 5 * CENTERJSAMPLE) << PASS1_BITS);

-    tmp11 = MULTIPLY(tmp11, FIX(0.790569415));          /* (c2+c4)/2 */

-    tmp10 -= tmp2 << 2;

-    tmp10 = MULTIPLY(tmp10, FIX(0.353553391));          /* (c2-c4)/2 */

-    dataptr[2] = (DCTELEM) DESCALE(tmp11 + tmp10, CONST_BITS-PASS1_BITS);

-    dataptr[4] = (DCTELEM) DESCALE(tmp11 - tmp10, CONST_BITS-PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp1, FIX(0.831253876));    /* c3 */

-

-    dataptr[1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0, FIX(0.513743148)), /* c1-c3 */

-	      CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp1, FIX(2.176250899)), /* c1+c3 */

-	      CONST_BITS-PASS1_BITS);

-

-    ctr++;

-

-    if (ctr != DCTSIZE) {

-      if (ctr == 10)

-	break;			/* Done. */

-      dataptr += DCTSIZE;	/* advance pointer to next row */

-    } else

-      dataptr = workspace;	/* switch pointer to extended workspace */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/5)*(8/10) = 32/25, which we

-   * fold into the constant multipliers:

-   * 10-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/20) * 32/25.

-   */

-

-  dataptr = data;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 5; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + wsptr[DCTSIZE*1];

-    tmp1 = dataptr[DCTSIZE*1] + wsptr[DCTSIZE*0];

-    tmp12 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*7];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*6];

-    tmp4 = dataptr[DCTSIZE*4] + dataptr[DCTSIZE*5];

-

-    tmp10 = tmp0 + tmp4;

-    tmp13 = tmp0 - tmp4;

-    tmp11 = tmp1 + tmp3;

-    tmp14 = tmp1 - tmp3;

-

-    tmp0 = dataptr[DCTSIZE*0] - wsptr[DCTSIZE*1];

-    tmp1 = dataptr[DCTSIZE*1] - wsptr[DCTSIZE*0];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*7];

-    tmp3 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*6];

-    tmp4 = dataptr[DCTSIZE*4] - dataptr[DCTSIZE*5];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11 + tmp12, FIX(1.28)), /* 32/25 */

-	      CONST_BITS+PASS1_BITS);

-    tmp12 += tmp12;

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp12, FIX(1.464477191)) - /* c4 */

-	      MULTIPLY(tmp11 - tmp12, FIX(0.559380511)),  /* c8 */

-	      CONST_BITS+PASS1_BITS);

-    tmp10 = MULTIPLY(tmp13 + tmp14, FIX(1.064004961));    /* c6 */

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp13, FIX(0.657591230)),  /* c2-c6 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      DESCALE(tmp10 - MULTIPLY(tmp14, FIX(2.785601151)),  /* c2+c6 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = tmp0 + tmp4;

-    tmp11 = tmp1 - tmp3;

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp2, FIX(1.28)),  /* 32/25 */

-	      CONST_BITS+PASS1_BITS);

-    tmp2 = MULTIPLY(tmp2, FIX(1.28));                     /* 32/25 */

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0, FIX(1.787906876)) +          /* c1 */

-	      MULTIPLY(tmp1, FIX(1.612894094)) + tmp2 +   /* c3 */

-	      MULTIPLY(tmp3, FIX(0.821810588)) +          /* c7 */

-	      MULTIPLY(tmp4, FIX(0.283176630)),           /* c9 */

-	      CONST_BITS+PASS1_BITS);

-    tmp12 = MULTIPLY(tmp0 - tmp4, FIX(1.217352341)) -     /* (c3+c7)/2 */

-	    MULTIPLY(tmp1 + tmp3, FIX(0.752365123));      /* (c1-c9)/2 */

-    tmp13 = MULTIPLY(tmp10 + tmp11, FIX(0.395541753)) +   /* (c3-c7)/2 */

-	    MULTIPLY(tmp11, FIX(0.64)) - tmp2;            /* 16/25 */

-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp12 + tmp13, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp12 - tmp13, CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-    wsptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 4x8 sample block.

- *

- * 4-point FDCT in pass 1 (rows), 8-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_4x8 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We must also scale the output by 8/4 = 2, which we add here.

-   * 4-point FDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]);

-    tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]);

-

-    tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]);

-    tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 - 4 * CENTERJSAMPLE) << (PASS1_BITS+1));

-    dataptr[2] = (DCTELEM) ((tmp0 - tmp1) << (PASS1_BITS+1));

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-2);

-

-    dataptr[1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS-PASS1_BITS-1);

-    dataptr[3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS-PASS1_BITS-1);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * 8-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    /* Even part per LL&M figure 1 --- note that published figure is faulty;

-     * rotator "c1" should be "c6".

-     */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];

-

-    /* Add fudge factor here for final descale. */

-    tmp10 = tmp0 + tmp3 + (ONE << (PASS1_BITS-1));

-    tmp12 = tmp0 - tmp3;

-    tmp11 = tmp1 + tmp2;

-    tmp13 = tmp1 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];

-    tmp3 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp10 + tmp11, PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM) RIGHT_SHIFT(tmp10 - tmp11, PASS1_BITS);

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      RIGHT_SHIFT(z1 + MULTIPLY(tmp12, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*6] = (DCTELEM)

-      RIGHT_SHIFT(z1 - MULTIPLY(tmp13, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS+PASS1_BITS);

-

-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).

-     * i0..i3 in the paper are tmp0..tmp3 here.

-     */

-

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(tmp12 + tmp13, FIX_1_175875602);       /*  c3 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS+PASS1_BITS-1);

-

-    tmp12 = MULTIPLY(tmp12, - FIX_0_390180644);          /* -c3+c5 */

-    tmp13 = MULTIPLY(tmp13, - FIX_1_961570560);          /* -c3-c5 */

-    tmp12 += z1;

-    tmp13 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223);       /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_1_501321110);              /*  c1+c3-c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_0_298631336);              /* -c1+c3+c5-c7 */

-    tmp0 += z1 + tmp12;

-    tmp3 += z1 + tmp13;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447);       /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_3_072711026);              /*  c1+c3+c5-c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_2_053119869);              /*  c1+c3-c5+c7 */

-    tmp1 += z1 + tmp13;

-    tmp2 += z1 + tmp12;

-

-    dataptr[DCTSIZE*1] = (DCTELEM) RIGHT_SHIFT(tmp0, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM) RIGHT_SHIFT(tmp1, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM) RIGHT_SHIFT(tmp2, CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*7] = (DCTELEM) RIGHT_SHIFT(tmp3, CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 3x6 sample block.

- *

- * 3-point FDCT in pass 1 (rows), 6-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_3x6 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1, tmp2;

-  INT32 tmp10, tmp11, tmp12;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * We scale the results further by 2 as part of output adaption

-   * scaling for different DCT size.

-   * 3-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/6).

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 6; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[2]);

-    tmp1 = GETJSAMPLE(elemptr[1]);

-

-    tmp2 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[2]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM)

-      ((tmp0 + tmp1 - 3 * CENTERJSAMPLE) << (PASS1_BITS+1));

-    dataptr[2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp1, FIX(0.707106781)), /* c2 */

-	      CONST_BITS-PASS1_BITS-1);

-

-    /* Odd part */

-

-    dataptr[1] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp2, FIX(1.224744871)),               /* c1 */

-	      CONST_BITS-PASS1_BITS-1);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We remove the PASS1_BITS scaling, but leave the results scaled up

-   * by an overall factor of 8.

-   * We must also scale the output by (8/6)*(8/3) = 32/9, which we partially

-   * fold into the constant multipliers (other part was done in pass 1):

-   * 6-point FDCT kernel, cK represents sqrt(2) * cos(K*pi/12) * 16/9.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 3; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*5];

-    tmp11 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*3];

-

-    tmp10 = tmp0 + tmp2;

-    tmp12 = tmp0 - tmp2;

-

-    tmp0 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*5];

-    tmp1 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*4];

-    tmp2 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*3];

-

-    dataptr[DCTSIZE*0] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 + tmp11, FIX(1.777777778)),         /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*2] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp12, FIX(2.177324216)),                 /* c2 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*4] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp10 - tmp11 - tmp11, FIX(1.257078722)), /* c4 */

-	      CONST_BITS+PASS1_BITS);

-

-    /* Odd part */

-

-    tmp10 = MULTIPLY(tmp0 + tmp2, FIX(0.650711829));             /* c5 */

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp0 + tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      DESCALE(MULTIPLY(tmp0 - tmp1 - tmp2, FIX(1.777777778)),    /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-    dataptr[DCTSIZE*5] = (DCTELEM)

-      DESCALE(tmp10 + MULTIPLY(tmp2 - tmp1, FIX(1.777777778)),   /* 16/9 */

-	      CONST_BITS+PASS1_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 2x4 sample block.

- *

- * 2-point FDCT in pass 1 (rows), 4-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_2x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  INT32 tmp0, tmp1;

-  INT32 tmp10, tmp11;

-  DCTELEM *dataptr;

-  JSAMPROW elemptr;

-  int ctr;

-  SHIFT_TEMPS

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: process rows.

-   * Note results are scaled up by sqrt(8) compared to a true DCT.

-   * We must also scale the output by (8/2)*(8/4) = 2**3, which we add here.

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 4; ctr++) {

-    elemptr = sample_data[ctr] + start_col;

-

-    /* Even part */

-

-    tmp0 = GETJSAMPLE(elemptr[0]);

-    tmp1 = GETJSAMPLE(elemptr[1]);

-

-    /* Apply unsigned->signed conversion. */

-    dataptr[0] = (DCTELEM) ((tmp0 + tmp1 - 2 * CENTERJSAMPLE) << 3);

-

-    /* Odd part */

-

-    dataptr[1] = (DCTELEM) ((tmp0 - tmp1) << 3);

-

-    dataptr += DCTSIZE;		/* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * 4-point FDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT].

-   */

-

-  dataptr = data;

-  for (ctr = 0; ctr < 2; ctr++) {

-    /* Even part */

-

-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*3];

-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*2];

-

-    tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*3];

-    tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*2];

-

-    dataptr[DCTSIZE*0] = (DCTELEM) (tmp0 + tmp1);

-    dataptr[DCTSIZE*2] = (DCTELEM) (tmp0 - tmp1);

-

-    /* Odd part */

-

-    tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100);       /* c6 */

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-1);

-

-    dataptr[DCTSIZE*1] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */

-		  CONST_BITS);

-    dataptr[DCTSIZE*3] = (DCTELEM)

-      RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */

-		  CONST_BITS);

-

-    dataptr++;			/* advance pointer to next column */

-  }

-}

-

-

-/*

- * Perform the forward DCT on a 1x2 sample block.

- *

- * 1-point FDCT in pass 1 (rows), 2-point in pass 2 (columns).

- */

-

-GLOBAL(void)

-jpeg_fdct_1x2 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col)

-{

-  DCTELEM tmp0, tmp1;

-

-  /* Pre-zero output coefficient block. */

-  MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2);

-

-  /* Pass 1: empty. */

-

-  /* Pass 2: process columns.

-   * We leave the results scaled up by an overall factor of 8.

-   * We must also scale the output by (8/1)*(8/2) = 2**5.

-   */

-

-  /* Even part */

-

-  tmp0 = GETJSAMPLE(sample_data[0][start_col]);

-  tmp1 = GETJSAMPLE(sample_data[1][start_col]);

-

-  /* Apply unsigned->signed conversion. */

-  data[DCTSIZE*0] = (tmp0 + tmp1 - 2 * CENTERJSAMPLE) << 5;

-

-  /* Odd part */

-

-  data[DCTSIZE*1] = (tmp0 - tmp1) << 5;

-}

-

-#endif /* DCT_SCALING_SUPPORTED */

-#endif /* DCT_ISLOW_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jidctflt.c b/plugins/AdvaImg/src/LibJPEG/jidctflt.c
deleted file mode 100644
index ce2499f299..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jidctflt.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*

- * jidctflt.c

- *

- * Copyright (C) 1994-1998, Thomas G. Lane.

- * Modified 2010-2015 by Guido Vollbeding.

- * 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 a floating-point implementation of the

- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine

- * must also perform dequantization of the input coefficients.

- *

- * This implementation should be more accurate than either of the integer

- * IDCT implementations.  However, it may not give the same results on all

- * machines because of differences in roundoff behavior.  Speed will depend

- * on the hardware's floating point capacity.

- *

- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT

- * on each row (or vice versa, but it's more convenient to emit a row at

- * a time).  Direct algorithms are also available, but they are much more

- * complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on Arai, Agui, and Nakajima's algorithm for

- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in

- * Japanese, but the algorithm is described in the Pennebaker & Mitchell

- * JPEG textbook (see REFERENCES section in file README).  The following code

- * is based directly on figure 4-8 in P&M.

- * While an 8-point DCT cannot be done in less than 11 multiplies, it is

- * possible to arrange the computation so that many of the multiplies are

- * simple scalings of the final outputs.  These multiplies can then be

- * folded into the multiplications or divisions by the JPEG quantization

- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds

- * to be done in the DCT itself.

- * The primary disadvantage of this method is that with a fixed-point

- * implementation, accuracy is lost due to imprecise representation of the

- * scaled quantization values.  However, that problem does not arise if

- * we use floating point arithmetic.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_FLOAT_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */

-#endif

-

-

-/* Dequantize a coefficient by multiplying it by the multiplier-table

- * entry; produce a float result.

- */

-

-#define DEQUANTIZE(coef,quantval)  (((FAST_FLOAT) (coef)) * (quantval))

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients.

- *

- * cK represents cos(K*pi/16).

- */

-

-GLOBAL(void)

-jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;

-  FAST_FLOAT z5, z10, z11, z12, z13;

-  JCOEFPTR inptr;

-  FLOAT_MULT_TYPE * quantptr;

-  FAST_FLOAT * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = DCTSIZE; ctr > 0; ctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any column in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * column DCT calculations can be simplified this way.

-     */

-

-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&

-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&

-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&

-	inptr[DCTSIZE*7] == 0) {

-      /* AC terms all zero */

-      FAST_FLOAT dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-

-      wsptr[DCTSIZE*0] = dcval;

-      wsptr[DCTSIZE*1] = dcval;

-      wsptr[DCTSIZE*2] = dcval;

-      wsptr[DCTSIZE*3] = dcval;

-      wsptr[DCTSIZE*4] = dcval;

-      wsptr[DCTSIZE*5] = dcval;

-      wsptr[DCTSIZE*6] = dcval;

-      wsptr[DCTSIZE*7] = dcval;

-

-      inptr++;			/* advance pointers to next column */

-      quantptr++;

-      wsptr++;

-      continue;

-    }

-

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp10 = tmp0 + tmp2;	/* phase 3 */

-    tmp11 = tmp0 - tmp2;

-

-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */

-    tmp12 = (tmp1 - tmp3) * ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */

-

-    tmp0 = tmp10 + tmp13;	/* phase 2 */

-    tmp3 = tmp10 - tmp13;

-    tmp1 = tmp11 + tmp12;

-    tmp2 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    z13 = tmp6 + tmp5;		/* phase 6 */

-    z10 = tmp6 - tmp5;

-    z11 = tmp4 + tmp7;

-    z12 = tmp4 - tmp7;

-

-    tmp7 = z11 + z13;		/* phase 5 */

-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */

-

-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */

-    tmp10 = z5 - z12 * ((FAST_FLOAT) 1.082392200); /* 2*(c2-c6) */

-    tmp12 = z5 - z10 * ((FAST_FLOAT) 2.613125930); /* 2*(c2+c6) */

-

-    tmp6 = tmp12 - tmp7;	/* phase 2 */

-    tmp5 = tmp11 - tmp6;

-    tmp4 = tmp10 - tmp5;

-

-    wsptr[DCTSIZE*0] = tmp0 + tmp7;

-    wsptr[DCTSIZE*7] = tmp0 - tmp7;

-    wsptr[DCTSIZE*1] = tmp1 + tmp6;

-    wsptr[DCTSIZE*6] = tmp1 - tmp6;

-    wsptr[DCTSIZE*2] = tmp2 + tmp5;

-    wsptr[DCTSIZE*5] = tmp2 - tmp5;

-    wsptr[DCTSIZE*3] = tmp3 + tmp4;

-    wsptr[DCTSIZE*4] = tmp3 - tmp4;

-

-    inptr++;			/* advance pointers to next column */

-    quantptr++;

-    wsptr++;

-  }

-

-  /* Pass 2: process rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-    /* Rows of zeroes can be exploited in the same way as we did with columns.

-     * However, the column calculation has created many nonzero AC terms, so

-     * the simplification applies less often (typically 5% to 10% of the time).

-     * And testing floats for zero is relatively expensive, so we don't bother.

-     */

-

-    /* Even part */

-

-    /* Prepare range-limit and float->int conversion */

-    z5 = wsptr[0] + (((FAST_FLOAT) RANGE_CENTER) + ((FAST_FLOAT) 0.5));

-    tmp10 = z5 + wsptr[4];

-    tmp11 = z5 - wsptr[4];

-

-    tmp13 = wsptr[2] + wsptr[6];

-    tmp12 = (wsptr[2] - wsptr[6]) *

-	      ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */

-

-    tmp0 = tmp10 + tmp13;

-    tmp3 = tmp10 - tmp13;

-    tmp1 = tmp11 + tmp12;

-    tmp2 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z13 = wsptr[5] + wsptr[3];

-    z10 = wsptr[5] - wsptr[3];

-    z11 = wsptr[1] + wsptr[7];

-    z12 = wsptr[1] - wsptr[7];

-

-    tmp7 = z11 + z13;		/* phase 5 */

-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */

-

-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */

-    tmp10 = z5 - z12 * ((FAST_FLOAT) 1.082392200); /* 2*(c2-c6) */

-    tmp12 = z5 - z10 * ((FAST_FLOAT) 2.613125930); /* 2*(c2+c6) */

-

-    tmp6 = tmp12 - tmp7;	/* phase 2 */

-    tmp5 = tmp11 - tmp6;

-    tmp4 = tmp10 - tmp5;

-

-    /* Final output stage: float->int conversion and range-limit */

-

-    outptr[0] = range_limit[(int) (tmp0 + tmp7) & RANGE_MASK];

-    outptr[7] = range_limit[(int) (tmp0 - tmp7) & RANGE_MASK];

-    outptr[1] = range_limit[(int) (tmp1 + tmp6) & RANGE_MASK];

-    outptr[6] = range_limit[(int) (tmp1 - tmp6) & RANGE_MASK];

-    outptr[2] = range_limit[(int) (tmp2 + tmp5) & RANGE_MASK];

-    outptr[5] = range_limit[(int) (tmp2 - tmp5) & RANGE_MASK];

-    outptr[3] = range_limit[(int) (tmp3 + tmp4) & RANGE_MASK];

-    outptr[4] = range_limit[(int) (tmp3 - tmp4) & RANGE_MASK];

-

-    wsptr += DCTSIZE;		/* advance pointer to next row */

-  }

-}

-

-#endif /* DCT_FLOAT_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jidctfst.c b/plugins/AdvaImg/src/LibJPEG/jidctfst.c
deleted file mode 100644
index 0c197ced77..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jidctfst.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*

- * jidctfst.c

- *

- * Copyright (C) 1994-1998, Thomas G. Lane.

- * Modified 2015 by Guido Vollbeding.

- * 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 a fast, not so accurate integer implementation of the

- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine

- * must also perform dequantization of the input coefficients.

- *

- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT

- * on each row (or vice versa, but it's more convenient to emit a row at

- * a time).  Direct algorithms are also available, but they are much more

- * complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on Arai, Agui, and Nakajima's algorithm for

- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in

- * Japanese, but the algorithm is described in the Pennebaker & Mitchell

- * JPEG textbook (see REFERENCES section in file README).  The following code

- * is based directly on figure 4-8 in P&M.

- * While an 8-point DCT cannot be done in less than 11 multiplies, it is

- * possible to arrange the computation so that many of the multiplies are

- * simple scalings of the final outputs.  These multiplies can then be

- * folded into the multiplications or divisions by the JPEG quantization

- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds

- * to be done in the DCT itself.

- * The primary disadvantage of this method is that with fixed-point math,

- * accuracy is lost due to imprecise representation of the scaled

- * quantization values.  The smaller the quantization table entry, the less

- * precise the scaled value, so this implementation does worse with high-

- * quality-setting files than with low-quality ones.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_IFAST_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */

-#endif

-

-

-/* Scaling decisions are generally the same as in the LL&M algorithm;

- * see jidctint.c for more details.  However, we choose to descale

- * (right shift) multiplication products as soon as they are formed,

- * rather than carrying additional fractional bits into subsequent additions.

- * This compromises accuracy slightly, but it lets us save a few shifts.

- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)

- * everywhere except in the multiplications proper; this saves a good deal

- * of work on 16-bit-int machines.

- *

- * The dequantized coefficients are not integers because the AA&N scaling

- * factors have been incorporated.  We represent them scaled up by PASS1_BITS,

- * so that the first and second IDCT rounds have the same input scaling.

- * For 8-bit JSAMPLEs, we choose IFAST_SCALE_BITS = PASS1_BITS so as to

- * avoid a descaling shift; this compromises accuracy rather drastically

- * for small quantization table entries, but it saves a lot of shifts.

- * For 12-bit JSAMPLEs, there's no hope of using 16x16 multiplies anyway,

- * so we use a much larger scaling factor to preserve accuracy.

- *

- * A final compromise is to represent the multiplicative constants to only

- * 8 fractional bits, rather than 13.  This saves some shifting work on some

- * machines, and may also reduce the cost of multiplication (since there

- * are fewer one-bits in the constants).

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define CONST_BITS  8

-#define PASS1_BITS  2

-#else

-#define CONST_BITS  8

-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */

-#endif

-

-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus

- * causing a lot of useless floating-point operations at run time.

- * To get around this we use the following pre-calculated constants.

- * If you change CONST_BITS you may want to add appropriate values.

- * (With a reasonable C compiler, you can just rely on the FIX() macro...)

- */

-

-#if CONST_BITS == 8

-#define FIX_1_082392200  ((INT32)  277)		/* FIX(1.082392200) */

-#define FIX_1_414213562  ((INT32)  362)		/* FIX(1.414213562) */

-#define FIX_1_847759065  ((INT32)  473)		/* FIX(1.847759065) */

-#define FIX_2_613125930  ((INT32)  669)		/* FIX(2.613125930) */

-#else

-#define FIX_1_082392200  FIX(1.082392200)

-#define FIX_1_414213562  FIX(1.414213562)

-#define FIX_1_847759065  FIX(1.847759065)

-#define FIX_2_613125930  FIX(2.613125930)

-#endif

-

-

-/* We can gain a little more speed, with a further compromise in accuracy,

- * by omitting the addition in a descaling shift.  This yields an incorrectly

- * rounded result half the time...

- */

-

-#ifndef USE_ACCURATE_ROUNDING

-#undef DESCALE

-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)

-#endif

-

-

-/* Multiply a DCTELEM variable by an INT32 constant, and immediately

- * descale to yield a DCTELEM result.

- */

-

-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))

-

-

-/* Dequantize a coefficient by multiplying it by the multiplier-table

- * entry; produce a DCTELEM result.  For 8-bit data a 16x16->16

- * multiplication will do.  For 12-bit data, the multiplier table is

- * declared INT32, so a 32-bit multiply will be used.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define DEQUANTIZE(coef,quantval)  (((IFAST_MULT_TYPE) (coef)) * (quantval))

-#else

-#define DEQUANTIZE(coef,quantval)  \

-	DESCALE((coef)*(quantval), IFAST_SCALE_BITS-PASS1_BITS)

-#endif

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients.

- *

- * cK represents cos(K*pi/16).

- */

-

-GLOBAL(void)

-jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;

-  DCTELEM tmp10, tmp11, tmp12, tmp13;

-  DCTELEM z5, z10, z11, z12, z13;

-  JCOEFPTR inptr;

-  IFAST_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[DCTSIZE2];	/* buffers data between passes */

-  SHIFT_TEMPS			/* for DESCALE */

-  ISHIFT_TEMPS			/* for IRIGHT_SHIFT */

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (IFAST_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = DCTSIZE; ctr > 0; ctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any column in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * column DCT calculations can be simplified this way.

-     */

-    

-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&

-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&

-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&

-	inptr[DCTSIZE*7] == 0) {

-      /* AC terms all zero */

-      int dcval = (int) DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-

-      wsptr[DCTSIZE*0] = dcval;

-      wsptr[DCTSIZE*1] = dcval;

-      wsptr[DCTSIZE*2] = dcval;

-      wsptr[DCTSIZE*3] = dcval;

-      wsptr[DCTSIZE*4] = dcval;

-      wsptr[DCTSIZE*5] = dcval;

-      wsptr[DCTSIZE*6] = dcval;

-      wsptr[DCTSIZE*7] = dcval;

-      

-      inptr++;			/* advance pointers to next column */

-      quantptr++;

-      wsptr++;

-      continue;

-    }

-    

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp10 = tmp0 + tmp2;	/* phase 3 */

-    tmp11 = tmp0 - tmp2;

-

-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */

-    tmp12 = MULTIPLY(tmp1 - tmp3, FIX_1_414213562) - tmp13; /* 2*c4 */

-

-    tmp0 = tmp10 + tmp13;	/* phase 2 */

-    tmp3 = tmp10 - tmp13;

-    tmp1 = tmp11 + tmp12;

-    tmp2 = tmp11 - tmp12;

-    

-    /* Odd part */

-

-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    z13 = tmp6 + tmp5;		/* phase 6 */

-    z10 = tmp6 - tmp5;

-    z11 = tmp4 + tmp7;

-    z12 = tmp4 - tmp7;

-

-    tmp7 = z11 + z13;		/* phase 5 */

-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */

-

-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */

-    tmp10 = z5 - MULTIPLY(z12, FIX_1_082392200); /* 2*(c2-c6) */

-    tmp12 = z5 - MULTIPLY(z10, FIX_2_613125930); /* 2*(c2+c6) */

-

-    tmp6 = tmp12 - tmp7;	/* phase 2 */

-    tmp5 = tmp11 - tmp6;

-    tmp4 = tmp10 - tmp5;

-

-    wsptr[DCTSIZE*0] = (int) (tmp0 + tmp7);

-    wsptr[DCTSIZE*7] = (int) (tmp0 - tmp7);

-    wsptr[DCTSIZE*1] = (int) (tmp1 + tmp6);

-    wsptr[DCTSIZE*6] = (int) (tmp1 - tmp6);

-    wsptr[DCTSIZE*2] = (int) (tmp2 + tmp5);

-    wsptr[DCTSIZE*5] = (int) (tmp2 - tmp5);

-    wsptr[DCTSIZE*3] = (int) (tmp3 + tmp4);

-    wsptr[DCTSIZE*4] = (int) (tmp3 - tmp4);

-

-    inptr++;			/* advance pointers to next column */

-    quantptr++;

-    wsptr++;

-  }

-  

-  /* Pass 2: process rows from work array, store into output array.

-   * Note that we must descale the results by a factor of 8 == 2**3,

-   * and also undo the PASS1_BITS scaling.

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z5 = (DCTELEM) wsptr[0] +

-	   ((((DCTELEM) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (1 << (PASS1_BITS+2)));

-

-    /* Rows of zeroes can be exploited in the same way as we did with columns.

-     * However, the column calculation has created many nonzero AC terms, so

-     * the simplification applies less often (typically 5% to 10% of the time).

-     * On machines with very fast multiplication, it's possible that the

-     * test takes more time than it's worth.  In that case this section

-     * may be commented out.

-     */

-    

-#ifndef NO_ZERO_ROW_TEST

-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&

-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {

-      /* AC terms all zero */

-      JSAMPLE dcval = range_limit[(int) IRIGHT_SHIFT(z5, PASS1_BITS+3)

-				  & RANGE_MASK];

-      

-      outptr[0] = dcval;

-      outptr[1] = dcval;

-      outptr[2] = dcval;

-      outptr[3] = dcval;

-      outptr[4] = dcval;

-      outptr[5] = dcval;

-      outptr[6] = dcval;

-      outptr[7] = dcval;

-

-      wsptr += DCTSIZE;		/* advance pointer to next row */

-      continue;

-    }

-#endif

-    

-    /* Even part */

-

-    tmp10 = z5 + (DCTELEM) wsptr[4];

-    tmp11 = z5 - (DCTELEM) wsptr[4];

-

-    tmp13 = (DCTELEM) wsptr[2] + (DCTELEM) wsptr[6];

-    tmp12 = MULTIPLY((DCTELEM) wsptr[2] - (DCTELEM) wsptr[6],

-		     FIX_1_414213562) - tmp13; /* 2*c4 */

-

-    tmp0 = tmp10 + tmp13;

-    tmp3 = tmp10 - tmp13;

-    tmp1 = tmp11 + tmp12;

-    tmp2 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z13 = (DCTELEM) wsptr[5] + (DCTELEM) wsptr[3];

-    z10 = (DCTELEM) wsptr[5] - (DCTELEM) wsptr[3];

-    z11 = (DCTELEM) wsptr[1] + (DCTELEM) wsptr[7];

-    z12 = (DCTELEM) wsptr[1] - (DCTELEM) wsptr[7];

-

-    tmp7 = z11 + z13;		/* phase 5 */

-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */

-

-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */

-    tmp10 = z5 - MULTIPLY(z12, FIX_1_082392200); /* 2*(c2-c6) */

-    tmp12 = z5 - MULTIPLY(z10, FIX_2_613125930); /* 2*(c2+c6) */

-

-    tmp6 = tmp12 - tmp7;	/* phase 2 */

-    tmp5 = tmp11 - tmp6;

-    tmp4 = tmp10 - tmp5;

-

-    /* Final output stage: scale down by a factor of 8 and range-limit */

-

-    outptr[0] = range_limit[(int) IRIGHT_SHIFT(tmp0 + tmp7, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) IRIGHT_SHIFT(tmp0 - tmp7, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) IRIGHT_SHIFT(tmp1 + tmp6, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) IRIGHT_SHIFT(tmp1 - tmp6, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) IRIGHT_SHIFT(tmp2 + tmp5, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) IRIGHT_SHIFT(tmp2 - tmp5, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) IRIGHT_SHIFT(tmp3 + tmp4, PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) IRIGHT_SHIFT(tmp3 - tmp4, PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += DCTSIZE;		/* advance pointer to next row */

-  }

-}

-

-#endif /* DCT_IFAST_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jidctint.c b/plugins/AdvaImg/src/LibJPEG/jidctint.c
deleted file mode 100644
index 2d7ecdae91..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jidctint.c
+++ /dev/null
@@ -1,5239 +0,0 @@
-/*

- * jidctint.c

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modification developed 2002-2015 by Guido Vollbeding.

- * 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 a slow-but-accurate integer implementation of the

- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine

- * must also perform dequantization of the input coefficients.

- *

- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT

- * on each row (or vice versa, but it's more convenient to emit a row at

- * a time).  Direct algorithms are also available, but they are much more

- * complex and seem not to be any faster when reduced to code.

- *

- * This implementation is based on an algorithm described in

- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT

- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,

- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.

- * The primary algorithm described there uses 11 multiplies and 29 adds.

- * We use their alternate method with 12 multiplies and 32 adds.

- * The advantage of this method is that no data path contains more than one

- * multiplication; this allows a very simple and accurate implementation in

- * scaled fixed-point arithmetic, with a minimal number of shifts.

- *

- * We also provide IDCT routines with various output sample block sizes for

- * direct resolution reduction or enlargement and for direct resolving the

- * common 2x1 and 1x2 subsampling cases without additional resampling: NxN

- * (N=1...16), 2NxN, and Nx2N (N=1...8) pixels for one 8x8 input DCT block.

- *

- * For N<8 we simply take the corresponding low-frequency coefficients of

- * the 8x8 input DCT block and apply an NxN point IDCT on the sub-block

- * to yield the downscaled outputs.

- * This can be seen as direct low-pass downsampling from the DCT domain

- * point of view rather than the usual spatial domain point of view,

- * yielding significant computational savings and results at least

- * as good as common bilinear (averaging) spatial downsampling.

- *

- * For N>8 we apply a partial NxN IDCT on the 8 input coefficients as

- * lower frequencies and higher frequencies assumed to be zero.

- * It turns out that the computational effort is similar to the 8x8 IDCT

- * regarding the output size.

- * Furthermore, the scaling and descaling is the same for all IDCT sizes.

- *

- * CAUTION: We rely on the FIX() macro except for the N=1,2,4,8 cases

- * since there would be too many additional constants to pre-calculate.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jdct.h"		/* Private declarations for DCT subsystem */

-

-#ifdef DCT_ISLOW_SUPPORTED

-

-

-/*

- * This module is specialized to the case DCTSIZE = 8.

- */

-

-#if DCTSIZE != 8

-  Sorry, this code only copes with 8x8 DCT blocks. /* deliberate syntax err */

-#endif

-

-

-/*

- * The poop on this scaling stuff is as follows:

- *

- * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)

- * larger than the true IDCT outputs.  The final outputs are therefore

- * a factor of N larger than desired; since N=8 this can be cured by

- * a simple right shift at the end of the algorithm.  The advantage of

- * this arrangement is that we save two multiplications per 1-D IDCT,

- * because the y0 and y4 inputs need not be divided by sqrt(N).

- *

- * We have to do addition and subtraction of the integer inputs, which

- * is no problem, and multiplication by fractional constants, which is

- * a problem to do in integer arithmetic.  We multiply all the constants

- * by CONST_SCALE and convert them to integer constants (thus retaining

- * CONST_BITS bits of precision in the constants).  After doing a

- * multiplication we have to divide the product by CONST_SCALE, with proper

- * rounding, to produce the correct output.  This division can be done

- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting

- * as long as possible so that partial sums can be added together with

- * full fractional precision.

- *

- * The outputs of the first pass are scaled up by PASS1_BITS bits so that

- * they are represented to better-than-integral precision.  These outputs

- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word

- * with the recommended scaling.  (To scale up 12-bit sample data further, an

- * intermediate INT32 array would be needed.)

- *

- * To avoid overflow of the 32-bit intermediate results in pass 2, we must

- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis

- * shows that the values given below are the most effective.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define CONST_BITS  13

-#define PASS1_BITS  2

-#else

-#define CONST_BITS  13

-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */

-#endif

-

-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus

- * causing a lot of useless floating-point operations at run time.

- * To get around this we use the following pre-calculated constants.

- * If you change CONST_BITS you may want to add appropriate values.

- * (With a reasonable C compiler, you can just rely on the FIX() macro...)

- */

-

-#if CONST_BITS == 13

-#define FIX_0_298631336  ((INT32)  2446)	/* FIX(0.298631336) */

-#define FIX_0_390180644  ((INT32)  3196)	/* FIX(0.390180644) */

-#define FIX_0_541196100  ((INT32)  4433)	/* FIX(0.541196100) */

-#define FIX_0_765366865  ((INT32)  6270)	/* FIX(0.765366865) */

-#define FIX_0_899976223  ((INT32)  7373)	/* FIX(0.899976223) */

-#define FIX_1_175875602  ((INT32)  9633)	/* FIX(1.175875602) */

-#define FIX_1_501321110  ((INT32)  12299)	/* FIX(1.501321110) */

-#define FIX_1_847759065  ((INT32)  15137)	/* FIX(1.847759065) */

-#define FIX_1_961570560  ((INT32)  16069)	/* FIX(1.961570560) */

-#define FIX_2_053119869  ((INT32)  16819)	/* FIX(2.053119869) */

-#define FIX_2_562915447  ((INT32)  20995)	/* FIX(2.562915447) */

-#define FIX_3_072711026  ((INT32)  25172)	/* FIX(3.072711026) */

-#else

-#define FIX_0_298631336  FIX(0.298631336)

-#define FIX_0_390180644  FIX(0.390180644)

-#define FIX_0_541196100  FIX(0.541196100)

-#define FIX_0_765366865  FIX(0.765366865)

-#define FIX_0_899976223  FIX(0.899976223)

-#define FIX_1_175875602  FIX(1.175875602)

-#define FIX_1_501321110  FIX(1.501321110)

-#define FIX_1_847759065  FIX(1.847759065)

-#define FIX_1_961570560  FIX(1.961570560)

-#define FIX_2_053119869  FIX(2.053119869)

-#define FIX_2_562915447  FIX(2.562915447)

-#define FIX_3_072711026  FIX(3.072711026)

-#endif

-

-

-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.

- * For 8-bit samples with the recommended scaling, all the variable

- * and constant values involved are no more than 16 bits wide, so a

- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.

- * For 12-bit samples, a full 32-bit multiplication will be needed.

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)

-#else

-#define MULTIPLY(var,const)  ((var) * (const))

-#endif

-

-

-/* Dequantize a coefficient by multiplying it by the multiplier-table

- * entry; produce an int result.  In this module, both inputs and result

- * are 16 bits or less, so either int or short multiply will work.

- */

-

-#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients.

- *

- * cK represents sqrt(2) * cos(K*pi/16).

- */

-

-GLOBAL(void)

-jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[DCTSIZE2];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * Note results are scaled up by sqrt(8) compared to a true IDCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = DCTSIZE; ctr > 0; ctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any column in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * column DCT calculations can be simplified this way.

-     */

-

-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&

-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&

-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&

-	inptr[DCTSIZE*7] == 0) {

-      /* AC terms all zero */

-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;

-

-      wsptr[DCTSIZE*0] = dcval;

-      wsptr[DCTSIZE*1] = dcval;

-      wsptr[DCTSIZE*2] = dcval;

-      wsptr[DCTSIZE*3] = dcval;

-      wsptr[DCTSIZE*4] = dcval;

-      wsptr[DCTSIZE*5] = dcval;

-      wsptr[DCTSIZE*6] = dcval;

-      wsptr[DCTSIZE*7] = dcval;

-

-      inptr++;			/* advance pointers to next column */

-      quantptr++;

-      wsptr++;

-      continue;

-    }

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z2 <<= CONST_BITS;

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z2 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    tmp0 = z2 + z3;

-    tmp1 = z2 - z3;

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    wsptr[DCTSIZE*0] = (int) RIGHT_SHIFT(tmp10 + tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*7] = (int) RIGHT_SHIFT(tmp10 - tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*1] = (int) RIGHT_SHIFT(tmp11 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*6] = (int) RIGHT_SHIFT(tmp11 - tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*2] = (int) RIGHT_SHIFT(tmp12 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*5] = (int) RIGHT_SHIFT(tmp12 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*3] = (int) RIGHT_SHIFT(tmp13 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*4] = (int) RIGHT_SHIFT(tmp13 - tmp0, CONST_BITS-PASS1_BITS);

-

-    inptr++;			/* advance pointers to next column */

-    quantptr++;

-    wsptr++;

-  }

-

-  /* Pass 2: process rows from work array, store into output array.

-   * Note that we must descale the results by a factor of 8 == 2**3,

-   * and also undo the PASS1_BITS scaling.

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < DCTSIZE; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z2 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-

-    /* Rows of zeroes can be exploited in the same way as we did with columns.

-     * However, the column calculation has created many nonzero AC terms, so

-     * the simplification applies less often (typically 5% to 10% of the time).

-     * On machines with very fast multiplication, it's possible that the

-     * test takes more time than it's worth.  In that case this section

-     * may be commented out.

-     */

-

-#ifndef NO_ZERO_ROW_TEST

-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&

-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {

-      /* AC terms all zero */

-      JSAMPLE dcval = range_limit[(int) RIGHT_SHIFT(z2, PASS1_BITS+3)

-				  & RANGE_MASK];

-

-      outptr[0] = dcval;

-      outptr[1] = dcval;

-      outptr[2] = dcval;

-      outptr[3] = dcval;

-      outptr[4] = dcval;

-      outptr[5] = dcval;

-      outptr[6] = dcval;

-      outptr[7] = dcval;

-

-      wsptr += DCTSIZE;		/* advance pointer to next row */

-      continue;

-    }

-#endif

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    z3 = (INT32) wsptr[4];

-

-    tmp0 = (z2 + z3) << CONST_BITS;

-    tmp1 = (z2 - z3) << CONST_BITS;

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[6];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = (INT32) wsptr[7];

-    tmp1 = (INT32) wsptr[5];

-    tmp2 = (INT32) wsptr[3];

-    tmp3 = (INT32) wsptr[1];

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp13 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp13 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += DCTSIZE;		/* advance pointer to next row */

-  }

-}

-

-#ifdef IDCT_SCALING_SUPPORTED

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 7x7 output block.

- *

- * Optimized algorithm with 12 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/14).

- */

-

-GLOBAL(void)

-jpeg_idct_7x7 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp10, tmp11, tmp12, tmp13;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[7*7];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 7; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp13 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp13 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp13 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp10 = MULTIPLY(z2 - z3, FIX(0.881747734));     /* c4 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.314692123));     /* c6 */

-    tmp11 = tmp10 + tmp12 + tmp13 - MULTIPLY(z2, FIX(1.841218003)); /* c2+c4-c6 */

-    tmp0 = z1 + z3;

-    z2 -= tmp0;

-    tmp0 = MULTIPLY(tmp0, FIX(1.274162392)) + tmp13; /* c2 */

-    tmp10 += tmp0 - MULTIPLY(z3, FIX(0.077722536));  /* c2-c4-c6 */

-    tmp12 += tmp0 - MULTIPLY(z1, FIX(2.470602249));  /* c2+c4+c6 */

-    tmp13 += MULTIPLY(z2, FIX(1.414213562));         /* c0 */

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-

-    tmp1 = MULTIPLY(z1 + z2, FIX(0.935414347));      /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(z1 - z2, FIX(0.170262339));      /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(z2 + z3, - FIX(1.378756276));    /* -c1 */

-    tmp1 += tmp2;

-    z2 = MULTIPLY(z1 + z3, FIX(0.613604268));        /* c5 */

-    tmp0 += z2;

-    tmp2 += z2 + MULTIPLY(z3, FIX(1.870828693));     /* c3+c1-c5 */

-

-    /* Final output stage */

-

-    wsptr[7*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[7*6] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[7*1] = (int) RIGHT_SHIFT(tmp11 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[7*5] = (int) RIGHT_SHIFT(tmp11 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[7*2] = (int) RIGHT_SHIFT(tmp12 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[7*4] = (int) RIGHT_SHIFT(tmp12 - tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[7*3] = (int) RIGHT_SHIFT(tmp13, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 7 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 7; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp13 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp13 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[4];

-    z3 = (INT32) wsptr[6];

-

-    tmp10 = MULTIPLY(z2 - z3, FIX(0.881747734));     /* c4 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.314692123));     /* c6 */

-    tmp11 = tmp10 + tmp12 + tmp13 - MULTIPLY(z2, FIX(1.841218003)); /* c2+c4-c6 */

-    tmp0 = z1 + z3;

-    z2 -= tmp0;

-    tmp0 = MULTIPLY(tmp0, FIX(1.274162392)) + tmp13; /* c2 */

-    tmp10 += tmp0 - MULTIPLY(z3, FIX(0.077722536));  /* c2-c4-c6 */

-    tmp12 += tmp0 - MULTIPLY(z1, FIX(2.470602249));  /* c2+c4+c6 */

-    tmp13 += MULTIPLY(z2, FIX(1.414213562));         /* c0 */

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-

-    tmp1 = MULTIPLY(z1 + z2, FIX(0.935414347));      /* (c3+c1-c5)/2 */

-    tmp2 = MULTIPLY(z1 - z2, FIX(0.170262339));      /* (c3+c5-c1)/2 */

-    tmp0 = tmp1 - tmp2;

-    tmp1 += tmp2;

-    tmp2 = MULTIPLY(z2 + z3, - FIX(1.378756276));    /* -c1 */

-    tmp1 += tmp2;

-    z2 = MULTIPLY(z1 + z3, FIX(0.613604268));        /* c5 */

-    tmp0 += z2;

-    tmp2 += z2 + MULTIPLY(z3, FIX(1.870828693));     /* c3+c1-c5 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 7;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 6x6 output block.

- *

- * Optimized algorithm with 3 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/12).

- */

-

-GLOBAL(void)

-jpeg_idct_6x6 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp10, tmp11, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[6*6];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp10 = MULTIPLY(tmp2, FIX(0.707106781));   /* c4 */

-    tmp1 = tmp0 + tmp10;

-    tmp11 = RIGHT_SHIFT(tmp0 - tmp10 - tmp10, CONST_BITS-PASS1_BITS);

-    tmp10 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp0 = MULTIPLY(tmp10, FIX(1.224744871));   /* c2 */

-    tmp10 = tmp1 + tmp0;

-    tmp12 = tmp1 - tmp0;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp1 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp0 = tmp1 + ((z1 + z2) << CONST_BITS);

-    tmp2 = tmp1 + ((z3 - z2) << CONST_BITS);

-    tmp1 = (z1 - z2 - z3) << PASS1_BITS;

-

-    /* Final output stage */

-

-    wsptr[6*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[6*5] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[6*1] = (int) (tmp11 + tmp1);

-    wsptr[6*4] = (int) (tmp11 - tmp1);

-    wsptr[6*2] = (int) RIGHT_SHIFT(tmp12 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[6*3] = (int) RIGHT_SHIFT(tmp12 - tmp2, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 6 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-    tmp2 = (INT32) wsptr[4];

-    tmp10 = MULTIPLY(tmp2, FIX(0.707106781));   /* c4 */

-    tmp1 = tmp0 + tmp10;

-    tmp11 = tmp0 - tmp10 - tmp10;

-    tmp10 = (INT32) wsptr[2];

-    tmp0 = MULTIPLY(tmp10, FIX(1.224744871));   /* c2 */

-    tmp10 = tmp1 + tmp0;

-    tmp12 = tmp1 - tmp0;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    tmp1 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp0 = tmp1 + ((z1 + z2) << CONST_BITS);

-    tmp2 = tmp1 + ((z3 - z2) << CONST_BITS);

-    tmp1 = (z1 - z2 - z3) << CONST_BITS;

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 6;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 5x5 output block.

- *

- * Optimized algorithm with 5 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/10).

- */

-

-GLOBAL(void)

-jpeg_idct_5x5 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp10, tmp11, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[5*5];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 5; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp12 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp12 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp12 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z1 = MULTIPLY(tmp0 + tmp1, FIX(0.790569415)); /* (c2+c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(0.353553391)); /* (c2-c4)/2 */

-    z3 = tmp12 + z2;

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z1;

-    tmp12 -= z2 << 2;

-

-    /* Odd part */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));     /* c3 */

-    tmp0 = z1 + MULTIPLY(z2, FIX(0.513743148));   /* c1-c3 */

-    tmp1 = z1 - MULTIPLY(z3, FIX(2.176250899));   /* c1+c3 */

-

-    /* Final output stage */

-

-    wsptr[5*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[5*4] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[5*1] = (int) RIGHT_SHIFT(tmp11 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[5*3] = (int) RIGHT_SHIFT(tmp11 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[5*2] = (int) RIGHT_SHIFT(tmp12, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 5 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 5; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp12 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp12 <<= CONST_BITS;

-    tmp0 = (INT32) wsptr[2];

-    tmp1 = (INT32) wsptr[4];

-    z1 = MULTIPLY(tmp0 + tmp1, FIX(0.790569415)); /* (c2+c4)/2 */

-    z2 = MULTIPLY(tmp0 - tmp1, FIX(0.353553391)); /* (c2-c4)/2 */

-    z3 = tmp12 + z2;

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z1;

-    tmp12 -= z2 << 2;

-

-    /* Odd part */

-

-    z2 = (INT32) wsptr[1];

-    z3 = (INT32) wsptr[3];

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));     /* c3 */

-    tmp0 = z1 + MULTIPLY(z2, FIX(0.513743148));   /* c1-c3 */

-    tmp1 = z1 - MULTIPLY(z3, FIX(2.176250899));   /* c1+c3 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 5;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 4x4 output block.

- *

- * Optimized algorithm with 3 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point IDCT].

- */

-

-GLOBAL(void)

-jpeg_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp2, tmp10, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[4*4];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 4; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    

-    tmp10 = (tmp0 + tmp2) << PASS1_BITS;

-    tmp12 = (tmp0 - tmp2) << PASS1_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);               /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp0 = RIGHT_SHIFT(z1 + MULTIPLY(z2, FIX_0_765366865), /* c2-c6 */

-		       CONST_BITS-PASS1_BITS);

-    tmp2 = RIGHT_SHIFT(z1 - MULTIPLY(z3, FIX_1_847759065), /* c2+c6 */

-		       CONST_BITS-PASS1_BITS);

-

-    /* Final output stage */

-

-    wsptr[4*0] = (int) (tmp10 + tmp0);

-    wsptr[4*3] = (int) (tmp10 - tmp0);

-    wsptr[4*1] = (int) (tmp12 + tmp2);

-    wsptr[4*2] = (int) (tmp12 - tmp2);

-  }

-

-  /* Pass 2: process 4 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 4; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp2 = (INT32) wsptr[2];

-

-    tmp10 = (tmp0 + tmp2) << CONST_BITS;

-    tmp12 = (tmp0 - tmp2) << CONST_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = (INT32) wsptr[1];

-    z3 = (INT32) wsptr[3];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);   /* c6 */

-    tmp0 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */

-    tmp2 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 4;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 3x3 output block.

- *

- * Optimized algorithm with 2 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/6).

- */

-

-GLOBAL(void)

-jpeg_idct_3x3 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp2, tmp10, tmp12;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[3*3];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 3; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp12 = MULTIPLY(tmp2, FIX(0.707106781)); /* c2 */

-    tmp10 = tmp0 + tmp12;

-    tmp2 = tmp0 - tmp12 - tmp12;

-

-    /* Odd part */

-

-    tmp12 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    tmp0 = MULTIPLY(tmp12, FIX(1.224744871)); /* c1 */

-

-    /* Final output stage */

-

-    wsptr[3*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[3*2] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[3*1] = (int) RIGHT_SHIFT(tmp2, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 3 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 3; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-    tmp2 = (INT32) wsptr[2];

-    tmp12 = MULTIPLY(tmp2, FIX(0.707106781)); /* c2 */

-    tmp10 = tmp0 + tmp12;

-    tmp2 = tmp0 - tmp12 - tmp12;

-

-    /* Odd part */

-

-    tmp12 = (INT32) wsptr[1];

-    tmp0 = MULTIPLY(tmp12, FIX(1.224744871)); /* c1 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 3;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 2x2 output block.

- *

- * Multiplication-less algorithm.

- */

-

-GLOBAL(void)

-jpeg_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;

-  ISLOW_MULT_TYPE * quantptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  ISHIFT_TEMPS

-

-  /* Pass 1: process columns from input. */

-

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-

-  /* Column 0 */

-  tmp4 = DEQUANTIZE(coef_block[DCTSIZE*0], quantptr[DCTSIZE*0]);

-  tmp5 = DEQUANTIZE(coef_block[DCTSIZE*1], quantptr[DCTSIZE*1]);

-  /* Add range center and fudge factor for final descale and range-limit. */

-  tmp4 += (((DCTELEM) RANGE_CENTER) << 3) + (1 << 2);

-

-  tmp0 = tmp4 + tmp5;

-  tmp2 = tmp4 - tmp5;

-

-  /* Column 1 */

-  tmp4 = DEQUANTIZE(coef_block[DCTSIZE*0+1], quantptr[DCTSIZE*0+1]);

-  tmp5 = DEQUANTIZE(coef_block[DCTSIZE*1+1], quantptr[DCTSIZE*1+1]);

-

-  tmp1 = tmp4 + tmp5;

-  tmp3 = tmp4 - tmp5;

-

-  /* Pass 2: process 2 rows, store into output array. */

-

-  /* Row 0 */

-  outptr = output_buf[0] + output_col;

-

-  outptr[0] = range_limit[(int) IRIGHT_SHIFT(tmp0 + tmp1, 3) & RANGE_MASK];

-  outptr[1] = range_limit[(int) IRIGHT_SHIFT(tmp0 - tmp1, 3) & RANGE_MASK];

-

-  /* Row 1 */

-  outptr = output_buf[1] + output_col;

-

-  outptr[0] = range_limit[(int) IRIGHT_SHIFT(tmp2 + tmp3, 3) & RANGE_MASK];

-  outptr[1] = range_limit[(int) IRIGHT_SHIFT(tmp2 - tmp3, 3) & RANGE_MASK];

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 1x1 output block.

- *

- * We hardly need an inverse DCT routine for this: just take the

- * average pixel value, which is one-eighth of the DC coefficient.

- */

-

-GLOBAL(void)

-jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  DCTELEM dcval;

-  ISLOW_MULT_TYPE * quantptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  ISHIFT_TEMPS

-

-  /* 1x1 is trivial: just take the DC coefficient divided by 8. */

-

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-

-  dcval = DEQUANTIZE(coef_block[0], quantptr[0]);

-  /* Add range center and fudge factor for descale and range-limit. */

-  dcval += (((DCTELEM) RANGE_CENTER) << 3) + (1 << 2);

-

-  output_buf[0][output_col] =

-    range_limit[(int) IRIGHT_SHIFT(dcval, 3) & RANGE_MASK];

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 9x9 output block.

- *

- * Optimized algorithm with 10 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/18).

- */

-

-GLOBAL(void)

-jpeg_idct_9x9 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*9];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp3 = MULTIPLY(z3, FIX(0.707106781));      /* c6 */

-    tmp1 = tmp0 + tmp3;

-    tmp2 = tmp0 - tmp3 - tmp3;

-

-    tmp0 = MULTIPLY(z1 - z2, FIX(0.707106781)); /* c6 */

-    tmp11 = tmp2 + tmp0;

-    tmp14 = tmp2 - tmp0 - tmp0;

-

-    tmp0 = MULTIPLY(z1 + z2, FIX(1.328926049)); /* c2 */

-    tmp2 = MULTIPLY(z1, FIX(1.083350441));      /* c4 */

-    tmp3 = MULTIPLY(z2, FIX(0.245575608));      /* c8 */

-

-    tmp10 = tmp1 + tmp0 - tmp3;

-    tmp12 = tmp1 - tmp0 + tmp2;

-    tmp13 = tmp1 - tmp2 + tmp3;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    z2 = MULTIPLY(z2, - FIX(1.224744871));           /* -c3 */

-

-    tmp2 = MULTIPLY(z1 + z3, FIX(0.909038955));      /* c5 */

-    tmp3 = MULTIPLY(z1 + z4, FIX(0.483689525));      /* c7 */

-    tmp0 = tmp2 + tmp3 - z2;

-    tmp1 = MULTIPLY(z3 - z4, FIX(1.392728481));      /* c1 */

-    tmp2 += z2 - tmp1;

-    tmp3 += z2 + tmp1;

-    tmp1 = MULTIPLY(z1 - z3 - z4, FIX(1.224744871)); /* c3 */

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[8*8] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[8*1] = (int) RIGHT_SHIFT(tmp11 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[8*7] = (int) RIGHT_SHIFT(tmp11 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[8*2] = (int) RIGHT_SHIFT(tmp12 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[8*6] = (int) RIGHT_SHIFT(tmp12 - tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[8*3] = (int) RIGHT_SHIFT(tmp13 + tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[8*5] = (int) RIGHT_SHIFT(tmp13 - tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[8*4] = (int) RIGHT_SHIFT(tmp14, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 9 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 9; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[4];

-    z3 = (INT32) wsptr[6];

-

-    tmp3 = MULTIPLY(z3, FIX(0.707106781));      /* c6 */

-    tmp1 = tmp0 + tmp3;

-    tmp2 = tmp0 - tmp3 - tmp3;

-

-    tmp0 = MULTIPLY(z1 - z2, FIX(0.707106781)); /* c6 */

-    tmp11 = tmp2 + tmp0;

-    tmp14 = tmp2 - tmp0 - tmp0;

-

-    tmp0 = MULTIPLY(z1 + z2, FIX(1.328926049)); /* c2 */

-    tmp2 = MULTIPLY(z1, FIX(1.083350441));      /* c4 */

-    tmp3 = MULTIPLY(z2, FIX(0.245575608));      /* c8 */

-

-    tmp10 = tmp1 + tmp0 - tmp3;

-    tmp12 = tmp1 - tmp0 + tmp2;

-    tmp13 = tmp1 - tmp2 + tmp3;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    z2 = MULTIPLY(z2, - FIX(1.224744871));           /* -c3 */

-

-    tmp2 = MULTIPLY(z1 + z3, FIX(0.909038955));      /* c5 */

-    tmp3 = MULTIPLY(z1 + z4, FIX(0.483689525));      /* c7 */

-    tmp0 = tmp2 + tmp3 - z2;

-    tmp1 = MULTIPLY(z3 - z4, FIX(1.392728481));      /* c1 */

-    tmp2 += z2 - tmp1;

-    tmp3 += z2 + tmp1;

-    tmp1 = MULTIPLY(z1 - z3 - z4, FIX(1.224744871)); /* c3 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[8] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp13 + tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp13 - tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 10x10 output block.

- *

- * Optimized algorithm with 12 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/20).

- */

-

-GLOBAL(void)

-jpeg_idct_10x10 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24;

-  INT32 z1, z2, z3, z4, z5;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*10];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z3 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z3 += ONE << (CONST_BITS-PASS1_BITS-1);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z1 = MULTIPLY(z4, FIX(1.144122806));         /* c4 */

-    z2 = MULTIPLY(z4, FIX(0.437016024));         /* c8 */

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z2;

-

-    tmp22 = RIGHT_SHIFT(z3 - ((z1 - z2) << 1),   /* c0 = (c4-c8)*2 */

-			CONST_BITS-PASS1_BITS);

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));    /* c6 */

-    tmp12 = z1 + MULTIPLY(z2, FIX(0.513743148)); /* c2-c6 */

-    tmp13 = z1 - MULTIPLY(z3, FIX(2.176250899)); /* c2+c6 */

-

-    tmp20 = tmp10 + tmp12;

-    tmp24 = tmp10 - tmp12;

-    tmp21 = tmp11 + tmp13;

-    tmp23 = tmp11 - tmp13;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = z2 + z4;

-    tmp13 = z2 - z4;

-

-    tmp12 = MULTIPLY(tmp13, FIX(0.309016994));        /* (c3-c7)/2 */

-    z5 = z3 << CONST_BITS;

-

-    z2 = MULTIPLY(tmp11, FIX(0.951056516));           /* (c3+c7)/2 */

-    z4 = z5 + tmp12;

-

-    tmp10 = MULTIPLY(z1, FIX(1.396802247)) + z2 + z4; /* c1 */

-    tmp14 = MULTIPLY(z1, FIX(0.221231742)) - z2 + z4; /* c9 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.587785252));           /* (c1-c9)/2 */

-    z4 = z5 - tmp12 - (tmp13 << (CONST_BITS - 1));

-

-    tmp12 = (z1 - tmp13 - z3) << PASS1_BITS;

-

-    tmp11 = MULTIPLY(z1, FIX(1.260073511)) - z2 - z4; /* c3 */

-    tmp13 = MULTIPLY(z1, FIX(0.642039522)) - z2 + z4; /* c7 */

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*9] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1] = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*8] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2] = (int) (tmp22 + tmp12);

-    wsptr[8*7] = (int) (tmp22 - tmp12);

-    wsptr[8*3] = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*6] = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4] = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5] = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 10 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 10; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z3 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 <<= CONST_BITS;

-    z4 = (INT32) wsptr[4];

-    z1 = MULTIPLY(z4, FIX(1.144122806));         /* c4 */

-    z2 = MULTIPLY(z4, FIX(0.437016024));         /* c8 */

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z2;

-

-    tmp22 = z3 - ((z1 - z2) << 1);               /* c0 = (c4-c8)*2 */

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[6];

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));    /* c6 */

-    tmp12 = z1 + MULTIPLY(z2, FIX(0.513743148)); /* c2-c6 */

-    tmp13 = z1 - MULTIPLY(z3, FIX(2.176250899)); /* c2+c6 */

-

-    tmp20 = tmp10 + tmp12;

-    tmp24 = tmp10 - tmp12;

-    tmp21 = tmp11 + tmp13;

-    tmp23 = tmp11 - tmp13;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z3 <<= CONST_BITS;

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = z2 + z4;

-    tmp13 = z2 - z4;

-

-    tmp12 = MULTIPLY(tmp13, FIX(0.309016994));        /* (c3-c7)/2 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.951056516));           /* (c3+c7)/2 */

-    z4 = z3 + tmp12;

-

-    tmp10 = MULTIPLY(z1, FIX(1.396802247)) + z2 + z4; /* c1 */

-    tmp14 = MULTIPLY(z1, FIX(0.221231742)) - z2 + z4; /* c9 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.587785252));           /* (c1-c9)/2 */

-    z4 = z3 - tmp12 - (tmp13 << (CONST_BITS - 1));

-

-    tmp12 = ((z1 - tmp13) << CONST_BITS) - z3;

-

-    tmp11 = MULTIPLY(z1, FIX(1.260073511)) - z2 - z4; /* c3 */

-    tmp13 = MULTIPLY(z1, FIX(0.642039522)) - z2 + z4; /* c7 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[9] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[8] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 11x11 output block.

- *

- * Optimized algorithm with 24 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/22).

- */

-

-GLOBAL(void)

-jpeg_idct_11x11 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*11];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp10 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp10 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp10 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp20 = MULTIPLY(z2 - z3, FIX(2.546640132));     /* c2+c4 */

-    tmp23 = MULTIPLY(z2 - z1, FIX(0.430815045));     /* c2-c6 */

-    z4 = z1 + z3;

-    tmp24 = MULTIPLY(z4, - FIX(1.155664402));        /* -(c2-c10) */

-    z4 -= z2;

-    tmp25 = tmp10 + MULTIPLY(z4, FIX(1.356927976));  /* c2 */

-    tmp21 = tmp20 + tmp23 + tmp25 -

-	    MULTIPLY(z2, FIX(1.821790775));          /* c2+c4+c10-c6 */

-    tmp20 += tmp25 + MULTIPLY(z3, FIX(2.115825087)); /* c4+c6 */

-    tmp23 += tmp25 - MULTIPLY(z1, FIX(1.513598477)); /* c6+c8 */

-    tmp24 += tmp25;

-    tmp22 = tmp24 - MULTIPLY(z3, FIX(0.788749120));  /* c8+c10 */

-    tmp24 += MULTIPLY(z2, FIX(1.944413522)) -        /* c2+c8 */

-	     MULTIPLY(z1, FIX(1.390975730));         /* c4+c10 */

-    tmp25 = tmp10 - MULTIPLY(z4, FIX(1.414213562));  /* c0 */

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = z1 + z2;

-    tmp14 = MULTIPLY(tmp11 + z3 + z4, FIX(0.398430003)); /* c9 */

-    tmp11 = MULTIPLY(tmp11, FIX(0.887983902));           /* c3-c9 */

-    tmp12 = MULTIPLY(z1 + z3, FIX(0.670361295));         /* c5-c9 */

-    tmp13 = tmp14 + MULTIPLY(z1 + z4, FIX(0.366151574)); /* c7-c9 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(z1, FIX(0.923107866));              /* c7+c5+c3-c1-2*c9 */

-    z1    = tmp14 - MULTIPLY(z2 + z3, FIX(1.163011579)); /* c7+c9 */

-    tmp11 += z1 + MULTIPLY(z2, FIX(2.073276588));        /* c1+c7+3*c9-c3 */

-    tmp12 += z1 - MULTIPLY(z3, FIX(1.192193623));        /* c3+c5-c7-c9 */

-    z1    = MULTIPLY(z2 + z4, - FIX(1.798248910));       /* -(c1+c9) */

-    tmp11 += z1;

-    tmp13 += z1 + MULTIPLY(z4, FIX(2.102458632));        /* c1+c5+c9-c7 */

-    tmp14 += MULTIPLY(z2, - FIX(1.467221301)) +          /* -(c5+c9) */

-	     MULTIPLY(z3, FIX(1.001388905)) -            /* c1-c9 */

-	     MULTIPLY(z4, FIX(1.684843907));             /* c3+c9 */

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 11 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 11; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp10 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp10 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[4];

-    z3 = (INT32) wsptr[6];

-

-    tmp20 = MULTIPLY(z2 - z3, FIX(2.546640132));     /* c2+c4 */

-    tmp23 = MULTIPLY(z2 - z1, FIX(0.430815045));     /* c2-c6 */

-    z4 = z1 + z3;

-    tmp24 = MULTIPLY(z4, - FIX(1.155664402));        /* -(c2-c10) */

-    z4 -= z2;

-    tmp25 = tmp10 + MULTIPLY(z4, FIX(1.356927976));  /* c2 */

-    tmp21 = tmp20 + tmp23 + tmp25 -

-	    MULTIPLY(z2, FIX(1.821790775));          /* c2+c4+c10-c6 */

-    tmp20 += tmp25 + MULTIPLY(z3, FIX(2.115825087)); /* c4+c6 */

-    tmp23 += tmp25 - MULTIPLY(z1, FIX(1.513598477)); /* c6+c8 */

-    tmp24 += tmp25;

-    tmp22 = tmp24 - MULTIPLY(z3, FIX(0.788749120));  /* c8+c10 */

-    tmp24 += MULTIPLY(z2, FIX(1.944413522)) -        /* c2+c8 */

-	     MULTIPLY(z1, FIX(1.390975730));         /* c4+c10 */

-    tmp25 = tmp10 - MULTIPLY(z4, FIX(1.414213562));  /* c0 */

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = z1 + z2;

-    tmp14 = MULTIPLY(tmp11 + z3 + z4, FIX(0.398430003)); /* c9 */

-    tmp11 = MULTIPLY(tmp11, FIX(0.887983902));           /* c3-c9 */

-    tmp12 = MULTIPLY(z1 + z3, FIX(0.670361295));         /* c5-c9 */

-    tmp13 = tmp14 + MULTIPLY(z1 + z4, FIX(0.366151574)); /* c7-c9 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(z1, FIX(0.923107866));              /* c7+c5+c3-c1-2*c9 */

-    z1    = tmp14 - MULTIPLY(z2 + z3, FIX(1.163011579)); /* c7+c9 */

-    tmp11 += z1 + MULTIPLY(z2, FIX(2.073276588));        /* c1+c7+3*c9-c3 */

-    tmp12 += z1 - MULTIPLY(z3, FIX(1.192193623));        /* c3+c5-c7-c9 */

-    z1    = MULTIPLY(z2 + z4, - FIX(1.798248910));       /* -(c1+c9) */

-    tmp11 += z1;

-    tmp13 += z1 + MULTIPLY(z4, FIX(2.102458632));        /* c1+c5+c9-c7 */

-    tmp14 += MULTIPLY(z2, - FIX(1.467221301)) +          /* -(c5+c9) */

-	     MULTIPLY(z3, FIX(1.001388905)) -            /* c1-c9 */

-	     MULTIPLY(z4, FIX(1.684843907));             /* c3+c9 */

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 12x12 output block.

- *

- * Optimized algorithm with 15 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/24).

- */

-

-GLOBAL(void)

-jpeg_idct_12x12 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*12];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z3 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z3 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z4 = MULTIPLY(z4, FIX(1.224744871)); /* c4 */

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z4 = MULTIPLY(z1, FIX(1.366025404)); /* c2 */

-    z1 <<= CONST_BITS;

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-    z2 <<= CONST_BITS;

-

-    tmp12 = z1 - z2;

-

-    tmp21 = z3 + tmp12;

-    tmp24 = z3 - tmp12;

-

-    tmp12 = z4 + z2;

-

-    tmp20 = tmp10 + tmp12;

-    tmp25 = tmp10 - tmp12;

-

-    tmp12 = z4 - z1 - z2;

-

-    tmp22 = tmp11 + tmp12;

-    tmp23 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = MULTIPLY(z2, FIX(1.306562965));                  /* c3 */

-    tmp14 = MULTIPLY(z2, - FIX_0_541196100);                 /* -c9 */

-

-    tmp10 = z1 + z3;

-    tmp15 = MULTIPLY(tmp10 + z4, FIX(0.860918669));          /* c7 */

-    tmp12 = tmp15 + MULTIPLY(tmp10, FIX(0.261052384));       /* c5-c7 */

-    tmp10 = tmp12 + tmp11 + MULTIPLY(z1, FIX(0.280143716));  /* c1-c5 */

-    tmp13 = MULTIPLY(z3 + z4, - FIX(1.045510580));           /* -(c7+c11) */

-    tmp12 += tmp13 + tmp14 - MULTIPLY(z3, FIX(1.478575242)); /* c1+c5-c7-c11 */

-    tmp13 += tmp15 - tmp11 + MULTIPLY(z4, FIX(1.586706681)); /* c1+c11 */

-    tmp15 += tmp14 - MULTIPLY(z1, FIX(0.676326758)) -        /* c7-c11 */

-	     MULTIPLY(z4, FIX(1.982889723));                 /* c5+c7 */

-

-    z1 -= z4;

-    z2 -= z3;

-    z3 = MULTIPLY(z1 + z2, FIX_0_541196100);                 /* c9 */

-    tmp11 = z3 + MULTIPLY(z1, FIX_0_765366865);              /* c3-c9 */

-    tmp14 = z3 - MULTIPLY(z2, FIX_1_847759065);              /* c3+c9 */

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 12 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 12; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z3 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 <<= CONST_BITS;

-

-    z4 = (INT32) wsptr[4];

-    z4 = MULTIPLY(z4, FIX(1.224744871)); /* c4 */

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    z1 = (INT32) wsptr[2];

-    z4 = MULTIPLY(z1, FIX(1.366025404)); /* c2 */

-    z1 <<= CONST_BITS;

-    z2 = (INT32) wsptr[6];

-    z2 <<= CONST_BITS;

-

-    tmp12 = z1 - z2;

-

-    tmp21 = z3 + tmp12;

-    tmp24 = z3 - tmp12;

-

-    tmp12 = z4 + z2;

-

-    tmp20 = tmp10 + tmp12;

-    tmp25 = tmp10 - tmp12;

-

-    tmp12 = z4 - z1 - z2;

-

-    tmp22 = tmp11 + tmp12;

-    tmp23 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = MULTIPLY(z2, FIX(1.306562965));                  /* c3 */

-    tmp14 = MULTIPLY(z2, - FIX_0_541196100);                 /* -c9 */

-

-    tmp10 = z1 + z3;

-    tmp15 = MULTIPLY(tmp10 + z4, FIX(0.860918669));          /* c7 */

-    tmp12 = tmp15 + MULTIPLY(tmp10, FIX(0.261052384));       /* c5-c7 */

-    tmp10 = tmp12 + tmp11 + MULTIPLY(z1, FIX(0.280143716));  /* c1-c5 */

-    tmp13 = MULTIPLY(z3 + z4, - FIX(1.045510580));           /* -(c7+c11) */

-    tmp12 += tmp13 + tmp14 - MULTIPLY(z3, FIX(1.478575242)); /* c1+c5-c7-c11 */

-    tmp13 += tmp15 - tmp11 + MULTIPLY(z4, FIX(1.586706681)); /* c1+c11 */

-    tmp15 += tmp14 - MULTIPLY(z1, FIX(0.676326758)) -        /* c7-c11 */

-	     MULTIPLY(z4, FIX(1.982889723));                 /* c5+c7 */

-

-    z1 -= z4;

-    z2 -= z3;

-    z3 = MULTIPLY(z1 + z2, FIX_0_541196100);                 /* c9 */

-    tmp11 = z3 + MULTIPLY(z1, FIX_0_765366865);              /* c3-c9 */

-    tmp14 = z3 - MULTIPLY(z2, FIX_1_847759065);              /* c3+c9 */

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 13x13 output block.

- *

- * Optimized algorithm with 29 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/26).

- */

-

-GLOBAL(void)

-jpeg_idct_13x13 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*13];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z1 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    tmp12 = MULTIPLY(tmp10, FIX(1.155388986));                /* (c4+c6)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.096834934)) + z1;           /* (c4-c6)/2 */

-

-    tmp20 = MULTIPLY(z2, FIX(1.373119086)) + tmp12 + tmp13;   /* c2 */

-    tmp22 = MULTIPLY(z2, FIX(0.501487041)) - tmp12 + tmp13;   /* c10 */

-

-    tmp12 = MULTIPLY(tmp10, FIX(0.316450131));                /* (c8-c12)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.486914739)) + z1;           /* (c8+c12)/2 */

-

-    tmp21 = MULTIPLY(z2, FIX(1.058554052)) - tmp12 + tmp13;   /* c6 */

-    tmp25 = MULTIPLY(z2, - FIX(1.252223920)) + tmp12 + tmp13; /* c4 */

-

-    tmp12 = MULTIPLY(tmp10, FIX(0.435816023));                /* (c2-c10)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.937303064)) - z1;           /* (c2+c10)/2 */

-

-    tmp23 = MULTIPLY(z2, - FIX(0.170464608)) - tmp12 - tmp13; /* c12 */

-    tmp24 = MULTIPLY(z2, - FIX(0.803364869)) + tmp12 - tmp13; /* c8 */

-

-    tmp26 = MULTIPLY(tmp11 - z2, FIX(1.414213562)) + z1;      /* c0 */

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.322312651));     /* c3 */

-    tmp12 = MULTIPLY(z1 + z3, FIX(1.163874945));     /* c5 */

-    tmp15 = z1 + z4;

-    tmp13 = MULTIPLY(tmp15, FIX(0.937797057));       /* c7 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(z1, FIX(2.020082300));          /* c7+c5+c3-c1 */

-    tmp14 = MULTIPLY(z2 + z3, - FIX(0.338443458));   /* -c11 */

-    tmp11 += tmp14 + MULTIPLY(z2, FIX(0.837223564)); /* c5+c9+c11-c3 */

-    tmp12 += tmp14 - MULTIPLY(z3, FIX(1.572116027)); /* c1+c5-c9-c11 */

-    tmp14 = MULTIPLY(z2 + z4, - FIX(1.163874945));   /* -c5 */

-    tmp11 += tmp14;

-    tmp13 += tmp14 + MULTIPLY(z4, FIX(2.205608352)); /* c3+c5+c9-c7 */

-    tmp14 = MULTIPLY(z3 + z4, - FIX(0.657217813));   /* -c9 */

-    tmp12 += tmp14;

-    tmp13 += tmp14;

-    tmp15 = MULTIPLY(tmp15, FIX(0.338443458));       /* c11 */

-    tmp14 = tmp15 + MULTIPLY(z1, FIX(0.318774355)) - /* c9-c11 */

-	    MULTIPLY(z2, FIX(0.466105296));          /* c1-c7 */

-    z1    = MULTIPLY(z3 - z2, FIX(0.937797057));     /* c7 */

-    tmp14 += z1;

-    tmp15 += z1 + MULTIPLY(z3, FIX(0.384515595)) -   /* c3-c7 */

-	     MULTIPLY(z4, FIX(1.742345811));         /* c1+c11 */

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*12] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp26, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 13 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 13; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z1 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z1 <<= CONST_BITS;

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[4];

-    z4 = (INT32) wsptr[6];

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    tmp12 = MULTIPLY(tmp10, FIX(1.155388986));                /* (c4+c6)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.096834934)) + z1;           /* (c4-c6)/2 */

-

-    tmp20 = MULTIPLY(z2, FIX(1.373119086)) + tmp12 + tmp13;   /* c2 */

-    tmp22 = MULTIPLY(z2, FIX(0.501487041)) - tmp12 + tmp13;   /* c10 */

-

-    tmp12 = MULTIPLY(tmp10, FIX(0.316450131));                /* (c8-c12)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.486914739)) + z1;           /* (c8+c12)/2 */

-

-    tmp21 = MULTIPLY(z2, FIX(1.058554052)) - tmp12 + tmp13;   /* c6 */

-    tmp25 = MULTIPLY(z2, - FIX(1.252223920)) + tmp12 + tmp13; /* c4 */

-

-    tmp12 = MULTIPLY(tmp10, FIX(0.435816023));                /* (c2-c10)/2 */

-    tmp13 = MULTIPLY(tmp11, FIX(0.937303064)) - z1;           /* (c2+c10)/2 */

-

-    tmp23 = MULTIPLY(z2, - FIX(0.170464608)) - tmp12 - tmp13; /* c12 */

-    tmp24 = MULTIPLY(z2, - FIX(0.803364869)) + tmp12 - tmp13; /* c8 */

-

-    tmp26 = MULTIPLY(tmp11 - z2, FIX(1.414213562)) + z1;      /* c0 */

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.322312651));     /* c3 */

-    tmp12 = MULTIPLY(z1 + z3, FIX(1.163874945));     /* c5 */

-    tmp15 = z1 + z4;

-    tmp13 = MULTIPLY(tmp15, FIX(0.937797057));       /* c7 */

-    tmp10 = tmp11 + tmp12 + tmp13 -

-	    MULTIPLY(z1, FIX(2.020082300));          /* c7+c5+c3-c1 */

-    tmp14 = MULTIPLY(z2 + z3, - FIX(0.338443458));   /* -c11 */

-    tmp11 += tmp14 + MULTIPLY(z2, FIX(0.837223564)); /* c5+c9+c11-c3 */

-    tmp12 += tmp14 - MULTIPLY(z3, FIX(1.572116027)); /* c1+c5-c9-c11 */

-    tmp14 = MULTIPLY(z2 + z4, - FIX(1.163874945));   /* -c5 */

-    tmp11 += tmp14;

-    tmp13 += tmp14 + MULTIPLY(z4, FIX(2.205608352)); /* c3+c5+c9-c7 */

-    tmp14 = MULTIPLY(z3 + z4, - FIX(0.657217813));   /* -c9 */

-    tmp12 += tmp14;

-    tmp13 += tmp14;

-    tmp15 = MULTIPLY(tmp15, FIX(0.338443458));       /* c11 */

-    tmp14 = tmp15 + MULTIPLY(z1, FIX(0.318774355)) - /* c9-c11 */

-	    MULTIPLY(z2, FIX(0.466105296));          /* c1-c7 */

-    z1    = MULTIPLY(z3 - z2, FIX(0.937797057));     /* c7 */

-    tmp14 += z1;

-    tmp15 += z1 + MULTIPLY(z3, FIX(0.384515595)) -   /* c3-c7 */

-	     MULTIPLY(z4, FIX(1.742345811));         /* c1+c11 */

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 14x14 output block.

- *

- * Optimized algorithm with 20 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/28).

- */

-

-GLOBAL(void)

-jpeg_idct_14x14 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*14];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z1 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z2 = MULTIPLY(z4, FIX(1.274162392));         /* c4 */

-    z3 = MULTIPLY(z4, FIX(0.314692123));         /* c12 */

-    z4 = MULTIPLY(z4, FIX(0.881747734));         /* c8 */

-

-    tmp10 = z1 + z2;

-    tmp11 = z1 + z3;

-    tmp12 = z1 - z4;

-

-    tmp23 = RIGHT_SHIFT(z1 - ((z2 + z3 - z4) << 1), /* c0 = (c4+c12-c8)*2 */

-			CONST_BITS-PASS1_BITS);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z3 = MULTIPLY(z1 + z2, FIX(1.105676686));    /* c6 */

-

-    tmp13 = z3 + MULTIPLY(z1, FIX(0.273079590)); /* c2-c6 */

-    tmp14 = z3 - MULTIPLY(z2, FIX(1.719280954)); /* c6+c10 */

-    tmp15 = MULTIPLY(z1, FIX(0.613604268)) -     /* c10 */

-	    MULTIPLY(z2, FIX(1.378756276));      /* c2 */

-

-    tmp20 = tmp10 + tmp13;

-    tmp26 = tmp10 - tmp13;

-    tmp21 = tmp11 + tmp14;

-    tmp25 = tmp11 - tmp14;

-    tmp22 = tmp12 + tmp15;

-    tmp24 = tmp12 - tmp15;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-    tmp13 = z4 << CONST_BITS;

-

-    tmp14 = z1 + z3;

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.334852607));           /* c3 */

-    tmp12 = MULTIPLY(tmp14, FIX(1.197448846));             /* c5 */

-    tmp10 = tmp11 + tmp12 + tmp13 - MULTIPLY(z1, FIX(1.126980169)); /* c3+c5-c1 */

-    tmp14 = MULTIPLY(tmp14, FIX(0.752406978));             /* c9 */

-    tmp16 = tmp14 - MULTIPLY(z1, FIX(1.061150426));        /* c9+c11-c13 */

-    z1    -= z2;

-    tmp15 = MULTIPLY(z1, FIX(0.467085129)) - tmp13;        /* c11 */

-    tmp16 += tmp15;

-    z1    += z4;

-    z4    = MULTIPLY(z2 + z3, - FIX(0.158341681)) - tmp13; /* -c13 */

-    tmp11 += z4 - MULTIPLY(z2, FIX(0.424103948));          /* c3-c9-c13 */

-    tmp12 += z4 - MULTIPLY(z3, FIX(2.373959773));          /* c3+c5-c13 */

-    z4    = MULTIPLY(z3 - z2, FIX(1.405321284));           /* c1 */

-    tmp14 += z4 + tmp13 - MULTIPLY(z3, FIX(1.6906431334)); /* c1+c9-c11 */

-    tmp15 += z4 + MULTIPLY(z2, FIX(0.674957567));          /* c1+c11-c5 */

-

-    tmp13 = (z1 - z3) << PASS1_BITS;

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*13] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*12] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) (tmp23 + tmp13);

-    wsptr[8*10] = (int) (tmp23 - tmp13);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp26 + tmp16, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp26 - tmp16, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 14 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 14; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z1 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z1 <<= CONST_BITS;

-    z4 = (INT32) wsptr[4];

-    z2 = MULTIPLY(z4, FIX(1.274162392));         /* c4 */

-    z3 = MULTIPLY(z4, FIX(0.314692123));         /* c12 */

-    z4 = MULTIPLY(z4, FIX(0.881747734));         /* c8 */

-

-    tmp10 = z1 + z2;

-    tmp11 = z1 + z3;

-    tmp12 = z1 - z4;

-

-    tmp23 = z1 - ((z2 + z3 - z4) << 1);          /* c0 = (c4+c12-c8)*2 */

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[6];

-

-    z3 = MULTIPLY(z1 + z2, FIX(1.105676686));    /* c6 */

-

-    tmp13 = z3 + MULTIPLY(z1, FIX(0.273079590)); /* c2-c6 */

-    tmp14 = z3 - MULTIPLY(z2, FIX(1.719280954)); /* c6+c10 */

-    tmp15 = MULTIPLY(z1, FIX(0.613604268)) -     /* c10 */

-	    MULTIPLY(z2, FIX(1.378756276));      /* c2 */

-

-    tmp20 = tmp10 + tmp13;

-    tmp26 = tmp10 - tmp13;

-    tmp21 = tmp11 + tmp14;

-    tmp25 = tmp11 - tmp14;

-    tmp22 = tmp12 + tmp15;

-    tmp24 = tmp12 - tmp15;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-    z4 <<= CONST_BITS;

-

-    tmp14 = z1 + z3;

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.334852607));           /* c3 */

-    tmp12 = MULTIPLY(tmp14, FIX(1.197448846));             /* c5 */

-    tmp10 = tmp11 + tmp12 + z4 - MULTIPLY(z1, FIX(1.126980169)); /* c3+c5-c1 */

-    tmp14 = MULTIPLY(tmp14, FIX(0.752406978));             /* c9 */

-    tmp16 = tmp14 - MULTIPLY(z1, FIX(1.061150426));        /* c9+c11-c13 */

-    z1    -= z2;

-    tmp15 = MULTIPLY(z1, FIX(0.467085129)) - z4;           /* c11 */

-    tmp16 += tmp15;

-    tmp13 = MULTIPLY(z2 + z3, - FIX(0.158341681)) - z4;    /* -c13 */

-    tmp11 += tmp13 - MULTIPLY(z2, FIX(0.424103948));       /* c3-c9-c13 */

-    tmp12 += tmp13 - MULTIPLY(z3, FIX(2.373959773));       /* c3+c5-c13 */

-    tmp13 = MULTIPLY(z3 - z2, FIX(1.405321284));           /* c1 */

-    tmp14 += tmp13 + z4 - MULTIPLY(z3, FIX(1.6906431334)); /* c1+c9-c11 */

-    tmp15 += tmp13 + MULTIPLY(z2, FIX(0.674957567));       /* c1+c11-c5 */

-

-    tmp13 = ((z1 - z3) << CONST_BITS) + z4;

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[13] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26 + tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp26 - tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 15x15 output block.

- *

- * Optimized algorithm with 22 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/30).

- */

-

-GLOBAL(void)

-jpeg_idct_15x15 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26, tmp27;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*15];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z1 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp10 = MULTIPLY(z4, FIX(0.437016024)); /* c12 */

-    tmp11 = MULTIPLY(z4, FIX(1.144122806)); /* c6 */

-

-    tmp12 = z1 - tmp10;

-    tmp13 = z1 + tmp11;

-    z1 -= (tmp11 - tmp10) << 1;             /* c0 = (c6-c12)*2 */

-

-    z4 = z2 - z3;

-    z3 += z2;

-    tmp10 = MULTIPLY(z3, FIX(1.337628990)); /* (c2+c4)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.045680613)); /* (c2-c4)/2 */

-    z2 = MULTIPLY(z2, FIX(1.439773946));    /* c4+c14 */

-

-    tmp20 = tmp13 + tmp10 + tmp11;

-    tmp23 = tmp12 - tmp10 + tmp11 + z2;

-

-    tmp10 = MULTIPLY(z3, FIX(0.547059574)); /* (c8+c14)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.399234004)); /* (c8-c14)/2 */

-

-    tmp25 = tmp13 - tmp10 - tmp11;

-    tmp26 = tmp12 + tmp10 - tmp11 - z2;

-

-    tmp10 = MULTIPLY(z3, FIX(0.790569415)); /* (c6+c12)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.353553391)); /* (c6-c12)/2 */

-

-    tmp21 = tmp12 + tmp10 + tmp11;

-    tmp24 = tmp13 - tmp10 + tmp11;

-    tmp11 += tmp11;

-    tmp22 = z1 + tmp11;                     /* c10 = c6-c12 */

-    tmp27 = z1 - tmp11 - tmp11;             /* c0 = (c6-c12)*2 */

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z3 = MULTIPLY(z4, FIX(1.224744871));                    /* c5 */

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp13 = z2 - z4;

-    tmp15 = MULTIPLY(z1 + tmp13, FIX(0.831253876));         /* c9 */

-    tmp11 = tmp15 + MULTIPLY(z1, FIX(0.513743148));         /* c3-c9 */

-    tmp14 = tmp15 - MULTIPLY(tmp13, FIX(2.176250899));      /* c3+c9 */

-

-    tmp13 = MULTIPLY(z2, - FIX(0.831253876));               /* -c9 */

-    tmp15 = MULTIPLY(z2, - FIX(1.344997024));               /* -c3 */

-    z2 = z1 - z4;

-    tmp12 = z3 + MULTIPLY(z2, FIX(1.406466353));            /* c1 */

-

-    tmp10 = tmp12 + MULTIPLY(z4, FIX(2.457431844)) - tmp15; /* c1+c7 */

-    tmp16 = tmp12 - MULTIPLY(z1, FIX(1.112434820)) + tmp13; /* c1-c13 */

-    tmp12 = MULTIPLY(z2, FIX(1.224744871)) - z3;            /* c5 */

-    z2 = MULTIPLY(z1 + z4, FIX(0.575212477));               /* c11 */

-    tmp13 += z2 + MULTIPLY(z1, FIX(0.475753014)) - z3;      /* c7-c11 */

-    tmp15 += z2 - MULTIPLY(z4, FIX(0.869244010)) + z3;      /* c11+c13 */

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*14] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*13] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*12] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp26 + tmp16, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp26 - tmp16, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp27, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 15 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 15; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z1 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z1 <<= CONST_BITS;

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[4];

-    z4 = (INT32) wsptr[6];

-

-    tmp10 = MULTIPLY(z4, FIX(0.437016024)); /* c12 */

-    tmp11 = MULTIPLY(z4, FIX(1.144122806)); /* c6 */

-

-    tmp12 = z1 - tmp10;

-    tmp13 = z1 + tmp11;

-    z1 -= (tmp11 - tmp10) << 1;             /* c0 = (c6-c12)*2 */

-

-    z4 = z2 - z3;

-    z3 += z2;

-    tmp10 = MULTIPLY(z3, FIX(1.337628990)); /* (c2+c4)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.045680613)); /* (c2-c4)/2 */

-    z2 = MULTIPLY(z2, FIX(1.439773946));    /* c4+c14 */

-

-    tmp20 = tmp13 + tmp10 + tmp11;

-    tmp23 = tmp12 - tmp10 + tmp11 + z2;

-

-    tmp10 = MULTIPLY(z3, FIX(0.547059574)); /* (c8+c14)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.399234004)); /* (c8-c14)/2 */

-

-    tmp25 = tmp13 - tmp10 - tmp11;

-    tmp26 = tmp12 + tmp10 - tmp11 - z2;

-

-    tmp10 = MULTIPLY(z3, FIX(0.790569415)); /* (c6+c12)/2 */

-    tmp11 = MULTIPLY(z4, FIX(0.353553391)); /* (c6-c12)/2 */

-

-    tmp21 = tmp12 + tmp10 + tmp11;

-    tmp24 = tmp13 - tmp10 + tmp11;

-    tmp11 += tmp11;

-    tmp22 = z1 + tmp11;                     /* c10 = c6-c12 */

-    tmp27 = z1 - tmp11 - tmp11;             /* c0 = (c6-c12)*2 */

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z4 = (INT32) wsptr[5];

-    z3 = MULTIPLY(z4, FIX(1.224744871));                    /* c5 */

-    z4 = (INT32) wsptr[7];

-

-    tmp13 = z2 - z4;

-    tmp15 = MULTIPLY(z1 + tmp13, FIX(0.831253876));         /* c9 */

-    tmp11 = tmp15 + MULTIPLY(z1, FIX(0.513743148));         /* c3-c9 */

-    tmp14 = tmp15 - MULTIPLY(tmp13, FIX(2.176250899));      /* c3+c9 */

-

-    tmp13 = MULTIPLY(z2, - FIX(0.831253876));               /* -c9 */

-    tmp15 = MULTIPLY(z2, - FIX(1.344997024));               /* -c3 */

-    z2 = z1 - z4;

-    tmp12 = z3 + MULTIPLY(z2, FIX(1.406466353));            /* c1 */

-

-    tmp10 = tmp12 + MULTIPLY(z4, FIX(2.457431844)) - tmp15; /* c1+c7 */

-    tmp16 = tmp12 - MULTIPLY(z1, FIX(1.112434820)) + tmp13; /* c1-c13 */

-    tmp12 = MULTIPLY(z2, FIX(1.224744871)) - z3;            /* c5 */

-    z2 = MULTIPLY(z1 + z4, FIX(0.575212477));               /* c11 */

-    tmp13 += z2 + MULTIPLY(z1, FIX(0.475753014)) - z3;      /* c7-c11 */

-    tmp15 += z2 - MULTIPLY(z4, FIX(0.869244010)) + z3;      /* c11+c13 */

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[14] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[13] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26 + tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp26 - tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp27,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 16x16 output block.

- *

- * Optimized algorithm with 28 multiplications in the 1-D kernel.

- * cK represents sqrt(2) * cos(K*pi/32).

- */

-

-GLOBAL(void)

-jpeg_idct_16x16 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp10, tmp11, tmp12, tmp13;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26, tmp27;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*16];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += 1 << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp1 = MULTIPLY(z1, FIX(1.306562965));      /* c4[16] = c2[8] */

-    tmp2 = MULTIPLY(z1, FIX_0_541196100);       /* c12[16] = c6[8] */

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-    z3 = z1 - z2;

-    z4 = MULTIPLY(z3, FIX(0.275899379));        /* c14[16] = c7[8] */

-    z3 = MULTIPLY(z3, FIX(1.387039845));        /* c2[16] = c1[8] */

-

-    tmp0 = z3 + MULTIPLY(z2, FIX_2_562915447);  /* (c6+c2)[16] = (c3+c1)[8] */

-    tmp1 = z4 + MULTIPLY(z1, FIX_0_899976223);  /* (c6-c14)[16] = (c3-c7)[8] */

-    tmp2 = z3 - MULTIPLY(z1, FIX(0.601344887)); /* (c2-c10)[16] = (c1-c5)[8] */

-    tmp3 = z4 - MULTIPLY(z2, FIX(0.509795579)); /* (c10-c14)[16] = (c5-c7)[8] */

-

-    tmp20 = tmp10 + tmp0;

-    tmp27 = tmp10 - tmp0;

-    tmp21 = tmp12 + tmp1;

-    tmp26 = tmp12 - tmp1;

-    tmp22 = tmp13 + tmp2;

-    tmp25 = tmp13 - tmp2;

-    tmp23 = tmp11 + tmp3;

-    tmp24 = tmp11 - tmp3;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = z1 + z3;

-

-    tmp1  = MULTIPLY(z1 + z2, FIX(1.353318001));   /* c3 */

-    tmp2  = MULTIPLY(tmp11,   FIX(1.247225013));   /* c5 */

-    tmp3  = MULTIPLY(z1 + z4, FIX(1.093201867));   /* c7 */

-    tmp10 = MULTIPLY(z1 - z4, FIX(0.897167586));   /* c9 */

-    tmp11 = MULTIPLY(tmp11,   FIX(0.666655658));   /* c11 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.410524528));   /* c13 */

-    tmp0  = tmp1 + tmp2 + tmp3 -

-	    MULTIPLY(z1, FIX(2.286341144));        /* c7+c5+c3-c1 */

-    tmp13 = tmp10 + tmp11 + tmp12 -

-	    MULTIPLY(z1, FIX(1.835730603));        /* c9+c11+c13-c15 */

-    z1    = MULTIPLY(z2 + z3, FIX(0.138617169));   /* c15 */

-    tmp1  += z1 + MULTIPLY(z2, FIX(0.071888074));  /* c9+c11-c3-c15 */

-    tmp2  += z1 - MULTIPLY(z3, FIX(1.125726048));  /* c5+c7+c15-c3 */

-    z1    = MULTIPLY(z3 - z2, FIX(1.407403738));   /* c1 */

-    tmp11 += z1 - MULTIPLY(z3, FIX(0.766367282));  /* c1+c11-c9-c13 */

-    tmp12 += z1 + MULTIPLY(z2, FIX(1.971951411));  /* c1+c5+c13-c7 */

-    z2    += z4;

-    z1    = MULTIPLY(z2, - FIX(0.666655658));      /* -c11 */

-    tmp1  += z1;

-    tmp3  += z1 + MULTIPLY(z4, FIX(1.065388962));  /* c3+c11+c15-c7 */

-    z2    = MULTIPLY(z2, - FIX(1.247225013));      /* -c5 */

-    tmp10 += z2 + MULTIPLY(z4, FIX(3.141271809));  /* c1+c5+c9-c13 */

-    tmp12 += z2;

-    z2    = MULTIPLY(z3 + z4, - FIX(1.353318001)); /* -c3 */

-    tmp2  += z2;

-    tmp3  += z2;

-    z2    = MULTIPLY(z4 - z3, FIX(0.410524528));   /* c13 */

-    tmp10 += z2;

-    tmp11 += z2;

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp0,  CONST_BITS-PASS1_BITS);

-    wsptr[8*15] = (int) RIGHT_SHIFT(tmp20 - tmp0,  CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp1,  CONST_BITS-PASS1_BITS);

-    wsptr[8*14] = (int) RIGHT_SHIFT(tmp21 - tmp1,  CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp2,  CONST_BITS-PASS1_BITS);

-    wsptr[8*13] = (int) RIGHT_SHIFT(tmp22 - tmp2,  CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp3,  CONST_BITS-PASS1_BITS);

-    wsptr[8*12] = (int) RIGHT_SHIFT(tmp23 - tmp3,  CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp24 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp25 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp26 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp26 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp27 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp27 - tmp13, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 16 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 16; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[4];

-    tmp1 = MULTIPLY(z1, FIX(1.306562965));      /* c4[16] = c2[8] */

-    tmp2 = MULTIPLY(z1, FIX_0_541196100);       /* c12[16] = c6[8] */

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[6];

-    z3 = z1 - z2;

-    z4 = MULTIPLY(z3, FIX(0.275899379));        /* c14[16] = c7[8] */

-    z3 = MULTIPLY(z3, FIX(1.387039845));        /* c2[16] = c1[8] */

-

-    tmp0 = z3 + MULTIPLY(z2, FIX_2_562915447);  /* (c6+c2)[16] = (c3+c1)[8] */

-    tmp1 = z4 + MULTIPLY(z1, FIX_0_899976223);  /* (c6-c14)[16] = (c3-c7)[8] */

-    tmp2 = z3 - MULTIPLY(z1, FIX(0.601344887)); /* (c2-c10)[16] = (c1-c5)[8] */

-    tmp3 = z4 - MULTIPLY(z2, FIX(0.509795579)); /* (c10-c14)[16] = (c5-c7)[8] */

-

-    tmp20 = tmp10 + tmp0;

-    tmp27 = tmp10 - tmp0;

-    tmp21 = tmp12 + tmp1;

-    tmp26 = tmp12 - tmp1;

-    tmp22 = tmp13 + tmp2;

-    tmp25 = tmp13 - tmp2;

-    tmp23 = tmp11 + tmp3;

-    tmp24 = tmp11 - tmp3;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = z1 + z3;

-

-    tmp1  = MULTIPLY(z1 + z2, FIX(1.353318001));   /* c3 */

-    tmp2  = MULTIPLY(tmp11,   FIX(1.247225013));   /* c5 */

-    tmp3  = MULTIPLY(z1 + z4, FIX(1.093201867));   /* c7 */

-    tmp10 = MULTIPLY(z1 - z4, FIX(0.897167586));   /* c9 */

-    tmp11 = MULTIPLY(tmp11,   FIX(0.666655658));   /* c11 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.410524528));   /* c13 */

-    tmp0  = tmp1 + tmp2 + tmp3 -

-	    MULTIPLY(z1, FIX(2.286341144));        /* c7+c5+c3-c1 */

-    tmp13 = tmp10 + tmp11 + tmp12 -

-	    MULTIPLY(z1, FIX(1.835730603));        /* c9+c11+c13-c15 */

-    z1    = MULTIPLY(z2 + z3, FIX(0.138617169));   /* c15 */

-    tmp1  += z1 + MULTIPLY(z2, FIX(0.071888074));  /* c9+c11-c3-c15 */

-    tmp2  += z1 - MULTIPLY(z3, FIX(1.125726048));  /* c5+c7+c15-c3 */

-    z1    = MULTIPLY(z3 - z2, FIX(1.407403738));   /* c1 */

-    tmp11 += z1 - MULTIPLY(z3, FIX(0.766367282));  /* c1+c11-c9-c13 */

-    tmp12 += z1 + MULTIPLY(z2, FIX(1.971951411));  /* c1+c5+c13-c7 */

-    z2    += z4;

-    z1    = MULTIPLY(z2, - FIX(0.666655658));      /* -c11 */

-    tmp1  += z1;

-    tmp3  += z1 + MULTIPLY(z4, FIX(1.065388962));  /* c3+c11+c15-c7 */

-    z2    = MULTIPLY(z2, - FIX(1.247225013));      /* -c5 */

-    tmp10 += z2 + MULTIPLY(z4, FIX(3.141271809));  /* c1+c5+c9-c13 */

-    tmp12 += z2;

-    z2    = MULTIPLY(z3 + z4, - FIX(1.353318001)); /* -c3 */

-    tmp2  += z2;

-    tmp3  += z2;

-    z2    = MULTIPLY(z4 - z3, FIX(0.410524528));   /* c13 */

-    tmp10 += z2;

-    tmp11 += z2;

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp0,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[15] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp0,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp1,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[14] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp1,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp2,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[13] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp2,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp3,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp3,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp26 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp27 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp27 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 16x8 output block.

- *

- * 8-point IDCT in pass 1 (columns), 16-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_16x8 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp10, tmp11, tmp12, tmp13;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26, tmp27;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*8];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * Note results are scaled up by sqrt(8) compared to a true IDCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 8-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = DCTSIZE; ctr > 0; ctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any column in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * column DCT calculations can be simplified this way.

-     */

-

-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&

-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&

-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&

-	inptr[DCTSIZE*7] == 0) {

-      /* AC terms all zero */

-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;

-

-      wsptr[DCTSIZE*0] = dcval;

-      wsptr[DCTSIZE*1] = dcval;

-      wsptr[DCTSIZE*2] = dcval;

-      wsptr[DCTSIZE*3] = dcval;

-      wsptr[DCTSIZE*4] = dcval;

-      wsptr[DCTSIZE*5] = dcval;

-      wsptr[DCTSIZE*6] = dcval;

-      wsptr[DCTSIZE*7] = dcval;

-

-      inptr++;			/* advance pointers to next column */

-      quantptr++;

-      wsptr++;

-      continue;

-    }

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z2 <<= CONST_BITS;

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z2 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    tmp0 = z2 + z3;

-    tmp1 = z2 - z3;

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    wsptr[DCTSIZE*0] = (int) RIGHT_SHIFT(tmp10 + tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*7] = (int) RIGHT_SHIFT(tmp10 - tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*1] = (int) RIGHT_SHIFT(tmp11 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*6] = (int) RIGHT_SHIFT(tmp11 - tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*2] = (int) RIGHT_SHIFT(tmp12 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*5] = (int) RIGHT_SHIFT(tmp12 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*3] = (int) RIGHT_SHIFT(tmp13 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[DCTSIZE*4] = (int) RIGHT_SHIFT(tmp13 - tmp0, CONST_BITS-PASS1_BITS);

-

-    inptr++;			/* advance pointers to next column */

-    quantptr++;

-    wsptr++;

-  }

-

-  /* Pass 2: process 8 rows from work array, store into output array.

-   * 16-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[4];

-    tmp1 = MULTIPLY(z1, FIX(1.306562965));      /* c4[16] = c2[8] */

-    tmp2 = MULTIPLY(z1, FIX_0_541196100);       /* c12[16] = c6[8] */

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[6];

-    z3 = z1 - z2;

-    z4 = MULTIPLY(z3, FIX(0.275899379));        /* c14[16] = c7[8] */

-    z3 = MULTIPLY(z3, FIX(1.387039845));        /* c2[16] = c1[8] */

-

-    tmp0 = z3 + MULTIPLY(z2, FIX_2_562915447);  /* (c6+c2)[16] = (c3+c1)[8] */

-    tmp1 = z4 + MULTIPLY(z1, FIX_0_899976223);  /* (c6-c14)[16] = (c3-c7)[8] */

-    tmp2 = z3 - MULTIPLY(z1, FIX(0.601344887)); /* (c2-c10)[16] = (c1-c5)[8] */

-    tmp3 = z4 - MULTIPLY(z2, FIX(0.509795579)); /* (c10-c14)[16] = (c5-c7)[8] */

-

-    tmp20 = tmp10 + tmp0;

-    tmp27 = tmp10 - tmp0;

-    tmp21 = tmp12 + tmp1;

-    tmp26 = tmp12 - tmp1;

-    tmp22 = tmp13 + tmp2;

-    tmp25 = tmp13 - tmp2;

-    tmp23 = tmp11 + tmp3;

-    tmp24 = tmp11 - tmp3;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = z1 + z3;

-

-    tmp1  = MULTIPLY(z1 + z2, FIX(1.353318001));   /* c3 */

-    tmp2  = MULTIPLY(tmp11,   FIX(1.247225013));   /* c5 */

-    tmp3  = MULTIPLY(z1 + z4, FIX(1.093201867));   /* c7 */

-    tmp10 = MULTIPLY(z1 - z4, FIX(0.897167586));   /* c9 */

-    tmp11 = MULTIPLY(tmp11,   FIX(0.666655658));   /* c11 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.410524528));   /* c13 */

-    tmp0  = tmp1 + tmp2 + tmp3 -

-	    MULTIPLY(z1, FIX(2.286341144));        /* c7+c5+c3-c1 */

-    tmp13 = tmp10 + tmp11 + tmp12 -

-	    MULTIPLY(z1, FIX(1.835730603));        /* c9+c11+c13-c15 */

-    z1    = MULTIPLY(z2 + z3, FIX(0.138617169));   /* c15 */

-    tmp1  += z1 + MULTIPLY(z2, FIX(0.071888074));  /* c9+c11-c3-c15 */

-    tmp2  += z1 - MULTIPLY(z3, FIX(1.125726048));  /* c5+c7+c15-c3 */

-    z1    = MULTIPLY(z3 - z2, FIX(1.407403738));   /* c1 */

-    tmp11 += z1 - MULTIPLY(z3, FIX(0.766367282));  /* c1+c11-c9-c13 */

-    tmp12 += z1 + MULTIPLY(z2, FIX(1.971951411));  /* c1+c5+c13-c7 */

-    z2    += z4;

-    z1    = MULTIPLY(z2, - FIX(0.666655658));      /* -c11 */

-    tmp1  += z1;

-    tmp3  += z1 + MULTIPLY(z4, FIX(1.065388962));  /* c3+c11+c15-c7 */

-    z2    = MULTIPLY(z2, - FIX(1.247225013));      /* -c5 */

-    tmp10 += z2 + MULTIPLY(z4, FIX(3.141271809));  /* c1+c5+c9-c13 */

-    tmp12 += z2;

-    z2    = MULTIPLY(z3 + z4, - FIX(1.353318001)); /* -c3 */

-    tmp2  += z2;

-    tmp3  += z2;

-    z2    = MULTIPLY(z4 - z3, FIX(0.410524528));   /* c13 */

-    tmp10 += z2;

-    tmp11 += z2;

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp0,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[15] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp0,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp1,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[14] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp1,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp2,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[13] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp2,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp3,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp3,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp26 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp27 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp27 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 14x7 output block.

- *

- * 7-point IDCT in pass 1 (columns), 14-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_14x7 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*7];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 7-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/14).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp23 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp23 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp23 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    tmp20 = MULTIPLY(z2 - z3, FIX(0.881747734));       /* c4 */

-    tmp22 = MULTIPLY(z1 - z2, FIX(0.314692123));       /* c6 */

-    tmp21 = tmp20 + tmp22 + tmp23 - MULTIPLY(z2, FIX(1.841218003)); /* c2+c4-c6 */

-    tmp10 = z1 + z3;

-    z2 -= tmp10;

-    tmp10 = MULTIPLY(tmp10, FIX(1.274162392)) + tmp23; /* c2 */

-    tmp20 += tmp10 - MULTIPLY(z3, FIX(0.077722536));   /* c2-c4-c6 */

-    tmp22 += tmp10 - MULTIPLY(z1, FIX(2.470602249));   /* c2+c4+c6 */

-    tmp23 += MULTIPLY(z2, FIX(1.414213562));           /* c0 */

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-

-    tmp11 = MULTIPLY(z1 + z2, FIX(0.935414347));       /* (c3+c1-c5)/2 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.170262339));       /* (c3+c5-c1)/2 */

-    tmp10 = tmp11 - tmp12;

-    tmp11 += tmp12;

-    tmp12 = MULTIPLY(z2 + z3, - FIX(1.378756276));     /* -c1 */

-    tmp11 += tmp12;

-    z2 = MULTIPLY(z1 + z3, FIX(0.613604268));          /* c5 */

-    tmp10 += z2;

-    tmp12 += z2 + MULTIPLY(z3, FIX(1.870828693));      /* c3+c1-c5 */

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*6] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1] = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*5] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*2] = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*4] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3] = (int) RIGHT_SHIFT(tmp23, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 7 rows from work array, store into output array.

-   * 14-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/28).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 7; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z1 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z1 <<= CONST_BITS;

-    z4 = (INT32) wsptr[4];

-    z2 = MULTIPLY(z4, FIX(1.274162392));         /* c4 */

-    z3 = MULTIPLY(z4, FIX(0.314692123));         /* c12 */

-    z4 = MULTIPLY(z4, FIX(0.881747734));         /* c8 */

-

-    tmp10 = z1 + z2;

-    tmp11 = z1 + z3;

-    tmp12 = z1 - z4;

-

-    tmp23 = z1 - ((z2 + z3 - z4) << 1);          /* c0 = (c4+c12-c8)*2 */

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[6];

-

-    z3 = MULTIPLY(z1 + z2, FIX(1.105676686));    /* c6 */

-

-    tmp13 = z3 + MULTIPLY(z1, FIX(0.273079590)); /* c2-c6 */

-    tmp14 = z3 - MULTIPLY(z2, FIX(1.719280954)); /* c6+c10 */

-    tmp15 = MULTIPLY(z1, FIX(0.613604268)) -     /* c10 */

-	    MULTIPLY(z2, FIX(1.378756276));      /* c2 */

-

-    tmp20 = tmp10 + tmp13;

-    tmp26 = tmp10 - tmp13;

-    tmp21 = tmp11 + tmp14;

-    tmp25 = tmp11 - tmp14;

-    tmp22 = tmp12 + tmp15;

-    tmp24 = tmp12 - tmp15;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-    z4 <<= CONST_BITS;

-

-    tmp14 = z1 + z3;

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.334852607));           /* c3 */

-    tmp12 = MULTIPLY(tmp14, FIX(1.197448846));             /* c5 */

-    tmp10 = tmp11 + tmp12 + z4 - MULTIPLY(z1, FIX(1.126980169)); /* c3+c5-c1 */

-    tmp14 = MULTIPLY(tmp14, FIX(0.752406978));             /* c9 */

-    tmp16 = tmp14 - MULTIPLY(z1, FIX(1.061150426));        /* c9+c11-c13 */

-    z1    -= z2;

-    tmp15 = MULTIPLY(z1, FIX(0.467085129)) - z4;           /* c11 */

-    tmp16 += tmp15;

-    tmp13 = MULTIPLY(z2 + z3, - FIX(0.158341681)) - z4;    /* -c13 */

-    tmp11 += tmp13 - MULTIPLY(z2, FIX(0.424103948));       /* c3-c9-c13 */

-    tmp12 += tmp13 - MULTIPLY(z3, FIX(2.373959773));       /* c3+c5-c13 */

-    tmp13 = MULTIPLY(z3 - z2, FIX(1.405321284));           /* c1 */

-    tmp14 += tmp13 + z4 - MULTIPLY(z3, FIX(1.6906431334)); /* c1+c9-c11 */

-    tmp15 += tmp13 + MULTIPLY(z2, FIX(0.674957567));       /* c1+c11-c5 */

-

-    tmp13 = ((z1 - z3) << CONST_BITS) + z4;

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[13] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[12] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp26 + tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp26 - tmp16,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 12x6 output block.

- *

- * 6-point IDCT in pass 1 (columns), 12-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_12x6 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*6];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 6-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp10 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp10 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp10 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp12 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp20 = MULTIPLY(tmp12, FIX(0.707106781));   /* c4 */

-    tmp11 = tmp10 + tmp20;

-    tmp21 = RIGHT_SHIFT(tmp10 - tmp20 - tmp20, CONST_BITS-PASS1_BITS);

-    tmp20 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp10 = MULTIPLY(tmp20, FIX(1.224744871));   /* c2 */

-    tmp20 = tmp11 + tmp10;

-    tmp22 = tmp11 - tmp10;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp11 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp10 = tmp11 + ((z1 + z2) << CONST_BITS);

-    tmp12 = tmp11 + ((z3 - z2) << CONST_BITS);

-    tmp11 = (z1 - z2 - z3) << PASS1_BITS;

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*5] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*1] = (int) (tmp21 + tmp11);

-    wsptr[8*4] = (int) (tmp21 - tmp11);

-    wsptr[8*2] = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*3] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 6 rows from work array, store into output array.

-   * 12-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/24).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z3 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 <<= CONST_BITS;

-

-    z4 = (INT32) wsptr[4];

-    z4 = MULTIPLY(z4, FIX(1.224744871)); /* c4 */

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    z1 = (INT32) wsptr[2];

-    z4 = MULTIPLY(z1, FIX(1.366025404)); /* c2 */

-    z1 <<= CONST_BITS;

-    z2 = (INT32) wsptr[6];

-    z2 <<= CONST_BITS;

-

-    tmp12 = z1 - z2;

-

-    tmp21 = z3 + tmp12;

-    tmp24 = z3 - tmp12;

-

-    tmp12 = z4 + z2;

-

-    tmp20 = tmp10 + tmp12;

-    tmp25 = tmp10 - tmp12;

-

-    tmp12 = z4 - z1 - z2;

-

-    tmp22 = tmp11 + tmp12;

-    tmp23 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = MULTIPLY(z2, FIX(1.306562965));                  /* c3 */

-    tmp14 = MULTIPLY(z2, - FIX_0_541196100);                 /* -c9 */

-

-    tmp10 = z1 + z3;

-    tmp15 = MULTIPLY(tmp10 + z4, FIX(0.860918669));          /* c7 */

-    tmp12 = tmp15 + MULTIPLY(tmp10, FIX(0.261052384));       /* c5-c7 */

-    tmp10 = tmp12 + tmp11 + MULTIPLY(z1, FIX(0.280143716));  /* c1-c5 */

-    tmp13 = MULTIPLY(z3 + z4, - FIX(1.045510580));           /* -(c7+c11) */

-    tmp12 += tmp13 + tmp14 - MULTIPLY(z3, FIX(1.478575242)); /* c1+c5-c7-c11 */

-    tmp13 += tmp15 - tmp11 + MULTIPLY(z4, FIX(1.586706681)); /* c1+c11 */

-    tmp15 += tmp14 - MULTIPLY(z1, FIX(0.676326758)) -        /* c7-c11 */

-	     MULTIPLY(z4, FIX(1.982889723));                 /* c5+c7 */

-

-    z1 -= z4;

-    z2 -= z3;

-    z3 = MULTIPLY(z1 + z2, FIX_0_541196100);                 /* c9 */

-    tmp11 = z3 + MULTIPLY(z1, FIX_0_765366865);              /* c3-c9 */

-    tmp14 = z3 - MULTIPLY(z2, FIX_1_847759065);              /* c3+c9 */

-

-    /* Final output stage */

-

-    outptr[0]  = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[11] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[1]  = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[10] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[2]  = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[9]  = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[3]  = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[8]  = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[4]  = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[7]  = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[5]  = range_limit[(int) RIGHT_SHIFT(tmp25 + tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-    outptr[6]  = range_limit[(int) RIGHT_SHIFT(tmp25 - tmp15,

-					       CONST_BITS+PASS1_BITS+3)

-			     & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 10x5 output block.

- *

- * 5-point IDCT in pass 1 (columns), 10-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_10x5 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*5];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 5-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/10).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp12 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp12 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp12 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp13 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp14 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z1 = MULTIPLY(tmp13 + tmp14, FIX(0.790569415)); /* (c2+c4)/2 */

-    z2 = MULTIPLY(tmp13 - tmp14, FIX(0.353553391)); /* (c2-c4)/2 */

-    z3 = tmp12 + z2;

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z1;

-    tmp12 -= z2 << 2;

-

-    /* Odd part */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));       /* c3 */

-    tmp13 = z1 + MULTIPLY(z2, FIX(0.513743148));    /* c1-c3 */

-    tmp14 = z1 - MULTIPLY(z3, FIX(2.176250899));    /* c1+c3 */

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) RIGHT_SHIFT(tmp10 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*4] = (int) RIGHT_SHIFT(tmp10 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*1] = (int) RIGHT_SHIFT(tmp11 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*3] = (int) RIGHT_SHIFT(tmp11 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[8*2] = (int) RIGHT_SHIFT(tmp12, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 5 rows from work array, store into output array.

-   * 10-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/20).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 5; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z3 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 <<= CONST_BITS;

-    z4 = (INT32) wsptr[4];

-    z1 = MULTIPLY(z4, FIX(1.144122806));         /* c4 */

-    z2 = MULTIPLY(z4, FIX(0.437016024));         /* c8 */

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z2;

-

-    tmp22 = z3 - ((z1 - z2) << 1);               /* c0 = (c4-c8)*2 */

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[6];

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));    /* c6 */

-    tmp12 = z1 + MULTIPLY(z2, FIX(0.513743148)); /* c2-c6 */

-    tmp13 = z1 - MULTIPLY(z3, FIX(2.176250899)); /* c2+c6 */

-

-    tmp20 = tmp10 + tmp12;

-    tmp24 = tmp10 - tmp12;

-    tmp21 = tmp11 + tmp13;

-    tmp23 = tmp11 - tmp13;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    z3 <<= CONST_BITS;

-    z4 = (INT32) wsptr[7];

-

-    tmp11 = z2 + z4;

-    tmp13 = z2 - z4;

-

-    tmp12 = MULTIPLY(tmp13, FIX(0.309016994));        /* (c3-c7)/2 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.951056516));           /* (c3+c7)/2 */

-    z4 = z3 + tmp12;

-

-    tmp10 = MULTIPLY(z1, FIX(1.396802247)) + z2 + z4; /* c1 */

-    tmp14 = MULTIPLY(z1, FIX(0.221231742)) - z2 + z4; /* c9 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.587785252));           /* (c1-c9)/2 */

-    z4 = z3 - tmp12 - (tmp13 << (CONST_BITS - 1));

-

-    tmp12 = ((z1 - tmp13) << CONST_BITS) - z3;

-

-    tmp11 = MULTIPLY(z1, FIX(1.260073511)) - z2 - z4; /* c3 */

-    tmp13 = MULTIPLY(z1, FIX(0.642039522)) - z2 + z4; /* c7 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[9] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[8] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp23 + tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp23 - tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp24 + tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp24 - tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 8;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 8x4 output block.

- *

- * 4-point IDCT in pass 1 (columns), 8-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_8x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*4];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 4-point IDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point IDCT].

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-

-    tmp10 = (tmp0 + tmp2) << PASS1_BITS;

-    tmp12 = (tmp0 - tmp2) << PASS1_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);               /* c6 */

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp0 = RIGHT_SHIFT(z1 + MULTIPLY(z2, FIX_0_765366865), /* c2-c6 */

-		       CONST_BITS-PASS1_BITS);

-    tmp2 = RIGHT_SHIFT(z1 - MULTIPLY(z3, FIX_1_847759065), /* c2+c6 */

-		       CONST_BITS-PASS1_BITS);

-

-    /* Final output stage */

-

-    wsptr[8*0] = (int) (tmp10 + tmp0);

-    wsptr[8*3] = (int) (tmp10 - tmp0);

-    wsptr[8*1] = (int) (tmp12 + tmp2);

-    wsptr[8*2] = (int) (tmp12 - tmp2);

-  }

-

-  /* Pass 2: process rows from work array, store into output array.

-   * Note that we must descale the results by a factor of 8 == 2**3,

-   * and also undo the PASS1_BITS scaling.

-   * 8-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 4; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z2 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 = (INT32) wsptr[4];

-

-    tmp0 = (z2 + z3) << CONST_BITS;

-    tmp1 = (z2 - z3) << CONST_BITS;

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[6];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = (INT32) wsptr[7];

-    tmp1 = (INT32) wsptr[5];

-    tmp2 = (INT32) wsptr[3];

-    tmp3 = (INT32) wsptr[1];

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp13 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp13 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += DCTSIZE;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 6x3 output block.

- *

- * 3-point IDCT in pass 1 (columns), 6-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_6x3 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp10, tmp11, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[6*3];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 3-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/6).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp12 = MULTIPLY(tmp2, FIX(0.707106781)); /* c2 */

-    tmp10 = tmp0 + tmp12;

-    tmp2 = tmp0 - tmp12 - tmp12;

-

-    /* Odd part */

-

-    tmp12 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    tmp0 = MULTIPLY(tmp12, FIX(1.224744871)); /* c1 */

-

-    /* Final output stage */

-

-    wsptr[6*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[6*2] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[6*1] = (int) RIGHT_SHIFT(tmp2, CONST_BITS-PASS1_BITS);

-  }

-  

-  /* Pass 2: process 3 rows from work array, store into output array.

-   * 6-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 3; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-    tmp2 = (INT32) wsptr[4];

-    tmp10 = MULTIPLY(tmp2, FIX(0.707106781));   /* c4 */

-    tmp1 = tmp0 + tmp10;

-    tmp11 = tmp0 - tmp10 - tmp10;

-    tmp10 = (INT32) wsptr[2];

-    tmp0 = MULTIPLY(tmp10, FIX(1.224744871));   /* c2 */

-    tmp10 = tmp1 + tmp0;

-    tmp12 = tmp1 - tmp0;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    tmp1 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp0 = tmp1 + ((z1 + z2) << CONST_BITS);

-    tmp2 = tmp1 + ((z3 - z2) << CONST_BITS);

-    tmp1 = (z1 - z2 - z3) << CONST_BITS;

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 6;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 4x2 output block.

- *

- * 2-point IDCT in pass 1 (columns), 4-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_4x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp2, tmp10, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  INT32 * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  INT32 workspace[4*2];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array. */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 4; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp10 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-

-    /* Odd part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-

-    /* Final output stage */

-

-    wsptr[4*0] = tmp10 + tmp0;

-    wsptr[4*1] = tmp10 - tmp0;

-  }

-

-  /* Pass 2: process 2 rows from work array, store into output array.

-   * 4-point IDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point IDCT].

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 2; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = wsptr[0] + ((((INT32) RANGE_CENTER) << 3) + (ONE << 2));

-    tmp2 = wsptr[2];

-

-    tmp10 = (tmp0 + tmp2) << CONST_BITS;

-    tmp12 = (tmp0 - tmp2) << CONST_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = wsptr[1];

-    z3 = wsptr[3];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);   /* c6 */

-    tmp0 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */

-    tmp2 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 4;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 2x1 output block.

- *

- * 1-point IDCT in pass 1 (columns), 2-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_2x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  DCTELEM tmp0, tmp1;

-  ISLOW_MULT_TYPE * quantptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  ISHIFT_TEMPS

-

-  /* Pass 1: empty. */

-

-  /* Pass 2: process 1 row from input, store into output array. */

-

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  outptr = output_buf[0] + output_col;

-

-  /* Even part */

-

-  tmp0 = DEQUANTIZE(coef_block[0], quantptr[0]);

-  /* Add range center and fudge factor for final descale and range-limit. */

-  tmp0 += (((DCTELEM) RANGE_CENTER) << 3) + (1 << 2);

-

-  /* Odd part */

-

-  tmp1 = DEQUANTIZE(coef_block[1], quantptr[1]);

-

-  /* Final output stage */

-

-  outptr[0] = range_limit[(int) IRIGHT_SHIFT(tmp0 + tmp1, 3) & RANGE_MASK];

-  outptr[1] = range_limit[(int) IRIGHT_SHIFT(tmp0 - tmp1, 3) & RANGE_MASK];

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 8x16 output block.

- *

- * 16-point IDCT in pass 1 (columns), 8-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_8x16 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3, tmp10, tmp11, tmp12, tmp13;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26, tmp27;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[8*16];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 16-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/32).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp1 = MULTIPLY(z1, FIX(1.306562965));      /* c4[16] = c2[8] */

-    tmp2 = MULTIPLY(z1, FIX_0_541196100);       /* c12[16] = c6[8] */

-

-    tmp10 = tmp0 + tmp1;

-    tmp11 = tmp0 - tmp1;

-    tmp12 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-    z3 = z1 - z2;

-    z4 = MULTIPLY(z3, FIX(0.275899379));        /* c14[16] = c7[8] */

-    z3 = MULTIPLY(z3, FIX(1.387039845));        /* c2[16] = c1[8] */

-

-    tmp0 = z3 + MULTIPLY(z2, FIX_2_562915447);  /* (c6+c2)[16] = (c3+c1)[8] */

-    tmp1 = z4 + MULTIPLY(z1, FIX_0_899976223);  /* (c6-c14)[16] = (c3-c7)[8] */

-    tmp2 = z3 - MULTIPLY(z1, FIX(0.601344887)); /* (c2-c10)[16] = (c1-c5)[8] */

-    tmp3 = z4 - MULTIPLY(z2, FIX(0.509795579)); /* (c10-c14)[16] = (c5-c7)[8] */

-

-    tmp20 = tmp10 + tmp0;

-    tmp27 = tmp10 - tmp0;

-    tmp21 = tmp12 + tmp1;

-    tmp26 = tmp12 - tmp1;

-    tmp22 = tmp13 + tmp2;

-    tmp25 = tmp13 - tmp2;

-    tmp23 = tmp11 + tmp3;

-    tmp24 = tmp11 - tmp3;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = z1 + z3;

-

-    tmp1  = MULTIPLY(z1 + z2, FIX(1.353318001));   /* c3 */

-    tmp2  = MULTIPLY(tmp11,   FIX(1.247225013));   /* c5 */

-    tmp3  = MULTIPLY(z1 + z4, FIX(1.093201867));   /* c7 */

-    tmp10 = MULTIPLY(z1 - z4, FIX(0.897167586));   /* c9 */

-    tmp11 = MULTIPLY(tmp11,   FIX(0.666655658));   /* c11 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.410524528));   /* c13 */

-    tmp0  = tmp1 + tmp2 + tmp3 -

-	    MULTIPLY(z1, FIX(2.286341144));        /* c7+c5+c3-c1 */

-    tmp13 = tmp10 + tmp11 + tmp12 -

-	    MULTIPLY(z1, FIX(1.835730603));        /* c9+c11+c13-c15 */

-    z1    = MULTIPLY(z2 + z3, FIX(0.138617169));   /* c15 */

-    tmp1  += z1 + MULTIPLY(z2, FIX(0.071888074));  /* c9+c11-c3-c15 */

-    tmp2  += z1 - MULTIPLY(z3, FIX(1.125726048));  /* c5+c7+c15-c3 */

-    z1    = MULTIPLY(z3 - z2, FIX(1.407403738));   /* c1 */

-    tmp11 += z1 - MULTIPLY(z3, FIX(0.766367282));  /* c1+c11-c9-c13 */

-    tmp12 += z1 + MULTIPLY(z2, FIX(1.971951411));  /* c1+c5+c13-c7 */

-    z2    += z4;

-    z1    = MULTIPLY(z2, - FIX(0.666655658));      /* -c11 */

-    tmp1  += z1;

-    tmp3  += z1 + MULTIPLY(z4, FIX(1.065388962));  /* c3+c11+c15-c7 */

-    z2    = MULTIPLY(z2, - FIX(1.247225013));      /* -c5 */

-    tmp10 += z2 + MULTIPLY(z4, FIX(3.141271809));  /* c1+c5+c9-c13 */

-    tmp12 += z2;

-    z2    = MULTIPLY(z3 + z4, - FIX(1.353318001)); /* -c3 */

-    tmp2  += z2;

-    tmp3  += z2;

-    z2    = MULTIPLY(z4 - z3, FIX(0.410524528));   /* c13 */

-    tmp10 += z2;

-    tmp11 += z2;

-

-    /* Final output stage */

-

-    wsptr[8*0]  = (int) RIGHT_SHIFT(tmp20 + tmp0,  CONST_BITS-PASS1_BITS);

-    wsptr[8*15] = (int) RIGHT_SHIFT(tmp20 - tmp0,  CONST_BITS-PASS1_BITS);

-    wsptr[8*1]  = (int) RIGHT_SHIFT(tmp21 + tmp1,  CONST_BITS-PASS1_BITS);

-    wsptr[8*14] = (int) RIGHT_SHIFT(tmp21 - tmp1,  CONST_BITS-PASS1_BITS);

-    wsptr[8*2]  = (int) RIGHT_SHIFT(tmp22 + tmp2,  CONST_BITS-PASS1_BITS);

-    wsptr[8*13] = (int) RIGHT_SHIFT(tmp22 - tmp2,  CONST_BITS-PASS1_BITS);

-    wsptr[8*3]  = (int) RIGHT_SHIFT(tmp23 + tmp3,  CONST_BITS-PASS1_BITS);

-    wsptr[8*12] = (int) RIGHT_SHIFT(tmp23 - tmp3,  CONST_BITS-PASS1_BITS);

-    wsptr[8*4]  = (int) RIGHT_SHIFT(tmp24 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*11] = (int) RIGHT_SHIFT(tmp24 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[8*5]  = (int) RIGHT_SHIFT(tmp25 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*10] = (int) RIGHT_SHIFT(tmp25 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[8*6]  = (int) RIGHT_SHIFT(tmp26 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*9]  = (int) RIGHT_SHIFT(tmp26 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[8*7]  = (int) RIGHT_SHIFT(tmp27 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[8*8]  = (int) RIGHT_SHIFT(tmp27 - tmp13, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process rows from work array, store into output array.

-   * Note that we must descale the results by a factor of 8 == 2**3,

-   * and also undo the PASS1_BITS scaling.

-   * 8-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 16; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    z2 = (INT32) wsptr[0] +

-	   ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	    (ONE << (PASS1_BITS+2)));

-    z3 = (INT32) wsptr[4];

-

-    tmp0 = (z2 + z3) << CONST_BITS;

-    tmp1 = (z2 - z3) << CONST_BITS;

-

-    z2 = (INT32) wsptr[2];

-    z3 = (INT32) wsptr[6];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = (INT32) wsptr[7];

-    tmp1 = (INT32) wsptr[5];

-    tmp2 = (INT32) wsptr[3];

-    tmp3 = (INT32) wsptr[1];

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[7] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp3,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp1,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp13 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp13 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += DCTSIZE;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 7x14 output block.

- *

- * 14-point IDCT in pass 1 (columns), 7-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_7x14 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25, tmp26;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[7*14];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 14-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/28).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 7; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z1 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z1 += ONE << (CONST_BITS-PASS1_BITS-1);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z2 = MULTIPLY(z4, FIX(1.274162392));         /* c4 */

-    z3 = MULTIPLY(z4, FIX(0.314692123));         /* c12 */

-    z4 = MULTIPLY(z4, FIX(0.881747734));         /* c8 */

-

-    tmp10 = z1 + z2;

-    tmp11 = z1 + z3;

-    tmp12 = z1 - z4;

-

-    tmp23 = RIGHT_SHIFT(z1 - ((z2 + z3 - z4) << 1), /* c0 = (c4+c12-c8)*2 */

-			CONST_BITS-PASS1_BITS);

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z3 = MULTIPLY(z1 + z2, FIX(1.105676686));    /* c6 */

-

-    tmp13 = z3 + MULTIPLY(z1, FIX(0.273079590)); /* c2-c6 */

-    tmp14 = z3 - MULTIPLY(z2, FIX(1.719280954)); /* c6+c10 */

-    tmp15 = MULTIPLY(z1, FIX(0.613604268)) -     /* c10 */

-	    MULTIPLY(z2, FIX(1.378756276));      /* c2 */

-

-    tmp20 = tmp10 + tmp13;

-    tmp26 = tmp10 - tmp13;

-    tmp21 = tmp11 + tmp14;

-    tmp25 = tmp11 - tmp14;

-    tmp22 = tmp12 + tmp15;

-    tmp24 = tmp12 - tmp15;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-    tmp13 = z4 << CONST_BITS;

-

-    tmp14 = z1 + z3;

-    tmp11 = MULTIPLY(z1 + z2, FIX(1.334852607));           /* c3 */

-    tmp12 = MULTIPLY(tmp14, FIX(1.197448846));             /* c5 */

-    tmp10 = tmp11 + tmp12 + tmp13 - MULTIPLY(z1, FIX(1.126980169)); /* c3+c5-c1 */

-    tmp14 = MULTIPLY(tmp14, FIX(0.752406978));             /* c9 */

-    tmp16 = tmp14 - MULTIPLY(z1, FIX(1.061150426));        /* c9+c11-c13 */

-    z1    -= z2;

-    tmp15 = MULTIPLY(z1, FIX(0.467085129)) - tmp13;        /* c11 */

-    tmp16 += tmp15;

-    z1    += z4;

-    z4    = MULTIPLY(z2 + z3, - FIX(0.158341681)) - tmp13; /* -c13 */

-    tmp11 += z4 - MULTIPLY(z2, FIX(0.424103948));          /* c3-c9-c13 */

-    tmp12 += z4 - MULTIPLY(z3, FIX(2.373959773));          /* c3+c5-c13 */

-    z4    = MULTIPLY(z3 - z2, FIX(1.405321284));           /* c1 */

-    tmp14 += z4 + tmp13 - MULTIPLY(z3, FIX(1.6906431334)); /* c1+c9-c11 */

-    tmp15 += z4 + MULTIPLY(z2, FIX(0.674957567));          /* c1+c11-c5 */

-

-    tmp13 = (z1 - z3) << PASS1_BITS;

-

-    /* Final output stage */

-

-    wsptr[7*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[7*13] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[7*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[7*12] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[7*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[7*11] = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[7*3]  = (int) (tmp23 + tmp13);

-    wsptr[7*10] = (int) (tmp23 - tmp13);

-    wsptr[7*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[7*9]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[7*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[7*8]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[7*6]  = (int) RIGHT_SHIFT(tmp26 + tmp16, CONST_BITS-PASS1_BITS);

-    wsptr[7*7]  = (int) RIGHT_SHIFT(tmp26 - tmp16, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 14 rows from work array, store into output array.

-   * 7-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/14).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 14; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp23 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp23 <<= CONST_BITS;

-

-    z1 = (INT32) wsptr[2];

-    z2 = (INT32) wsptr[4];

-    z3 = (INT32) wsptr[6];

-

-    tmp20 = MULTIPLY(z2 - z3, FIX(0.881747734));       /* c4 */

-    tmp22 = MULTIPLY(z1 - z2, FIX(0.314692123));       /* c6 */

-    tmp21 = tmp20 + tmp22 + tmp23 - MULTIPLY(z2, FIX(1.841218003)); /* c2+c4-c6 */

-    tmp10 = z1 + z3;

-    z2 -= tmp10;

-    tmp10 = MULTIPLY(tmp10, FIX(1.274162392)) + tmp23; /* c2 */

-    tmp20 += tmp10 - MULTIPLY(z3, FIX(0.077722536));   /* c2-c4-c6 */

-    tmp22 += tmp10 - MULTIPLY(z1, FIX(2.470602249));   /* c2+c4+c6 */

-    tmp23 += MULTIPLY(z2, FIX(1.414213562));           /* c0 */

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-

-    tmp11 = MULTIPLY(z1 + z2, FIX(0.935414347));       /* (c3+c1-c5)/2 */

-    tmp12 = MULTIPLY(z1 - z2, FIX(0.170262339));       /* (c3+c5-c1)/2 */

-    tmp10 = tmp11 - tmp12;

-    tmp11 += tmp12;

-    tmp12 = MULTIPLY(z2 + z3, - FIX(1.378756276));     /* -c1 */

-    tmp11 += tmp12;

-    z2 = MULTIPLY(z1 + z3, FIX(0.613604268));          /* c5 */

-    tmp10 += z2;

-    tmp12 += z2 + MULTIPLY(z3, FIX(1.870828693));      /* c3+c1-c5 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[6] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp23,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 7;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 6x12 output block.

- *

- * 12-point IDCT in pass 1 (columns), 6-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_6x12 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14, tmp15;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24, tmp25;

-  INT32 z1, z2, z3, z4;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[6*12];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 12-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/24).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z3 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z3 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z4 = MULTIPLY(z4, FIX(1.224744871)); /* c4 */

-

-    tmp10 = z3 + z4;

-    tmp11 = z3 - z4;

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z4 = MULTIPLY(z1, FIX(1.366025404)); /* c2 */

-    z1 <<= CONST_BITS;

-    z2 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-    z2 <<= CONST_BITS;

-

-    tmp12 = z1 - z2;

-

-    tmp21 = z3 + tmp12;

-    tmp24 = z3 - tmp12;

-

-    tmp12 = z4 + z2;

-

-    tmp20 = tmp10 + tmp12;

-    tmp25 = tmp10 - tmp12;

-

-    tmp12 = z4 - z1 - z2;

-

-    tmp22 = tmp11 + tmp12;

-    tmp23 = tmp11 - tmp12;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = MULTIPLY(z2, FIX(1.306562965));                  /* c3 */

-    tmp14 = MULTIPLY(z2, - FIX_0_541196100);                 /* -c9 */

-

-    tmp10 = z1 + z3;

-    tmp15 = MULTIPLY(tmp10 + z4, FIX(0.860918669));          /* c7 */

-    tmp12 = tmp15 + MULTIPLY(tmp10, FIX(0.261052384));       /* c5-c7 */

-    tmp10 = tmp12 + tmp11 + MULTIPLY(z1, FIX(0.280143716));  /* c1-c5 */

-    tmp13 = MULTIPLY(z3 + z4, - FIX(1.045510580));           /* -(c7+c11) */

-    tmp12 += tmp13 + tmp14 - MULTIPLY(z3, FIX(1.478575242)); /* c1+c5-c7-c11 */

-    tmp13 += tmp15 - tmp11 + MULTIPLY(z4, FIX(1.586706681)); /* c1+c11 */

-    tmp15 += tmp14 - MULTIPLY(z1, FIX(0.676326758)) -        /* c7-c11 */

-	     MULTIPLY(z4, FIX(1.982889723));                 /* c5+c7 */

-

-    z1 -= z4;

-    z2 -= z3;

-    z3 = MULTIPLY(z1 + z2, FIX_0_541196100);                 /* c9 */

-    tmp11 = z3 + MULTIPLY(z1, FIX_0_765366865);              /* c3-c9 */

-    tmp14 = z3 - MULTIPLY(z2, FIX_1_847759065);              /* c3+c9 */

-

-    /* Final output stage */

-

-    wsptr[6*0]  = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[6*11] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[6*1]  = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[6*10] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[6*2]  = (int) RIGHT_SHIFT(tmp22 + tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[6*9]  = (int) RIGHT_SHIFT(tmp22 - tmp12, CONST_BITS-PASS1_BITS);

-    wsptr[6*3]  = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[6*8]  = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[6*4]  = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[6*7]  = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[6*5]  = (int) RIGHT_SHIFT(tmp25 + tmp15, CONST_BITS-PASS1_BITS);

-    wsptr[6*6]  = (int) RIGHT_SHIFT(tmp25 - tmp15, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 12 rows from work array, store into output array.

-   * 6-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 12; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp10 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp10 <<= CONST_BITS;

-    tmp12 = (INT32) wsptr[4];

-    tmp20 = MULTIPLY(tmp12, FIX(0.707106781));   /* c4 */

-    tmp11 = tmp10 + tmp20;

-    tmp21 = tmp10 - tmp20 - tmp20;

-    tmp20 = (INT32) wsptr[2];

-    tmp10 = MULTIPLY(tmp20, FIX(1.224744871));   /* c2 */

-    tmp20 = tmp11 + tmp10;

-    tmp22 = tmp11 - tmp10;

-

-    /* Odd part */

-

-    z1 = (INT32) wsptr[1];

-    z2 = (INT32) wsptr[3];

-    z3 = (INT32) wsptr[5];

-    tmp11 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp10 = tmp11 + ((z1 + z2) << CONST_BITS);

-    tmp12 = tmp11 + ((z3 - z2) << CONST_BITS);

-    tmp11 = (z1 - z2 - z3) << CONST_BITS;

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp20 + tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[5] = range_limit[(int) RIGHT_SHIFT(tmp20 - tmp10,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp21 + tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp21 - tmp11,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp22 + tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp22 - tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 6;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 5x10 output block.

- *

- * 10-point IDCT in pass 1 (columns), 5-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_5x10 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		JCOEFPTR coef_block,

-		JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp10, tmp11, tmp12, tmp13, tmp14;

-  INT32 tmp20, tmp21, tmp22, tmp23, tmp24;

-  INT32 z1, z2, z3, z4, z5;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[5*10];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 10-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/20).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 5; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    z3 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z3 += ONE << (CONST_BITS-PASS1_BITS-1);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z1 = MULTIPLY(z4, FIX(1.144122806));         /* c4 */

-    z2 = MULTIPLY(z4, FIX(0.437016024));         /* c8 */

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z2;

-

-    tmp22 = RIGHT_SHIFT(z3 - ((z1 - z2) << 1),   /* c0 = (c4-c8)*2 */

-			CONST_BITS-PASS1_BITS);

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));    /* c6 */

-    tmp12 = z1 + MULTIPLY(z2, FIX(0.513743148)); /* c2-c6 */

-    tmp13 = z1 - MULTIPLY(z3, FIX(2.176250899)); /* c2+c6 */

-

-    tmp20 = tmp10 + tmp12;

-    tmp24 = tmp10 - tmp12;

-    tmp21 = tmp11 + tmp13;

-    tmp23 = tmp11 - tmp13;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    z4 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-

-    tmp11 = z2 + z4;

-    tmp13 = z2 - z4;

-

-    tmp12 = MULTIPLY(tmp13, FIX(0.309016994));        /* (c3-c7)/2 */

-    z5 = z3 << CONST_BITS;

-

-    z2 = MULTIPLY(tmp11, FIX(0.951056516));           /* (c3+c7)/2 */

-    z4 = z5 + tmp12;

-

-    tmp10 = MULTIPLY(z1, FIX(1.396802247)) + z2 + z4; /* c1 */

-    tmp14 = MULTIPLY(z1, FIX(0.221231742)) - z2 + z4; /* c9 */

-

-    z2 = MULTIPLY(tmp11, FIX(0.587785252));           /* (c1-c9)/2 */

-    z4 = z5 - tmp12 - (tmp13 << (CONST_BITS - 1));

-

-    tmp12 = (z1 - tmp13 - z3) << PASS1_BITS;

-

-    tmp11 = MULTIPLY(z1, FIX(1.260073511)) - z2 - z4; /* c3 */

-    tmp13 = MULTIPLY(z1, FIX(0.642039522)) - z2 + z4; /* c7 */

-

-    /* Final output stage */

-

-    wsptr[5*0] = (int) RIGHT_SHIFT(tmp20 + tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[5*9] = (int) RIGHT_SHIFT(tmp20 - tmp10, CONST_BITS-PASS1_BITS);

-    wsptr[5*1] = (int) RIGHT_SHIFT(tmp21 + tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[5*8] = (int) RIGHT_SHIFT(tmp21 - tmp11, CONST_BITS-PASS1_BITS);

-    wsptr[5*2] = (int) (tmp22 + tmp12);

-    wsptr[5*7] = (int) (tmp22 - tmp12);

-    wsptr[5*3] = (int) RIGHT_SHIFT(tmp23 + tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[5*6] = (int) RIGHT_SHIFT(tmp23 - tmp13, CONST_BITS-PASS1_BITS);

-    wsptr[5*4] = (int) RIGHT_SHIFT(tmp24 + tmp14, CONST_BITS-PASS1_BITS);

-    wsptr[5*5] = (int) RIGHT_SHIFT(tmp24 - tmp14, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 10 rows from work array, store into output array.

-   * 5-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/10).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 10; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp12 = (INT32) wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	       (ONE << (PASS1_BITS+2)));

-    tmp12 <<= CONST_BITS;

-    tmp13 = (INT32) wsptr[2];

-    tmp14 = (INT32) wsptr[4];

-    z1 = MULTIPLY(tmp13 + tmp14, FIX(0.790569415)); /* (c2+c4)/2 */

-    z2 = MULTIPLY(tmp13 - tmp14, FIX(0.353553391)); /* (c2-c4)/2 */

-    z3 = tmp12 + z2;

-    tmp10 = z3 + z1;

-    tmp11 = z3 - z1;

-    tmp12 -= z2 << 2;

-

-    /* Odd part */

-

-    z2 = (INT32) wsptr[1];

-    z3 = (INT32) wsptr[3];

-

-    z1 = MULTIPLY(z2 + z3, FIX(0.831253876));       /* c3 */

-    tmp13 = z1 + MULTIPLY(z2, FIX(0.513743148));    /* c1-c3 */

-    tmp14 = z1 - MULTIPLY(z3, FIX(2.176250899));    /* c1+c3 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[4] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp13,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp11 + tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp11 - tmp14,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 5;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 4x8 output block.

- *

- * 8-point IDCT in pass 1 (columns), 4-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_4x8 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp3;

-  INT32 tmp10, tmp11, tmp12, tmp13;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[4*8];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * Note results are scaled up by sqrt(8) compared to a true IDCT;

-   * furthermore, we scale the results by 2**PASS1_BITS.

-   * 8-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/16).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 4; ctr > 0; ctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any column in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * column DCT calculations can be simplified this way.

-     */

-

-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&

-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&

-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&

-	inptr[DCTSIZE*7] == 0) {

-      /* AC terms all zero */

-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;

-

-      wsptr[4*0] = dcval;

-      wsptr[4*1] = dcval;

-      wsptr[4*2] = dcval;

-      wsptr[4*3] = dcval;

-      wsptr[4*4] = dcval;

-      wsptr[4*5] = dcval;

-      wsptr[4*6] = dcval;

-      wsptr[4*7] = dcval;

-

-      inptr++;			/* advance pointers to next column */

-      quantptr++;

-      wsptr++;

-      continue;

-    }

-

-    /* Even part: reverse the even part of the forward DCT.

-     * The rotator is c(-6).

-     */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);       /* c6 */

-    tmp2 = z1 + MULTIPLY(z2, FIX_0_765366865);     /* c2-c6 */

-    tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065);     /* c2+c6 */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    z2 <<= CONST_BITS;

-    z3 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    z2 += ONE << (CONST_BITS-PASS1_BITS-1);

-

-    tmp0 = z2 + z3;

-    tmp1 = z2 - z3;

-

-    tmp10 = tmp0 + tmp2;

-    tmp13 = tmp0 - tmp2;

-    tmp11 = tmp1 + tmp3;

-    tmp12 = tmp1 - tmp3;

-

-    /* Odd part per figure 8; the matrix is unitary and hence its

-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.

-     */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);

-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-

-    z2 = tmp0 + tmp2;

-    z3 = tmp1 + tmp3;

-

-    z1 = MULTIPLY(z2 + z3, FIX_1_175875602);       /*  c3 */

-    z2 = MULTIPLY(z2, - FIX_1_961570560);          /* -c3-c5 */

-    z3 = MULTIPLY(z3, - FIX_0_390180644);          /* -c3+c5 */

-    z2 += z1;

-    z3 += z1;

-

-    z1 = MULTIPLY(tmp0 + tmp3, - FIX_0_899976223); /* -c3+c7 */

-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336);        /* -c1+c3+c5-c7 */

-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110);        /*  c1+c3-c5-c7 */

-    tmp0 += z1 + z2;

-    tmp3 += z1 + z3;

-

-    z1 = MULTIPLY(tmp1 + tmp2, - FIX_2_562915447); /* -c1-c3 */

-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869);        /*  c1+c3-c5+c7 */

-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026);        /*  c1+c3+c5-c7 */

-    tmp1 += z1 + z3;

-    tmp2 += z1 + z2;

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    wsptr[4*0] = (int) RIGHT_SHIFT(tmp10 + tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[4*7] = (int) RIGHT_SHIFT(tmp10 - tmp3, CONST_BITS-PASS1_BITS);

-    wsptr[4*1] = (int) RIGHT_SHIFT(tmp11 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[4*6] = (int) RIGHT_SHIFT(tmp11 - tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[4*2] = (int) RIGHT_SHIFT(tmp12 + tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[4*5] = (int) RIGHT_SHIFT(tmp12 - tmp1, CONST_BITS-PASS1_BITS);

-    wsptr[4*3] = (int) RIGHT_SHIFT(tmp13 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[4*4] = (int) RIGHT_SHIFT(tmp13 - tmp0, CONST_BITS-PASS1_BITS);

-

-    inptr++;			/* advance pointers to next column */

-    quantptr++;

-    wsptr++;

-  }

-

-  /* Pass 2: process 8 rows from work array, store into output array.

-   * 4-point IDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point IDCT].

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 8; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp2 = (INT32) wsptr[2];

-

-    tmp10 = (tmp0 + tmp2) << CONST_BITS;

-    tmp12 = (tmp0 - tmp2) << CONST_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = (INT32) wsptr[1];

-    z3 = (INT32) wsptr[3];

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);   /* c6 */

-    tmp0 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */

-    tmp2 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[3] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp12 + tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp12 - tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 4;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a reduced-size 3x6 output block.

- *

- * 6-point IDCT in pass 1 (columns), 3-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_3x6 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp1, tmp2, tmp10, tmp11, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  int * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  int workspace[3*6];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 6-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/12).

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 3; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp0 <<= CONST_BITS;

-    /* Add fudge factor here for final descale. */

-    tmp0 += ONE << (CONST_BITS-PASS1_BITS-1);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);

-    tmp10 = MULTIPLY(tmp2, FIX(0.707106781));   /* c4 */

-    tmp1 = tmp0 + tmp10;

-    tmp11 = RIGHT_SHIFT(tmp0 - tmp10 - tmp10, CONST_BITS-PASS1_BITS);

-    tmp10 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-    tmp0 = MULTIPLY(tmp10, FIX(1.224744871));   /* c2 */

-    tmp10 = tmp1 + tmp0;

-    tmp12 = tmp1 - tmp0;

-

-    /* Odd part */

-

-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);

-    tmp1 = MULTIPLY(z1 + z3, FIX(0.366025404)); /* c5 */

-    tmp0 = tmp1 + ((z1 + z2) << CONST_BITS);

-    tmp2 = tmp1 + ((z3 - z2) << CONST_BITS);

-    tmp1 = (z1 - z2 - z3) << PASS1_BITS;

-

-    /* Final output stage */

-

-    wsptr[3*0] = (int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[3*5] = (int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS-PASS1_BITS);

-    wsptr[3*1] = (int) (tmp11 + tmp1);

-    wsptr[3*4] = (int) (tmp11 - tmp1);

-    wsptr[3*2] = (int) RIGHT_SHIFT(tmp12 + tmp2, CONST_BITS-PASS1_BITS);

-    wsptr[3*3] = (int) RIGHT_SHIFT(tmp12 - tmp2, CONST_BITS-PASS1_BITS);

-  }

-

-  /* Pass 2: process 6 rows from work array, store into output array.

-   * 3-point IDCT kernel, cK represents sqrt(2) * cos(K*pi/6).

-   */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 6; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp0 = (INT32) wsptr[0] +

-	     ((((INT32) RANGE_CENTER) << (PASS1_BITS+3)) +

-	      (ONE << (PASS1_BITS+2)));

-    tmp0 <<= CONST_BITS;

-    tmp2 = (INT32) wsptr[2];

-    tmp12 = MULTIPLY(tmp2, FIX(0.707106781)); /* c2 */

-    tmp10 = tmp0 + tmp12;

-    tmp2 = tmp0 - tmp12 - tmp12;

-

-    /* Odd part */

-

-    tmp12 = (INT32) wsptr[1];

-    tmp0 = MULTIPLY(tmp12, FIX(1.224744871)); /* c1 */

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[2] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp2,

-					      CONST_BITS+PASS1_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 3;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 2x4 output block.

- *

- * 4-point IDCT in pass 1 (columns), 2-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_2x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  INT32 tmp0, tmp2, tmp10, tmp12;

-  INT32 z1, z2, z3;

-  JCOEFPTR inptr;

-  ISLOW_MULT_TYPE * quantptr;

-  INT32 * wsptr;

-  JSAMPROW outptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  int ctr;

-  INT32 workspace[2*4];	/* buffers data between passes */

-  SHIFT_TEMPS

-

-  /* Pass 1: process columns from input, store into work array.

-   * 4-point IDCT kernel,

-   * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point IDCT].

-   */

-

-  inptr = coef_block;

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-  wsptr = workspace;

-  for (ctr = 0; ctr < 2; ctr++, inptr++, quantptr++, wsptr++) {

-    /* Even part */

-

-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);

-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);

-

-    tmp10 = (tmp0 + tmp2) << CONST_BITS;

-    tmp12 = (tmp0 - tmp2) << CONST_BITS;

-

-    /* Odd part */

-    /* Same rotation as in the even part of the 8x8 LL&M IDCT */

-

-    z2 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);

-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);

-

-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);   /* c6 */

-    tmp0 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */

-    tmp2 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */

-

-    /* Final output stage */

-

-    wsptr[2*0] = tmp10 + tmp0;

-    wsptr[2*3] = tmp10 - tmp0;

-    wsptr[2*1] = tmp12 + tmp2;

-    wsptr[2*2] = tmp12 - tmp2;

-  }

-

-  /* Pass 2: process 4 rows from work array, store into output array. */

-

-  wsptr = workspace;

-  for (ctr = 0; ctr < 4; ctr++) {

-    outptr = output_buf[ctr] + output_col;

-

-    /* Even part */

-

-    /* Add range center and fudge factor for final descale and range-limit. */

-    tmp10 = wsptr[0] +

-	      ((((INT32) RANGE_CENTER) << (CONST_BITS+3)) +

-	       (ONE << (CONST_BITS+2)));

-

-    /* Odd part */

-

-    tmp0 = wsptr[1];

-

-    /* Final output stage */

-

-    outptr[0] = range_limit[(int) RIGHT_SHIFT(tmp10 + tmp0, CONST_BITS+3)

-			    & RANGE_MASK];

-    outptr[1] = range_limit[(int) RIGHT_SHIFT(tmp10 - tmp0, CONST_BITS+3)

-			    & RANGE_MASK];

-

-    wsptr += 2;		/* advance pointer to next row */

-  }

-}

-

-

-/*

- * Perform dequantization and inverse DCT on one block of coefficients,

- * producing a 1x2 output block.

- *

- * 2-point IDCT in pass 1 (columns), 1-point in pass 2 (rows).

- */

-

-GLOBAL(void)

-jpeg_idct_1x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,

-	       JCOEFPTR coef_block,

-	       JSAMPARRAY output_buf, JDIMENSION output_col)

-{

-  DCTELEM tmp0, tmp1;

-  ISLOW_MULT_TYPE * quantptr;

-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);

-  ISHIFT_TEMPS

-

-  /* Process 1 column from input, store into output array. */

-

-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;

-

-  /* Even part */

-

-  tmp0 = DEQUANTIZE(coef_block[DCTSIZE*0], quantptr[DCTSIZE*0]);

-  /* Add range center and fudge factor for final descale and range-limit. */

-  tmp0 += (((DCTELEM) RANGE_CENTER) << 3) + (1 << 2);

-

-  /* Odd part */

-

-  tmp1 = DEQUANTIZE(coef_block[DCTSIZE*1], quantptr[DCTSIZE*1]);

-

-  /* Final output stage */

-

-  output_buf[0][output_col] =

-    range_limit[(int) IRIGHT_SHIFT(tmp0 + tmp1, 3) & RANGE_MASK];

-  output_buf[1][output_col] =

-    range_limit[(int) IRIGHT_SHIFT(tmp0 - tmp1, 3) & RANGE_MASK];

-}

-

-#endif /* IDCT_SCALING_SUPPORTED */

-#endif /* DCT_ISLOW_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jinclude.h b/plugins/AdvaImg/src/LibJPEG/jinclude.h
deleted file mode 100644
index 5ff60fedf4..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jinclude.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * jinclude.h

- *

- * Copyright (C) 1991-1994, 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 exists to provide a single place to fix any problems with

- * including the wrong system include files.  (Common problems are taken

- * care of by the standard jconfig symbols, but on really weird systems

- * you may have to edit this file.)

- *

- * NOTE: this file is NOT intended to be included by applications using the

- * JPEG library.  Most applications need only include jpeglib.h.

- */

-

-

-/* Include auto-config file to find out which system include files we need. */

-

-#include "jconfig.h"		/* auto configuration options */

-#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */

-

-/*

- * We need the NULL macro and size_t typedef.

- * On an ANSI-conforming system it is sufficient to include <stddef.h>.

- * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to

- * pull in <sys/types.h> as well.

- * Note that the core JPEG library does not require <stdio.h>;

- * only the default error handler and data source/destination modules do.

- * But we must pull it in because of the references to FILE in jpeglib.h.

- * You can remove those references if you want to compile without <stdio.h>.

- */

-

-#ifdef HAVE_STDDEF_H

-#include <stddef.h>

-#endif

-

-#ifdef HAVE_STDLIB_H

-#include <stdlib.h>

-#endif

-

-#ifdef NEED_SYS_TYPES_H

-#include <sys/types.h>

-#endif

-

-#include <stdio.h>

-

-/*

- * We need memory copying and zeroing functions, plus strncpy().

- * ANSI and System V implementations declare these in <string.h>.

- * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().

- * Some systems may declare memset and memcpy in <memory.h>.

- *

- * NOTE: we assume the size parameters to these functions are of type size_t.

- * Change the casts in these macros if not!

- */

-

-#ifdef NEED_BSD_STRINGS

-

-#include <strings.h>

-#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))

-#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))

-

-#else /* not BSD, assume ANSI/SysV string lib */

-

-#include <string.h>

-#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))

-#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))

-

-#endif

-

-/*

- * In ANSI C, and indeed any rational implementation, size_t is also the

- * type returned by sizeof().  However, it seems there are some irrational

- * implementations out there, in which sizeof() returns an int even though

- * size_t is defined as long or unsigned long.  To ensure consistent results

- * we always use this SIZEOF() macro in place of using sizeof() directly.

- */

-

-#define SIZEOF(object)	((size_t) sizeof(object))

-

-/*

- * The modules that use fread() and fwrite() always invoke them through

- * these macros.  On some systems you may need to twiddle the argument casts.

- * CAUTION: argument order is different from underlying functions!

- */

-

-#define JFREAD(file,buf,sizeofbuf)  \

-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))

-#define JFWRITE(file,buf,sizeofbuf)  \

-  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemansi.c b/plugins/AdvaImg/src/LibJPEG/jmemansi.c
deleted file mode 100644
index b5da4743fb..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemansi.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*

- * jmemansi.c

- *

- * Copyright (C) 1992-1996, 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 provides a simple generic implementation of the system-

- * dependent portion of the JPEG memory manager.  This implementation

- * assumes that you have the ANSI-standard library routine tmpfile().

- * Also, the problem of determining the amount of memory available

- * is shoved onto the user.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"		/* import the system-dependent declarations */

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */

-extern void * malloc JPP((size_t size));

-extern void free JPP((void *ptr));

-#endif

-

-#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */

-#define SEEK_SET  0		/* if not, assume 0 is correct */

-#endif

-

-

-/*

- * Memory allocation and freeing are controlled by the regular library

- * routines malloc() and free().

- */

-

-GLOBAL(void *)

-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * "Large" objects are treated the same as "small" ones.

- * NB: although we include FAR keywords in the routine declarations,

- * this file won't actually work in 80x86 small/medium model; at least,

- * you probably won't be able to process useful-size images in only 64KB.

- */

-

-GLOBAL(void FAR *)

-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void FAR *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * This routine computes the total memory space available for allocation.

- * It's impossible to do this in a portable way; our current solution is

- * to make the user tell us (with a default value set at compile time).

- * If you can actually get the available space, it's a good idea to subtract

- * a slop factor of 5% or so.

- */

-

-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */

-#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */

-#endif

-

-GLOBAL(long)

-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,

-		    long max_bytes_needed, long already_allocated)

-{

-  return cinfo->mem->max_memory_to_use - already_allocated;

-}

-

-

-/*

- * Backing store (temporary file) management.

- * Backing store objects are only used when the value returned by

- * jpeg_mem_available is less than the total space needed.  You can dispense

- * with these routines if you have plenty of virtual memory; see jmemnobs.c.

- */

-

-

-METHODDEF(void)

-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		    void FAR * buffer_address,

-		    long file_offset, long byte_count)

-{

-  if (fseek(info->temp_file, file_offset, SEEK_SET))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  if (JFREAD(info->temp_file, buffer_address, byte_count)

-      != (size_t) byte_count)

-    ERREXIT(cinfo, JERR_TFILE_READ);

-}

-

-

-METHODDEF(void)

-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		     void FAR * buffer_address,

-		     long file_offset, long byte_count)

-{

-  if (fseek(info->temp_file, file_offset, SEEK_SET))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  if (JFWRITE(info->temp_file, buffer_address, byte_count)

-      != (size_t) byte_count)

-    ERREXIT(cinfo, JERR_TFILE_WRITE);

-}

-

-

-METHODDEF(void)

-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  fclose(info->temp_file);

-  /* Since this implementation uses tmpfile() to create the file,

-   * no explicit file deletion is needed.

-   */

-}

-

-

-/*

- * Initial opening of a backing-store object.

- *

- * This version uses tmpfile(), which constructs a suitable file name

- * behind the scenes.  We don't have to use info->temp_name[] at all;

- * indeed, we can't even find out the actual name of the temp file.

- */

-

-GLOBAL(void)

-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-			 long total_bytes_needed)

-{

-  if ((info->temp_file = tmpfile()) == NULL)

-    ERREXITS(cinfo, JERR_TFILE_CREATE, "");

-  info->read_backing_store = read_backing_store;

-  info->write_backing_store = write_backing_store;

-  info->close_backing_store = close_backing_store;

-}

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.

- */

-

-GLOBAL(long)

-jpeg_mem_init (j_common_ptr cinfo)

-{

-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */

-}

-

-GLOBAL(void)

-jpeg_mem_term (j_common_ptr cinfo)

-{

-  /* no work */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemdos.c b/plugins/AdvaImg/src/LibJPEG/jmemdos.c
deleted file mode 100644
index 0955047ecc..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemdos.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*

- * jmemdos.c

- *

- * Copyright (C) 1992-1997, 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 provides an MS-DOS-compatible implementation of the system-

- * dependent portion of the JPEG memory manager.  Temporary data can be

- * stored in extended or expanded memory as well as in regular DOS files.

- *

- * If you use this file, you must be sure that NEED_FAR_POINTERS is defined

- * if you compile in a small-data memory model; it should NOT be defined if

- * you use a large-data memory model.  This file is not recommended if you

- * are using a flat-memory-space 386 environment such as DJGCC or Watcom C.

- * Also, this code will NOT work if struct fields are aligned on greater than

- * 2-byte boundaries.

- *

- * Based on code contributed by Ge' Weijers.

- */

-

-/*

- * If you have both extended and expanded memory, you may want to change the

- * order in which they are tried in jopen_backing_store.  On a 286 machine

- * expanded memory is usually faster, since extended memory access involves

- * an expensive protected-mode-and-back switch.  On 386 and better, extended

- * memory is usually faster.  As distributed, the code tries extended memory

- * first (what? not everyone has a 386? :-).

- *

- * You can disable use of extended/expanded memory entirely by altering these

- * definitions or overriding them from the Makefile (eg, -DEMS_SUPPORTED=0).

- */

-

-#ifndef XMS_SUPPORTED

-#define XMS_SUPPORTED  1

-#endif

-#ifndef EMS_SUPPORTED

-#define EMS_SUPPORTED  1

-#endif

-

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"		/* import the system-dependent declarations */

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare these */

-extern void * malloc JPP((size_t size));

-extern void free JPP((void *ptr));

-extern char * getenv JPP((const char * name));

-#endif

-

-#ifdef NEED_FAR_POINTERS

-

-#ifdef __TURBOC__

-/* These definitions work for Borland C (Turbo C) */

-#include <alloc.h>		/* need farmalloc(), farfree() */

-#define far_malloc(x)	farmalloc(x)

-#define far_free(x)	farfree(x)

-#else

-/* These definitions work for Microsoft C and compatible compilers */

-#include <malloc.h>		/* need _fmalloc(), _ffree() */

-#define far_malloc(x)	_fmalloc(x)

-#define far_free(x)	_ffree(x)

-#endif

-

-#else /* not NEED_FAR_POINTERS */

-

-#define far_malloc(x)	malloc(x)

-#define far_free(x)	free(x)

-

-#endif /* NEED_FAR_POINTERS */

-

-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */

-#define READ_BINARY	"r"

-#else

-#define READ_BINARY	"rb"

-#endif

-

-#ifndef USE_MSDOS_MEMMGR	/* make sure user got configuration right */

-  You forgot to define USE_MSDOS_MEMMGR in jconfig.h. /* deliberate syntax error */

-#endif

-

-#if MAX_ALLOC_CHUNK >= 65535L	/* make sure jconfig.h got this right */

-  MAX_ALLOC_CHUNK should be less than 64K. /* deliberate syntax error */

-#endif

-

-

-/*

- * Declarations for assembly-language support routines (see jmemdosa.asm).

- *

- * The functions are declared "far" as are all their pointer arguments;

- * this ensures the assembly source code will work regardless of the

- * compiler memory model.  We assume "short" is 16 bits, "long" is 32.

- */

-

-typedef void far * XMSDRIVER;	/* actually a pointer to code */

-typedef struct {		/* registers for calling XMS driver */

-	unsigned short ax, dx, bx;

-	void far * ds_si;

-      } XMScontext;

-typedef struct {		/* registers for calling EMS driver */

-	unsigned short ax, dx, bx;

-	void far * ds_si;

-      } EMScontext;

-

-extern short far jdos_open JPP((short far * handle, char far * filename));

-extern short far jdos_close JPP((short handle));

-extern short far jdos_seek JPP((short handle, long offset));

-extern short far jdos_read JPP((short handle, void far * buffer,

-				unsigned short count));

-extern short far jdos_write JPP((short handle, void far * buffer,

-				 unsigned short count));

-extern void far jxms_getdriver JPP((XMSDRIVER far *));

-extern void far jxms_calldriver JPP((XMSDRIVER, XMScontext far *));

-extern short far jems_available JPP((void));

-extern void far jems_calldriver JPP((EMScontext far *));

-

-

-/*

- * Selection of a file name for a temporary file.

- * This is highly system-dependent, and you may want to customize it.

- */

-

-static int next_file_num;	/* to distinguish among several temp files */

-

-LOCAL(void)

-select_file_name (char * fname)

-{

-  const char * env;

-  char * ptr;

-  FILE * tfile;

-

-  /* Keep generating file names till we find one that's not in use */

-  for (;;) {

-    /* Get temp directory name from environment TMP or TEMP variable;

-     * if none, use "."

-     */

-    if ((env = (const char *) getenv("TMP")) == NULL)

-      if ((env = (const char *) getenv("TEMP")) == NULL)

-	env = ".";

-    if (*env == '\0')		/* null string means "." */

-      env = ".";

-    ptr = fname;		/* copy name to fname */

-    while (*env != '\0')

-      *ptr++ = *env++;

-    if (ptr[-1] != '\\' && ptr[-1] != '/')

-      *ptr++ = '\\';		/* append backslash if not in env variable */

-    /* Append a suitable file name */

-    next_file_num++;		/* advance counter */

-    sprintf(ptr, "JPG%03d.TMP", next_file_num);

-    /* Probe to see if file name is already in use */

-    if ((tfile = fopen(fname, READ_BINARY)) == NULL)

-      break;

-    fclose(tfile);		/* oops, it's there; close tfile & try again */

-  }

-}

-

-

-/*

- * Near-memory allocation and freeing are controlled by the regular library

- * routines malloc() and free().

- */

-

-GLOBAL(void *)

-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * "Large" objects are allocated in far memory, if possible

- */

-

-GLOBAL(void FAR *)

-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void FAR *) far_malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)

-{

-  far_free(object);

-}

-

-

-/*

- * This routine computes the total memory space available for allocation.

- * It's impossible to do this in a portable way; our current solution is

- * to make the user tell us (with a default value set at compile time).

- * If you can actually get the available space, it's a good idea to subtract

- * a slop factor of 5% or so.

- */

-

-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */

-#define DEFAULT_MAX_MEM		300000L /* for total usage about 450K */

-#endif

-

-GLOBAL(long)

-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,

-		    long max_bytes_needed, long already_allocated)

-{

-  return cinfo->mem->max_memory_to_use - already_allocated;

-}

-

-

-/*

- * Backing store (temporary file) management.

- * Backing store objects are only used when the value returned by

- * jpeg_mem_available is less than the total space needed.  You can dispense

- * with these routines if you have plenty of virtual memory; see jmemnobs.c.

- */

-

-/*

- * For MS-DOS we support three types of backing storage:

- *   1. Conventional DOS files.  We access these by direct DOS calls rather

- *      than via the stdio package.  This provides a bit better performance,

- *      but the real reason is that the buffers to be read or written are FAR.

- *      The stdio library for small-data memory models can't cope with that.

- *   2. Extended memory, accessed per the XMS V2.0 specification.

- *   3. Expanded memory, accessed per the LIM/EMS 4.0 specification.

- * You'll need copies of those specs to make sense of the related code.

- * The specs are available by Internet FTP from the SIMTEL archives 

- * (oak.oakland.edu and its various mirror sites).  See files

- * pub/msdos/microsoft/xms20.arc and pub/msdos/info/limems41.zip.

- */

-

-

-/*

- * Access methods for a DOS file.

- */

-

-

-METHODDEF(void)

-read_file_store (j_common_ptr cinfo, backing_store_ptr info,

-		 void FAR * buffer_address,

-		 long file_offset, long byte_count)

-{

-  if (jdos_seek(info->handle.file_handle, file_offset))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */

-  if (byte_count > 65535L)	/* safety check */

-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);

-  if (jdos_read(info->handle.file_handle, buffer_address,

-		(unsigned short) byte_count))

-    ERREXIT(cinfo, JERR_TFILE_READ);

-}

-

-

-METHODDEF(void)

-write_file_store (j_common_ptr cinfo, backing_store_ptr info,

-		  void FAR * buffer_address,

-		  long file_offset, long byte_count)

-{

-  if (jdos_seek(info->handle.file_handle, file_offset))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */

-  if (byte_count > 65535L)	/* safety check */

-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);

-  if (jdos_write(info->handle.file_handle, buffer_address,

-		 (unsigned short) byte_count))

-    ERREXIT(cinfo, JERR_TFILE_WRITE);

-}

-

-

-METHODDEF(void)

-close_file_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  jdos_close(info->handle.file_handle);	/* close the file */

-  remove(info->temp_name);	/* delete the file */

-/* If your system doesn't have remove(), try unlink() instead.

- * remove() is the ANSI-standard name for this function, but

- * unlink() was more common in pre-ANSI systems.

- */

-  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);

-}

-

-

-LOCAL(boolean)

-open_file_store (j_common_ptr cinfo, backing_store_ptr info,

-		 long total_bytes_needed)

-{

-  short handle;

-

-  select_file_name(info->temp_name);

-  if (jdos_open((short far *) & handle, (char far *) info->temp_name)) {

-    /* might as well exit since jpeg_open_backing_store will fail anyway */

-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);

-    return FALSE;

-  }

-  info->handle.file_handle = handle;

-  info->read_backing_store = read_file_store;

-  info->write_backing_store = write_file_store;

-  info->close_backing_store = close_file_store;

-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);

-  return TRUE;			/* succeeded */

-}

-

-

-/*

- * Access methods for extended memory.

- */

-

-#if XMS_SUPPORTED

-

-static XMSDRIVER xms_driver;	/* saved address of XMS driver */

-

-typedef union {			/* either long offset or real-mode pointer */

-	long offset;

-	void far * ptr;

-      } XMSPTR;

-

-typedef struct {		/* XMS move specification structure */

-	long length;

-	XMSH src_handle;

-	XMSPTR src;

-	XMSH dst_handle;

-	XMSPTR dst;

-      } XMSspec;

-

-#define ODD(X)	(((X) & 1L) != 0)

-

-

-METHODDEF(void)

-read_xms_store (j_common_ptr cinfo, backing_store_ptr info,

-		void FAR * buffer_address,

-		long file_offset, long byte_count)

-{

-  XMScontext ctx;

-  XMSspec spec;

-  char endbuffer[2];

-

-  /* The XMS driver can't cope with an odd length, so handle the last byte

-   * specially if byte_count is odd.  We don't expect this to be common.

-   */

-

-  spec.length = byte_count & (~ 1L);

-  spec.src_handle = info->handle.xms_handle;

-  spec.src.offset = file_offset;

-  spec.dst_handle = 0;

-  spec.dst.ptr = buffer_address;

-  

-  ctx.ds_si = (void far *) & spec;

-  ctx.ax = 0x0b00;		/* EMB move */

-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);

-  if (ctx.ax != 1)

-    ERREXIT(cinfo, JERR_XMS_READ);

-

-  if (ODD(byte_count)) {

-    read_xms_store(cinfo, info, (void FAR *) endbuffer,

-		   file_offset + byte_count - 1L, 2L);

-    ((char FAR *) buffer_address)[byte_count - 1L] = endbuffer[0];

-  }

-}

-

-

-METHODDEF(void)

-write_xms_store (j_common_ptr cinfo, backing_store_ptr info,

-		 void FAR * buffer_address,

-		 long file_offset, long byte_count)

-{

-  XMScontext ctx;

-  XMSspec spec;

-  char endbuffer[2];

-

-  /* The XMS driver can't cope with an odd length, so handle the last byte

-   * specially if byte_count is odd.  We don't expect this to be common.

-   */

-

-  spec.length = byte_count & (~ 1L);

-  spec.src_handle = 0;

-  spec.src.ptr = buffer_address;

-  spec.dst_handle = info->handle.xms_handle;

-  spec.dst.offset = file_offset;

-

-  ctx.ds_si = (void far *) & spec;

-  ctx.ax = 0x0b00;		/* EMB move */

-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);

-  if (ctx.ax != 1)

-    ERREXIT(cinfo, JERR_XMS_WRITE);

-

-  if (ODD(byte_count)) {

-    read_xms_store(cinfo, info, (void FAR *) endbuffer,

-		   file_offset + byte_count - 1L, 2L);

-    endbuffer[0] = ((char FAR *) buffer_address)[byte_count - 1L];

-    write_xms_store(cinfo, info, (void FAR *) endbuffer,

-		    file_offset + byte_count - 1L, 2L);

-  }

-}

-

-

-METHODDEF(void)

-close_xms_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  XMScontext ctx;

-

-  ctx.dx = info->handle.xms_handle;

-  ctx.ax = 0x0a00;

-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);

-  TRACEMS1(cinfo, 1, JTRC_XMS_CLOSE, info->handle.xms_handle);

-  /* we ignore any error return from the driver */

-}

-

-

-LOCAL(boolean)

-open_xms_store (j_common_ptr cinfo, backing_store_ptr info,

-		long total_bytes_needed)

-{

-  XMScontext ctx;

-

-  /* Get address of XMS driver */

-  jxms_getdriver((XMSDRIVER far *) & xms_driver);

-  if (xms_driver == NULL)

-    return FALSE;		/* no driver to be had */

-

-  /* Get version number, must be >= 2.00 */

-  ctx.ax = 0x0000;

-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);

-  if (ctx.ax < (unsigned short) 0x0200)

-    return FALSE;

-

-  /* Try to get space (expressed in kilobytes) */

-  ctx.dx = (unsigned short) ((total_bytes_needed + 1023L) >> 10);

-  ctx.ax = 0x0900;

-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);

-  if (ctx.ax != 1)

-    return FALSE;

-

-  /* Succeeded, save the handle and away we go */

-  info->handle.xms_handle = ctx.dx;

-  info->read_backing_store = read_xms_store;

-  info->write_backing_store = write_xms_store;

-  info->close_backing_store = close_xms_store;

-  TRACEMS1(cinfo, 1, JTRC_XMS_OPEN, ctx.dx);

-  return TRUE;			/* succeeded */

-}

-

-#endif /* XMS_SUPPORTED */

-

-

-/*

- * Access methods for expanded memory.

- */

-

-#if EMS_SUPPORTED

-

-/* The EMS move specification structure requires word and long fields aligned

- * at odd byte boundaries.  Some compilers will align struct fields at even

- * byte boundaries.  While it's usually possible to force byte alignment,

- * that causes an overall performance penalty and may pose problems in merging

- * JPEG into a larger application.  Instead we accept some rather dirty code

- * here.  Note this code would fail if the hardware did not allow odd-byte

- * word & long accesses, but all 80x86 CPUs do.

- */

-

-typedef void far * EMSPTR;

-

-typedef union {			/* EMS move specification structure */

-	long length;		/* It's easy to access first 4 bytes */

-	char bytes[18];		/* Misaligned fields in here! */

-      } EMSspec;

-

-/* Macros for accessing misaligned fields */

-#define FIELD_AT(spec,offset,type)  (*((type *) &(spec.bytes[offset])))

-#define SRC_TYPE(spec)		FIELD_AT(spec,4,char)

-#define SRC_HANDLE(spec)	FIELD_AT(spec,5,EMSH)

-#define SRC_OFFSET(spec)	FIELD_AT(spec,7,unsigned short)

-#define SRC_PAGE(spec)		FIELD_AT(spec,9,unsigned short)

-#define SRC_PTR(spec)		FIELD_AT(spec,7,EMSPTR)

-#define DST_TYPE(spec)		FIELD_AT(spec,11,char)

-#define DST_HANDLE(spec)	FIELD_AT(spec,12,EMSH)

-#define DST_OFFSET(spec)	FIELD_AT(spec,14,unsigned short)

-#define DST_PAGE(spec)		FIELD_AT(spec,16,unsigned short)

-#define DST_PTR(spec)		FIELD_AT(spec,14,EMSPTR)

-

-#define EMSPAGESIZE	16384L	/* gospel, see the EMS specs */

-

-#define HIBYTE(W)  (((W) >> 8) & 0xFF)

-#define LOBYTE(W)  ((W) & 0xFF)

-

-

-METHODDEF(void)

-read_ems_store (j_common_ptr cinfo, backing_store_ptr info,

-		void FAR * buffer_address,

-		long file_offset, long byte_count)

-{

-  EMScontext ctx;

-  EMSspec spec;

-

-  spec.length = byte_count;

-  SRC_TYPE(spec) = 1;

-  SRC_HANDLE(spec) = info->handle.ems_handle;

-  SRC_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);

-  SRC_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);

-  DST_TYPE(spec) = 0;

-  DST_HANDLE(spec) = 0;

-  DST_PTR(spec)    = buffer_address;

-  

-  ctx.ds_si = (void far *) & spec;

-  ctx.ax = 0x5700;		/* move memory region */

-  jems_calldriver((EMScontext far *) & ctx);

-  if (HIBYTE(ctx.ax) != 0)

-    ERREXIT(cinfo, JERR_EMS_READ);

-}

-

-

-METHODDEF(void)

-write_ems_store (j_common_ptr cinfo, backing_store_ptr info,

-		 void FAR * buffer_address,

-		 long file_offset, long byte_count)

-{

-  EMScontext ctx;

-  EMSspec spec;

-

-  spec.length = byte_count;

-  SRC_TYPE(spec) = 0;

-  SRC_HANDLE(spec) = 0;

-  SRC_PTR(spec)    = buffer_address;

-  DST_TYPE(spec) = 1;

-  DST_HANDLE(spec) = info->handle.ems_handle;

-  DST_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);

-  DST_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);

-  

-  ctx.ds_si = (void far *) & spec;

-  ctx.ax = 0x5700;		/* move memory region */

-  jems_calldriver((EMScontext far *) & ctx);

-  if (HIBYTE(ctx.ax) != 0)

-    ERREXIT(cinfo, JERR_EMS_WRITE);

-}

-

-

-METHODDEF(void)

-close_ems_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  EMScontext ctx;

-

-  ctx.ax = 0x4500;

-  ctx.dx = info->handle.ems_handle;

-  jems_calldriver((EMScontext far *) & ctx);

-  TRACEMS1(cinfo, 1, JTRC_EMS_CLOSE, info->handle.ems_handle);

-  /* we ignore any error return from the driver */

-}

-

-

-LOCAL(boolean)

-open_ems_store (j_common_ptr cinfo, backing_store_ptr info,

-		long total_bytes_needed)

-{

-  EMScontext ctx;

-

-  /* Is EMS driver there? */

-  if (! jems_available())

-    return FALSE;

-

-  /* Get status, make sure EMS is OK */

-  ctx.ax = 0x4000;

-  jems_calldriver((EMScontext far *) & ctx);

-  if (HIBYTE(ctx.ax) != 0)

-    return FALSE;

-

-  /* Get version, must be >= 4.0 */

-  ctx.ax = 0x4600;

-  jems_calldriver((EMScontext far *) & ctx);

-  if (HIBYTE(ctx.ax) != 0 || LOBYTE(ctx.ax) < 0x40)

-    return FALSE;

-

-  /* Try to allocate requested space */

-  ctx.ax = 0x4300;

-  ctx.bx = (unsigned short) ((total_bytes_needed + EMSPAGESIZE-1L) / EMSPAGESIZE);

-  jems_calldriver((EMScontext far *) & ctx);

-  if (HIBYTE(ctx.ax) != 0)

-    return FALSE;

-

-  /* Succeeded, save the handle and away we go */

-  info->handle.ems_handle = ctx.dx;

-  info->read_backing_store = read_ems_store;

-  info->write_backing_store = write_ems_store;

-  info->close_backing_store = close_ems_store;

-  TRACEMS1(cinfo, 1, JTRC_EMS_OPEN, ctx.dx);

-  return TRUE;			/* succeeded */

-}

-

-#endif /* EMS_SUPPORTED */

-

-

-/*

- * Initial opening of a backing-store object.

- */

-

-GLOBAL(void)

-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-			 long total_bytes_needed)

-{

-  /* Try extended memory, then expanded memory, then regular file. */

-#if XMS_SUPPORTED

-  if (open_xms_store(cinfo, info, total_bytes_needed))

-    return;

-#endif

-#if EMS_SUPPORTED

-  if (open_ems_store(cinfo, info, total_bytes_needed))

-    return;

-#endif

-  if (open_file_store(cinfo, info, total_bytes_needed))

-    return;

-  ERREXITS(cinfo, JERR_TFILE_CREATE, "");

-}

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.

- */

-

-GLOBAL(long)

-jpeg_mem_init (j_common_ptr cinfo)

-{

-  next_file_num = 0;		/* initialize temp file name generator */

-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */

-}

-

-GLOBAL(void)

-jpeg_mem_term (j_common_ptr cinfo)

-{

-  /* Microsoft C, at least in v6.00A, will not successfully reclaim freed

-   * blocks of size > 32Kbytes unless we give it a kick in the rear, like so:

-   */

-#ifdef NEED_FHEAPMIN

-  _fheapmin();

-#endif

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemdosa.asm b/plugins/AdvaImg/src/LibJPEG/jmemdosa.asm
deleted file mode 100644
index c6ec48b346..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemdosa.asm
+++ /dev/null
@@ -1,379 +0,0 @@
-;

-; jmemdosa.asm

-;

-; Copyright (C) 1992, 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 low-level interface routines to support the MS-DOS

-; backing store manager (jmemdos.c).  Routines are provided to access disk

-; files through direct DOS calls, and to access XMS and EMS drivers.

-;

-; This file should assemble with Microsoft's MASM or any compatible

-; assembler (including Borland's Turbo Assembler).  If you haven't got

-; a compatible assembler, better fall back to jmemansi.c or jmemname.c.

-;

-; To minimize dependence on the C compiler's register usage conventions,

-; we save and restore all 8086 registers, even though most compilers only

-; require SI,DI,DS to be preserved.  Also, we use only 16-bit-wide return

-; values, which everybody returns in AX.

-;

-; Based on code contributed by Ge' Weijers.

-;

-

-JMEMDOSA_TXT	segment byte public 'CODE'

-

-		assume	cs:JMEMDOSA_TXT

-

-		public	_jdos_open

-		public	_jdos_close

-		public	_jdos_seek

-		public	_jdos_read

-		public	_jdos_write

-		public	_jxms_getdriver

-		public	_jxms_calldriver

-		public	_jems_available

-		public	_jems_calldriver

-

-;

-; short far jdos_open (short far * handle, char far * filename)

-;

-; Create and open a temporary file

-;

-_jdos_open	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	cx,0			; normal file attributes

-		lds	dx,dword ptr [bp+10]	; get filename pointer

-		mov	ah,3ch			; create file

-		int	21h

-		jc	open_err		; if failed, return error code

-		lds	bx,dword ptr [bp+6]	; get handle pointer

-		mov	word ptr [bx],ax	; save the handle

-		xor	ax,ax			; return zero for OK

-open_err:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jdos_open	endp

-

-

-;

-; short far jdos_close (short handle)

-;

-; Close the file handle

-;

-_jdos_close	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	bx,word ptr [bp+6]	; file handle

-		mov	ah,3eh			; close file

-		int	21h

-		jc	close_err		; if failed, return error code

-		xor	ax,ax			; return zero for OK

-close_err:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jdos_close	endp

-

-

-;

-; short far jdos_seek (short handle, long offset)

-;

-; Set file position

-;

-_jdos_seek	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	bx,word ptr [bp+6]	; file handle

-		mov	dx,word ptr [bp+8]	; LS offset

-		mov	cx,word ptr [bp+10]	; MS offset

-		mov	ax,4200h		; absolute seek

-		int	21h

-		jc	seek_err		; if failed, return error code

-		xor	ax,ax			; return zero for OK

-seek_err:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jdos_seek	endp

-

-

-;

-; short far jdos_read (short handle, void far * buffer, unsigned short count)

-;

-; Read from file

-;

-_jdos_read	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	bx,word ptr [bp+6]	; file handle

-		lds	dx,dword ptr [bp+8]	; buffer address

-		mov	cx,word ptr [bp+12]	; number of bytes

-		mov	ah,3fh			; read file

-		int	21h

-		jc	read_err		; if failed, return error code

-		cmp	ax,word ptr [bp+12]	; make sure all bytes were read

-		je	read_ok

-		mov	ax,1			; else return 1 for not OK

-		jmp	short read_err

-read_ok:	xor	ax,ax			; return zero for OK

-read_err:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jdos_read	endp

-

-

-;

-; short far jdos_write (short handle, void far * buffer, unsigned short count)

-;

-; Write to file

-;

-_jdos_write	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	bx,word ptr [bp+6]	; file handle

-		lds	dx,dword ptr [bp+8]	; buffer address

-		mov	cx,word ptr [bp+12]	; number of bytes

-		mov	ah,40h			; write file

-		int	21h

-		jc	write_err		; if failed, return error code

-		cmp	ax,word ptr [bp+12]	; make sure all bytes written

-		je	write_ok

-		mov	ax,1			; else return 1 for not OK

-		jmp	short write_err

-write_ok:	xor	ax,ax			; return zero for OK

-write_err:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jdos_write	endp

-

-

-;

-; void far jxms_getdriver (XMSDRIVER far *)

-;

-; Get the address of the XMS driver, or NULL if not available

-;

-_jxms_getdriver	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov 	ax,4300h		; call multiplex interrupt with

-		int	2fh			; a magic cookie, hex 4300

-		cmp 	al,80h			; AL should contain hex 80

-		je	xmsavail

-		xor 	dx,dx			; no XMS driver available

-		xor 	ax,ax			; return a nil pointer

-		jmp	short xmsavail_done

-xmsavail:	mov 	ax,4310h		; fetch driver address with

-		int	2fh			; another magic cookie

-		mov 	dx,es			; copy address to dx:ax

-		mov 	ax,bx

-xmsavail_done:	les 	bx,dword ptr [bp+6]	; get pointer to return value

-		mov	word ptr es:[bx],ax

-		mov	word ptr es:[bx+2],dx

-		pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop	bp

-		ret

-_jxms_getdriver	endp

-

-

-;

-; void far jxms_calldriver (XMSDRIVER, XMScontext far *)

-;

-; The XMScontext structure contains values for the AX,DX,BX,SI,DS registers.

-; These are loaded, the XMS call is performed, and the new values of the

-; AX,DX,BX registers are written back to the context structure.

-;

-_jxms_calldriver 	proc	far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		les 	bx,dword ptr [bp+10]	; get XMScontext pointer

-		mov 	ax,word ptr es:[bx]	; load registers

-		mov 	dx,word ptr es:[bx+2]

-		mov 	si,word ptr es:[bx+6]

-		mov 	ds,word ptr es:[bx+8]

-		mov 	bx,word ptr es:[bx+4]

-		call	dword ptr [bp+6]	; call the driver

-		mov	cx,bx			; save returned BX for a sec

-		les 	bx,dword ptr [bp+10]	; get XMScontext pointer

-		mov 	word ptr es:[bx],ax	; put back ax,dx,bx

-		mov 	word ptr es:[bx+2],dx

-		mov 	word ptr es:[bx+4],cx

-		pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jxms_calldriver 	endp

-

-

-;

-; short far jems_available (void)

-;

-; Have we got an EMS driver? (this comes straight from the EMS 4.0 specs)

-;

-_jems_available	proc	far

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		mov	ax,3567h		; get interrupt vector 67h

-		int	21h

-		push	cs

-		pop	ds

-		mov	di,000ah		; check offs 10 in returned seg

-		lea	si,ASCII_device_name	; against literal string

-		mov	cx,8

-		cld

-		repe cmpsb

-		jne	no_ems

-		mov	ax,1			; match, it's there

-		jmp	short avail_done

-no_ems:		xor	ax,ax			; it's not there

-avail_done:	pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		ret

-

-ASCII_device_name	db	"EMMXXXX0"

-

-_jems_available	endp

-

-

-;

-; void far jems_calldriver (EMScontext far *)

-;

-; The EMScontext structure contains values for the AX,DX,BX,SI,DS registers.

-; These are loaded, the EMS trap is performed, and the new values of the

-; AX,DX,BX registers are written back to the context structure.

-;

-_jems_calldriver	proc far

-		push	bp			; linkage

-		mov 	bp,sp

-		push	si			; save all registers for safety

-		push	di

-		push	bx

-		push	cx

-		push	dx

-		push	es

-		push	ds

-		les 	bx,dword ptr [bp+6]	; get EMScontext pointer

-		mov 	ax,word ptr es:[bx]	; load registers

-		mov 	dx,word ptr es:[bx+2]

-		mov 	si,word ptr es:[bx+6]

-		mov 	ds,word ptr es:[bx+8]

-		mov 	bx,word ptr es:[bx+4]

-		int	67h			; call the EMS driver

-		mov	cx,bx			; save returned BX for a sec

-		les 	bx,dword ptr [bp+6]	; get EMScontext pointer

-		mov 	word ptr es:[bx],ax	; put back ax,dx,bx

-		mov 	word ptr es:[bx+2],dx

-		mov 	word ptr es:[bx+4],cx

-		pop	ds			; restore registers and exit

-		pop	es

-		pop	dx

-		pop	cx

-		pop	bx

-		pop	di

-		pop	si

-		pop 	bp

-		ret

-_jems_calldriver	endp

-

-JMEMDOSA_TXT	ends

-

-		end

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemmac.c b/plugins/AdvaImg/src/LibJPEG/jmemmac.c
deleted file mode 100644
index a6f043ed46..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemmac.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*

- * jmemmac.c

- *

- * Copyright (C) 1992-1997, 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.

- *

- * jmemmac.c provides an Apple Macintosh implementation of the system-

- * dependent portion of the JPEG memory manager.

- *

- * If you use jmemmac.c, then you must define USE_MAC_MEMMGR in the

- * JPEG_INTERNALS part of jconfig.h.

- *

- * jmemmac.c uses the Macintosh toolbox routines NewPtr and DisposePtr

- * instead of malloc and free.  It accurately determines the amount of

- * memory available by using CompactMem.  Notice that if left to its

- * own devices, this code can chew up all available space in the

- * application's zone, with the exception of the rather small "slop"

- * factor computed in jpeg_mem_available().  The application can ensure

- * that more space is left over by reducing max_memory_to_use.

- *

- * Large images are swapped to disk using temporary files and System 7.0+'s

- * temporary folder functionality.

- *

- * Note that jmemmac.c depends on two features of MacOS that were first

- * introduced in System 7: FindFolder and the FSSpec-based calls.

- * If your application uses jmemmac.c and is run under System 6 or earlier,

- * and the jpeg library decides it needs a temporary file, it will abort,

- * printing error messages about requiring System 7.  (If no temporary files

- * are created, it will run fine.)

- *

- * If you want to use jmemmac.c in an application that might be used with

- * System 6 or earlier, then you should remove dependencies on FindFolder

- * and the FSSpec calls.  You will need to replace FindFolder with some

- * other mechanism for finding a place to put temporary files, and you

- * should replace the FSSpec calls with their HFS equivalents:

- *

- *     FSpDelete     ->  HDelete

- *     FSpGetFInfo   ->  HGetFInfo

- *     FSpCreate     ->  HCreate

- *     FSpOpenDF     ->  HOpen      *** Note: not HOpenDF ***

- *     FSMakeFSSpec  ->  (fill in spec by hand.)

- *

- * (Use HOpen instead of HOpenDF.  HOpen is just a glue-interface to PBHOpen,

- * which is on all HFS macs.  HOpenDF is a System 7 addition which avoids the

- * ages-old problem of names starting with a period.)

- *

- * Contributed by Sam Bushell (jsam@iagu.on.net) and

- * Dan Gildor (gyld@in-touch.com).

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"    /* import the system-dependent declarations */

-

-#ifndef USE_MAC_MEMMGR	/* make sure user got configuration right */

-  You forgot to define USE_MAC_MEMMGR in jconfig.h. /* deliberate syntax error */

-#endif

-

-#include <Memory.h>     /* we use the MacOS memory manager */

-#include <Files.h>      /* we use the MacOS File stuff */

-#include <Folders.h>    /* we use the MacOS HFS stuff */

-#include <Script.h>     /* for smSystemScript */

-#include <Gestalt.h>    /* we use Gestalt to test for specific functionality */

-

-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */

-#define TEMP_FILE_NAME  "JPG%03d.TMP"

-#endif

-

-static int next_file_num;	/* to distinguish among several temp files */

-

-

-/*

- * Memory allocation and freeing are controlled by the MacOS library

- * routines NewPtr() and DisposePtr(), which allocate fixed-address

- * storage.  Unfortunately, the IJG library isn't smart enough to cope

- * with relocatable storage.

- */

-

-GLOBAL(void *)

-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void *) NewPtr(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)

-{

-  DisposePtr((Ptr) object);

-}

-

-

-/*

- * "Large" objects are treated the same as "small" ones.

- * NB: we include FAR keywords in the routine declarations simply for

- * consistency with the rest of the IJG code; FAR should expand to empty

- * on rational architectures like the Mac.

- */

-

-GLOBAL(void FAR *)

-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void FAR *) NewPtr(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)

-{

-  DisposePtr((Ptr) object);

-}

-

-

-/*

- * This routine computes the total memory space available for allocation.

- */

-

-GLOBAL(long)

-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,

-		    long max_bytes_needed, long already_allocated)

-{

-  long limit = cinfo->mem->max_memory_to_use - already_allocated;

-  long slop, mem;

-

-  /* Don't ask for more than what application has told us we may use */

-  if (max_bytes_needed > limit && limit > 0)

-    max_bytes_needed = limit;

-  /* Find whether there's a big enough free block in the heap.

-   * CompactMem tries to create a contiguous block of the requested size,

-   * and then returns the size of the largest free block (which could be

-   * much more or much less than we asked for).

-   * We add some slop to ensure we don't use up all available memory.

-   */

-  slop = max_bytes_needed / 16 + 32768L;

-  mem = CompactMem(max_bytes_needed + slop) - slop;

-  if (mem < 0)

-    mem = 0;			/* sigh, couldn't even get the slop */

-  /* Don't take more than the application says we can have */

-  if (mem > limit && limit > 0)

-    mem = limit;

-  return mem;

-}

-

-

-/*

- * Backing store (temporary file) management.

- * Backing store objects are only used when the value returned by

- * jpeg_mem_available is less than the total space needed.  You can dispense

- * with these routines if you have plenty of virtual memory; see jmemnobs.c.

- */

-

-

-METHODDEF(void)

-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		    void FAR * buffer_address,

-		    long file_offset, long byte_count)

-{

-  long bytes = byte_count;

-  long retVal;

-

-  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-

-  retVal = FSRead ( info->temp_file, &bytes,

-		    (unsigned char *) buffer_address );

-  if ( retVal != noErr || bytes != byte_count )

-    ERREXIT(cinfo, JERR_TFILE_READ);

-}

-

-

-METHODDEF(void)

-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		     void FAR * buffer_address,

-		     long file_offset, long byte_count)

-{

-  long bytes = byte_count;

-  long retVal;

-

-  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-

-  retVal = FSWrite ( info->temp_file, &bytes,

-		     (unsigned char *) buffer_address );

-  if ( retVal != noErr || bytes != byte_count )

-    ERREXIT(cinfo, JERR_TFILE_WRITE);

-}

-

-

-METHODDEF(void)

-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  FSClose ( info->temp_file );

-  FSpDelete ( &(info->tempSpec) );

-}

-

-

-/*

- * Initial opening of a backing-store object.

- *

- * This version uses FindFolder to find the Temporary Items folder,

- * and puts the temporary file in there.

- */

-

-GLOBAL(void)

-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-			 long total_bytes_needed)

-{

-  short         tmpRef, vRefNum;

-  long          dirID;

-  FInfo         finderInfo;

-  FSSpec        theSpec;

-  Str255        fName;

-  OSErr         osErr;

-  long          gestaltResponse = 0;

-

-  /* Check that FSSpec calls are available. */

-  osErr = Gestalt( gestaltFSAttr, &gestaltResponse );

-  if ( ( osErr != noErr )

-       || !( gestaltResponse & (1<<gestaltHasFSSpecCalls) ) )

-    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required");

-  /* TO DO: add a proper error message to jerror.h. */

-

-  /* Check that FindFolder is available. */

-  osErr = Gestalt( gestaltFindFolderAttr, &gestaltResponse );

-  if ( ( osErr != noErr )

-       || !( gestaltResponse & (1<<gestaltFindFolderPresent) ) )

-    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required.");

-  /* TO DO: add a proper error message to jerror.h. */

-

-  osErr = FindFolder ( kOnSystemDisk, kTemporaryFolderType, kCreateFolder,

-                       &vRefNum, &dirID );

-  if ( osErr != noErr )

-    ERREXITS(cinfo, JERR_TFILE_CREATE, "- temporary items folder unavailable");

-  /* TO DO: Try putting the temp files somewhere else. */

-

-  /* Keep generating file names till we find one that's not in use */

-  for (;;) {

-    next_file_num++;		/* advance counter */

-

-    sprintf(info->temp_name, TEMP_FILE_NAME, next_file_num);

-    strcpy ( (Ptr)fName+1, info->temp_name );

-    *fName = strlen (info->temp_name);

-    osErr = FSMakeFSSpec ( vRefNum, dirID, fName, &theSpec );

-

-    if ( (osErr = FSpGetFInfo ( &theSpec, &finderInfo ) ) != noErr )

-      break;

-  }

-

-  osErr = FSpCreate ( &theSpec, '????', '????', smSystemScript );

-  if ( osErr != noErr )

-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);

-

-  osErr = FSpOpenDF ( &theSpec, fsRdWrPerm, &(info->temp_file) );

-  if ( osErr != noErr )

-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);

-

-  info->tempSpec = theSpec;

-

-  info->read_backing_store = read_backing_store;

-  info->write_backing_store = write_backing_store;

-  info->close_backing_store = close_backing_store;

-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);

-}

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.

- */

-

-GLOBAL(long)

-jpeg_mem_init (j_common_ptr cinfo)

-{

-  next_file_num = 0;

-

-  /* max_memory_to_use will be initialized to FreeMem()'s result;

-   * the calling application might later reduce it, for example

-   * to leave room to invoke multiple JPEG objects.

-   * Note that FreeMem returns the total number of free bytes;

-   * it may not be possible to allocate a single block of this size.

-   */

-  return FreeMem();

-}

-

-GLOBAL(void)

-jpeg_mem_term (j_common_ptr cinfo)

-{

-  /* no work */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemmgr.c b/plugins/AdvaImg/src/LibJPEG/jmemmgr.c
deleted file mode 100644
index ea9342022c..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemmgr.c
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*

- * jmemmgr.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2011-2012 by Guido Vollbeding.

- * 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 the JPEG system-independent memory management

- * routines.  This code is usable across a wide variety of machines; most

- * of the system dependencies have been isolated in a separate file.

- * The major functions provided here are:

- *   * pool-based allocation and freeing of memory;

- *   * policy decisions about how to divide available memory among the

- *     virtual arrays;

- *   * control logic for swapping virtual arrays between main memory and

- *     backing storage.

- * The separate system-dependent file provides the actual backing-storage

- * access code, and it contains the policy decision about how much total

- * main memory to use.

- * This file is system-dependent in the sense that some of its functions

- * are unnecessary in some systems.  For example, if there is enough virtual

- * memory so that backing storage will never be used, much of the virtual

- * array control logic could be removed.  (Of course, if you have that much

- * memory then you shouldn't care about a little bit of unused code...)

- */

-

-#define JPEG_INTERNALS

-#define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"		/* import the system-dependent declarations */

-

-#ifndef NO_GETENV

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare getenv() */

-extern char * getenv JPP((const char * name));

-#endif

-#endif

-

-

-/*

- * Some important notes:

- *   The allocation routines provided here must never return NULL.

- *   They should exit to error_exit if unsuccessful.

- *

- *   It's not a good idea to try to merge the sarray and barray routines,

- *   even though they are textually almost the same, because samples are

- *   usually stored as bytes while coefficients are shorts or ints.  Thus,

- *   in machines where byte pointers have a different representation from

- *   word pointers, the resulting machine code could not be the same.

- */

-

-

-/*

- * Many machines require storage alignment: longs must start on 4-byte

- * boundaries, doubles on 8-byte boundaries, etc.  On such machines, malloc()

- * always returns pointers that are multiples of the worst-case alignment

- * requirement, and we had better do so too.

- * There isn't any really portable way to determine the worst-case alignment

- * requirement.  This module assumes that the alignment requirement is

- * multiples of sizeof(ALIGN_TYPE).

- * By default, we define ALIGN_TYPE as double.  This is necessary on some

- * workstations (where doubles really do need 8-byte alignment) and will work

- * fine on nearly everything.  If your machine has lesser alignment needs,

- * you can save a few bytes by making ALIGN_TYPE smaller.

- * The only place I know of where this will NOT work is certain Macintosh

- * 680x0 compilers that define double as a 10-byte IEEE extended float.

- * Doing 10-byte alignment is counterproductive because longwords won't be

- * aligned well.  Put "#define ALIGN_TYPE long" in jconfig.h if you have

- * such a compiler.

- */

-

-#ifndef ALIGN_TYPE		/* so can override from jconfig.h */

-#define ALIGN_TYPE  double

-#endif

-

-

-/*

- * We allocate objects from "pools", where each pool is gotten with a single

- * request to jpeg_get_small() or jpeg_get_large().  There is no per-object

- * overhead within a pool, except for alignment padding.  Each pool has a

- * header with a link to the next pool of the same class.

- * Small and large pool headers are identical except that the latter's

- * link pointer must be FAR on 80x86 machines.

- * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE

- * field.  This forces the compiler to make SIZEOF(small_pool_hdr) a multiple

- * of the alignment requirement of ALIGN_TYPE.

- */

-

-typedef union small_pool_struct * small_pool_ptr;

-

-typedef union small_pool_struct {

-  struct {

-    small_pool_ptr next;	/* next in list of pools */

-    size_t bytes_used;		/* how many bytes already used within pool */

-    size_t bytes_left;		/* bytes still available in this pool */

-  } hdr;

-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */

-} small_pool_hdr;

-

-typedef union large_pool_struct FAR * large_pool_ptr;

-

-typedef union large_pool_struct {

-  struct {

-    large_pool_ptr next;	/* next in list of pools */

-    size_t bytes_used;		/* how many bytes already used within pool */

-    size_t bytes_left;		/* bytes still available in this pool */

-  } hdr;

-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */

-} large_pool_hdr;

-

-

-/*

- * Here is the full definition of a memory manager object.

- */

-

-typedef struct {

-  struct jpeg_memory_mgr pub;	/* public fields */

-

-  /* Each pool identifier (lifetime class) names a linked list of pools. */

-  small_pool_ptr small_list[JPOOL_NUMPOOLS];

-  large_pool_ptr large_list[JPOOL_NUMPOOLS];

-

-  /* Since we only have one lifetime class of virtual arrays, only one

-   * linked list is necessary (for each datatype).  Note that the virtual

-   * array control blocks being linked together are actually stored somewhere

-   * in the small-pool list.

-   */

-  jvirt_sarray_ptr virt_sarray_list;

-  jvirt_barray_ptr virt_barray_list;

-

-  /* This counts total space obtained from jpeg_get_small/large */

-  long total_space_allocated;

-

-  /* alloc_sarray and alloc_barray set this value for use by virtual

-   * array routines.

-   */

-  JDIMENSION last_rowsperchunk;	/* from most recent alloc_sarray/barray */

-} my_memory_mgr;

-

-typedef my_memory_mgr * my_mem_ptr;

-

-

-/*

- * The control blocks for virtual arrays.

- * Note that these blocks are allocated in the "small" pool area.

- * System-dependent info for the associated backing store (if any) is hidden

- * inside the backing_store_info struct.

- */

-

-struct jvirt_sarray_control {

-  JSAMPARRAY mem_buffer;	/* => the in-memory buffer */

-  JDIMENSION rows_in_array;	/* total virtual array height */

-  JDIMENSION samplesperrow;	/* width of array (and of memory buffer) */

-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_sarray */

-  JDIMENSION rows_in_mem;	/* height of memory buffer */

-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */

-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */

-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */

-  boolean pre_zero;		/* pre-zero mode requested? */

-  boolean dirty;		/* do current buffer contents need written? */

-  boolean b_s_open;		/* is backing-store data valid? */

-  jvirt_sarray_ptr next;	/* link to next virtual sarray control block */

-  backing_store_info b_s_info;	/* System-dependent control info */

-};

-

-struct jvirt_barray_control {

-  JBLOCKARRAY mem_buffer;	/* => the in-memory buffer */

-  JDIMENSION rows_in_array;	/* total virtual array height */

-  JDIMENSION blocksperrow;	/* width of array (and of memory buffer) */

-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_barray */

-  JDIMENSION rows_in_mem;	/* height of memory buffer */

-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */

-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */

-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */

-  boolean pre_zero;		/* pre-zero mode requested? */

-  boolean dirty;		/* do current buffer contents need written? */

-  boolean b_s_open;		/* is backing-store data valid? */

-  jvirt_barray_ptr next;	/* link to next virtual barray control block */

-  backing_store_info b_s_info;	/* System-dependent control info */

-};

-

-

-#ifdef MEM_STATS		/* optional extra stuff for statistics */

-

-LOCAL(void)

-print_mem_stats (j_common_ptr cinfo, int pool_id)

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  small_pool_ptr shdr_ptr;

-  large_pool_ptr lhdr_ptr;

-

-  /* Since this is only a debugging stub, we can cheat a little by using

-   * fprintf directly rather than going through the trace message code.

-   * This is helpful because message parm array can't handle longs.

-   */

-  fprintf(stderr, "Freeing pool %d, total space = %ld\n",

-	  pool_id, mem->total_space_allocated);

-

-  for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL;

-       lhdr_ptr = lhdr_ptr->hdr.next) {

-    fprintf(stderr, "  Large chunk used %ld\n",

-	    (long) lhdr_ptr->hdr.bytes_used);

-  }

-

-  for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL;

-       shdr_ptr = shdr_ptr->hdr.next) {

-    fprintf(stderr, "  Small chunk used %ld free %ld\n",

-	    (long) shdr_ptr->hdr.bytes_used,

-	    (long) shdr_ptr->hdr.bytes_left);

-  }

-}

-

-#endif /* MEM_STATS */

-

-

-LOCAL(noreturn_t)

-out_of_memory (j_common_ptr cinfo, int which)

-/* Report an out-of-memory error and stop execution */

-/* If we compiled MEM_STATS support, report alloc requests before dying */

-{

-#ifdef MEM_STATS

-  cinfo->err->trace_level = 2;	/* force self_destruct to report stats */

-#endif

-  ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);

-}

-

-

-/*

- * Allocation of "small" objects.

- *

- * For these, we use pooled storage.  When a new pool must be created,

- * we try to get enough space for the current request plus a "slop" factor,

- * where the slop will be the amount of leftover space in the new pool.

- * The speed vs. space tradeoff is largely determined by the slop values.

- * A different slop value is provided for each pool class (lifetime),

- * and we also distinguish the first pool of a class from later ones.

- * NOTE: the values given work fairly well on both 16- and 32-bit-int

- * machines, but may be too small if longs are 64 bits or more.

- */

-

-static const size_t first_pool_slop[JPOOL_NUMPOOLS] = 

-{

-	1600,			/* first PERMANENT pool */

-	16000			/* first IMAGE pool */

-};

-

-static const size_t extra_pool_slop[JPOOL_NUMPOOLS] = 

-{

-	0,			/* additional PERMANENT pools */

-	5000			/* additional IMAGE pools */

-};

-

-#define MIN_SLOP  50		/* greater than 0 to avoid futile looping */

-

-

-METHODDEF(void *)

-alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)

-/* Allocate a "small" object */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  small_pool_ptr hdr_ptr, prev_hdr_ptr;

-  char * data_ptr;

-  size_t odd_bytes, min_request, slop;

-

-  /* Check for unsatisfiable request (do now to ensure no overflow below) */

-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr)))

-    out_of_memory(cinfo, 1);	/* request exceeds malloc's ability */

-

-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */

-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);

-  if (odd_bytes > 0)

-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;

-

-  /* See if space is available in any existing pool */

-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)

-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */

-  prev_hdr_ptr = NULL;

-  hdr_ptr = mem->small_list[pool_id];

-  while (hdr_ptr != NULL) {

-    if (hdr_ptr->hdr.bytes_left >= sizeofobject)

-      break;			/* found pool with enough space */

-    prev_hdr_ptr = hdr_ptr;

-    hdr_ptr = hdr_ptr->hdr.next;

-  }

-

-  /* Time to make a new pool? */

-  if (hdr_ptr == NULL) {

-    /* min_request is what we need now, slop is what will be leftover */

-    min_request = sizeofobject + SIZEOF(small_pool_hdr);

-    if (prev_hdr_ptr == NULL)	/* first pool in class? */

-      slop = first_pool_slop[pool_id];

-    else

-      slop = extra_pool_slop[pool_id];

-    /* Don't ask for more than MAX_ALLOC_CHUNK */

-    if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request))

-      slop = (size_t) (MAX_ALLOC_CHUNK-min_request);

-    /* Try to get space, if fail reduce slop and try again */

-    for (;;) {

-      hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop);

-      if (hdr_ptr != NULL)

-	break;

-      slop /= 2;

-      if (slop < MIN_SLOP)	/* give up when it gets real small */

-	out_of_memory(cinfo, 2); /* jpeg_get_small failed */

-    }

-    mem->total_space_allocated += min_request + slop;

-    /* Success, initialize the new pool header and add to end of list */

-    hdr_ptr->hdr.next = NULL;

-    hdr_ptr->hdr.bytes_used = 0;

-    hdr_ptr->hdr.bytes_left = sizeofobject + slop;

-    if (prev_hdr_ptr == NULL)	/* first pool in class? */

-      mem->small_list[pool_id] = hdr_ptr;

-    else

-      prev_hdr_ptr->hdr.next = hdr_ptr;

-  }

-

-  /* OK, allocate the object from the current pool */

-  data_ptr = (char *) (hdr_ptr + 1); /* point to first data byte in pool */

-  data_ptr += hdr_ptr->hdr.bytes_used; /* point to place for object */

-  hdr_ptr->hdr.bytes_used += sizeofobject;

-  hdr_ptr->hdr.bytes_left -= sizeofobject;

-

-  return (void *) data_ptr;

-}

-

-

-/*

- * Allocation of "large" objects.

- *

- * The external semantics of these are the same as "small" objects,

- * except that FAR pointers are used on 80x86.  However the pool

- * management heuristics are quite different.  We assume that each

- * request is large enough that it may as well be passed directly to

- * jpeg_get_large; the pool management just links everything together

- * so that we can free it all on demand.

- * Note: the major use of "large" objects is in JSAMPARRAY and JBLOCKARRAY

- * structures.  The routines that create these structures (see below)

- * deliberately bunch rows together to ensure a large request size.

- */

-

-METHODDEF(void FAR *)

-alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)

-/* Allocate a "large" object */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  large_pool_ptr hdr_ptr;

-  size_t odd_bytes;

-

-  /* Check for unsatisfiable request (do now to ensure no overflow below) */

-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)))

-    out_of_memory(cinfo, 3);	/* request exceeds malloc's ability */

-

-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */

-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);

-  if (odd_bytes > 0)

-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;

-

-  /* Always make a new pool */

-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)

-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */

-

-  hdr_ptr = (large_pool_ptr) jpeg_get_large(cinfo, sizeofobject +

-					    SIZEOF(large_pool_hdr));

-  if (hdr_ptr == NULL)

-    out_of_memory(cinfo, 4);	/* jpeg_get_large failed */

-  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);

-

-  /* Success, initialize the new pool header and add to list */

-  hdr_ptr->hdr.next = mem->large_list[pool_id];

-  /* We maintain space counts in each pool header for statistical purposes,

-   * even though they are not needed for allocation.

-   */

-  hdr_ptr->hdr.bytes_used = sizeofobject;

-  hdr_ptr->hdr.bytes_left = 0;

-  mem->large_list[pool_id] = hdr_ptr;

-

-  return (void FAR *) (hdr_ptr + 1); /* point to first data byte in pool */

-}

-

-

-/*

- * Creation of 2-D sample arrays.

- * The pointers are in near heap, the samples themselves in FAR heap.

- *

- * To minimize allocation overhead and to allow I/O of large contiguous

- * blocks, we allocate the sample rows in groups of as many rows as possible

- * without exceeding MAX_ALLOC_CHUNK total bytes per allocation request.

- * NB: the virtual array control routines, later in this file, know about

- * this chunking of rows.  The rowsperchunk value is left in the mem manager

- * object so that it can be saved away if this sarray is the workspace for

- * a virtual array.

- */

-

-METHODDEF(JSAMPARRAY)

-alloc_sarray (j_common_ptr cinfo, int pool_id,

-	      JDIMENSION samplesperrow, JDIMENSION numrows)

-/* Allocate a 2-D sample array */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  JSAMPARRAY result;

-  JSAMPROW workspace;

-  JDIMENSION rowsperchunk, currow, i;

-  long ltemp;

-

-  /* Calculate max # of rows allowed in one allocation chunk */

-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /

-	  ((long) samplesperrow * SIZEOF(JSAMPLE));

-  if (ltemp <= 0)

-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);

-  if (ltemp < (long) numrows)

-    rowsperchunk = (JDIMENSION) ltemp;

-  else

-    rowsperchunk = numrows;

-  mem->last_rowsperchunk = rowsperchunk;

-

-  /* Get space for row pointers (small object) */

-  result = (JSAMPARRAY) alloc_small(cinfo, pool_id,

-				    (size_t) (numrows * SIZEOF(JSAMPROW)));

-

-  /* Get the rows themselves (large objects) */

-  currow = 0;

-  while (currow < numrows) {

-    rowsperchunk = MIN(rowsperchunk, numrows - currow);

-    workspace = (JSAMPROW) alloc_large(cinfo, pool_id,

-	(size_t) ((size_t) rowsperchunk * (size_t) samplesperrow

-		  * SIZEOF(JSAMPLE)));

-    for (i = rowsperchunk; i > 0; i--) {

-      result[currow++] = workspace;

-      workspace += samplesperrow;

-    }

-  }

-

-  return result;

-}

-

-

-/*

- * Creation of 2-D coefficient-block arrays.

- * This is essentially the same as the code for sample arrays, above.

- */

-

-METHODDEF(JBLOCKARRAY)

-alloc_barray (j_common_ptr cinfo, int pool_id,

-	      JDIMENSION blocksperrow, JDIMENSION numrows)

-/* Allocate a 2-D coefficient-block array */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  JBLOCKARRAY result;

-  JBLOCKROW workspace;

-  JDIMENSION rowsperchunk, currow, i;

-  long ltemp;

-

-  /* Calculate max # of rows allowed in one allocation chunk */

-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /

-	  ((long) blocksperrow * SIZEOF(JBLOCK));

-  if (ltemp <= 0)

-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);

-  if (ltemp < (long) numrows)

-    rowsperchunk = (JDIMENSION) ltemp;

-  else

-    rowsperchunk = numrows;

-  mem->last_rowsperchunk = rowsperchunk;

-

-  /* Get space for row pointers (small object) */

-  result = (JBLOCKARRAY) alloc_small(cinfo, pool_id,

-				     (size_t) (numrows * SIZEOF(JBLOCKROW)));

-

-  /* Get the rows themselves (large objects) */

-  currow = 0;

-  while (currow < numrows) {

-    rowsperchunk = MIN(rowsperchunk, numrows - currow);

-    workspace = (JBLOCKROW) alloc_large(cinfo, pool_id,

-	(size_t) ((size_t) rowsperchunk * (size_t) blocksperrow

-		  * SIZEOF(JBLOCK)));

-    for (i = rowsperchunk; i > 0; i--) {

-      result[currow++] = workspace;

-      workspace += blocksperrow;

-    }

-  }

-

-  return result;

-}

-

-

-/*

- * About virtual array management:

- *

- * The above "normal" array routines are only used to allocate strip buffers

- * (as wide as the image, but just a few rows high).  Full-image-sized buffers

- * are handled as "virtual" arrays.  The array is still accessed a strip at a

- * time, but the memory manager must save the whole array for repeated

- * accesses.  The intended implementation is that there is a strip buffer in

- * memory (as high as is possible given the desired memory limit), plus a

- * backing file that holds the rest of the array.

- *

- * The request_virt_array routines are told the total size of the image and

- * the maximum number of rows that will be accessed at once.  The in-memory

- * buffer must be at least as large as the maxaccess value.

- *

- * The request routines create control blocks but not the in-memory buffers.

- * That is postponed until realize_virt_arrays is called.  At that time the

- * total amount of space needed is known (approximately, anyway), so free

- * memory can be divided up fairly.

- *

- * The access_virt_array routines are responsible for making a specific strip

- * area accessible (after reading or writing the backing file, if necessary).

- * Note that the access routines are told whether the caller intends to modify

- * the accessed strip; during a read-only pass this saves having to rewrite

- * data to disk.  The access routines are also responsible for pre-zeroing

- * any newly accessed rows, if pre-zeroing was requested.

- *

- * In current usage, the access requests are usually for nonoverlapping

- * strips; that is, successive access start_row numbers differ by exactly

- * num_rows = maxaccess.  This means we can get good performance with simple

- * buffer dump/reload logic, by making the in-memory buffer be a multiple

- * of the access height; then there will never be accesses across bufferload

- * boundaries.  The code will still work with overlapping access requests,

- * but it doesn't handle bufferload overlaps very efficiently.

- */

-

-

-METHODDEF(jvirt_sarray_ptr)

-request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,

-		     JDIMENSION samplesperrow, JDIMENSION numrows,

-		     JDIMENSION maxaccess)

-/* Request a virtual 2-D sample array */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  jvirt_sarray_ptr result;

-

-  /* Only IMAGE-lifetime virtual arrays are currently supported */

-  if (pool_id != JPOOL_IMAGE)

-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */

-

-  /* get control block */

-  result = (jvirt_sarray_ptr) alloc_small(cinfo, pool_id,

-					  SIZEOF(struct jvirt_sarray_control));

-

-  result->mem_buffer = NULL;	/* marks array not yet realized */

-  result->rows_in_array = numrows;

-  result->samplesperrow = samplesperrow;

-  result->maxaccess = maxaccess;

-  result->pre_zero = pre_zero;

-  result->b_s_open = FALSE;	/* no associated backing-store object */

-  result->next = mem->virt_sarray_list; /* add to list of virtual arrays */

-  mem->virt_sarray_list = result;

-

-  return result;

-}

-

-

-METHODDEF(jvirt_barray_ptr)

-request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero,

-		     JDIMENSION blocksperrow, JDIMENSION numrows,

-		     JDIMENSION maxaccess)

-/* Request a virtual 2-D coefficient-block array */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  jvirt_barray_ptr result;

-

-  /* Only IMAGE-lifetime virtual arrays are currently supported */

-  if (pool_id != JPOOL_IMAGE)

-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */

-

-  /* get control block */

-  result = (jvirt_barray_ptr) alloc_small(cinfo, pool_id,

-					  SIZEOF(struct jvirt_barray_control));

-

-  result->mem_buffer = NULL;	/* marks array not yet realized */

-  result->rows_in_array = numrows;

-  result->blocksperrow = blocksperrow;

-  result->maxaccess = maxaccess;

-  result->pre_zero = pre_zero;

-  result->b_s_open = FALSE;	/* no associated backing-store object */

-  result->next = mem->virt_barray_list; /* add to list of virtual arrays */

-  mem->virt_barray_list = result;

-

-  return result;

-}

-

-

-METHODDEF(void)

-realize_virt_arrays (j_common_ptr cinfo)

-/* Allocate the in-memory buffers for any unrealized virtual arrays */

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  long space_per_minheight, maximum_space, avail_mem;

-  long minheights, max_minheights;

-  jvirt_sarray_ptr sptr;

-  jvirt_barray_ptr bptr;

-

-  /* Compute the minimum space needed (maxaccess rows in each buffer)

-   * and the maximum space needed (full image height in each buffer).

-   * These may be of use to the system-dependent jpeg_mem_available routine.

-   */

-  space_per_minheight = 0;

-  maximum_space = 0;

-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {

-    if (sptr->mem_buffer == NULL) { /* if not realized yet */

-      space_per_minheight += (long) sptr->maxaccess *

-			     (long) sptr->samplesperrow * SIZEOF(JSAMPLE);

-      maximum_space += (long) sptr->rows_in_array *

-		       (long) sptr->samplesperrow * SIZEOF(JSAMPLE);

-    }

-  }

-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {

-    if (bptr->mem_buffer == NULL) { /* if not realized yet */

-      space_per_minheight += (long) bptr->maxaccess *

-			     (long) bptr->blocksperrow * SIZEOF(JBLOCK);

-      maximum_space += (long) bptr->rows_in_array *

-		       (long) bptr->blocksperrow * SIZEOF(JBLOCK);

-    }

-  }

-

-  if (space_per_minheight <= 0)

-    return;			/* no unrealized arrays, no work */

-

-  /* Determine amount of memory to actually use; this is system-dependent. */

-  avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,

-				 mem->total_space_allocated);

-

-  /* If the maximum space needed is available, make all the buffers full

-   * height; otherwise parcel it out with the same number of minheights

-   * in each buffer.

-   */

-  if (avail_mem >= maximum_space)

-    max_minheights = 1000000000L;

-  else {

-    max_minheights = avail_mem / space_per_minheight;

-    /* If there doesn't seem to be enough space, try to get the minimum

-     * anyway.  This allows a "stub" implementation of jpeg_mem_available().

-     */

-    if (max_minheights <= 0)

-      max_minheights = 1;

-  }

-

-  /* Allocate the in-memory buffers and initialize backing store as needed. */

-

-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {

-    if (sptr->mem_buffer == NULL) { /* if not realized yet */

-      minheights = ((long) sptr->rows_in_array - 1L) / sptr->maxaccess + 1L;

-      if (minheights <= max_minheights) {

-	/* This buffer fits in memory */

-	sptr->rows_in_mem = sptr->rows_in_array;

-      } else {

-	/* It doesn't fit in memory, create backing store. */

-	sptr->rows_in_mem = (JDIMENSION) (max_minheights * sptr->maxaccess);

-	jpeg_open_backing_store(cinfo, & sptr->b_s_info,

-				(long) sptr->rows_in_array *

-				(long) sptr->samplesperrow *

-				(long) SIZEOF(JSAMPLE));

-	sptr->b_s_open = TRUE;

-      }

-      sptr->mem_buffer = alloc_sarray(cinfo, JPOOL_IMAGE,

-				      sptr->samplesperrow, sptr->rows_in_mem);

-      sptr->rowsperchunk = mem->last_rowsperchunk;

-      sptr->cur_start_row = 0;

-      sptr->first_undef_row = 0;

-      sptr->dirty = FALSE;

-    }

-  }

-

-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {

-    if (bptr->mem_buffer == NULL) { /* if not realized yet */

-      minheights = ((long) bptr->rows_in_array - 1L) / bptr->maxaccess + 1L;

-      if (minheights <= max_minheights) {

-	/* This buffer fits in memory */

-	bptr->rows_in_mem = bptr->rows_in_array;

-      } else {

-	/* It doesn't fit in memory, create backing store. */

-	bptr->rows_in_mem = (JDIMENSION) (max_minheights * bptr->maxaccess);

-	jpeg_open_backing_store(cinfo, & bptr->b_s_info,

-				(long) bptr->rows_in_array *

-				(long) bptr->blocksperrow *

-				(long) SIZEOF(JBLOCK));

-	bptr->b_s_open = TRUE;

-      }

-      bptr->mem_buffer = alloc_barray(cinfo, JPOOL_IMAGE,

-				      bptr->blocksperrow, bptr->rows_in_mem);

-      bptr->rowsperchunk = mem->last_rowsperchunk;

-      bptr->cur_start_row = 0;

-      bptr->first_undef_row = 0;

-      bptr->dirty = FALSE;

-    }

-  }

-}

-

-

-LOCAL(void)

-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)

-/* Do backing store read or write of a virtual sample array */

-{

-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;

-

-  bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE);

-  file_offset = ptr->cur_start_row * bytesperrow;

-  /* Loop to read or write each allocation chunk in mem_buffer */

-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {

-    /* One chunk, but check for short chunk at end of buffer */

-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);

-    /* Transfer no more than is currently defined */

-    thisrow = (long) ptr->cur_start_row + i;

-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);

-    /* Transfer no more than fits in file */

-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);

-    if (rows <= 0)		/* this chunk might be past end of file! */

-      break;

-    byte_count = rows * bytesperrow;

-    if (writing)

-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,

-					    (void FAR *) ptr->mem_buffer[i],

-					    file_offset, byte_count);

-    else

-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,

-					   (void FAR *) ptr->mem_buffer[i],

-					   file_offset, byte_count);

-    file_offset += byte_count;

-  }

-}

-

-

-LOCAL(void)

-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)

-/* Do backing store read or write of a virtual coefficient-block array */

-{

-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;

-

-  bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK);

-  file_offset = ptr->cur_start_row * bytesperrow;

-  /* Loop to read or write each allocation chunk in mem_buffer */

-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {

-    /* One chunk, but check for short chunk at end of buffer */

-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);

-    /* Transfer no more than is currently defined */

-    thisrow = (long) ptr->cur_start_row + i;

-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);

-    /* Transfer no more than fits in file */

-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);

-    if (rows <= 0)		/* this chunk might be past end of file! */

-      break;

-    byte_count = rows * bytesperrow;

-    if (writing)

-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,

-					    (void FAR *) ptr->mem_buffer[i],

-					    file_offset, byte_count);

-    else

-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,

-					   (void FAR *) ptr->mem_buffer[i],

-					   file_offset, byte_count);

-    file_offset += byte_count;

-  }

-}

-

-

-METHODDEF(JSAMPARRAY)

-access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,

-		    JDIMENSION start_row, JDIMENSION num_rows,

-		    boolean writable)

-/* Access the part of a virtual sample array starting at start_row */

-/* and extending for num_rows rows.  writable is true if  */

-/* caller intends to modify the accessed area. */

-{

-  JDIMENSION end_row = start_row + num_rows;

-  JDIMENSION undef_row;

-

-  /* debugging check */

-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||

-      ptr->mem_buffer == NULL)

-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-

-  /* Make the desired part of the virtual array accessible */

-  if (start_row < ptr->cur_start_row ||

-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {

-    if (! ptr->b_s_open)

-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);

-    /* Flush old buffer contents if necessary */

-    if (ptr->dirty) {

-      do_sarray_io(cinfo, ptr, TRUE);

-      ptr->dirty = FALSE;

-    }

-    /* Decide what part of virtual array to access.

-     * Algorithm: if target address > current window, assume forward scan,

-     * load starting at target address.  If target address < current window,

-     * assume backward scan, load so that target area is top of window.

-     * Note that when switching from forward write to forward read, will have

-     * start_row = 0, so the limiting case applies and we load from 0 anyway.

-     */

-    if (start_row > ptr->cur_start_row) {

-      ptr->cur_start_row = start_row;

-    } else {

-      /* use long arithmetic here to avoid overflow & unsigned problems */

-      long ltemp;

-

-      ltemp = (long) end_row - (long) ptr->rows_in_mem;

-      if (ltemp < 0)

-	ltemp = 0;		/* don't fall off front end of file */

-      ptr->cur_start_row = (JDIMENSION) ltemp;

-    }

-    /* Read in the selected part of the array.

-     * During the initial write pass, we will do no actual read

-     * because the selected part is all undefined.

-     */

-    do_sarray_io(cinfo, ptr, FALSE);

-  }

-  /* Ensure the accessed part of the array is defined; prezero if needed.

-   * To improve locality of access, we only prezero the part of the array

-   * that the caller is about to access, not the entire in-memory array.

-   */

-  if (ptr->first_undef_row < end_row) {

-    if (ptr->first_undef_row < start_row) {

-      if (writable)		/* writer skipped over a section of array */

-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-      undef_row = start_row;	/* but reader is allowed to read ahead */

-    } else {

-      undef_row = ptr->first_undef_row;

-    }

-    if (writable)

-      ptr->first_undef_row = end_row;

-    if (ptr->pre_zero) {

-      size_t bytesperrow = (size_t) ptr->samplesperrow * SIZEOF(JSAMPLE);

-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */

-      end_row -= ptr->cur_start_row;

-      while (undef_row < end_row) {

-	FMEMZERO((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);

-	undef_row++;

-      }

-    } else {

-      if (! writable)		/* reader looking at undefined data */

-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-    }

-  }

-  /* Flag the buffer dirty if caller will write in it */

-  if (writable)

-    ptr->dirty = TRUE;

-  /* Return address of proper part of the buffer */

-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);

-}

-

-

-METHODDEF(JBLOCKARRAY)

-access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,

-		    JDIMENSION start_row, JDIMENSION num_rows,

-		    boolean writable)

-/* Access the part of a virtual block array starting at start_row */

-/* and extending for num_rows rows.  writable is true if  */

-/* caller intends to modify the accessed area. */

-{

-  JDIMENSION end_row = start_row + num_rows;

-  JDIMENSION undef_row;

-

-  /* debugging check */

-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||

-      ptr->mem_buffer == NULL)

-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-

-  /* Make the desired part of the virtual array accessible */

-  if (start_row < ptr->cur_start_row ||

-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {

-    if (! ptr->b_s_open)

-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);

-    /* Flush old buffer contents if necessary */

-    if (ptr->dirty) {

-      do_barray_io(cinfo, ptr, TRUE);

-      ptr->dirty = FALSE;

-    }

-    /* Decide what part of virtual array to access.

-     * Algorithm: if target address > current window, assume forward scan,

-     * load starting at target address.  If target address < current window,

-     * assume backward scan, load so that target area is top of window.

-     * Note that when switching from forward write to forward read, will have

-     * start_row = 0, so the limiting case applies and we load from 0 anyway.

-     */

-    if (start_row > ptr->cur_start_row) {

-      ptr->cur_start_row = start_row;

-    } else {

-      /* use long arithmetic here to avoid overflow & unsigned problems */

-      long ltemp;

-

-      ltemp = (long) end_row - (long) ptr->rows_in_mem;

-      if (ltemp < 0)

-	ltemp = 0;		/* don't fall off front end of file */

-      ptr->cur_start_row = (JDIMENSION) ltemp;

-    }

-    /* Read in the selected part of the array.

-     * During the initial write pass, we will do no actual read

-     * because the selected part is all undefined.

-     */

-    do_barray_io(cinfo, ptr, FALSE);

-  }

-  /* Ensure the accessed part of the array is defined; prezero if needed.

-   * To improve locality of access, we only prezero the part of the array

-   * that the caller is about to access, not the entire in-memory array.

-   */

-  if (ptr->first_undef_row < end_row) {

-    if (ptr->first_undef_row < start_row) {

-      if (writable)		/* writer skipped over a section of array */

-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-      undef_row = start_row;	/* but reader is allowed to read ahead */

-    } else {

-      undef_row = ptr->first_undef_row;

-    }

-    if (writable)

-      ptr->first_undef_row = end_row;

-    if (ptr->pre_zero) {

-      size_t bytesperrow = (size_t) ptr->blocksperrow * SIZEOF(JBLOCK);

-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */

-      end_row -= ptr->cur_start_row;

-      while (undef_row < end_row) {

-	FMEMZERO((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);

-	undef_row++;

-      }

-    } else {

-      if (! writable)		/* reader looking at undefined data */

-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);

-    }

-  }

-  /* Flag the buffer dirty if caller will write in it */

-  if (writable)

-    ptr->dirty = TRUE;

-  /* Return address of proper part of the buffer */

-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);

-}

-

-

-/*

- * Release all objects belonging to a specified pool.

- */

-

-METHODDEF(void)

-free_pool (j_common_ptr cinfo, int pool_id)

-{

-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;

-  small_pool_ptr shdr_ptr;

-  large_pool_ptr lhdr_ptr;

-  size_t space_freed;

-

-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)

-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */

-

-#ifdef MEM_STATS

-  if (cinfo->err->trace_level > 1)

-    print_mem_stats(cinfo, pool_id); /* print pool's memory usage statistics */

-#endif

-

-  /* If freeing IMAGE pool, close any virtual arrays first */

-  if (pool_id == JPOOL_IMAGE) {

-    jvirt_sarray_ptr sptr;

-    jvirt_barray_ptr bptr;

-

-    for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {

-      if (sptr->b_s_open) {	/* there may be no backing store */

-	sptr->b_s_open = FALSE;	/* prevent recursive close if error */

-	(*sptr->b_s_info.close_backing_store) (cinfo, & sptr->b_s_info);

-      }

-    }

-    mem->virt_sarray_list = NULL;

-    for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {

-      if (bptr->b_s_open) {	/* there may be no backing store */

-	bptr->b_s_open = FALSE;	/* prevent recursive close if error */

-	(*bptr->b_s_info.close_backing_store) (cinfo, & bptr->b_s_info);

-      }

-    }

-    mem->virt_barray_list = NULL;

-  }

-

-  /* Release large objects */

-  lhdr_ptr = mem->large_list[pool_id];

-  mem->large_list[pool_id] = NULL;

-

-  while (lhdr_ptr != NULL) {

-    large_pool_ptr next_lhdr_ptr = lhdr_ptr->hdr.next;

-    space_freed = lhdr_ptr->hdr.bytes_used +

-		  lhdr_ptr->hdr.bytes_left +

-		  SIZEOF(large_pool_hdr);

-    jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);

-    mem->total_space_allocated -= space_freed;

-    lhdr_ptr = next_lhdr_ptr;

-  }

-

-  /* Release small objects */

-  shdr_ptr = mem->small_list[pool_id];

-  mem->small_list[pool_id] = NULL;

-

-  while (shdr_ptr != NULL) {

-    small_pool_ptr next_shdr_ptr = shdr_ptr->hdr.next;

-    space_freed = shdr_ptr->hdr.bytes_used +

-		  shdr_ptr->hdr.bytes_left +

-		  SIZEOF(small_pool_hdr);

-    jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);

-    mem->total_space_allocated -= space_freed;

-    shdr_ptr = next_shdr_ptr;

-  }

-}

-

-

-/*

- * Close up shop entirely.

- * Note that this cannot be called unless cinfo->mem is non-NULL.

- */

-

-METHODDEF(void)

-self_destruct (j_common_ptr cinfo)

-{

-  int pool;

-

-  /* Close all backing store, release all memory.

-   * Releasing pools in reverse order might help avoid fragmentation

-   * with some (brain-damaged) malloc libraries.

-   */

-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {

-    free_pool(cinfo, pool);

-  }

-

-  /* Release the memory manager control block too. */

-  jpeg_free_small(cinfo, (void *) cinfo->mem, SIZEOF(my_memory_mgr));

-  cinfo->mem = NULL;		/* ensures I will be called only once */

-

-  jpeg_mem_term(cinfo);		/* system-dependent cleanup */

-}

-

-

-/*

- * Memory manager initialization.

- * When this is called, only the error manager pointer is valid in cinfo!

- */

-

-GLOBAL(void)

-jinit_memory_mgr (j_common_ptr cinfo)

-{

-  my_mem_ptr mem;

-  long max_to_use;

-  int pool;

-  size_t test_mac;

-

-  cinfo->mem = NULL;		/* for safety if init fails */

-

-  /* Check for configuration errors.

-   * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably

-   * doesn't reflect any real hardware alignment requirement.

-   * The test is a little tricky: for X>0, X and X-1 have no one-bits

-   * in common if and only if X is a power of 2, ie has only one one-bit.

-   * Some compilers may give an "unreachable code" warning here; ignore it.

-   */

-  if ((SIZEOF(ALIGN_TYPE) & (SIZEOF(ALIGN_TYPE)-1)) != 0)

-    ERREXIT(cinfo, JERR_BAD_ALIGN_TYPE);

-  /* MAX_ALLOC_CHUNK must be representable as type size_t, and must be

-   * a multiple of SIZEOF(ALIGN_TYPE).

-   * Again, an "unreachable code" warning may be ignored here.

-   * But a "constant too large" warning means you need to fix MAX_ALLOC_CHUNK.

-   */

-  test_mac = (size_t) MAX_ALLOC_CHUNK;

-  if ((long) test_mac != MAX_ALLOC_CHUNK ||

-      (MAX_ALLOC_CHUNK % SIZEOF(ALIGN_TYPE)) != 0)

-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);

-

-  max_to_use = jpeg_mem_init(cinfo); /* system-dependent initialization */

-

-  /* Attempt to allocate memory manager's control block */

-  mem = (my_mem_ptr) jpeg_get_small(cinfo, SIZEOF(my_memory_mgr));

-

-  if (mem == NULL) {

-    jpeg_mem_term(cinfo);	/* system-dependent cleanup */

-    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 0);

-  }

-

-  /* OK, fill in the method pointers */

-  mem->pub.alloc_small = alloc_small;

-  mem->pub.alloc_large = alloc_large;

-  mem->pub.alloc_sarray = alloc_sarray;

-  mem->pub.alloc_barray = alloc_barray;

-  mem->pub.request_virt_sarray = request_virt_sarray;

-  mem->pub.request_virt_barray = request_virt_barray;

-  mem->pub.realize_virt_arrays = realize_virt_arrays;

-  mem->pub.access_virt_sarray = access_virt_sarray;

-  mem->pub.access_virt_barray = access_virt_barray;

-  mem->pub.free_pool = free_pool;

-  mem->pub.self_destruct = self_destruct;

-

-  /* Make MAX_ALLOC_CHUNK accessible to other modules */

-  mem->pub.max_alloc_chunk = MAX_ALLOC_CHUNK;

-

-  /* Initialize working state */

-  mem->pub.max_memory_to_use = max_to_use;

-

-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {

-    mem->small_list[pool] = NULL;

-    mem->large_list[pool] = NULL;

-  }

-  mem->virt_sarray_list = NULL;

-  mem->virt_barray_list = NULL;

-

-  mem->total_space_allocated = SIZEOF(my_memory_mgr);

-

-  /* Declare ourselves open for business */

-  cinfo->mem = & mem->pub;

-

-  /* Check for an environment variable JPEGMEM; if found, override the

-   * default max_memory setting from jpeg_mem_init.  Note that the

-   * surrounding application may again override this value.

-   * If your system doesn't support getenv(), define NO_GETENV to disable

-   * this feature.

-   */

-#ifndef NO_GETENV

-  { char * memenv;

-

-    if ((memenv = getenv("JPEGMEM")) != NULL) {

-      char ch = 'x';

-

-      if (sscanf(memenv, "%ld%c", &max_to_use, &ch) > 0) {

-	if (ch == 'm' || ch == 'M')

-	  max_to_use *= 1000L;

-	mem->pub.max_memory_to_use = max_to_use * 1000L;

-      }

-    }

-  }

-#endif

-

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemname.c b/plugins/AdvaImg/src/LibJPEG/jmemname.c
deleted file mode 100644
index e28b212f48..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemname.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*

- * jmemname.c

- *

- * Copyright (C) 1992-1997, 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 provides a generic implementation of the system-dependent

- * portion of the JPEG memory manager.  This implementation assumes that

- * you must explicitly construct a name for each temp file.

- * Also, the problem of determining the amount of memory available

- * is shoved onto the user.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"		/* import the system-dependent declarations */

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */

-extern void * malloc JPP((size_t size));

-extern void free JPP((void *ptr));

-#endif

-

-#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */

-#define SEEK_SET  0		/* if not, assume 0 is correct */

-#endif

-

-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */

-#define READ_BINARY	"r"

-#define RW_BINARY	"w+"

-#else

-#ifdef VMS			/* VMS is very nonstandard */

-#define READ_BINARY	"rb", "ctx=stm"

-#define RW_BINARY	"w+b", "ctx=stm"

-#else				/* standard ANSI-compliant case */

-#define READ_BINARY	"rb"

-#define RW_BINARY	"w+b"

-#endif

-#endif

-

-

-/*

- * Selection of a file name for a temporary file.

- * This is system-dependent!

- *

- * The code as given is suitable for most Unix systems, and it is easily

- * modified for most non-Unix systems.  Some notes:

- *  1.  The temp file is created in the directory named by TEMP_DIRECTORY.

- *      The default value is /usr/tmp, which is the conventional place for

- *      creating large temp files on Unix.  On other systems you'll probably

- *      want to change the file location.  You can do this by editing the

- *      #define, or (preferred) by defining TEMP_DIRECTORY in jconfig.h.

- *

- *  2.  If you need to change the file name as well as its location,

- *      you can override the TEMP_FILE_NAME macro.  (Note that this is

- *      actually a printf format string; it must contain %s and %d.)

- *      Few people should need to do this.

- *

- *  3.  mktemp() is used to ensure that multiple processes running

- *      simultaneously won't select the same file names.  If your system

- *      doesn't have mktemp(), define NO_MKTEMP to do it the hard way.

- *      (If you don't have <errno.h>, also define NO_ERRNO_H.)

- *

- *  4.  You probably want to define NEED_SIGNAL_CATCHER so that cjpeg.c/djpeg.c

- *      will cause the temp files to be removed if you stop the program early.

- */

-

-#ifndef TEMP_DIRECTORY		/* can override from jconfig.h or Makefile */

-#define TEMP_DIRECTORY  "/usr/tmp/" /* recommended setting for Unix */

-#endif

-

-static int next_file_num;	/* to distinguish among several temp files */

-

-#ifdef NO_MKTEMP

-

-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */

-#define TEMP_FILE_NAME  "%sJPG%03d.TMP"

-#endif

-

-#ifndef NO_ERRNO_H

-#include <errno.h>		/* to define ENOENT */

-#endif

-

-/* ANSI C specifies that errno is a macro, but on older systems it's more

- * likely to be a plain int variable.  And not all versions of errno.h

- * bother to declare it, so we have to in order to be most portable.  Thus:

- */

-#ifndef errno

-extern int errno;

-#endif

-

-

-LOCAL(void)

-select_file_name (char * fname)

-{

-  FILE * tfile;

-

-  /* Keep generating file names till we find one that's not in use */

-  for (;;) {

-    next_file_num++;		/* advance counter */

-    sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);

-    if ((tfile = fopen(fname, READ_BINARY)) == NULL) {

-      /* fopen could have failed for a reason other than the file not

-       * being there; for example, file there but unreadable.

-       * If <errno.h> isn't available, then we cannot test the cause.

-       */

-#ifdef ENOENT

-      if (errno != ENOENT)

-	continue;

-#endif

-      break;

-    }

-    fclose(tfile);		/* oops, it's there; close tfile & try again */

-  }

-}

-

-#else /* ! NO_MKTEMP */

-

-/* Note that mktemp() requires the initial filename to end in six X's */

-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */

-#define TEMP_FILE_NAME  "%sJPG%dXXXXXX"

-#endif

-

-LOCAL(void)

-select_file_name (char * fname)

-{

-  next_file_num++;		/* advance counter */

-  sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);

-  mktemp(fname);		/* make sure file name is unique */

-  /* mktemp replaces the trailing XXXXXX with a unique string of characters */

-}

-

-#endif /* NO_MKTEMP */

-

-

-/*

- * Memory allocation and freeing are controlled by the regular library

- * routines malloc() and free().

- */

-

-GLOBAL(void *)

-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * "Large" objects are treated the same as "small" ones.

- * NB: although we include FAR keywords in the routine declarations,

- * this file won't actually work in 80x86 small/medium model; at least,

- * you probably won't be able to process useful-size images in only 64KB.

- */

-

-GLOBAL(void FAR *)

-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void FAR *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * This routine computes the total memory space available for allocation.

- * It's impossible to do this in a portable way; our current solution is

- * to make the user tell us (with a default value set at compile time).

- * If you can actually get the available space, it's a good idea to subtract

- * a slop factor of 5% or so.

- */

-

-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */

-#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */

-#endif

-

-GLOBAL(long)

-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,

-		    long max_bytes_needed, long already_allocated)

-{

-  return cinfo->mem->max_memory_to_use - already_allocated;

-}

-

-

-/*

- * Backing store (temporary file) management.

- * Backing store objects are only used when the value returned by

- * jpeg_mem_available is less than the total space needed.  You can dispense

- * with these routines if you have plenty of virtual memory; see jmemnobs.c.

- */

-

-

-METHODDEF(void)

-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		    void FAR * buffer_address,

-		    long file_offset, long byte_count)

-{

-  if (fseek(info->temp_file, file_offset, SEEK_SET))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  if (JFREAD(info->temp_file, buffer_address, byte_count)

-      != (size_t) byte_count)

-    ERREXIT(cinfo, JERR_TFILE_READ);

-}

-

-

-METHODDEF(void)

-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-		     void FAR * buffer_address,

-		     long file_offset, long byte_count)

-{

-  if (fseek(info->temp_file, file_offset, SEEK_SET))

-    ERREXIT(cinfo, JERR_TFILE_SEEK);

-  if (JFWRITE(info->temp_file, buffer_address, byte_count)

-      != (size_t) byte_count)

-    ERREXIT(cinfo, JERR_TFILE_WRITE);

-}

-

-

-METHODDEF(void)

-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)

-{

-  fclose(info->temp_file);	/* close the file */

-  unlink(info->temp_name);	/* delete the file */

-/* If your system doesn't have unlink(), use remove() instead.

- * remove() is the ANSI-standard name for this function, but if

- * your system was ANSI you'd be using jmemansi.c, right?

- */

-  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);

-}

-

-

-/*

- * Initial opening of a backing-store object.

- */

-

-GLOBAL(void)

-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-			 long total_bytes_needed)

-{

-  select_file_name(info->temp_name);

-  if ((info->temp_file = fopen(info->temp_name, RW_BINARY)) == NULL)

-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);

-  info->read_backing_store = read_backing_store;

-  info->write_backing_store = write_backing_store;

-  info->close_backing_store = close_backing_store;

-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);

-}

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.

- */

-

-GLOBAL(long)

-jpeg_mem_init (j_common_ptr cinfo)

-{

-  next_file_num = 0;		/* initialize temp file name generator */

-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */

-}

-

-GLOBAL(void)

-jpeg_mem_term (j_common_ptr cinfo)

-{

-  /* no work */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemnobs.c b/plugins/AdvaImg/src/LibJPEG/jmemnobs.c
deleted file mode 100644
index 6aa1e92950..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemnobs.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*

- * jmemnobs.c

- *

- * Copyright (C) 1992-1996, 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 provides a really simple implementation of the system-

- * dependent portion of the JPEG memory manager.  This implementation

- * assumes that no backing-store files are needed: all required space

- * can be obtained from malloc().

- * This is very portable in the sense that it'll compile on almost anything,

- * but you'd better have lots of main memory (or virtual memory) if you want

- * to process big images.

- * Note that the max_memory_to_use option is ignored by this implementation.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "jmemsys.h"		/* import the system-dependent declarations */

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */

-extern void * malloc JPP((size_t size));

-extern void free JPP((void *ptr));

-#endif

-

-

-/*

- * Memory allocation and freeing are controlled by the regular library

- * routines malloc() and free().

- */

-

-GLOBAL(void *)

-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * "Large" objects are treated the same as "small" ones.

- * NB: although we include FAR keywords in the routine declarations,

- * this file won't actually work in 80x86 small/medium model; at least,

- * you probably won't be able to process useful-size images in only 64KB.

- */

-

-GLOBAL(void FAR *)

-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)

-{

-  return (void FAR *) malloc(sizeofobject);

-}

-

-GLOBAL(void)

-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)

-{

-  free(object);

-}

-

-

-/*

- * This routine computes the total memory space available for allocation.

- * Here we always say, "we got all you want bud!"

- */

-

-GLOBAL(long)

-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,

-		    long max_bytes_needed, long already_allocated)

-{

-  return max_bytes_needed;

-}

-

-

-/*

- * Backing store (temporary file) management.

- * Since jpeg_mem_available always promised the moon,

- * this should never be called and we can just error out.

- */

-

-GLOBAL(void)

-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,

-			 long total_bytes_needed)

-{

-  ERREXIT(cinfo, JERR_NO_BACKING_STORE);

-}

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.  Here, there isn't any.

- */

-

-GLOBAL(long)

-jpeg_mem_init (j_common_ptr cinfo)

-{

-  return 0;			/* just set max_memory_to_use to 0 */

-}

-

-GLOBAL(void)

-jpeg_mem_term (j_common_ptr cinfo)

-{

-  /* no work */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jmemsys.h b/plugins/AdvaImg/src/LibJPEG/jmemsys.h
deleted file mode 100644
index 2a8796119c..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmemsys.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*

- * jmemsys.h

- *

- * Copyright (C) 1992-1997, 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 include file defines the interface between the system-independent

- * and system-dependent portions of the JPEG memory manager.  No other

- * modules need include it.  (The system-independent portion is jmemmgr.c;

- * there are several different versions of the system-dependent portion.)

- *

- * This file works as-is for the system-dependent memory managers supplied

- * in the IJG distribution.  You may need to modify it if you write a

- * custom memory manager.  If system-dependent changes are needed in

- * this file, the best method is to #ifdef them based on a configuration

- * symbol supplied in jconfig.h, as we have done with USE_MSDOS_MEMMGR

- * and USE_MAC_MEMMGR.

- */

-

-

-/* Short forms of external names for systems with brain-damaged linkers. */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jpeg_get_small		jGetSmall

-#define jpeg_free_small		jFreeSmall

-#define jpeg_get_large		jGetLarge

-#define jpeg_free_large		jFreeLarge

-#define jpeg_mem_available	jMemAvail

-#define jpeg_open_backing_store	jOpenBackStore

-#define jpeg_mem_init		jMemInit

-#define jpeg_mem_term		jMemTerm

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-

-/*

- * These two functions are used to allocate and release small chunks of

- * memory.  (Typically the total amount requested through jpeg_get_small is

- * no more than 20K or so; this will be requested in chunks of a few K each.)

- * Behavior should be the same as for the standard library functions malloc

- * and free; in particular, jpeg_get_small must return NULL on failure.

- * On most systems, these ARE malloc and free.  jpeg_free_small is passed the

- * size of the object being freed, just in case it's needed.

- * On an 80x86 machine using small-data memory model, these manage near heap.

- */

-

-EXTERN(void *) jpeg_get_small JPP((j_common_ptr cinfo, size_t sizeofobject));

-EXTERN(void) jpeg_free_small JPP((j_common_ptr cinfo, void * object,

-				  size_t sizeofobject));

-

-/*

- * These two functions are used to allocate and release large chunks of

- * memory (up to the total free space designated by jpeg_mem_available).

- * The interface is the same as above, except that on an 80x86 machine,

- * far pointers are used.  On most other machines these are identical to

- * the jpeg_get/free_small routines; but we keep them separate anyway,

- * in case a different allocation strategy is desirable for large chunks.

- */

-

-EXTERN(void FAR *) jpeg_get_large JPP((j_common_ptr cinfo,

-				       size_t sizeofobject));

-EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object,

-				  size_t sizeofobject));

-

-/*

- * The macro MAX_ALLOC_CHUNK designates the maximum number of bytes that may

- * be requested in a single call to jpeg_get_large (and jpeg_get_small for that

- * matter, but that case should never come into play).  This macro is needed

- * to model the 64Kb-segment-size limit of far addressing on 80x86 machines.

- * On those machines, we expect that jconfig.h will provide a proper value.

- * On machines with 32-bit flat address spaces, any large constant may be used.

- *

- * NB: jmemmgr.c expects that MAX_ALLOC_CHUNK will be representable as type

- * size_t and will be a multiple of sizeof(align_type).

- */

-

-#ifndef MAX_ALLOC_CHUNK		/* may be overridden in jconfig.h */

-#define MAX_ALLOC_CHUNK  1000000000L

-#endif

-

-/*

- * This routine computes the total space still available for allocation by

- * jpeg_get_large.  If more space than this is needed, backing store will be

- * used.  NOTE: any memory already allocated must not be counted.

- *

- * There is a minimum space requirement, corresponding to the minimum

- * feasible buffer sizes; jmemmgr.c will request that much space even if

- * jpeg_mem_available returns zero.  The maximum space needed, enough to hold

- * all working storage in memory, is also passed in case it is useful.

- * Finally, the total space already allocated is passed.  If no better

- * method is available, cinfo->mem->max_memory_to_use - already_allocated

- * is often a suitable calculation.

- *

- * It is OK for jpeg_mem_available to underestimate the space available

- * (that'll just lead to more backing-store access than is really necessary).

- * However, an overestimate will lead to failure.  Hence it's wise to subtract

- * a slop factor from the true available space.  5% should be enough.

- *

- * On machines with lots of virtual memory, any large constant may be returned.

- * Conversely, zero may be returned to always use the minimum amount of memory.

- */

-

-EXTERN(long) jpeg_mem_available JPP((j_common_ptr cinfo,

-				     long min_bytes_needed,

-				     long max_bytes_needed,

-				     long already_allocated));

-

-

-/*

- * This structure holds whatever state is needed to access a single

- * backing-store object.  The read/write/close method pointers are called

- * by jmemmgr.c to manipulate the backing-store object; all other fields

- * are private to the system-dependent backing store routines.

- */

-

-#define TEMP_NAME_LENGTH   64	/* max length of a temporary file's name */

-

-

-#ifdef USE_MSDOS_MEMMGR		/* DOS-specific junk */

-

-typedef unsigned short XMSH;	/* type of extended-memory handles */

-typedef unsigned short EMSH;	/* type of expanded-memory handles */

-

-typedef union {

-  short file_handle;		/* DOS file handle if it's a temp file */

-  XMSH xms_handle;		/* handle if it's a chunk of XMS */

-  EMSH ems_handle;		/* handle if it's a chunk of EMS */

-} handle_union;

-

-#endif /* USE_MSDOS_MEMMGR */

-

-#ifdef USE_MAC_MEMMGR		/* Mac-specific junk */

-#include <Files.h>

-#endif /* USE_MAC_MEMMGR */

-

-

-typedef struct backing_store_struct * backing_store_ptr;

-

-typedef struct backing_store_struct {

-  /* Methods for reading/writing/closing this backing-store object */

-  JMETHOD(void, read_backing_store, (j_common_ptr cinfo,

-				     backing_store_ptr info,

-				     void FAR * buffer_address,

-				     long file_offset, long byte_count));

-  JMETHOD(void, write_backing_store, (j_common_ptr cinfo,

-				      backing_store_ptr info,

-				      void FAR * buffer_address,

-				      long file_offset, long byte_count));

-  JMETHOD(void, close_backing_store, (j_common_ptr cinfo,

-				      backing_store_ptr info));

-

-  /* Private fields for system-dependent backing-store management */

-#ifdef USE_MSDOS_MEMMGR

-  /* For the MS-DOS manager (jmemdos.c), we need: */

-  handle_union handle;		/* reference to backing-store storage object */

-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */

-#else

-#ifdef USE_MAC_MEMMGR

-  /* For the Mac manager (jmemmac.c), we need: */

-  short temp_file;		/* file reference number to temp file */

-  FSSpec tempSpec;		/* the FSSpec for the temp file */

-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */

-#else

-  /* For a typical implementation with temp files, we need: */

-  FILE * temp_file;		/* stdio reference to temp file */

-  char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */

-#endif

-#endif

-} backing_store_info;

-

-

-/*

- * Initial opening of a backing-store object.  This must fill in the

- * read/write/close pointers in the object.  The read/write routines

- * may take an error exit if the specified maximum file size is exceeded.

- * (If jpeg_mem_available always returns a large value, this routine can

- * just take an error exit.)

- */

-

-EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo,

-					  backing_store_ptr info,

-					  long total_bytes_needed));

-

-

-/*

- * These routines take care of any system-dependent initialization and

- * cleanup required.  jpeg_mem_init will be called before anything is

- * allocated (and, therefore, nothing in cinfo is of use except the error

- * manager pointer).  It should return a suitable default value for

- * max_memory_to_use; this may subsequently be overridden by the surrounding

- * application.  (Note that max_memory_to_use is only important if

- * jpeg_mem_available chooses to consult it ... no one else will.)

- * jpeg_mem_term may assume that all requested memory has been freed and that

- * all opened backing-store objects have been closed.

- */

-

-EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));

-EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));

diff --git a/plugins/AdvaImg/src/LibJPEG/jmorecfg.h b/plugins/AdvaImg/src/LibJPEG/jmorecfg.h
deleted file mode 100644
index 7407ac79b1..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jmorecfg.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*

- * jmorecfg.h

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 1997-2013 by Guido Vollbeding.

- * 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 additional configuration options that customize the

- * JPEG software for special applications or support machine-dependent

- * optimizations.  Most users will not need to touch this file.

- */

-

-

-/*

- * Define BITS_IN_JSAMPLE as either

- *   8   for 8-bit sample values (the usual setting)

- *   9   for 9-bit sample values

- *   10  for 10-bit sample values

- *   11  for 11-bit sample values

- *   12  for 12-bit sample values

- * Only 8, 9, 10, 11, and 12 bits sample data precision are supported for

- * full-feature DCT processing.  Further depths up to 16-bit may be added

- * later for the lossless modes of operation.

- * Run-time selection and conversion of data precision will be added later

- * and are currently not supported, sorry.

- * 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 DCT coefficients are of the same type (16 bits)

- * in all cases (see below).

- */

-

-#define BITS_IN_JSAMPLE  8	/* use 8, 9, 10, 11, or 12 */

-

-

-/*

- * Maximum number of components (color channels) allowed in JPEG image.

- * To meet the letter of the JPEG spec, set this to 255.  However, darn

- * few applications need more than 4 channels (maybe 5 for CMYK + alpha

- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are

- * really short on memory.  (Each allowed component costs a hundred or so

- * bytes of storage, whether actually used in an image or not.)

- */

-

-#define MAX_COMPONENTS  10	/* maximum number of image components */

-

-

-/*

- * Basic data types.

- * You may need to change these if you have a machine with unusual data

- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,

- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,

- * but it had better be at least 16.

- */

-

-/* Representation of a single sample (pixel element value).

- * We frequently allocate large arrays of these, so it's important to keep

- * them small.  But if you have memory to burn and access to char or short

- * arrays is very slow on your hardware, you might want to change these.

- */

-

-#if BITS_IN_JSAMPLE == 8

-/* JSAMPLE should be the smallest type that will hold the values 0..255.

- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.

- */

-

-#ifdef HAVE_UNSIGNED_CHAR

-

-typedef unsigned char JSAMPLE;

-#define GETJSAMPLE(value)  ((int) (value))

-

-#else /* not HAVE_UNSIGNED_CHAR */

-

-typedef char JSAMPLE;

-#ifdef CHAR_IS_UNSIGNED

-#define GETJSAMPLE(value)  ((int) (value))

-#else

-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)

-#endif /* CHAR_IS_UNSIGNED */

-

-#endif /* HAVE_UNSIGNED_CHAR */

-

-#define MAXJSAMPLE	255

-#define CENTERJSAMPLE	128

-

-#endif /* BITS_IN_JSAMPLE == 8 */

-

-

-#if BITS_IN_JSAMPLE == 9

-/* JSAMPLE should be the smallest type that will hold the values 0..511.

- * On nearly all machines "short" will do nicely.

- */

-

-typedef short JSAMPLE;

-#define GETJSAMPLE(value)  ((int) (value))

-

-#define MAXJSAMPLE	511

-#define CENTERJSAMPLE	256

-

-#endif /* BITS_IN_JSAMPLE == 9 */

-

-

-#if BITS_IN_JSAMPLE == 10

-/* JSAMPLE should be the smallest type that will hold the values 0..1023.

- * On nearly all machines "short" will do nicely.

- */

-

-typedef short JSAMPLE;

-#define GETJSAMPLE(value)  ((int) (value))

-

-#define MAXJSAMPLE	1023

-#define CENTERJSAMPLE	512

-

-#endif /* BITS_IN_JSAMPLE == 10 */

-

-

-#if BITS_IN_JSAMPLE == 11

-/* JSAMPLE should be the smallest type that will hold the values 0..2047.

- * On nearly all machines "short" will do nicely.

- */

-

-typedef short JSAMPLE;

-#define GETJSAMPLE(value)  ((int) (value))

-

-#define MAXJSAMPLE	2047

-#define CENTERJSAMPLE	1024

-

-#endif /* BITS_IN_JSAMPLE == 11 */

-

-

-#if BITS_IN_JSAMPLE == 12

-/* JSAMPLE should be the smallest type that will hold the values 0..4095.

- * On nearly all machines "short" will do nicely.

- */

-

-typedef short JSAMPLE;

-#define GETJSAMPLE(value)  ((int) (value))

-

-#define MAXJSAMPLE	4095

-#define CENTERJSAMPLE	2048

-

-#endif /* BITS_IN_JSAMPLE == 12 */

-

-

-/* Representation of a DCT frequency coefficient.

- * This should be a signed value of at least 16 bits; "short" is usually OK.

- * Again, we allocate large arrays of these, but you can change to int

- * if you have memory to burn and "short" is really slow.

- */

-

-typedef short JCOEF;

-

-

-/* Compressed datastreams are represented as arrays of JOCTET.

- * These must be EXACTLY 8 bits wide, at least once they are written to

- * external storage.  Note that when using the stdio data source/destination

- * managers, this is also the data type passed to fread/fwrite.

- */

-

-#ifdef HAVE_UNSIGNED_CHAR

-

-typedef unsigned char JOCTET;

-#define GETJOCTET(value)  (value)

-

-#else /* not HAVE_UNSIGNED_CHAR */

-

-typedef char JOCTET;

-#ifdef CHAR_IS_UNSIGNED

-#define GETJOCTET(value)  (value)

-#else

-#define GETJOCTET(value)  ((value) & 0xFF)

-#endif /* CHAR_IS_UNSIGNED */

-

-#endif /* HAVE_UNSIGNED_CHAR */

-

-

-/* These typedefs are used for various table entries and so forth.

- * They must be at least as wide as specified; but making them too big

- * won't cost a huge amount of memory, so we don't provide special

- * extraction code like we did for JSAMPLE.  (In other words, these

- * typedefs live at a different point on the speed/space tradeoff curve.)

- */

-

-/* UINT8 must hold at least the values 0..255. */

-

-#ifdef HAVE_UNSIGNED_CHAR

-typedef unsigned char UINT8;

-#else /* not HAVE_UNSIGNED_CHAR */

-#ifdef CHAR_IS_UNSIGNED

-typedef char UINT8;

-#else /* not CHAR_IS_UNSIGNED */

-typedef short UINT8;

-#endif /* CHAR_IS_UNSIGNED */

-#endif /* HAVE_UNSIGNED_CHAR */

-

-/* UINT16 must hold at least the values 0..65535. */

-

-#ifdef HAVE_UNSIGNED_SHORT

-typedef unsigned short UINT16;

-#else /* not HAVE_UNSIGNED_SHORT */

-typedef unsigned int UINT16;

-#endif /* HAVE_UNSIGNED_SHORT */

-

-/* INT16 must hold at least the values -32768..32767. */

-

-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */

-typedef short INT16;

-#endif

-

-/* INT32 must hold at least signed 32-bit values. */

-

-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */

-#ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */

-#ifndef _BASETSD_H		/* MinGW is slightly different */

-#ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */

-typedef long INT32;

-#endif

-#endif

-#endif

-#endif

-

-/* Datatype used for image dimensions.  The JPEG standard only supports

- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore

- * "unsigned int" is sufficient on all machines.  However, if you need to

- * handle larger images and you don't mind deviating from the spec, you

- * can change this datatype.

- */

-

-typedef unsigned int JDIMENSION;

-

-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */

-

-

-/* These macros are used in all function definitions and extern declarations.

- * You could modify them if you need to change function linkage conventions;

- * in particular, you'll need to do that to make the library a Windows DLL.

- * Another application is to make all functions global for use with debuggers

- * or code profilers that require it.

- */

-

-/* a function called through method pointers: */

-#define METHODDEF(type)		static type

-/* a function used only in its module: */

-#define LOCAL(type)		static type

-/* a function referenced thru EXTERNs: */

-#define GLOBAL(type)		type

-/* a reference to a GLOBAL function: */

-#define EXTERN(type)		extern type

-

-

-/* This macro is used to declare a "method", that is, a function pointer.

- * We want to supply prototype parameters if the compiler can cope.

- * Note that the arglist parameter must be parenthesized!

- * Again, you can customize this if you need special linkage keywords.

- */

-

-#ifdef HAVE_PROTOTYPES

-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist

-#else

-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()

-#endif

-

-

-/* The noreturn type identifier is used to declare functions

- * which cannot return.

- * Compilers can thus create more optimized code and perform

- * better checks for warnings and errors.

- * Static analyzer tools can make improved inferences about

- * execution paths and are prevented from giving false alerts.

- *

- * Unfortunately, the proposed specifications of corresponding

- * extensions in the Dec 2011 ISO C standard revision (C11),

- * GCC, MSVC, etc. are not viable.

- * Thus we introduce a user defined type to declare noreturn

- * functions at least for clarity.  A proper compiler would

- * have a suitable noreturn type to match in place of void.

- */

-

-#ifndef HAVE_NORETURN_T

-typedef void noreturn_t;

-#endif

-

-

-/* Here is the pseudo-keyword for declaring pointers that must be "far"

- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled

- * by just saying "FAR *" where such a pointer is needed.  In a few places

- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.

- */

-

-#ifndef FAR

-#ifdef NEED_FAR_POINTERS

-#define FAR  far

-#else

-#define FAR

-#endif

-#endif

-

-

-/*

- * On a few systems, type boolean and/or its values FALSE, TRUE may appear

- * in standard header files.  Or you may have conflicts with application-

- * specific header files that you want to include together with these files.

- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.

- */

-

-#ifndef HAVE_BOOLEAN

-#if defined FALSE || defined TRUE || defined QGLOBAL_H

-/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */

-typedef int boolean;

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

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

-#endif

-#ifndef TRUE

-#define TRUE	1

-#endif

-#else

-typedef enum { FALSE = 0, TRUE = 1 } boolean;

-#endif

-#endif

-

-

-/*

- * The remaining options affect code selection within the JPEG library,

- * but they don't need to be visible to most applications using the library.

- * To minimize application namespace pollution, the symbols won't be

- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.

- */

-

-#ifdef JPEG_INTERNALS

-#define JPEG_INTERNAL_OPTIONS

-#endif

-

-#ifdef JPEG_INTERNAL_OPTIONS

-

-

-/*

- * These defines indicate whether to include various optional functions.

- * Undefining some of these symbols will produce a smaller but less capable

- * library.  Note that you can leave certain source files out of the

- * compilation/linking process if you've #undef'd the corresponding symbols.

- * (You may HAVE to do that if your compiler doesn't like null source files.)

- */

-

-/* Capability options common to encoder and decoder: */

-

-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */

-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */

-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */

-

-/* Encoder capability options: */

-

-#define C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */

-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */

-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/

-#define DCT_SCALING_SUPPORTED	    /* Input rescaling via DCT? (Requires DCT_ISLOW)*/

-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */

-/* Note: if you selected more than 8-bit data precision, it is dangerous to

- * turn off ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only

- * good for 8-bit precision, so arithmetic coding is recommended for higher

- * precision.  The Huffman encoder normally uses entropy optimization to

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

- * supply different default Huffman tables.

- * The exact same statements apply for progressive JPEG: the default tables

- * don't work for progressive mode.  (This may get fixed, however.)

- */

-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */

-

-/* Decoder capability options: */

-

-#define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */

-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */

-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/

-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? (Requires DCT_ISLOW)*/

-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */

-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */

-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */

-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */

-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */

-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */

-

-/* more capability options later, no doubt */

-

-

-/*

- * Ordering of RGB data in scanlines passed to or from the application.

- * If your application wants to deal with data in the order B,G,R, just

- * change these macros.  You can also deal with formats such as R,G,B,X

- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing

- * the offsets will also change the order in which colormap data is organized.

- * RESTRICTIONS:

- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.

- * 2. The color quantizer modules will not behave desirably if RGB_PIXELSIZE

- *    is not 3 (they don't understand about dummy color components!).  So you

- *    can't use color quantization if you change that value.

- */

-

-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */

-#define RGB_GREEN	1	/* Offset of Green */

-#define RGB_BLUE	2	/* Offset of Blue */

-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */

-

-

-/* Definitions for speed-related optimizations. */

-

-

-/* If your compiler supports inline functions, define INLINE

- * as the inline keyword; otherwise define it as empty.

- */

-

-#ifndef INLINE

-#ifdef __GNUC__			/* for instance, GNU C knows about inline */

-#define INLINE __inline__

-#endif

-#ifndef INLINE

-#define INLINE			/* default is to define it as empty */

-#endif

-#endif

-

-

-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying

- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER

- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.

- */

-

-#ifndef MULTIPLIER

-#define MULTIPLIER  int		/* type for fastest integer multiply */

-#endif

-

-

-/* FAST_FLOAT should be either float or double, whichever is done faster

- * by your compiler.  (Note that this type is only used in the floating point

- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)

- * Typically, float is faster in ANSI C compilers, while double is faster in

- * pre-ANSI compilers (because they insist on converting to double anyway).

- * The code below therefore chooses float if we have ANSI-style prototypes.

- */

-

-#ifndef FAST_FLOAT

-#ifdef HAVE_PROTOTYPES

-#define FAST_FLOAT  float

-#else

-#define FAST_FLOAT  double

-#endif

-#endif

-

-#endif /* JPEG_INTERNAL_OPTIONS */

diff --git a/plugins/AdvaImg/src/LibJPEG/jpegint.h b/plugins/AdvaImg/src/LibJPEG/jpegint.h
deleted file mode 100644
index ec14a1ebc8..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jpegint.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/*

- * jpegint.h

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 1997-2013 by Guido Vollbeding.

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

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

- *

- * This file provides common declarations for the various JPEG modules.

- * These declarations are considered internal to the JPEG library; most

- * applications using the library shouldn't need to include this file.

- */

-

-

-/* Declarations for both compression & decompression */

-

-typedef enum {			/* Operating modes for buffer controllers */

-	JBUF_PASS_THRU,		/* Plain stripwise operation */

-	/* Remaining modes require a full-image buffer to have been created */

-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */

-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */

-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */

-} J_BUF_MODE;

-

-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */

-#define CSTATE_START	100	/* after create_compress */

-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */

-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */

-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */

-#define DSTATE_START	200	/* after create_decompress */

-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */

-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */

-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/

-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */

-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */

-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */

-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */

-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */

-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */

-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */

-

-

-/* Declarations for compression modules */

-

-/* Master control module */

-struct jpeg_comp_master {

-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));

-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));

-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));

-

-  /* State variables made visible to other modules */

-  boolean call_pass_startup;	/* True if pass_startup must be called */

-  boolean is_last_pass;		/* True during last pass */

-};

-

-/* Main buffer control (downsampled-data buffer) */

-struct jpeg_c_main_controller {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));

-  JMETHOD(void, process_data, (j_compress_ptr cinfo,

-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,

-			       JDIMENSION in_rows_avail));

-};

-

-/* Compression preprocessing (downsampling input buffer control) */

-struct jpeg_c_prep_controller {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));

-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,

-				   JSAMPARRAY input_buf,

-				   JDIMENSION *in_row_ctr,

-				   JDIMENSION in_rows_avail,

-				   JSAMPIMAGE output_buf,

-				   JDIMENSION *out_row_group_ctr,

-				   JDIMENSION out_row_groups_avail));

-};

-

-/* Coefficient buffer control */

-struct jpeg_c_coef_controller {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));

-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,

-				   JSAMPIMAGE input_buf));

-};

-

-/* Colorspace conversion */

-struct jpeg_color_converter {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));

-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,

-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,

-				JDIMENSION output_row, int num_rows));

-};

-

-/* Downsampling */

-struct jpeg_downsampler {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));

-  JMETHOD(void, downsample, (j_compress_ptr cinfo,

-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,

-			     JSAMPIMAGE output_buf,

-			     JDIMENSION out_row_group_index));

-

-  boolean need_context_rows;	/* TRUE if need rows above & below */

-};

-

-/* Forward DCT (also controls coefficient quantization) */

-typedef JMETHOD(void, forward_DCT_ptr,

-		(j_compress_ptr cinfo, jpeg_component_info * compptr,

-		 JSAMPARRAY sample_data, JBLOCKROW coef_blocks,

-		 JDIMENSION start_row, JDIMENSION start_col,

-		 JDIMENSION num_blocks));

-

-struct jpeg_forward_dct {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));

-  /* It is useful to allow each component to have a separate FDCT method. */

-  forward_DCT_ptr forward_DCT[MAX_COMPONENTS];

-};

-

-/* Entropy encoding */

-struct jpeg_entropy_encoder {

-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));

-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));

-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));

-};

-

-/* Marker writing */

-struct jpeg_marker_writer {

-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));

-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));

-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));

-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));

-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));

-  /* These routines are exported to allow insertion of extra markers */

-  /* Probably only COM and APPn markers should be written this way */

-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,

-				      unsigned int datalen));

-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));

-};

-

-

-/* Declarations for decompression modules */

-

-/* Master control module */

-struct jpeg_decomp_master {

-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));

-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));

-

-  /* State variables made visible to other modules */

-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */

-};

-

-/* Input control module */

-struct jpeg_input_controller {

-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));

-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));

-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));

-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));

-

-  /* State variables made visible to other modules */

-  boolean has_multiple_scans;	/* True if file has multiple scans */

-  boolean eoi_reached;		/* True when EOI has been consumed */

-};

-

-/* Main buffer control (downsampled-data buffer) */

-struct jpeg_d_main_controller {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));

-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,

-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,

-			       JDIMENSION out_rows_avail));

-};

-

-/* Coefficient buffer control */

-struct jpeg_d_coef_controller {

-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));

-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));

-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));

-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,

-				 JSAMPIMAGE output_buf));

-  /* Pointer to array of coefficient virtual arrays, or NULL if none */

-  jvirt_barray_ptr *coef_arrays;

-};

-

-/* Decompression postprocessing (color quantization buffer control) */

-struct jpeg_d_post_controller {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));

-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,

-				    JSAMPIMAGE input_buf,

-				    JDIMENSION *in_row_group_ctr,

-				    JDIMENSION in_row_groups_avail,

-				    JSAMPARRAY output_buf,

-				    JDIMENSION *out_row_ctr,

-				    JDIMENSION out_rows_avail));

-};

-

-/* Marker reading & parsing */

-struct jpeg_marker_reader {

-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));

-  /* Read markers until SOS or EOI.

-   * Returns same codes as are defined for jpeg_consume_input:

-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.

-   */

-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));

-  /* Read a restart marker --- exported for use by entropy decoder only */

-  jpeg_marker_parser_method read_restart_marker;

-

-  /* State of marker reader --- nominally internal, but applications

-   * supplying COM or APPn handlers might like to know the state.

-   */

-  boolean saw_SOI;		/* found SOI? */

-  boolean saw_SOF;		/* found SOF? */

-  int next_restart_num;		/* next restart number expected (0-7) */

-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */

-};

-

-/* Entropy decoding */

-struct jpeg_entropy_decoder {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));

-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, JBLOCKROW *MCU_data));

-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));

-};

-

-/* Inverse DCT (also performs dequantization) */

-typedef JMETHOD(void, inverse_DCT_method_ptr,

-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,

-		 JCOEFPTR coef_block,

-		 JSAMPARRAY output_buf, JDIMENSION output_col));

-

-struct jpeg_inverse_dct {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));

-  /* It is useful to allow each component to have a separate IDCT method. */

-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];

-};

-

-/* Upsampling (note that upsampler must also call color converter) */

-struct jpeg_upsampler {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));

-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,

-			   JSAMPIMAGE input_buf,

-			   JDIMENSION *in_row_group_ctr,

-			   JDIMENSION in_row_groups_avail,

-			   JSAMPARRAY output_buf,

-			   JDIMENSION *out_row_ctr,

-			   JDIMENSION out_rows_avail));

-

-  boolean need_context_rows;	/* TRUE if need rows above & below */

-};

-

-/* Colorspace conversion */

-struct jpeg_color_deconverter {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));

-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,

-				JSAMPIMAGE input_buf, JDIMENSION input_row,

-				JSAMPARRAY output_buf, int num_rows));

-};

-

-/* Color quantization or color precision reduction */

-struct jpeg_color_quantizer {

-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));

-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,

-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,

-				 int num_rows));

-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));

-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));

-};

-

-

-/* Miscellaneous useful macros */

-

-#undef MAX

-#define MAX(a,b)	((a) > (b) ? (a) : (b))

-#undef MIN

-#define MIN(a,b)	((a) < (b) ? (a) : (b))

-

-

-/* We assume that right shift corresponds to signed division by 2 with

- * rounding towards minus infinity.  This is correct for typical "arithmetic

- * shift" instructions that shift in copies of the sign bit.  But some

- * C compilers implement >> with an unsigned shift.  For these machines you

- * must define RIGHT_SHIFT_IS_UNSIGNED.

- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.

- * It is only applied with constant shift counts.  SHIFT_TEMPS must be

- * included in the variables of any routine using RIGHT_SHIFT.

- */

-

-#ifdef RIGHT_SHIFT_IS_UNSIGNED

-#define SHIFT_TEMPS	INT32 shift_temp;

-#define RIGHT_SHIFT(x,shft)  \

-	((shift_temp = (x)) < 0 ? \

-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \

-	 (shift_temp >> (shft)))

-#else

-#define SHIFT_TEMPS

-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))

-#endif

-

-

-/* Short forms of external names for systems with brain-damaged linkers. */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jinit_compress_master	jICompress

-#define jinit_c_master_control	jICMaster

-#define jinit_c_main_controller	jICMainC

-#define jinit_c_prep_controller	jICPrepC

-#define jinit_c_coef_controller	jICCoefC

-#define jinit_color_converter	jICColor

-#define jinit_downsampler	jIDownsampler

-#define jinit_forward_dct	jIFDCT

-#define jinit_huff_encoder	jIHEncoder

-#define jinit_arith_encoder	jIAEncoder

-#define jinit_marker_writer	jIMWriter

-#define jinit_master_decompress	jIDMaster

-#define jinit_d_main_controller	jIDMainC

-#define jinit_d_coef_controller	jIDCoefC

-#define jinit_d_post_controller	jIDPostC

-#define jinit_input_controller	jIInCtlr

-#define jinit_marker_reader	jIMReader

-#define jinit_huff_decoder	jIHDecoder

-#define jinit_arith_decoder	jIADecoder

-#define jinit_inverse_dct	jIIDCT

-#define jinit_upsampler		jIUpsampler

-#define jinit_color_deconverter	jIDColor

-#define jinit_1pass_quantizer	jI1Quant

-#define jinit_2pass_quantizer	jI2Quant

-#define jinit_merged_upsampler	jIMUpsampler

-#define jinit_memory_mgr	jIMemMgr

-#define jdiv_round_up		jDivRound

-#define jround_up		jRound

-#define jzero_far		jZeroFar

-#define jcopy_sample_rows	jCopySamples

-#define jcopy_block_row		jCopyBlocks

-#define jpeg_zigzag_order	jZIGTable

-#define jpeg_natural_order	jZAGTable

-#define jpeg_natural_order7	jZAG7Table

-#define jpeg_natural_order6	jZAG6Table

-#define jpeg_natural_order5	jZAG5Table

-#define jpeg_natural_order4	jZAG4Table

-#define jpeg_natural_order3	jZAG3Table

-#define jpeg_natural_order2	jZAG2Table

-#define jpeg_aritab		jAriTab

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-

-/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays

- * and coefficient-block arrays.  This won't work on 80x86 because the arrays

- * are FAR and we're assuming a small-pointer memory model.  However, some

- * DOS compilers provide far-pointer versions of memcpy() and memset() even

- * in the small-model libraries.  These will be used if USE_FMEM is defined.

- * Otherwise, the routines in jutils.c do it the hard way.

- */

-

-#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macro */

-#define FMEMZERO(target,size)	MEMZERO(target,size)

-#else				/* 80x86 case */

-#ifdef USE_FMEM

-#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))

-#else

-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));

-#define FMEMZERO(target,size)	jzero_far(target, size)

-#endif

-#endif

-

-

-/* Compression module initialization routines */

-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,

-					 boolean transcode_only));

-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));

-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));

-/* Decompression module initialization routines */

-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,

-					  boolean need_full_buffer));

-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));

-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));

-/* Memory manager initialization */

-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));

-

-/* Utility routines in jutils.c */

-EXTERN(long) jdiv_round_up JPP((long a, long b));

-EXTERN(long) jround_up JPP((long a, long b));

-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,

-				    JSAMPARRAY output_array, int dest_row,

-				    int num_rows, JDIMENSION num_cols));

-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,

-				  JDIMENSION num_blocks));

-/* Constant tables in jutils.c */

-#if 0				/* This table is not actually needed in v6a */

-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */

-#endif

-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */

-extern const int jpeg_natural_order7[]; /* zz to natural order for 7x7 block */

-extern const int jpeg_natural_order6[]; /* zz to natural order for 6x6 block */

-extern const int jpeg_natural_order5[]; /* zz to natural order for 5x5 block */

-extern const int jpeg_natural_order4[]; /* zz to natural order for 4x4 block */

-extern const int jpeg_natural_order3[]; /* zz to natural order for 3x3 block */

-extern const int jpeg_natural_order2[]; /* zz to natural order for 2x2 block */

-

-/* Arithmetic coding probability estimation tables in jaricom.c */

-extern const INT32 jpeg_aritab[];

-

-/* Suppress undefined-structure complaints if necessary. */

-

-#ifdef INCOMPLETE_TYPES_BROKEN

-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */

-struct jvirt_sarray_control { long dummy; };

-struct jvirt_barray_control { long dummy; };

-#endif

-#endif /* INCOMPLETE_TYPES_BROKEN */

diff --git a/plugins/AdvaImg/src/LibJPEG/jpeglib.h b/plugins/AdvaImg/src/LibJPEG/jpeglib.h
deleted file mode 100644
index 20ef353d8a..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jpeglib.h
+++ /dev/null
@@ -1,1180 +0,0 @@
-/*

- * jpeglib.h

- *

- * Copyright (C) 1991-1998, Thomas G. Lane.

- * Modified 2002-2015 by Guido Vollbeding.

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

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

- *

- * This file defines the application interface for the JPEG library.

- * Most applications using the library need only include this file,

- * and perhaps jerror.h if they want to know the exact error codes.

- */

-

-#ifndef JPEGLIB_H

-#define JPEGLIB_H

-

-/*

- * First we include the configuration files that record how this

- * installation of the JPEG library is set up.  jconfig.h can be

- * generated automatically for many systems.  jmorecfg.h contains

- * manual configuration options that most people need not worry about.

- */

-

-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */

-#include "jconfig.h"		/* widely used configuration options */

-#endif

-#include "jmorecfg.h"		/* seldom changed options */

-

-

-#ifdef __cplusplus

-#ifndef DONT_USE_EXTERN_C

-extern "C" {

-#endif

-#endif

-

-/* Version IDs for the JPEG library.

- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 90".

- */

-

-#define JPEG_LIB_VERSION        90	/* Compatibility version 9.0 */

-#define JPEG_LIB_VERSION_MAJOR  9

-#define JPEG_LIB_VERSION_MINOR  2

-

-

-/* Various constants determining the sizes of things.

- * All of these are specified by the JPEG standard,

- * so don't change them if you want to be compatible.

- */

-

-#define DCTSIZE		    8	/* The basic DCT block is 8x8 coefficients */

-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */

-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */

-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */

-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */

-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */

-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */

-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;

- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.

- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU

- * to handle it.  We even let you do this from the jconfig.h file.  However,

- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe

- * sometimes emits noncompliant files doesn't mean you should too.

- */

-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */

-#ifndef D_MAX_BLOCKS_IN_MCU

-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */

-#endif

-

-

-/* Data structures for images (arrays of samples and of DCT coefficients).

- * On 80x86 machines, the image arrays are too big for near pointers,

- * but the pointer arrays can fit in near memory.

- */

-

-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */

-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */

-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */

-

-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */

-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */

-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */

-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */

-

-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */

-

-

-/* Types for JPEG compression parameters and working tables. */

-

-

-/* DCT coefficient quantization tables. */

-

-typedef struct {

-  /* This array gives the coefficient quantizers in natural array order

-   * (not the zigzag order in which they are stored in a JPEG DQT marker).

-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.

-   */

-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */

-  /* This field is used only during compression.  It's initialized FALSE when

-   * the table is created, and set TRUE when it's been output to the file.

-   * You could suppress output of a table by setting this to TRUE.

-   * (See jpeg_suppress_tables for an example.)

-   */

-  boolean sent_table;		/* TRUE when table has been output */

-} JQUANT_TBL;

-

-

-/* Huffman coding tables. */

-

-typedef struct {

-  /* These two fields directly represent the contents of a JPEG DHT marker */

-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */

-				/* length k bits; bits[0] is unused */

-  UINT8 huffval[256];		/* The symbols, in order of incr code length */

-  /* This field is used only during compression.  It's initialized FALSE when

-   * the table is created, and set TRUE when it's been output to the file.

-   * You could suppress output of a table by setting this to TRUE.

-   * (See jpeg_suppress_tables for an example.)

-   */

-  boolean sent_table;		/* TRUE when table has been output */

-} JHUFF_TBL;

-

-

-/* Basic info about one component (color channel). */

-

-typedef struct {

-  /* These values are fixed over the whole image. */

-  /* For compression, they must be supplied by parameter setup; */

-  /* for decompression, they are read from the SOF marker. */

-  int component_id;		/* identifier for this component (0..255) */

-  int component_index;		/* its index in SOF or cinfo->comp_info[] */

-  int h_samp_factor;		/* horizontal sampling factor (1..4) */

-  int v_samp_factor;		/* vertical sampling factor (1..4) */

-  int quant_tbl_no;		/* quantization table selector (0..3) */

-  /* These values may vary between scans. */

-  /* For compression, they must be supplied by parameter setup; */

-  /* for decompression, they are read from the SOS marker. */

-  /* The decompressor output side may not use these variables. */

-  int dc_tbl_no;		/* DC entropy table selector (0..3) */

-  int ac_tbl_no;		/* AC entropy table selector (0..3) */

-  

-  /* Remaining fields should be treated as private by applications. */

-  

-  /* These values are computed during compression or decompression startup: */

-  /* Component's size in DCT blocks.

-   * Any dummy blocks added to complete an MCU are not counted; therefore

-   * these values do not depend on whether a scan is interleaved or not.

-   */

-  JDIMENSION width_in_blocks;

-  JDIMENSION height_in_blocks;

-  /* Size of a DCT block in samples,

-   * reflecting any scaling we choose to apply during the DCT step.

-   * Values from 1 to 16 are supported.

-   * Note that different components may receive different DCT scalings.

-   */

-  int DCT_h_scaled_size;

-  int DCT_v_scaled_size;

-  /* The downsampled dimensions are the component's actual, unpadded number

-   * of samples at the main buffer (preprocessing/compression interface);

-   * DCT scaling is included, so

-   * downsampled_width =

-   *   ceil(image_width * Hi/Hmax * DCT_h_scaled_size/block_size)

-   * and similarly for height.

-   */

-  JDIMENSION downsampled_width;	 /* actual width in samples */

-  JDIMENSION downsampled_height; /* actual height in samples */

-  /* For decompression, in cases where some of the components will be

-   * ignored (eg grayscale output from YCbCr image), we can skip most

-   * computations for the unused components.

-   * For compression, some of the components will need further quantization

-   * scale by factor of 2 after DCT (eg BG_YCC output from normal RGB input).

-   * The field is first set TRUE for decompression, FALSE for compression

-   * in initial_setup, and then adapted in color conversion setup.

-   */

-  boolean component_needed;

-

-  /* These values are computed before starting a scan of the component. */

-  /* The decompressor output side may not use these variables. */

-  int MCU_width;		/* number of blocks per MCU, horizontally */

-  int MCU_height;		/* number of blocks per MCU, vertically */

-  int MCU_blocks;		/* MCU_width * MCU_height */

-  int MCU_sample_width;	/* MCU width in samples: MCU_width * DCT_h_scaled_size */

-  int last_col_width;		/* # of non-dummy blocks across in last MCU */

-  int last_row_height;		/* # of non-dummy blocks down in last MCU */

-

-  /* Saved quantization table for component; NULL if none yet saved.

-   * See jdinput.c comments about the need for this information.

-   * This field is currently used only for decompression.

-   */

-  JQUANT_TBL * quant_table;

-

-  /* Private per-component storage for DCT or IDCT subsystem. */

-  void * dct_table;

-} jpeg_component_info;

-

-

-/* The script for encoding a multiple-scan file is an array of these: */

-

-typedef struct {

-  int comps_in_scan;		/* number of components encoded in this scan */

-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */

-  int Ss, Se;			/* progressive JPEG spectral selection parms */

-  int Ah, Al;			/* progressive JPEG successive approx. parms */

-} jpeg_scan_info;

-

-/* The decompressor can save APPn and COM markers in a list of these: */

-

-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;

-

-struct jpeg_marker_struct {

-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */

-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */

-  unsigned int original_length;	/* # bytes of data in the file */

-  unsigned int data_length;	/* # bytes of data saved at data[] */

-  JOCTET FAR * data;		/* the data contained in the marker */

-  /* the marker length word is not counted in data_length or original_length */

-};

-

-/* Known color spaces. */

-

-typedef enum {

-	JCS_UNKNOWN,		/* error/unspecified */

-	JCS_GRAYSCALE,		/* monochrome */

-	JCS_RGB,		/* red/green/blue, standard RGB (sRGB) */

-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV), standard YCC */

-	JCS_CMYK,		/* C/M/Y/K */

-	JCS_YCCK,		/* Y/Cb/Cr/K */

-	JCS_BG_RGB,		/* big gamut red/green/blue, bg-sRGB */

-	JCS_BG_YCC		/* big gamut Y/Cb/Cr, bg-sYCC */

-} J_COLOR_SPACE;

-

-/* Supported color transforms. */

-

-typedef enum {

-	JCT_NONE           = 0,

-	JCT_SUBTRACT_GREEN = 1

-} J_COLOR_TRANSFORM;

-

-/* DCT/IDCT algorithm options. */

-

-typedef enum {

-	JDCT_ISLOW,		/* slow but accurate integer algorithm */

-	JDCT_IFAST,		/* faster, less accurate integer method */

-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */

-} J_DCT_METHOD;

-

-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */

-#define JDCT_DEFAULT  JDCT_ISLOW

-#endif

-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */

-#define JDCT_FASTEST  JDCT_IFAST

-#endif

-

-/* Dithering options for decompression. */

-

-typedef enum {

-	JDITHER_NONE,		/* no dithering */

-	JDITHER_ORDERED,	/* simple ordered dither */

-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */

-} J_DITHER_MODE;

-

-

-/* Common fields between JPEG compression and decompression master structs. */

-

-#define jpeg_common_fields \

-  struct jpeg_error_mgr * err;	/* Error handler module */\

-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\

-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\

-  void * client_data;		/* Available for use by application */\

-  boolean is_decompressor;	/* So common code can tell which is which */\

-  int global_state		/* For checking call sequence validity */

-

-/* Routines that are to be used by both halves of the library are declared

- * to receive a pointer to this structure.  There are no actual instances of

- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.

- */

-struct jpeg_common_struct {

-  jpeg_common_fields;		/* Fields common to both master struct types */

-  /* Additional fields follow in an actual jpeg_compress_struct or

-   * jpeg_decompress_struct.  All three structs must agree on these

-   * initial fields!  (This would be a lot cleaner in C++.)

-   */

-};

-

-typedef struct jpeg_common_struct * j_common_ptr;

-typedef struct jpeg_compress_struct * j_compress_ptr;

-typedef struct jpeg_decompress_struct * j_decompress_ptr;

-

-

-/* Master record for a compression instance */

-

-struct jpeg_compress_struct {

-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */

-

-  /* Destination for compressed data */

-  struct jpeg_destination_mgr * dest;

-

-  /* Description of source image --- these fields must be filled in by

-   * outer application before starting compression.  in_color_space must

-   * be correct before you can even call jpeg_set_defaults().

-   */

-

-  JDIMENSION image_width;	/* input image width */

-  JDIMENSION image_height;	/* input image height */

-  int input_components;		/* # of color components in input image */

-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */

-

-  double input_gamma;		/* image gamma of input image */

-

-  /* Compression parameters --- these fields must be set before calling

-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to

-   * initialize everything to reasonable defaults, then changing anything

-   * the application specifically wants to change.  That way you won't get

-   * burnt when new parameters are added.  Also note that there are several

-   * helper routines to simplify changing parameters.

-   */

-

-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */

-

-  JDIMENSION jpeg_width;	/* scaled JPEG image width */

-  JDIMENSION jpeg_height;	/* scaled JPEG image height */

-  /* Dimensions of actual JPEG image that will be written to file,

-   * derived from input dimensions by scaling factors above.

-   * These fields are computed by jpeg_start_compress().

-   * You can also use jpeg_calc_jpeg_dimensions() to determine these values

-   * in advance of calling jpeg_start_compress().

-   */

-

-  int data_precision;		/* bits of precision in image data */

-

-  int num_components;		/* # of color components in JPEG image */

-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */

-

-  jpeg_component_info * comp_info;

-  /* comp_info[i] describes component that appears i'th in SOF */

-

-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];

-  int q_scale_factor[NUM_QUANT_TBLS];

-  /* ptrs to coefficient quantization tables, or NULL if not defined,

-   * and corresponding scale factors (percentage, initialized 100).

-   */

-

-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];

-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];

-  /* ptrs to Huffman coding tables, or NULL if not defined */

-

-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */

-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */

-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */

-

-  int num_scans;		/* # of entries in scan_info array */

-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */

-  /* The default value of scan_info is NULL, which causes a single-scan

-   * sequential JPEG file to be emitted.  To create a multi-scan file,

-   * set num_scans and scan_info to point to an array of scan definitions.

-   */

-

-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */

-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */

-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */

-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */

-  boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */

-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */

-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */

-

-  /* The restart interval can be specified in absolute MCUs by setting

-   * restart_interval, or in MCU rows by setting restart_in_rows

-   * (in which case the correct restart_interval will be figured

-   * for each scan).

-   */

-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */

-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */

-

-  /* Parameters controlling emission of special markers. */

-

-  boolean write_JFIF_header;	/* should a JFIF marker be written? */

-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */

-  UINT8 JFIF_minor_version;

-  /* These three values are not used by the JPEG code, merely copied */

-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */

-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */

-  /* ratio is defined by X_density/Y_density even when density_unit=0. */

-  UINT8 density_unit;		/* JFIF code for pixel size units */

-  UINT16 X_density;		/* Horizontal pixel density */

-  UINT16 Y_density;		/* Vertical pixel density */

-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */

-

-  J_COLOR_TRANSFORM color_transform;

-  /* Color transform identifier, writes LSE marker if nonzero */

-

-  /* State variable: index of next scanline to be written to

-   * jpeg_write_scanlines().  Application may use this to control its

-   * processing loop, e.g., "while (next_scanline < image_height)".

-   */

-

-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */

-

-  /* Remaining fields are known throughout compressor, but generally

-   * should not be touched by a surrounding application.

-   */

-

-  /*

-   * These fields are computed during compression startup

-   */

-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */

-  int max_h_samp_factor;	/* largest h_samp_factor */

-  int max_v_samp_factor;	/* largest v_samp_factor */

-

-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */

-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */

-

-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */

-  /* The coefficient controller receives data in units of MCU rows as defined

-   * for fully interleaved scans (whether the JPEG file is interleaved or not).

-   * There are v_samp_factor * DCTSIZE sample rows of each component in an

-   * "iMCU" (interleaved MCU) row.

-   */

-  

-  /*

-   * These fields are valid during any one scan.

-   * They describe the components and MCUs actually appearing in the scan.

-   */

-  int comps_in_scan;		/* # of JPEG components in this scan */

-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];

-  /* *cur_comp_info[i] describes component that appears i'th in SOS */

-  

-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */

-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */

-  

-  int blocks_in_MCU;		/* # of DCT blocks per MCU */

-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];

-  /* MCU_membership[i] is index in cur_comp_info of component owning */

-  /* i'th block in an MCU */

-

-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */

-

-  int block_size;		/* the basic DCT block size: 1..16 */

-  const int * natural_order;	/* natural-order position array */

-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) */

-

-  /*

-   * Links to compression subobjects (methods and private variables of modules)

-   */

-  struct jpeg_comp_master * master;

-  struct jpeg_c_main_controller * main;

-  struct jpeg_c_prep_controller * prep;

-  struct jpeg_c_coef_controller * coef;

-  struct jpeg_marker_writer * marker;

-  struct jpeg_color_converter * cconvert;

-  struct jpeg_downsampler * downsample;

-  struct jpeg_forward_dct * fdct;

-  struct jpeg_entropy_encoder * entropy;

-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */

-  int script_space_size;

-};

-

-

-/* Master record for a decompression instance */

-

-struct jpeg_decompress_struct {

-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */

-

-  /* Source of compressed data */

-  struct jpeg_source_mgr * src;

-

-  /* Basic description of image --- filled in by jpeg_read_header(). */

-  /* Application may inspect these values to decide how to process image. */

-

-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */

-  JDIMENSION image_height;	/* nominal image height */

-  int num_components;		/* # of color components in JPEG image */

-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */

-

-  /* Decompression processing parameters --- these fields must be set before

-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes

-   * them to default values.

-   */

-

-  J_COLOR_SPACE out_color_space; /* colorspace for output */

-

-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */

-

-  double output_gamma;		/* image gamma wanted in output */

-

-  boolean buffered_image;	/* TRUE=multiple output passes */

-  boolean raw_data_out;		/* TRUE=downsampled data wanted */

-

-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */

-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */

-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */

-

-  boolean quantize_colors;	/* TRUE=colormapped output wanted */

-  /* the following are ignored if not quantize_colors: */

-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */

-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */

-  int desired_number_of_colors;	/* max # colors to use in created colormap */

-  /* these are significant only in buffered-image mode: */

-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */

-  boolean enable_external_quant;/* enable future use of external colormap */

-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */

-

-  /* Description of actual output image that will be returned to application.

-   * These fields are computed by jpeg_start_decompress().

-   * You can also use jpeg_calc_output_dimensions() to determine these values

-   * in advance of calling jpeg_start_decompress().

-   */

-

-  JDIMENSION output_width;	/* scaled image width */

-  JDIMENSION output_height;	/* scaled image height */

-  int out_color_components;	/* # of color components in out_color_space */

-  int output_components;	/* # of color components returned */

-  /* output_components is 1 (a colormap index) when quantizing colors;

-   * otherwise it equals out_color_components.

-   */

-  int rec_outbuf_height;	/* min recommended height of scanline buffer */

-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows

-   * high, space and time will be wasted due to unnecessary data copying.

-   * Usually rec_outbuf_height will be 1 or 2, at most 4.

-   */

-

-  /* When quantizing colors, the output colormap is described by these fields.

-   * The application can supply a colormap by setting colormap non-NULL before

-   * calling jpeg_start_decompress; otherwise a colormap is created during

-   * jpeg_start_decompress or jpeg_start_output.

-   * The map has out_color_components rows and actual_number_of_colors columns.

-   */

-  int actual_number_of_colors;	/* number of entries in use */

-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */

-

-  /* State variables: these variables indicate the progress of decompression.

-   * The application may examine these but must not modify them.

-   */

-

-  /* Row index of next scanline to be read from jpeg_read_scanlines().

-   * Application may use this to control its processing loop, e.g.,

-   * "while (output_scanline < output_height)".

-   */

-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */

-

-  /* Current input scan number and number of iMCU rows completed in scan.

-   * These indicate the progress of the decompressor input side.

-   */

-  int input_scan_number;	/* Number of SOS markers seen so far */

-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */

-

-  /* The "output scan number" is the notional scan being displayed by the

-   * output side.  The decompressor will not allow output scan/row number

-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.

-   */

-  int output_scan_number;	/* Nominal scan number being displayed */

-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */

-

-  /* Current progression status.  coef_bits[c][i] indicates the precision

-   * with which component c's DCT coefficient i (in zigzag order) is known.

-   * It is -1 when no data has yet been received, otherwise it is the point

-   * transform (shift) value for the most recent scan of the coefficient

-   * (thus, 0 at completion of the progression).

-   * This pointer is NULL when reading a non-progressive file.

-   */

-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */

-

-  /* Internal JPEG parameters --- the application usually need not look at

-   * these fields.  Note that the decompressor output side may not use

-   * any parameters that can change between scans.

-   */

-

-  /* Quantization and Huffman tables are carried forward across input

-   * datastreams when processing abbreviated JPEG datastreams.

-   */

-

-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];

-  /* ptrs to coefficient quantization tables, or NULL if not defined */

-

-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];

-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];

-  /* ptrs to Huffman coding tables, or NULL if not defined */

-

-  /* These parameters are never carried across datastreams, since they

-   * are given in SOF/SOS markers or defined to be reset by SOI.

-   */

-

-  int data_precision;		/* bits of precision in image data */

-

-  jpeg_component_info * comp_info;

-  /* comp_info[i] describes component that appears i'th in SOF */

-

-  boolean is_baseline;		/* TRUE if Baseline SOF0 encountered */

-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */

-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */

-

-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */

-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */

-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */

-

-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */

-

-  /* These fields record data obtained from optional markers recognized by

-   * the JPEG library.

-   */

-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */

-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */

-  UINT8 JFIF_major_version;	/* JFIF version number */

-  UINT8 JFIF_minor_version;

-  UINT8 density_unit;		/* JFIF code for pixel size units */

-  UINT16 X_density;		/* Horizontal pixel density */

-  UINT16 Y_density;		/* Vertical pixel density */

-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */

-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */

-

-  J_COLOR_TRANSFORM color_transform;

-  /* Color transform identifier derived from LSE marker, otherwise zero */

-

-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */

-

-  /* Aside from the specific data retained from APPn markers known to the

-   * library, the uninterpreted contents of any or all APPn and COM markers

-   * can be saved in a list for examination by the application.

-   */

-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */

-

-  /* Remaining fields are known throughout decompressor, but generally

-   * should not be touched by a surrounding application.

-   */

-

-  /*

-   * These fields are computed during decompression startup

-   */

-  int max_h_samp_factor;	/* largest h_samp_factor */

-  int max_v_samp_factor;	/* largest v_samp_factor */

-

-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */

-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */

-

-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */

-  /* The coefficient controller's input and output progress is measured in

-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows

-   * in fully interleaved JPEG scans, but are used whether the scan is

-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block

-   * rows of each component.  Therefore, the IDCT output contains

-   * v_samp_factor*DCT_v_scaled_size sample rows of a component per iMCU row.

-   */

-

-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */

-

-  /*

-   * These fields are valid during any one scan.

-   * They describe the components and MCUs actually appearing in the scan.

-   * Note that the decompressor output side must not use these fields.

-   */

-  int comps_in_scan;		/* # of JPEG components in this scan */

-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];

-  /* *cur_comp_info[i] describes component that appears i'th in SOS */

-

-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */

-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */

-

-  int blocks_in_MCU;		/* # of DCT blocks per MCU */

-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];

-  /* MCU_membership[i] is index in cur_comp_info of component owning */

-  /* i'th block in an MCU */

-

-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */

-

-  /* These fields are derived from Se of first SOS marker.

-   */

-  int block_size;		/* the basic DCT block size: 1..16 */

-  const int * natural_order; /* natural-order position array for entropy decode */

-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) for entropy decode */

-

-  /* This field is shared between entropy decoder and marker parser.

-   * It is either zero or the code of a JPEG marker that has been

-   * read from the data source, but has not yet been processed.

-   */

-  int unread_marker;

-

-  /*

-   * Links to decompression subobjects (methods, private variables of modules)

-   */

-  struct jpeg_decomp_master * master;

-  struct jpeg_d_main_controller * main;

-  struct jpeg_d_coef_controller * coef;

-  struct jpeg_d_post_controller * post;

-  struct jpeg_input_controller * inputctl;

-  struct jpeg_marker_reader * marker;

-  struct jpeg_entropy_decoder * entropy;

-  struct jpeg_inverse_dct * idct;

-  struct jpeg_upsampler * upsample;

-  struct jpeg_color_deconverter * cconvert;

-  struct jpeg_color_quantizer * cquantize;

-};

-

-

-/* "Object" declarations for JPEG modules that may be supplied or called

- * directly by the surrounding application.

- * As with all objects in the JPEG library, these structs only define the

- * publicly visible methods and state variables of a module.  Additional

- * private fields may exist after the public ones.

- */

-

-

-/* Error handler object */

-

-struct jpeg_error_mgr {

-  /* Error exit handler: does not return to caller */

-  JMETHOD(noreturn_t, error_exit, (j_common_ptr cinfo));

-  /* Conditionally emit a trace or warning message */

-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));

-  /* Routine that actually outputs a trace or error message */

-  JMETHOD(void, output_message, (j_common_ptr cinfo));

-  /* Format a message string for the most recent JPEG error or message */

-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));

-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */

-  /* Reset error state variables at start of a new image */

-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));

-  

-  /* The message ID code and any parameters are saved here.

-   * A message can have one string parameter or up to 8 int parameters.

-   */

-  int msg_code;

-#define JMSG_STR_PARM_MAX  80

-  union {

-    int i[8];

-    char s[JMSG_STR_PARM_MAX];

-  } msg_parm;

-  

-  /* Standard state variables for error facility */

-  

-  int trace_level;		/* max msg_level that will be displayed */

-  

-  /* For recoverable corrupt-data errors, we emit a warning message,

-   * but keep going unless emit_message chooses to abort.  emit_message

-   * should count warnings in num_warnings.  The surrounding application

-   * can check for bad data by seeing if num_warnings is nonzero at the

-   * end of processing.

-   */

-  long num_warnings;		/* number of corrupt-data warnings */

-

-  /* These fields point to the table(s) of error message strings.

-   * An application can change the table pointer to switch to a different

-   * message list (typically, to change the language in which errors are

-   * reported).  Some applications may wish to add additional error codes

-   * that will be handled by the JPEG library error mechanism; the second

-   * table pointer is used for this purpose.

-   *

-   * First table includes all errors generated by JPEG library itself.

-   * Error code 0 is reserved for a "no such error string" message.

-   */

-  const char * const * jpeg_message_table; /* Library errors */

-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */

-  /* Second table can be added by application (see cjpeg/djpeg for example).

-   * It contains strings numbered first_addon_message..last_addon_message.

-   */

-  const char * const * addon_message_table; /* Non-library errors */

-  int first_addon_message;	/* code for first string in addon table */

-  int last_addon_message;	/* code for last string in addon table */

-};

-

-

-/* Progress monitor object */

-

-struct jpeg_progress_mgr {

-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));

-

-  long pass_counter;		/* work units completed in this pass */

-  long pass_limit;		/* total number of work units in this pass */

-  int completed_passes;		/* passes completed so far */

-  int total_passes;		/* total number of passes expected */

-};

-

-

-/* Data destination object for compression */

-

-struct jpeg_destination_mgr {

-  JOCTET * next_output_byte;	/* => next byte to write in buffer */

-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */

-

-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));

-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));

-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));

-};

-

-

-/* Data source object for decompression */

-

-struct jpeg_source_mgr {

-  const JOCTET * next_input_byte; /* => next byte to read from buffer */

-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */

-

-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));

-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));

-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));

-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));

-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));

-};

-

-

-/* Memory manager object.

- * Allocates "small" objects (a few K total), "large" objects (tens of K),

- * and "really big" objects (virtual arrays with backing store if needed).

- * The memory manager does not allow individual objects to be freed; rather,

- * each created object is assigned to a pool, and whole pools can be freed

- * at once.  This is faster and more convenient than remembering exactly what

- * to free, especially where malloc()/free() are not too speedy.

- * NB: alloc routines never return NULL.  They exit to error_exit if not

- * successful.

- */

-

-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */

-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */

-#define JPOOL_NUMPOOLS	2

-

-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;

-typedef struct jvirt_barray_control * jvirt_barray_ptr;

-

-

-struct jpeg_memory_mgr {

-  /* Method pointers */

-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,

-				size_t sizeofobject));

-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,

-				     size_t sizeofobject));

-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,

-				     JDIMENSION samplesperrow,

-				     JDIMENSION numrows));

-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,

-				      JDIMENSION blocksperrow,

-				      JDIMENSION numrows));

-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,

-						  int pool_id,

-						  boolean pre_zero,

-						  JDIMENSION samplesperrow,

-						  JDIMENSION numrows,

-						  JDIMENSION maxaccess));

-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,

-						  int pool_id,

-						  boolean pre_zero,

-						  JDIMENSION blocksperrow,

-						  JDIMENSION numrows,

-						  JDIMENSION maxaccess));

-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));

-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,

-					   jvirt_sarray_ptr ptr,

-					   JDIMENSION start_row,

-					   JDIMENSION num_rows,

-					   boolean writable));

-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,

-					    jvirt_barray_ptr ptr,

-					    JDIMENSION start_row,

-					    JDIMENSION num_rows,

-					    boolean writable));

-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));

-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));

-

-  /* Limit on memory allocation for this JPEG object.  (Note that this is

-   * merely advisory, not a guaranteed maximum; it only affects the space

-   * used for virtual-array buffers.)  May be changed by outer application

-   * after creating the JPEG object.

-   */

-  long max_memory_to_use;

-

-  /* Maximum allocation request accepted by alloc_large. */

-  long max_alloc_chunk;

-};

-

-

-/* Routine signature for application-supplied marker processing methods.

- * Need not pass marker code since it is stored in cinfo->unread_marker.

- */

-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));

-

-

-/* Declarations for routines called by application.

- * The JPP macro hides prototype parameters from compilers that can't cope.

- * Note JPP requires double parentheses.

- */

-

-#ifdef HAVE_PROTOTYPES

-#define JPP(arglist)	arglist

-#else

-#define JPP(arglist)	()

-#endif

-

-

-/* Short forms of external names for systems with brain-damaged linkers.

- * We shorten external names to be unique in the first six letters, which

- * is good enough for all known systems.

- * (If your compiler itself needs names to be unique in less than 15 

- * characters, you are out of luck.  Get a better compiler.)

- */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jpeg_std_error		jStdError

-#define jpeg_CreateCompress	jCreaCompress

-#define jpeg_CreateDecompress	jCreaDecompress

-#define jpeg_destroy_compress	jDestCompress

-#define jpeg_destroy_decompress	jDestDecompress

-#define jpeg_stdio_dest		jStdDest

-#define jpeg_stdio_src		jStdSrc

-#define jpeg_mem_dest		jMemDest

-#define jpeg_mem_src		jMemSrc

-#define jpeg_set_defaults	jSetDefaults

-#define jpeg_set_colorspace	jSetColorspace

-#define jpeg_default_colorspace	jDefColorspace

-#define jpeg_set_quality	jSetQuality

-#define jpeg_set_linear_quality	jSetLQuality

-#define jpeg_default_qtables	jDefQTables

-#define jpeg_add_quant_table	jAddQuantTable

-#define jpeg_quality_scaling	jQualityScaling

-#define jpeg_simple_progression	jSimProgress

-#define jpeg_suppress_tables	jSuppressTables

-#define jpeg_alloc_quant_table	jAlcQTable

-#define jpeg_alloc_huff_table	jAlcHTable

-#define jpeg_start_compress	jStrtCompress

-#define jpeg_write_scanlines	jWrtScanlines

-#define jpeg_finish_compress	jFinCompress

-#define jpeg_calc_jpeg_dimensions	jCjpegDimensions

-#define jpeg_write_raw_data	jWrtRawData

-#define jpeg_write_marker	jWrtMarker

-#define jpeg_write_m_header	jWrtMHeader

-#define jpeg_write_m_byte	jWrtMByte

-#define jpeg_write_tables	jWrtTables

-#define jpeg_read_header	jReadHeader

-#define jpeg_start_decompress	jStrtDecompress

-#define jpeg_read_scanlines	jReadScanlines

-#define jpeg_finish_decompress	jFinDecompress

-#define jpeg_read_raw_data	jReadRawData

-#define jpeg_has_multiple_scans	jHasMultScn

-#define jpeg_start_output	jStrtOutput

-#define jpeg_finish_output	jFinOutput

-#define jpeg_input_complete	jInComplete

-#define jpeg_new_colormap	jNewCMap

-#define jpeg_consume_input	jConsumeInput

-#define jpeg_core_output_dimensions	jCoreDimensions

-#define jpeg_calc_output_dimensions	jCalcDimensions

-#define jpeg_save_markers	jSaveMarkers

-#define jpeg_set_marker_processor	jSetMarker

-#define jpeg_read_coefficients	jReadCoefs

-#define jpeg_write_coefficients	jWrtCoefs

-#define jpeg_copy_critical_parameters	jCopyCrit

-#define jpeg_abort_compress	jAbrtCompress

-#define jpeg_abort_decompress	jAbrtDecompress

-#define jpeg_abort		jAbort

-#define jpeg_destroy		jDestroy

-#define jpeg_resync_to_restart	jResyncRestart

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-

-/* Default error-management setup */

-EXTERN(struct jpeg_error_mgr *) jpeg_std_error

-	JPP((struct jpeg_error_mgr * err));

-

-/* Initialization of JPEG compression objects.

- * jpeg_create_compress() and jpeg_create_decompress() are the exported

- * names that applications should call.  These expand to calls on

- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information

- * passed for version mismatch checking.

- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.

- */

-#define jpeg_create_compress(cinfo) \

-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \

-			(size_t) sizeof(struct jpeg_compress_struct))

-#define jpeg_create_decompress(cinfo) \

-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \

-			  (size_t) sizeof(struct jpeg_decompress_struct))

-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,

-				      int version, size_t structsize));

-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,

-					int version, size_t structsize));

-/* Destruction of JPEG compression objects */

-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));

-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));

-

-/* Standard data source and destination managers: stdio streams. */

-/* Caller is responsible for opening the file before and closing after. */

-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));

-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));

-

-/* Data source and destination managers: memory buffers. */

-EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo,

-			       unsigned char ** outbuffer,

-			       unsigned long * outsize));

-EXTERN(void) jpeg_mem_src JPP((j_decompress_ptr cinfo,

-			      const unsigned char * inbuffer,

-			      unsigned long insize));

-

-/* Default parameter setup for compression */

-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));

-/* Compression parameter setup aids */

-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,

-				      J_COLOR_SPACE colorspace));

-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));

-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,

-				   boolean force_baseline));

-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,

-					  int scale_factor,

-					  boolean force_baseline));

-EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,

-				       boolean force_baseline));

-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,

-				       const unsigned int *basic_table,

-				       int scale_factor,

-				       boolean force_baseline));

-EXTERN(int) jpeg_quality_scaling JPP((int quality));

-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));

-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,

-				       boolean suppress));

-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));

-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));

-

-/* Main entry points for compression */

-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,

-				      boolean write_all_tables));

-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,

-					     JSAMPARRAY scanlines,

-					     JDIMENSION num_lines));

-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));

-

-/* Precalculate JPEG dimensions for current compression parameters. */

-EXTERN(void) jpeg_calc_jpeg_dimensions JPP((j_compress_ptr cinfo));

-

-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */

-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,

-					    JSAMPIMAGE data,

-					    JDIMENSION num_lines));

-

-/* Write a special marker.  See libjpeg.txt concerning safe usage. */

-EXTERN(void) jpeg_write_marker

-	JPP((j_compress_ptr cinfo, int marker,

-	     const JOCTET * dataptr, unsigned int datalen));

-/* Same, but piecemeal. */

-EXTERN(void) jpeg_write_m_header

-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));

-EXTERN(void) jpeg_write_m_byte

-	JPP((j_compress_ptr cinfo, int val));

-

-/* Alternate compression function: just write an abbreviated table file */

-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));

-

-/* Decompression startup: read start of JPEG datastream to see what's there */

-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,

-				  boolean require_image));

-/* Return value is one of: */

-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */

-#define JPEG_HEADER_OK		1 /* Found valid image datastream */

-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */

-/* If you pass require_image = TRUE (normal case), you need not check for

- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.

- * JPEG_SUSPENDED is only possible if you use a data source module that can

- * give a suspension return (the stdio source module doesn't).

- */

-

-/* Main entry points for decompression */

-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));

-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,

-					    JSAMPARRAY scanlines,

-					    JDIMENSION max_lines));

-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));

-

-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */

-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,

-					   JSAMPIMAGE data,

-					   JDIMENSION max_lines));

-

-/* Additional entry points for buffered-image mode. */

-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));

-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,

-				       int scan_number));

-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));

-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));

-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));

-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));

-/* Return value is one of: */

-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */

-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */

-#define JPEG_REACHED_EOI	2 /* Reached end of image */

-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */

-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */

-

-/* Precalculate output dimensions for current decompression parameters. */

-EXTERN(void) jpeg_core_output_dimensions JPP((j_decompress_ptr cinfo));

-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));

-

-/* Control saving of COM and APPn markers into marker_list. */

-EXTERN(void) jpeg_save_markers

-	JPP((j_decompress_ptr cinfo, int marker_code,

-	     unsigned int length_limit));

-

-/* Install a special processing method for COM or APPn markers. */

-EXTERN(void) jpeg_set_marker_processor

-	JPP((j_decompress_ptr cinfo, int marker_code,

-	     jpeg_marker_parser_method routine));

-

-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */

-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));

-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,

-					  jvirt_barray_ptr * coef_arrays));

-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,

-						j_compress_ptr dstinfo));

-

-/* If you choose to abort compression or decompression before completing

- * jpeg_finish_(de)compress, then you need to clean up to release memory,

- * temporary files, etc.  You can just call jpeg_destroy_(de)compress

- * if you're done with the JPEG object, but if you want to clean it up and

- * reuse it, call this:

- */

-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));

-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));

-

-/* Generic versions of jpeg_abort and jpeg_destroy that work on either

- * flavor of JPEG object.  These may be more convenient in some places.

- */

-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));

-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));

-

-/* Default restart-marker-resync procedure for use by data source modules */

-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,

-					    int desired));

-

-

-/* These marker codes are exported since applications and data source modules

- * are likely to want to use them.

- */

-

-#define JPEG_RST0	0xD0	/* RST0 marker code */

-#define JPEG_EOI	0xD9	/* EOI marker code */

-#define JPEG_APP0	0xE0	/* APP0 marker code */

-#define JPEG_COM	0xFE	/* COM marker code */

-

-

-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)

- * for structure definitions that are never filled in, keep it quiet by

- * supplying dummy definitions for the various substructures.

- */

-

-#ifdef INCOMPLETE_TYPES_BROKEN

-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */

-struct jvirt_sarray_control { long dummy; };

-struct jvirt_barray_control { long dummy; };

-struct jpeg_comp_master { long dummy; };

-struct jpeg_c_main_controller { long dummy; };

-struct jpeg_c_prep_controller { long dummy; };

-struct jpeg_c_coef_controller { long dummy; };

-struct jpeg_marker_writer { long dummy; };

-struct jpeg_color_converter { long dummy; };

-struct jpeg_downsampler { long dummy; };

-struct jpeg_forward_dct { long dummy; };

-struct jpeg_entropy_encoder { long dummy; };

-struct jpeg_decomp_master { long dummy; };

-struct jpeg_d_main_controller { long dummy; };

-struct jpeg_d_coef_controller { long dummy; };

-struct jpeg_d_post_controller { long dummy; };

-struct jpeg_input_controller { long dummy; };

-struct jpeg_marker_reader { long dummy; };

-struct jpeg_entropy_decoder { long dummy; };

-struct jpeg_inverse_dct { long dummy; };

-struct jpeg_upsampler { long dummy; };

-struct jpeg_color_deconverter { long dummy; };

-struct jpeg_color_quantizer { long dummy; };

-#endif /* JPEG_INTERNALS */

-#endif /* INCOMPLETE_TYPES_BROKEN */

-

-

-/*

- * The JPEG library modules define JPEG_INTERNALS before including this file.

- * The internal structure declarations are read only when that is true.

- * Applications using the library should not include jpegint.h, but may wish

- * to include jerror.h.

- */

-

-#ifdef JPEG_INTERNALS

-#include "jpegint.h"		/* fetch private declarations */

-#include "jerror.h"		/* fetch error codes too */

-#endif

-

-#ifdef __cplusplus

-#ifndef DONT_USE_EXTERN_C

-}

-#endif

-#endif

-

-#endif /* JPEGLIB_H */

diff --git a/plugins/AdvaImg/src/LibJPEG/jpegtran.c b/plugins/AdvaImg/src/LibJPEG/jpegtran.c
deleted file mode 100644
index f3175aee24..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jpegtran.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*

- * jpegtran.c

- *

- * Copyright (C) 1995-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.

- *

- * This file contains a command-line user interface for JPEG transcoding.

- * It is very similar to cjpeg.c, and partly to djpeg.c, but provides

- * lossless transcoding between different JPEG file formats.  It also

- * provides some lossless and sort-of-lossless transformations of JPEG data.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-#include "transupp.h"		/* Support routines for jpegtran */

-#include "jversion.h"		/* for version message */

-

-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */

-#ifdef __MWERKS__

-#include <SIOUX.h>              /* Metrowerks needs this */

-#include <console.h>		/* ... and this */

-#endif

-#ifdef THINK_C

-#include <console.h>		/* Think declares it here */

-#endif

-#endif

-

-

-/*

- * Argument-parsing code.

- * The switch parser is designed to be useful with DOS-style command line

- * syntax, ie, intermixed switches and file names, where only the switches

- * to the left of a given file name affect processing of that file.

- * The main program in this file doesn't actually use this capability...

- */

-

-

-static const char * progname;	/* program name for error messages */

-static char * outfilename;	/* for -outfile switch */

-static char * scaleoption;	/* -scale switch */

-static JCOPY_OPTION copyoption;	/* -copy switch */

-static jpeg_transform_info transformoption; /* image transformation options */

-

-

-LOCAL(void)

-usage (void)

-/* complain about bad command line */

-{

-  fprintf(stderr, "usage: %s [switches] ", progname);

-#ifdef TWO_FILE_COMMANDLINE

-  fprintf(stderr, "inputfile outputfile\n");

-#else

-  fprintf(stderr, "[inputfile]\n");

-#endif

-

-  fprintf(stderr, "Switches (names may be abbreviated):\n");

-  fprintf(stderr, "  -copy none     Copy no extra markers from source file\n");

-  fprintf(stderr, "  -copy comments Copy only comment markers (default)\n");

-  fprintf(stderr, "  -copy all      Copy all extra markers\n");

-#ifdef ENTROPY_OPT_SUPPORTED

-  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");

-#endif

-#ifdef C_PROGRESSIVE_SUPPORTED

-  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");

-#endif

-  fprintf(stderr, "Switches for modifying the image:\n");

-#if TRANSFORMS_SUPPORTED

-  fprintf(stderr, "  -crop WxH+X+Y  Crop to a rectangular subarea\n");

-  fprintf(stderr, "  -flip [horizontal|vertical]  Mirror image (left-right or top-bottom)\n");

-  fprintf(stderr, "  -grayscale     Reduce to grayscale (omit color data)\n");

-  fprintf(stderr, "  -perfect       Fail if there is non-transformable edge blocks\n");

-  fprintf(stderr, "  -rotate [90|180|270]         Rotate image (degrees clockwise)\n");

-#endif

-  fprintf(stderr, "  -scale M/N     Scale output image by fraction M/N, eg, 1/8\n");

-#if TRANSFORMS_SUPPORTED

-  fprintf(stderr, "  -transpose     Transpose image\n");

-  fprintf(stderr, "  -transverse    Transverse transpose image\n");

-  fprintf(stderr, "  -trim          Drop non-transformable edge blocks\n");

-  fprintf(stderr, "  -wipe WxH+X+Y  Wipe (gray out) a rectangular subarea\n");

-#endif

-  fprintf(stderr, "Switches for advanced users:\n");

-#ifdef C_ARITH_CODING_SUPPORTED

-  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");

-#endif

-  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");

-  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");

-  fprintf(stderr, "  -outfile name  Specify name for output file\n");

-  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");

-  fprintf(stderr, "Switches for wizards:\n");

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");

-#endif

-  exit(EXIT_FAILURE);

-}

-

-

-LOCAL(void)

-select_transform (JXFORM_CODE transform)

-/* Silly little routine to detect multiple transform options,

- * which we can't handle.

- */

-{

-#if TRANSFORMS_SUPPORTED

-  if (transformoption.transform == JXFORM_NONE ||

-      transformoption.transform == transform) {

-    transformoption.transform = transform;

-  } else {

-    fprintf(stderr, "%s: can only do one image transformation at a time\n",

-	    progname);

-    usage();

-  }

-#else

-  fprintf(stderr, "%s: sorry, image transformation was not compiled\n",

-	  progname);

-  exit(EXIT_FAILURE);

-#endif

-}

-

-

-LOCAL(int)

-parse_switches (j_compress_ptr cinfo, int argc, char **argv,

-		int last_file_arg_seen, boolean for_real)

-/* Parse optional switches.

- * Returns argv[] index of first file-name argument (== argc if none).

- * Any file names with indexes <= last_file_arg_seen are ignored;

- * they have presumably been processed in a previous iteration.

- * (Pass 0 for last_file_arg_seen on the first or only iteration.)

- * for_real is FALSE on the first (dummy) pass; we may skip any expensive

- * processing.

- */

-{

-  int argn;

-  char * arg;

-  boolean simple_progressive;

-  char * scansarg = NULL;	/* saves -scans parm if any */

-

-  /* Set up default JPEG parameters. */

-  simple_progressive = FALSE;

-  outfilename = NULL;

-  scaleoption = NULL;

-  copyoption = JCOPYOPT_DEFAULT;

-  transformoption.transform = JXFORM_NONE;

-  transformoption.perfect = FALSE;

-  transformoption.trim = FALSE;

-  transformoption.force_grayscale = FALSE;

-  transformoption.crop = FALSE;

-  cinfo->err->trace_level = 0;

-

-  /* Scan command line options, adjust parameters */

-

-  for (argn = 1; argn < argc; argn++) {

-    arg = argv[argn];

-    if (*arg != '-') {

-      /* Not a switch, must be a file name argument */

-      if (argn <= last_file_arg_seen) {

-	outfilename = NULL;	/* -outfile applies to just one input file */

-	continue;		/* ignore this name if previously processed */

-      }

-      break;			/* else done parsing switches */

-    }

-    arg++;			/* advance past switch marker character */

-

-    if (keymatch(arg, "arithmetic", 1)) {

-      /* Use arithmetic coding. */

-#ifdef C_ARITH_CODING_SUPPORTED

-      cinfo->arith_code = TRUE;

-#else

-      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "copy", 2)) {

-      /* Select which extra markers to copy. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "none", 1)) {

-	copyoption = JCOPYOPT_NONE;

-      } else if (keymatch(argv[argn], "comments", 1)) {

-	copyoption = JCOPYOPT_COMMENTS;

-      } else if (keymatch(argv[argn], "all", 1)) {

-	copyoption = JCOPYOPT_ALL;

-      } else

-	usage();

-

-    } else if (keymatch(arg, "crop", 2)) {

-      /* Perform lossless cropping. */

-#if TRANSFORMS_SUPPORTED

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (transformoption.crop /* reject multiple crop/wipe requests */ ||

-	  ! jtransform_parse_crop_spec(&transformoption, argv[argn])) {

-	fprintf(stderr, "%s: bogus -crop argument '%s'\n",

-		progname, argv[argn]);

-	exit(EXIT_FAILURE);

-      }

-#else

-      select_transform(JXFORM_NONE);	/* force an error */

-#endif

-

-    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {

-      /* Enable debug printouts. */

-      /* On first -d, print version identification */

-      static boolean printed_version = FALSE;

-

-      if (! printed_version) {

-	fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",

-		JVERSION, JCOPYRIGHT);

-	printed_version = TRUE;

-      }

-      cinfo->err->trace_level++;

-

-    } else if (keymatch(arg, "flip", 1)) {

-      /* Mirror left-right or top-bottom. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "horizontal", 1))

-	select_transform(JXFORM_FLIP_H);

-      else if (keymatch(argv[argn], "vertical", 1))

-	select_transform(JXFORM_FLIP_V);

-      else

-	usage();

-

-    } else if (keymatch(arg, "grayscale", 1) || keymatch(arg, "greyscale",1)) {

-      /* Force to grayscale. */

-#if TRANSFORMS_SUPPORTED

-      transformoption.force_grayscale = TRUE;

-#else

-      select_transform(JXFORM_NONE);	/* force an error */

-#endif

-

-    } else if (keymatch(arg, "maxmemory", 3)) {

-      /* Maximum memory in Kb (or Mb with 'm'). */

-      long lval;

-      char ch = 'x';

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)

-	usage();

-      if (ch == 'm' || ch == 'M')

-	lval *= 1000L;

-      cinfo->mem->max_memory_to_use = lval * 1000L;

-

-    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {

-      /* Enable entropy parm optimization. */

-#ifdef ENTROPY_OPT_SUPPORTED

-      cinfo->optimize_coding = TRUE;

-#else

-      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "outfile", 4)) {

-      /* Set output file name. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      outfilename = argv[argn];	/* save it away for later use */

-

-    } else if (keymatch(arg, "perfect", 2)) {

-      /* Fail if there is any partial edge MCUs that the transform can't

-       * handle. */

-      transformoption.perfect = TRUE;

-

-    } else if (keymatch(arg, "progressive", 2)) {

-      /* Select simple progressive mode. */

-#ifdef C_PROGRESSIVE_SUPPORTED

-      simple_progressive = TRUE;

-      /* We must postpone execution until num_components is known. */

-#else

-      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "restart", 1)) {

-      /* Restart interval in MCU rows (or in MCUs with 'b'). */

-      long lval;

-      char ch = 'x';

-

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)

-	usage();

-      if (lval < 0 || lval > 65535L)

-	usage();

-      if (ch == 'b' || ch == 'B') {

-	cinfo->restart_interval = (unsigned int) lval;

-	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */

-      } else {

-	cinfo->restart_in_rows = (int) lval;

-	/* restart_interval will be computed during startup */

-      }

-

-    } else if (keymatch(arg, "rotate", 2)) {

-      /* Rotate 90, 180, or 270 degrees (measured clockwise). */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (keymatch(argv[argn], "90", 2))

-	select_transform(JXFORM_ROT_90);

-      else if (keymatch(argv[argn], "180", 3))

-	select_transform(JXFORM_ROT_180);

-      else if (keymatch(argv[argn], "270", 3))

-	select_transform(JXFORM_ROT_270);

-      else

-	usage();

-

-    } else if (keymatch(arg, "scale", 4)) {

-      /* Scale the output image by a fraction M/N. */

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      scaleoption = argv[argn];

-      /* We must postpone processing until decompression startup. */

-

-    } else if (keymatch(arg, "scans", 1)) {

-      /* Set scan script. */

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      scansarg = argv[argn];

-      /* We must postpone reading the file in case -progressive appears. */

-#else

-      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",

-	      progname);

-      exit(EXIT_FAILURE);

-#endif

-

-    } else if (keymatch(arg, "transpose", 1)) {

-      /* Transpose (across UL-to-LR axis). */

-      select_transform(JXFORM_TRANSPOSE);

-

-    } else if (keymatch(arg, "transverse", 6)) {

-      /* Transverse transpose (across UR-to-LL axis). */

-      select_transform(JXFORM_TRANSVERSE);

-

-    } else if (keymatch(arg, "trim", 3)) {

-      /* Trim off any partial edge MCUs that the transform can't handle. */

-      transformoption.trim = TRUE;

-

-    } else if (keymatch(arg, "wipe", 1)) {

-#if TRANSFORMS_SUPPORTED

-      if (++argn >= argc)	/* advance to next argument */

-	usage();

-      if (transformoption.crop /* reject multiple crop/wipe requests */ ||

-	  ! jtransform_parse_crop_spec(&transformoption, argv[argn])) {

-	fprintf(stderr, "%s: bogus -wipe argument '%s'\n",

-		progname, argv[argn]);

-	exit(EXIT_FAILURE);

-      }

-      select_transform(JXFORM_WIPE);

-#else

-      select_transform(JXFORM_NONE);	/* force an error */

-#endif

-

-    } else {

-      usage();			/* bogus switch */

-    }

-  }

-

-  /* Post-switch-scanning cleanup */

-

-  if (for_real) {

-

-#ifdef C_PROGRESSIVE_SUPPORTED

-    if (simple_progressive)	/* process -progressive; -scans can override */

-      jpeg_simple_progression(cinfo);

-#endif

-

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-    if (scansarg != NULL)	/* process -scans if it was present */

-      if (! read_scan_script(cinfo, scansarg))

-	usage();

-#endif

-  }

-

-  return argn;			/* return index of next arg (file name) */

-}

-

-

-/*

- * The main program.

- */

-

-int

-main (int argc, char **argv)

-{

-  struct jpeg_decompress_struct srcinfo;

-  struct jpeg_compress_struct dstinfo;

-  struct jpeg_error_mgr jsrcerr, jdsterr;

-#ifdef PROGRESS_REPORT

-  struct cdjpeg_progress_mgr progress;

-#endif

-  jvirt_barray_ptr * src_coef_arrays;

-  jvirt_barray_ptr * dst_coef_arrays;

-  int file_index;

-  /* We assume all-in-memory processing and can therefore use only a

-   * single file pointer for sequential input and output operation. 

-   */

-  FILE * fp;

-

-  /* On Mac, fetch a command line. */

-#ifdef USE_CCOMMAND

-  argc = ccommand(&argv);

-#endif

-

-  progname = argv[0];

-  if (progname == NULL || progname[0] == 0)

-    progname = "jpegtran";	/* in case C library doesn't provide it */

-

-  /* Initialize the JPEG decompression object with default error handling. */

-  srcinfo.err = jpeg_std_error(&jsrcerr);

-  jpeg_create_decompress(&srcinfo);

-  /* Initialize the JPEG compression object with default error handling. */

-  dstinfo.err = jpeg_std_error(&jdsterr);

-  jpeg_create_compress(&dstinfo);

-

-  /* Now safe to enable signal catcher.

-   * Note: we assume only the decompression object will have virtual arrays.

-   */

-#ifdef NEED_SIGNAL_CATCHER

-  enable_signal_catcher((j_common_ptr) &srcinfo);

-#endif

-

-  /* Scan command line to find file names.

-   * It is convenient to use just one switch-parsing routine, but the switch

-   * values read here are mostly ignored; we will rescan the switches after

-   * opening the input file.  Also note that most of the switches affect the

-   * destination JPEG object, so we parse into that and then copy over what

-   * needs to affects the source too.

-   */

-

-  file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE);

-  jsrcerr.trace_level = jdsterr.trace_level;

-  srcinfo.mem->max_memory_to_use = dstinfo.mem->max_memory_to_use;

-

-#ifdef TWO_FILE_COMMANDLINE

-  /* Must have either -outfile switch or explicit output file name */

-  if (outfilename == NULL) {

-    if (file_index != argc-2) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-    outfilename = argv[file_index+1];

-  } else {

-    if (file_index != argc-1) {

-      fprintf(stderr, "%s: must name one input and one output file\n",

-	      progname);

-      usage();

-    }

-  }

-#else

-  /* Unix style: expect zero or one file name */

-  if (file_index < argc-1) {

-    fprintf(stderr, "%s: only one input file\n", progname);

-    usage();

-  }

-#endif /* TWO_FILE_COMMANDLINE */

-

-  /* Open the input file. */

-  if (file_index < argc) {

-    if ((fp = fopen(argv[file_index], READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s for reading\n", progname, argv[file_index]);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default input file is stdin */

-    fp = read_stdin();

-  }

-

-#ifdef PROGRESS_REPORT

-  start_progress_monitor((j_common_ptr) &dstinfo, &progress);

-#endif

-

-  /* Specify data source for decompression */

-  jpeg_stdio_src(&srcinfo, fp);

-

-  /* Enable saving of extra markers that we want to copy */

-  jcopy_markers_setup(&srcinfo, copyoption);

-

-  /* Read file header */

-  (void) jpeg_read_header(&srcinfo, TRUE);

-

-  /* Adjust default decompression parameters */

-  if (scaleoption != NULL)

-    if (sscanf(scaleoption, "%u/%u",

-	&srcinfo.scale_num, &srcinfo.scale_denom) < 1)

-      usage();

-

-  /* Any space needed by a transform option must be requested before

-   * jpeg_read_coefficients so that memory allocation will be done right.

-   */

-#if TRANSFORMS_SUPPORTED

-  /* Fail right away if -perfect is given and transformation is not perfect.

-   */

-  if (!jtransform_request_workspace(&srcinfo, &transformoption)) {

-    fprintf(stderr, "%s: transformation is not perfect\n", progname);

-    exit(EXIT_FAILURE);

-  }

-#endif

-

-  /* Read source file as DCT coefficients */

-  src_coef_arrays = jpeg_read_coefficients(&srcinfo);

-

-  /* Initialize destination compression parameters from source values */

-  jpeg_copy_critical_parameters(&srcinfo, &dstinfo);

-

-  /* Adjust destination parameters if required by transform options;

-   * also find out which set of coefficient arrays will hold the output.

-   */

-#if TRANSFORMS_SUPPORTED

-  dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo,

-						 src_coef_arrays,

-						 &transformoption);

-#else

-  dst_coef_arrays = src_coef_arrays;

-#endif

-

-  /* Close input file, if we opened it.

-   * Note: we assume that jpeg_read_coefficients consumed all input

-   * until JPEG_REACHED_EOI, and that jpeg_finish_decompress will

-   * only consume more while (! cinfo->inputctl->eoi_reached).

-   * We cannot call jpeg_finish_decompress here since we still need the

-   * virtual arrays allocated from the source object for processing.

-   */

-  if (fp != stdin)

-    fclose(fp);

-

-  /* Open the output file. */

-  if (outfilename != NULL) {

-    if ((fp = fopen(outfilename, WRITE_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s for writing\n", progname, outfilename);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default output file is stdout */

-    fp = write_stdout();

-  }

-

-  /* Adjust default compression parameters by re-parsing the options */

-  file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE);

-

-  /* Specify data destination for compression */

-  jpeg_stdio_dest(&dstinfo, fp);

-

-  /* Start compressor (note no image data is actually written here) */

-  jpeg_write_coefficients(&dstinfo, dst_coef_arrays);

-

-  /* Copy to the output file any extra markers that we want to preserve */

-  jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);

-

-  /* Execute image transformation, if any */

-#if TRANSFORMS_SUPPORTED

-  jtransform_execute_transformation(&srcinfo, &dstinfo,

-				    src_coef_arrays,

-				    &transformoption);

-#endif

-

-  /* Finish compression and release memory */

-  jpeg_finish_compress(&dstinfo);

-  jpeg_destroy_compress(&dstinfo);

-  (void) jpeg_finish_decompress(&srcinfo);

-  jpeg_destroy_decompress(&srcinfo);

-

-  /* Close output file, if we opened it */

-  if (fp != stdout)

-    fclose(fp);

-

-#ifdef PROGRESS_REPORT

-  end_progress_monitor((j_common_ptr) &dstinfo);

-#endif

-

-  /* All done. */

-  exit(jsrcerr.num_warnings + jdsterr.num_warnings ?EXIT_WARNING:EXIT_SUCCESS);

-  return 0;			/* suppress no-return-value warnings */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jquant1.c b/plugins/AdvaImg/src/LibJPEG/jquant1.c
deleted file mode 100644
index 1c482bc4b1..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jquant1.c
+++ /dev/null
@@ -1,857 +0,0 @@
-/*

- * jquant1.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2011 by Guido Vollbeding.

- * 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 1-pass color quantization (color mapping) routines.

- * These routines provide mapping to a fixed color map using equally spaced

- * color values.  Optional Floyd-Steinberg or ordered dithering is available.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-#ifdef QUANT_1PASS_SUPPORTED

-

-

-/*

- * The main purpose of 1-pass quantization is to provide a fast, if not very

- * high quality, colormapped output capability.  A 2-pass quantizer usually

- * gives better visual quality; however, for quantized grayscale output this

- * quantizer is perfectly adequate.  Dithering is highly recommended with this

- * quantizer, though you can turn it off if you really want to.

- *

- * In 1-pass quantization the colormap must be chosen in advance of seeing the

- * image.  We use a map consisting of all combinations of Ncolors[i] color

- * values for the i'th component.  The Ncolors[] values are chosen so that

- * their product, the total number of colors, is no more than that requested.

- * (In most cases, the product will be somewhat less.)

- *

- * Since the colormap is orthogonal, the representative value for each color

- * component can be determined without considering the other components;

- * then these indexes can be combined into a colormap index by a standard

- * N-dimensional-array-subscript calculation.  Most of the arithmetic involved

- * can be precalculated and stored in the lookup table colorindex[].

- * colorindex[i][j] maps pixel value j in component i to the nearest

- * representative value (grid plane) for that component; this index is

- * multiplied by the array stride for component i, so that the

- * index of the colormap entry closest to a given pixel value is just

- *    sum( colorindex[component-number][pixel-component-value] )

- * Aside from being fast, this scheme allows for variable spacing between

- * representative values with no additional lookup cost.

- *

- * If gamma correction has been applied in color conversion, it might be wise

- * to adjust the color grid spacing so that the representative colors are

- * equidistant in linear space.  At this writing, gamma correction is not

- * implemented by jdcolor, so nothing is done here.

- */

-

-

-/* Declarations for ordered dithering.

- *

- * We use a standard 16x16 ordered dither array.  The basic concept of ordered

- * dithering is described in many references, for instance Dale Schumacher's

- * chapter II.2 of Graphics Gems II (James Arvo, ed. Academic Press, 1991).

- * In place of Schumacher's comparisons against a "threshold" value, we add a

- * "dither" value to the input pixel and then round the result to the nearest

- * output value.  The dither value is equivalent to (0.5 - threshold) times

- * the distance between output values.  For ordered dithering, we assume that

- * the output colors are equally spaced; if not, results will probably be

- * worse, since the dither may be too much or too little at a given point.

- *

- * The normal calculation would be to form pixel value + dither, range-limit

- * this to 0..MAXJSAMPLE, and then index into the colorindex table as usual.

- * We can skip the separate range-limiting step by extending the colorindex

- * table in both directions.

- */

-

-#define ODITHER_SIZE  16	/* dimension of dither matrix */

-/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */

-#define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */

-#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */

-

-typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];

-typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];

-

-static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {

-  /* Bayer's order-4 dither array.  Generated by the code given in

-   * Stephen Hawley's article "Ordered Dithering" in Graphics Gems I.

-   * The values in this array must range from 0 to ODITHER_CELLS-1.

-   */

-  {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },

-  { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },

-  {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },

-  { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },

-  {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },

-  { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },

-  {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },

-  { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },

-  {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },

-  { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },

-  {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },

-  { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },

-  {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },

-  { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },

-  {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },

-  { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }

-};

-

-

-/* Declarations for Floyd-Steinberg dithering.

- *

- * Errors are accumulated into the array fserrors[], at a resolution of

- * 1/16th of a pixel count.  The error at a given pixel is propagated

- * to its not-yet-processed neighbors using the standard F-S fractions,

- *		...	(here)	7/16

- *		3/16	5/16	1/16

- * We work left-to-right on even rows, right-to-left on odd rows.

- *

- * We can get away with a single array (holding one row's worth of errors)

- * by using it to store the current row's errors at pixel columns not yet

- * processed, but the next row's errors at columns already processed.  We

- * need only a few extra variables to hold the errors immediately around the

- * current column.  (If we are lucky, those variables are in registers, but

- * even if not, they're probably cheaper to access than array elements are.)

- *

- * The fserrors[] array is indexed [component#][position].

- * We provide (#columns + 2) entries per component; the extra entry at each

- * end saves us from special-casing the first and last pixels.

- *

- * Note: on a wide image, we might not have enough room in a PC's near data

- * segment to hold the error array; so it is allocated with alloc_large.

- */

-

-#if BITS_IN_JSAMPLE == 8

-typedef INT16 FSERROR;		/* 16 bits should be enough */

-typedef int LOCFSERROR;		/* use 'int' for calculation temps */

-#else

-typedef INT32 FSERROR;		/* may need more than 16 bits */

-typedef INT32 LOCFSERROR;	/* be sure calculation temps are big enough */

-#endif

-

-typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */

-

-

-/* Private subobject */

-

-#define MAX_Q_COMPS 4		/* max components I can handle */

-

-typedef struct {

-  struct jpeg_color_quantizer pub; /* public fields */

-

-  /* Initially allocated colormap is saved here */

-  JSAMPARRAY sv_colormap;	/* The color map as a 2-D pixel array */

-  int sv_actual;		/* number of entries in use */

-

-  JSAMPARRAY colorindex;	/* Precomputed mapping for speed */

-  /* colorindex[i][j] = index of color closest to pixel value j in component i,

-   * premultiplied as described above.  Since colormap indexes must fit into

-   * JSAMPLEs, the entries of this array will too.

-   */

-  boolean is_padded;		/* is the colorindex padded for odither? */

-

-  int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */

-

-  /* Variables for ordered dithering */

-  int row_index;		/* cur row's vertical index in dither matrix */

-  ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */

-

-  /* Variables for Floyd-Steinberg dithering */

-  FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */

-  boolean on_odd_row;		/* flag to remember which row we are on */

-} my_cquantizer;

-

-typedef my_cquantizer * my_cquantize_ptr;

-

-

-/*

- * Policy-making subroutines for create_colormap and create_colorindex.

- * These routines determine the colormap to be used.  The rest of the module

- * only assumes that the colormap is orthogonal.

- *

- *  * select_ncolors decides how to divvy up the available colors

- *    among the components.

- *  * output_value defines the set of representative values for a component.

- *  * largest_input_value defines the mapping from input values to

- *    representative values for a component.

- * Note that the latter two routines may impose different policies for

- * different components, though this is not currently done.

- */

-

-

-LOCAL(int)

-select_ncolors (j_decompress_ptr cinfo, int Ncolors[])

-/* Determine allocation of desired colors to components, */

-/* and fill in Ncolors[] array to indicate choice. */

-/* Return value is total number of colors (product of Ncolors[] values). */

-{

-  int nc = cinfo->out_color_components; /* number of color components */

-  int max_colors = cinfo->desired_number_of_colors;

-  int total_colors, iroot, i, j;

-  boolean changed;

-  long temp;

-  static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };

-

-  /* We can allocate at least the nc'th root of max_colors per component. */

-  /* Compute floor(nc'th root of max_colors). */

-  iroot = 1;

-  do {

-    iroot++;

-    temp = iroot;		/* set temp = iroot ** nc */

-    for (i = 1; i < nc; i++)

-      temp *= iroot;

-  } while (temp <= (long) max_colors); /* repeat till iroot exceeds root */

-  iroot--;			/* now iroot = floor(root) */

-

-  /* Must have at least 2 color values per component */

-  if (iroot < 2)

-    ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, (int) temp);

-

-  /* Initialize to iroot color values for each component */

-  total_colors = 1;

-  for (i = 0; i < nc; i++) {

-    Ncolors[i] = iroot;

-    total_colors *= iroot;

-  }

-  /* We may be able to increment the count for one or more components without

-   * exceeding max_colors, though we know not all can be incremented.

-   * Sometimes, the first component can be incremented more than once!

-   * (Example: for 16 colors, we start at 2*2*2, go to 3*2*2, then 4*2*2.)

-   * In RGB colorspace, try to increment G first, then R, then B.

-   */

-  do {

-    changed = FALSE;

-    for (i = 0; i < nc; i++) {

-      j = (cinfo->out_color_space == JCS_RGB ? RGB_order[i] : i);

-      /* calculate new total_colors if Ncolors[j] is incremented */

-      temp = total_colors / Ncolors[j];

-      temp *= Ncolors[j]+1;	/* done in long arith to avoid oflo */

-      if (temp > (long) max_colors)

-	break;			/* won't fit, done with this pass */

-      Ncolors[j]++;		/* OK, apply the increment */

-      total_colors = (int) temp;

-      changed = TRUE;

-    }

-  } while (changed);

-

-  return total_colors;

-}

-

-

-LOCAL(int)

-output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)

-/* Return j'th output value, where j will range from 0 to maxj */

-/* The output values must fall in 0..MAXJSAMPLE in increasing order */

-{

-  /* We always provide values 0 and MAXJSAMPLE for each component;

-   * any additional values are equally spaced between these limits.

-   * (Forcing the upper and lower values to the limits ensures that

-   * dithering can't produce a color outside the selected gamut.)

-   */

-  return (int) (((INT32) j * MAXJSAMPLE + maxj/2) / maxj);

-}

-

-

-LOCAL(int)

-largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)

-/* Return largest input value that should map to j'th output value */

-/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */

-{

-  /* Breakpoints are halfway between values returned by output_value */

-  return (int) (((INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));

-}

-

-

-/*

- * Create the colormap.

- */

-

-LOCAL(void)

-create_colormap (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  JSAMPARRAY colormap;		/* Created colormap */

-  int total_colors;		/* Number of distinct output colors */

-  int i,j,k, nci, blksize, blkdist, ptr, val;

-

-  /* Select number of colors for each component */

-  total_colors = select_ncolors(cinfo, cquantize->Ncolors);

-

-  /* Report selected color counts */

-  if (cinfo->out_color_components == 3)

-    TRACEMS4(cinfo, 1, JTRC_QUANT_3_NCOLORS,

-	     total_colors, cquantize->Ncolors[0],

-	     cquantize->Ncolors[1], cquantize->Ncolors[2]);

-  else

-    TRACEMS1(cinfo, 1, JTRC_QUANT_NCOLORS, total_colors);

-

-  /* Allocate and fill in the colormap. */

-  /* The colors are ordered in the map in standard row-major order, */

-  /* i.e. rightmost (highest-indexed) color changes most rapidly. */

-

-  colormap = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE,

-     (JDIMENSION) total_colors, (JDIMENSION) cinfo->out_color_components);

-

-  /* blksize is number of adjacent repeated entries for a component */

-  /* blkdist is distance between groups of identical entries for a component */

-  blkdist = total_colors;

-

-  for (i = 0; i < cinfo->out_color_components; i++) {

-    /* fill in colormap entries for i'th color component */

-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */

-    blksize = blkdist / nci;

-    for (j = 0; j < nci; j++) {

-      /* Compute j'th output value (out of nci) for component */

-      val = output_value(cinfo, i, j, nci-1);

-      /* Fill in all colormap entries that have this value of this component */

-      for (ptr = j * blksize; ptr < total_colors; ptr += blkdist) {

-	/* fill in blksize entries beginning at ptr */

-	for (k = 0; k < blksize; k++)

-	  colormap[i][ptr+k] = (JSAMPLE) val;

-      }

-    }

-    blkdist = blksize;		/* blksize of this color is blkdist of next */

-  }

-

-  /* Save the colormap in private storage,

-   * where it will survive color quantization mode changes.

-   */

-  cquantize->sv_colormap = colormap;

-  cquantize->sv_actual = total_colors;

-}

-

-

-/*

- * Create the color index table.

- */

-

-LOCAL(void)

-create_colorindex (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  JSAMPROW indexptr;

-  int i,j,k, nci, blksize, val, pad;

-

-  /* For ordered dither, we pad the color index tables by MAXJSAMPLE in

-   * each direction (input index values can be -MAXJSAMPLE .. 2*MAXJSAMPLE).

-   * This is not necessary in the other dithering modes.  However, we

-   * flag whether it was done in case user changes dithering mode.

-   */

-  if (cinfo->dither_mode == JDITHER_ORDERED) {

-    pad = MAXJSAMPLE*2;

-    cquantize->is_padded = TRUE;

-  } else {

-    pad = 0;

-    cquantize->is_padded = FALSE;

-  }

-

-  cquantize->colorindex = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE,

-     (JDIMENSION) (MAXJSAMPLE+1 + pad),

-     (JDIMENSION) cinfo->out_color_components);

-

-  /* blksize is number of adjacent repeated entries for a component */

-  blksize = cquantize->sv_actual;

-

-  for (i = 0; i < cinfo->out_color_components; i++) {

-    /* fill in colorindex entries for i'th color component */

-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */

-    blksize = blksize / nci;

-

-    /* adjust colorindex pointers to provide padding at negative indexes. */

-    if (pad)

-      cquantize->colorindex[i] += MAXJSAMPLE;

-

-    /* in loop, val = index of current output value, */

-    /* and k = largest j that maps to current val */

-    indexptr = cquantize->colorindex[i];

-    val = 0;

-    k = largest_input_value(cinfo, i, 0, nci-1);

-    for (j = 0; j <= MAXJSAMPLE; j++) {

-      while (j > k)		/* advance val if past boundary */

-	k = largest_input_value(cinfo, i, ++val, nci-1);

-      /* premultiply so that no multiplication needed in main processing */

-      indexptr[j] = (JSAMPLE) (val * blksize);

-    }

-    /* Pad at both ends if necessary */

-    if (pad)

-      for (j = 1; j <= MAXJSAMPLE; j++) {

-	indexptr[-j] = indexptr[0];

-	indexptr[MAXJSAMPLE+j] = indexptr[MAXJSAMPLE];

-      }

-  }

-}

-

-

-/*

- * Create an ordered-dither array for a component having ncolors

- * distinct output values.

- */

-

-LOCAL(ODITHER_MATRIX_PTR)

-make_odither_array (j_decompress_ptr cinfo, int ncolors)

-{

-  ODITHER_MATRIX_PTR odither;

-  int j,k;

-  INT32 num,den;

-

-  odither = (ODITHER_MATRIX_PTR)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(ODITHER_MATRIX));

-  /* The inter-value distance for this color is MAXJSAMPLE/(ncolors-1).

-   * Hence the dither value for the matrix cell with fill order f

-   * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).

-   * On 16-bit-int machine, be careful to avoid overflow.

-   */

-  den = 2 * ODITHER_CELLS * ((INT32) (ncolors - 1));

-  for (j = 0; j < ODITHER_SIZE; j++) {

-    for (k = 0; k < ODITHER_SIZE; k++) {

-      num = ((INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))

-	    * MAXJSAMPLE;

-      /* Ensure round towards zero despite C's lack of consistency

-       * about rounding negative values in integer division...

-       */

-      odither[j][k] = (int) (num<0 ? -((-num)/den) : num/den);

-    }

-  }

-  return odither;

-}

-

-

-/*

- * Create the ordered-dither tables.

- * Components having the same number of representative colors may 

- * share a dither table.

- */

-

-LOCAL(void)

-create_odither_tables (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  ODITHER_MATRIX_PTR odither;

-  int i, j, nci;

-

-  for (i = 0; i < cinfo->out_color_components; i++) {

-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */

-    odither = NULL;		/* search for matching prior component */

-    for (j = 0; j < i; j++) {

-      if (nci == cquantize->Ncolors[j]) {

-	odither = cquantize->odither[j];

-	break;

-      }

-    }

-    if (odither == NULL)	/* need a new table? */

-      odither = make_odither_array(cinfo, nci);

-    cquantize->odither[i] = odither;

-  }

-}

-

-

-/*

- * Map some rows of pixels to the output colormapped representation.

- */

-

-METHODDEF(void)

-color_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		JSAMPARRAY output_buf, int num_rows)

-/* General case, no dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  JSAMPARRAY colorindex = cquantize->colorindex;

-  register int pixcode, ci;

-  register JSAMPROW ptrin, ptrout;

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-  register int nc = cinfo->out_color_components;

-

-  for (row = 0; row < num_rows; row++) {

-    ptrin = input_buf[row];

-    ptrout = output_buf[row];

-    for (col = width; col > 0; col--) {

-      pixcode = 0;

-      for (ci = 0; ci < nc; ci++) {

-	pixcode += GETJSAMPLE(colorindex[ci][GETJSAMPLE(*ptrin++)]);

-      }

-      *ptrout++ = (JSAMPLE) pixcode;

-    }

-  }

-}

-

-

-METHODDEF(void)

-color_quantize3 (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		 JSAMPARRAY output_buf, int num_rows)

-/* Fast path for out_color_components==3, no dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  register int pixcode;

-  register JSAMPROW ptrin, ptrout;

-  JSAMPROW colorindex0 = cquantize->colorindex[0];

-  JSAMPROW colorindex1 = cquantize->colorindex[1];

-  JSAMPROW colorindex2 = cquantize->colorindex[2];

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-

-  for (row = 0; row < num_rows; row++) {

-    ptrin = input_buf[row];

-    ptrout = output_buf[row];

-    for (col = width; col > 0; col--) {

-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*ptrin++)]);

-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*ptrin++)]);

-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*ptrin++)]);

-      *ptrout++ = (JSAMPLE) pixcode;

-    }

-  }

-}

-

-

-METHODDEF(void)

-quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		     JSAMPARRAY output_buf, int num_rows)

-/* General case, with ordered dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  register JSAMPROW input_ptr;

-  register JSAMPROW output_ptr;

-  JSAMPROW colorindex_ci;

-  int * dither;			/* points to active row of dither matrix */

-  int row_index, col_index;	/* current indexes into dither matrix */

-  int nc = cinfo->out_color_components;

-  int ci;

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-

-  for (row = 0; row < num_rows; row++) {

-    /* Initialize output values to 0 so can process components separately */

-    FMEMZERO((void FAR *) output_buf[row],

-	     (size_t) (width * SIZEOF(JSAMPLE)));

-    row_index = cquantize->row_index;

-    for (ci = 0; ci < nc; ci++) {

-      input_ptr = input_buf[row] + ci;

-      output_ptr = output_buf[row];

-      colorindex_ci = cquantize->colorindex[ci];

-      dither = cquantize->odither[ci][row_index];

-      col_index = 0;

-

-      for (col = width; col > 0; col--) {

-	/* Form pixel value + dither, range-limit to 0..MAXJSAMPLE,

-	 * select output value, accumulate into output code for this pixel.

-	 * Range-limiting need not be done explicitly, as we have extended

-	 * the colorindex table to produce the right answers for out-of-range

-	 * inputs.  The maximum dither is +- MAXJSAMPLE; this sets the

-	 * required amount of padding.

-	 */

-	*output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]];

-	input_ptr += nc;

-	output_ptr++;

-	col_index = (col_index + 1) & ODITHER_MASK;

-      }

-    }

-    /* Advance row index for next row */

-    row_index = (row_index + 1) & ODITHER_MASK;

-    cquantize->row_index = row_index;

-  }

-}

-

-

-METHODDEF(void)

-quantize3_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		      JSAMPARRAY output_buf, int num_rows)

-/* Fast path for out_color_components==3, with ordered dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  register int pixcode;

-  register JSAMPROW input_ptr;

-  register JSAMPROW output_ptr;

-  JSAMPROW colorindex0 = cquantize->colorindex[0];

-  JSAMPROW colorindex1 = cquantize->colorindex[1];

-  JSAMPROW colorindex2 = cquantize->colorindex[2];

-  int * dither0;		/* points to active row of dither matrix */

-  int * dither1;

-  int * dither2;

-  int row_index, col_index;	/* current indexes into dither matrix */

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-

-  for (row = 0; row < num_rows; row++) {

-    row_index = cquantize->row_index;

-    input_ptr = input_buf[row];

-    output_ptr = output_buf[row];

-    dither0 = cquantize->odither[0][row_index];

-    dither1 = cquantize->odither[1][row_index];

-    dither2 = cquantize->odither[2][row_index];

-    col_index = 0;

-

-    for (col = width; col > 0; col--) {

-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*input_ptr++) +

-					dither0[col_index]]);

-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*input_ptr++) +

-					dither1[col_index]]);

-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*input_ptr++) +

-					dither2[col_index]]);

-      *output_ptr++ = (JSAMPLE) pixcode;

-      col_index = (col_index + 1) & ODITHER_MASK;

-    }

-    row_index = (row_index + 1) & ODITHER_MASK;

-    cquantize->row_index = row_index;

-  }

-}

-

-

-METHODDEF(void)

-quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		    JSAMPARRAY output_buf, int num_rows)

-/* General case, with Floyd-Steinberg dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  register LOCFSERROR cur;	/* current error or pixel value */

-  LOCFSERROR belowerr;		/* error for pixel below cur */

-  LOCFSERROR bpreverr;		/* error for below/prev col */

-  LOCFSERROR bnexterr;		/* error for below/next col */

-  LOCFSERROR delta;

-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */

-  register JSAMPROW input_ptr;

-  register JSAMPROW output_ptr;

-  JSAMPROW colorindex_ci;

-  JSAMPROW colormap_ci;

-  int pixcode;

-  int nc = cinfo->out_color_components;

-  int dir;			/* 1 for left-to-right, -1 for right-to-left */

-  int dirnc;			/* dir * nc */

-  int ci;

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-  JSAMPLE *range_limit = cinfo->sample_range_limit;

-  SHIFT_TEMPS

-

-  for (row = 0; row < num_rows; row++) {

-    /* Initialize output values to 0 so can process components separately */

-    FMEMZERO((void FAR *) output_buf[row],

-	     (size_t) (width * SIZEOF(JSAMPLE)));

-    for (ci = 0; ci < nc; ci++) {

-      input_ptr = input_buf[row] + ci;

-      output_ptr = output_buf[row];

-      if (cquantize->on_odd_row) {

-	/* work right to left in this row */

-	input_ptr += (width-1) * nc; /* so point to rightmost pixel */

-	output_ptr += width-1;

-	dir = -1;

-	dirnc = -nc;

-	errorptr = cquantize->fserrors[ci] + (width+1); /* => entry after last column */

-      } else {

-	/* work left to right in this row */

-	dir = 1;

-	dirnc = nc;

-	errorptr = cquantize->fserrors[ci]; /* => entry before first column */

-      }

-      colorindex_ci = cquantize->colorindex[ci];

-      colormap_ci = cquantize->sv_colormap[ci];

-      /* Preset error values: no error propagated to first pixel from left */

-      cur = 0;

-      /* and no error propagated to row below yet */

-      belowerr = bpreverr = 0;

-

-      for (col = width; col > 0; col--) {

-	/* cur holds the error propagated from the previous pixel on the

-	 * current line.  Add the error propagated from the previous line

-	 * to form the complete error correction term for this pixel, and

-	 * round the error term (which is expressed * 16) to an integer.

-	 * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct

-	 * for either sign of the error value.

-	 * Note: errorptr points to *previous* column's array entry.

-	 */

-	cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4);

-	/* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.

-	 * The maximum error is +- MAXJSAMPLE; this sets the required size

-	 * of the range_limit array.

-	 */

-	cur += GETJSAMPLE(*input_ptr);

-	cur = GETJSAMPLE(range_limit[cur]);

-	/* Select output value, accumulate into output code for this pixel */

-	pixcode = GETJSAMPLE(colorindex_ci[cur]);

-	*output_ptr += (JSAMPLE) pixcode;

-	/* Compute actual representation error at this pixel */

-	/* Note: we can do this even though we don't have the final */

-	/* pixel code, because the colormap is orthogonal. */

-	cur -= GETJSAMPLE(colormap_ci[pixcode]);

-	/* Compute error fractions to be propagated to adjacent pixels.

-	 * Add these into the running sums, and simultaneously shift the

-	 * next-line error sums left by 1 column.

-	 */

-	bnexterr = cur;

-	delta = cur * 2;

-	cur += delta;		/* form error * 3 */

-	errorptr[0] = (FSERROR) (bpreverr + cur);

-	cur += delta;		/* form error * 5 */

-	bpreverr = belowerr + cur;

-	belowerr = bnexterr;

-	cur += delta;		/* form error * 7 */

-	/* At this point cur contains the 7/16 error value to be propagated

-	 * to the next pixel on the current line, and all the errors for the

-	 * next line have been shifted over. We are therefore ready to move on.

-	 */

-	input_ptr += dirnc;	/* advance input ptr to next column */

-	output_ptr += dir;	/* advance output ptr to next column */

-	errorptr += dir;	/* advance errorptr to current column */

-      }

-      /* Post-loop cleanup: we must unload the final error value into the

-       * final fserrors[] entry.  Note we need not unload belowerr because

-       * it is for the dummy column before or after the actual array.

-       */

-      errorptr[0] = (FSERROR) bpreverr; /* unload prev err into array */

-    }

-    cquantize->on_odd_row = (cquantize->on_odd_row ? FALSE : TRUE);

-  }

-}

-

-

-/*

- * Allocate workspace for Floyd-Steinberg errors.

- */

-

-LOCAL(void)

-alloc_fs_workspace (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  size_t arraysize;

-  int i;

-

-  arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));

-  for (i = 0; i < cinfo->out_color_components; i++) {

-    cquantize->fserrors[i] = (FSERRPTR)

-      (*cinfo->mem->alloc_large)((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);

-  }

-}

-

-

-/*

- * Initialize for one-pass color quantization.

- */

-

-METHODDEF(void)

-start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  size_t arraysize;

-  int i;

-

-  /* Install my colormap. */

-  cinfo->colormap = cquantize->sv_colormap;

-  cinfo->actual_number_of_colors = cquantize->sv_actual;

-

-  /* Initialize for desired dithering mode. */

-  switch (cinfo->dither_mode) {

-  case JDITHER_NONE:

-    if (cinfo->out_color_components == 3)

-      cquantize->pub.color_quantize = color_quantize3;

-    else

-      cquantize->pub.color_quantize = color_quantize;

-    break;

-  case JDITHER_ORDERED:

-    if (cinfo->out_color_components == 3)

-      cquantize->pub.color_quantize = quantize3_ord_dither;

-    else

-      cquantize->pub.color_quantize = quantize_ord_dither;

-    cquantize->row_index = 0;	/* initialize state for ordered dither */

-    /* If user changed to ordered dither from another mode,

-     * we must recreate the color index table with padding.

-     * This will cost extra space, but probably isn't very likely.

-     */

-    if (! cquantize->is_padded)

-      create_colorindex(cinfo);

-    /* Create ordered-dither tables if we didn't already. */

-    if (cquantize->odither[0] == NULL)

-      create_odither_tables(cinfo);

-    break;

-  case JDITHER_FS:

-    cquantize->pub.color_quantize = quantize_fs_dither;

-    cquantize->on_odd_row = FALSE; /* initialize state for F-S dither */

-    /* Allocate Floyd-Steinberg workspace if didn't already. */

-    if (cquantize->fserrors[0] == NULL)

-      alloc_fs_workspace(cinfo);

-    /* Initialize the propagated errors to zero. */

-    arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));

-    for (i = 0; i < cinfo->out_color_components; i++)

-      FMEMZERO((void FAR *) cquantize->fserrors[i], arraysize);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_NOT_COMPILED);

-    break;

-  }

-}

-

-

-/*

- * Finish up at the end of the pass.

- */

-

-METHODDEF(void)

-finish_pass_1_quant (j_decompress_ptr cinfo)

-{

-  /* no work in 1-pass case */

-}

-

-

-/*

- * Switch to a new external colormap between output passes.

- * Shouldn't get to this module!

- */

-

-METHODDEF(void)

-new_color_map_1_quant (j_decompress_ptr cinfo)

-{

-  ERREXIT(cinfo, JERR_MODE_CHANGE);

-}

-

-

-/*

- * Module initialization routine for 1-pass color quantization.

- */

-

-GLOBAL(void)

-jinit_1pass_quantizer (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize;

-

-  cquantize = (my_cquantize_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_cquantizer));

-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;

-  cquantize->pub.start_pass = start_pass_1_quant;

-  cquantize->pub.finish_pass = finish_pass_1_quant;

-  cquantize->pub.new_color_map = new_color_map_1_quant;

-  cquantize->fserrors[0] = NULL; /* Flag FS workspace not allocated */

-  cquantize->odither[0] = NULL;	/* Also flag odither arrays not allocated */

-

-  /* Make sure my internal arrays won't overflow */

-  if (cinfo->out_color_components > MAX_Q_COMPS)

-    ERREXIT1(cinfo, JERR_QUANT_COMPONENTS, MAX_Q_COMPS);

-  /* Make sure colormap indexes can be represented by JSAMPLEs */

-  if (cinfo->desired_number_of_colors > (MAXJSAMPLE+1))

-    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXJSAMPLE+1);

-

-  /* Create the colormap and color index table. */

-  create_colormap(cinfo);

-  create_colorindex(cinfo);

-

-  /* Allocate Floyd-Steinberg workspace now if requested.

-   * We do this now since it is FAR storage and may affect the memory

-   * manager's space calculations.  If the user changes to FS dither

-   * mode in a later pass, we will allocate the space then, and will

-   * possibly overrun the max_memory_to_use setting.

-   */

-  if (cinfo->dither_mode == JDITHER_FS)

-    alloc_fs_workspace(cinfo);

-}

-

-#endif /* QUANT_1PASS_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jquant2.c b/plugins/AdvaImg/src/LibJPEG/jquant2.c
deleted file mode 100644
index f7e351f2ac..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jquant2.c
+++ /dev/null
@@ -1,1311 +0,0 @@
-/*

- * jquant2.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2011 by Guido Vollbeding.

- * 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 2-pass color quantization (color mapping) routines.

- * These routines provide selection of a custom color map for an image,

- * followed by mapping of the image to that color map, with optional

- * Floyd-Steinberg dithering.

- * It is also possible to use just the second pass to map to an arbitrary

- * externally-given color map.

- *

- * Note: ordered dithering is not supported, since there isn't any fast

- * way to compute intercolor distances; it's unclear that ordered dither's

- * fundamental assumptions even hold with an irregularly spaced color map.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-#ifdef QUANT_2PASS_SUPPORTED

-

-

-/*

- * This module implements the well-known Heckbert paradigm for color

- * quantization.  Most of the ideas used here can be traced back to

- * Heckbert's seminal paper

- *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",

- *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.

- *

- * In the first pass over the image, we accumulate a histogram showing the

- * usage count of each possible color.  To keep the histogram to a reasonable

- * size, we reduce the precision of the input; typical practice is to retain

- * 5 or 6 bits per color, so that 8 or 4 different input values are counted

- * in the same histogram cell.

- *

- * Next, the color-selection step begins with a box representing the whole

- * color space, and repeatedly splits the "largest" remaining box until we

- * have as many boxes as desired colors.  Then the mean color in each

- * remaining box becomes one of the possible output colors.

- * 

- * The second pass over the image maps each input pixel to the closest output

- * color (optionally after applying a Floyd-Steinberg dithering correction).

- * This mapping is logically trivial, but making it go fast enough requires

- * considerable care.

- *

- * Heckbert-style quantizers vary a good deal in their policies for choosing

- * the "largest" box and deciding where to cut it.  The particular policies

- * used here have proved out well in experimental comparisons, but better ones

- * may yet be found.

- *

- * In earlier versions of the IJG code, this module quantized in YCbCr color

- * space, processing the raw upsampled data without a color conversion step.

- * This allowed the color conversion math to be done only once per colormap

- * entry, not once per pixel.  However, that optimization precluded other

- * useful optimizations (such as merging color conversion with upsampling)

- * and it also interfered with desired capabilities such as quantizing to an

- * externally-supplied colormap.  We have therefore abandoned that approach.

- * The present code works in the post-conversion color space, typically RGB.

- *

- * To improve the visual quality of the results, we actually work in scaled

- * RGB space, giving G distances more weight than R, and R in turn more than

- * B.  To do everything in integer math, we must use integer scale factors.

- * The 2/3/1 scale factors used here correspond loosely to the relative

- * weights of the colors in the NTSC grayscale equation.

- * If you want to use this code to quantize a non-RGB color space, you'll

- * probably need to change these scale factors.

- */

-

-#define R_SCALE 2		/* scale R distances by this much */

-#define G_SCALE 3		/* scale G distances by this much */

-#define B_SCALE 1		/* and B by this much */

-

-/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined

- * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B

- * and B,G,R orders.  If you define some other weird order in jmorecfg.h,

- * you'll get compile errors until you extend this logic.  In that case

- * you'll probably want to tweak the histogram sizes too.

- */

-

-#if RGB_RED == 0

-#define C0_SCALE R_SCALE

-#endif

-#if RGB_BLUE == 0

-#define C0_SCALE B_SCALE

-#endif

-#if RGB_GREEN == 1

-#define C1_SCALE G_SCALE

-#endif

-#if RGB_RED == 2

-#define C2_SCALE R_SCALE

-#endif

-#if RGB_BLUE == 2

-#define C2_SCALE B_SCALE

-#endif

-

-

-/*

- * First we have the histogram data structure and routines for creating it.

- *

- * The number of bits of precision can be adjusted by changing these symbols.

- * We recommend keeping 6 bits for G and 5 each for R and B.

- * If you have plenty of memory and cycles, 6 bits all around gives marginally

- * better results; if you are short of memory, 5 bits all around will save

- * some space but degrade the results.

- * To maintain a fully accurate histogram, we'd need to allocate a "long"

- * (preferably unsigned long) for each cell.  In practice this is overkill;

- * we can get by with 16 bits per cell.  Few of the cell counts will overflow,

- * and clamping those that do overflow to the maximum value will give close-

- * enough results.  This reduces the recommended histogram size from 256Kb

- * to 128Kb, which is a useful savings on PC-class machines.

- * (In the second pass the histogram space is re-used for pixel mapping data;

- * in that capacity, each cell must be able to store zero to the number of

- * desired colors.  16 bits/cell is plenty for that too.)

- * Since the JPEG code is intended to run in small memory model on 80x86

- * machines, we can't just allocate the histogram in one chunk.  Instead

- * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each

- * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and

- * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that

- * on 80x86 machines, the pointer row is in near memory but the actual

- * arrays are in far memory (same arrangement as we use for image arrays).

- */

-

-#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */

-

-/* These will do the right thing for either R,G,B or B,G,R color order,

- * but you may not like the results for other color orders.

- */

-#define HIST_C0_BITS  5		/* bits of precision in R/B histogram */

-#define HIST_C1_BITS  6		/* bits of precision in G histogram */

-#define HIST_C2_BITS  5		/* bits of precision in B/R histogram */

-

-/* Number of elements along histogram axes. */

-#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)

-#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)

-#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)

-

-/* These are the amounts to shift an input value to get a histogram index. */

-#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)

-#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)

-#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)

-

-

-typedef UINT16 histcell;	/* histogram cell; prefer an unsigned type */

-

-typedef histcell FAR * histptr;	/* for pointers to histogram cells */

-

-typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */

-typedef hist1d FAR * hist2d;	/* type for the 2nd-level pointers */

-typedef hist2d * hist3d;	/* type for top-level pointer */

-

-

-/* Declarations for Floyd-Steinberg dithering.

- *

- * Errors are accumulated into the array fserrors[], at a resolution of

- * 1/16th of a pixel count.  The error at a given pixel is propagated

- * to its not-yet-processed neighbors using the standard F-S fractions,

- *		...	(here)	7/16

- *		3/16	5/16	1/16

- * We work left-to-right on even rows, right-to-left on odd rows.

- *

- * We can get away with a single array (holding one row's worth of errors)

- * by using it to store the current row's errors at pixel columns not yet

- * processed, but the next row's errors at columns already processed.  We

- * need only a few extra variables to hold the errors immediately around the

- * current column.  (If we are lucky, those variables are in registers, but

- * even if not, they're probably cheaper to access than array elements are.)

- *

- * The fserrors[] array has (#columns + 2) entries; the extra entry at

- * each end saves us from special-casing the first and last pixels.

- * Each entry is three values long, one value for each color component.

- *

- * Note: on a wide image, we might not have enough room in a PC's near data

- * segment to hold the error array; so it is allocated with alloc_large.

- */

-

-#if BITS_IN_JSAMPLE == 8

-typedef INT16 FSERROR;		/* 16 bits should be enough */

-typedef int LOCFSERROR;		/* use 'int' for calculation temps */

-#else

-typedef INT32 FSERROR;		/* may need more than 16 bits */

-typedef INT32 LOCFSERROR;	/* be sure calculation temps are big enough */

-#endif

-

-typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */

-

-

-/* Private subobject */

-

-typedef struct {

-  struct jpeg_color_quantizer pub; /* public fields */

-

-  /* Space for the eventually created colormap is stashed here */

-  JSAMPARRAY sv_colormap;	/* colormap allocated at init time */

-  int desired;			/* desired # of colors = size of colormap */

-

-  /* Variables for accumulating image statistics */

-  hist3d histogram;		/* pointer to the histogram */

-

-  boolean needs_zeroed;		/* TRUE if next pass must zero histogram */

-

-  /* Variables for Floyd-Steinberg dithering */

-  FSERRPTR fserrors;		/* accumulated errors */

-  boolean on_odd_row;		/* flag to remember which row we are on */

-  int * error_limiter;		/* table for clamping the applied error */

-} my_cquantizer;

-

-typedef my_cquantizer * my_cquantize_ptr;

-

-

-/*

- * Prescan some rows of pixels.

- * In this module the prescan simply updates the histogram, which has been

- * initialized to zeroes by start_pass.

- * An output_buf parameter is required by the method signature, but no data

- * is actually output (in fact the buffer controller is probably passing a

- * NULL pointer).

- */

-

-METHODDEF(void)

-prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-		  JSAMPARRAY output_buf, int num_rows)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  register JSAMPROW ptr;

-  register histptr histp;

-  register hist3d histogram = cquantize->histogram;

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-

-  for (row = 0; row < num_rows; row++) {

-    ptr = input_buf[row];

-    for (col = width; col > 0; col--) {

-      /* get pixel value and index into the histogram */

-      histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]

-			 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]

-			 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];

-      /* increment, check for overflow and undo increment if so. */

-      if (++(*histp) <= 0)

-	(*histp)--;

-      ptr += 3;

-    }

-  }

-}

-

-

-/*

- * Next we have the really interesting routines: selection of a colormap

- * given the completed histogram.

- * These routines work with a list of "boxes", each representing a rectangular

- * subset of the input color space (to histogram precision).

- */

-

-typedef struct {

-  /* The bounds of the box (inclusive); expressed as histogram indexes */

-  int c0min, c0max;

-  int c1min, c1max;

-  int c2min, c2max;

-  /* The volume (actually 2-norm) of the box */

-  INT32 volume;

-  /* The number of nonzero histogram cells within this box */

-  long colorcount;

-} box;

-

-typedef box * boxptr;

-

-

-LOCAL(boxptr)

-find_biggest_color_pop (boxptr boxlist, int numboxes)

-/* Find the splittable box with the largest color population */

-/* Returns NULL if no splittable boxes remain */

-{

-  register boxptr boxp;

-  register int i;

-  register long maxc = 0;

-  boxptr which = NULL;

-  

-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {

-    if (boxp->colorcount > maxc && boxp->volume > 0) {

-      which = boxp;

-      maxc = boxp->colorcount;

-    }

-  }

-  return which;

-}

-

-

-LOCAL(boxptr)

-find_biggest_volume (boxptr boxlist, int numboxes)

-/* Find the splittable box with the largest (scaled) volume */

-/* Returns NULL if no splittable boxes remain */

-{

-  register boxptr boxp;

-  register int i;

-  register INT32 maxv = 0;

-  boxptr which = NULL;

-  

-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {

-    if (boxp->volume > maxv) {

-      which = boxp;

-      maxv = boxp->volume;

-    }

-  }

-  return which;

-}

-

-

-LOCAL(void)

-update_box (j_decompress_ptr cinfo, boxptr boxp)

-/* Shrink the min/max bounds of a box to enclose only nonzero elements, */

-/* and recompute its volume and population */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  histptr histp;

-  int c0,c1,c2;

-  int c0min,c0max,c1min,c1max,c2min,c2max;

-  INT32 dist0,dist1,dist2;

-  long ccount;

-  

-  c0min = boxp->c0min;  c0max = boxp->c0max;

-  c1min = boxp->c1min;  c1max = boxp->c1max;

-  c2min = boxp->c2min;  c2max = boxp->c2max;

-  

-  if (c0max > c0min)

-    for (c0 = c0min; c0 <= c0max; c0++)

-      for (c1 = c1min; c1 <= c1max; c1++) {

-	histp = & histogram[c0][c1][c2min];

-	for (c2 = c2min; c2 <= c2max; c2++)

-	  if (*histp++ != 0) {

-	    boxp->c0min = c0min = c0;

-	    goto have_c0min;

-	  }

-      }

- have_c0min:

-  if (c0max > c0min)

-    for (c0 = c0max; c0 >= c0min; c0--)

-      for (c1 = c1min; c1 <= c1max; c1++) {

-	histp = & histogram[c0][c1][c2min];

-	for (c2 = c2min; c2 <= c2max; c2++)

-	  if (*histp++ != 0) {

-	    boxp->c0max = c0max = c0;

-	    goto have_c0max;

-	  }

-      }

- have_c0max:

-  if (c1max > c1min)

-    for (c1 = c1min; c1 <= c1max; c1++)

-      for (c0 = c0min; c0 <= c0max; c0++) {

-	histp = & histogram[c0][c1][c2min];

-	for (c2 = c2min; c2 <= c2max; c2++)

-	  if (*histp++ != 0) {

-	    boxp->c1min = c1min = c1;

-	    goto have_c1min;

-	  }

-      }

- have_c1min:

-  if (c1max > c1min)

-    for (c1 = c1max; c1 >= c1min; c1--)

-      for (c0 = c0min; c0 <= c0max; c0++) {

-	histp = & histogram[c0][c1][c2min];

-	for (c2 = c2min; c2 <= c2max; c2++)

-	  if (*histp++ != 0) {

-	    boxp->c1max = c1max = c1;

-	    goto have_c1max;

-	  }

-      }

- have_c1max:

-  if (c2max > c2min)

-    for (c2 = c2min; c2 <= c2max; c2++)

-      for (c0 = c0min; c0 <= c0max; c0++) {

-	histp = & histogram[c0][c1min][c2];

-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)

-	  if (*histp != 0) {

-	    boxp->c2min = c2min = c2;

-	    goto have_c2min;

-	  }

-      }

- have_c2min:

-  if (c2max > c2min)

-    for (c2 = c2max; c2 >= c2min; c2--)

-      for (c0 = c0min; c0 <= c0max; c0++) {

-	histp = & histogram[c0][c1min][c2];

-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)

-	  if (*histp != 0) {

-	    boxp->c2max = c2max = c2;

-	    goto have_c2max;

-	  }

-      }

- have_c2max:

-

-  /* Update box volume.

-   * We use 2-norm rather than real volume here; this biases the method

-   * against making long narrow boxes, and it has the side benefit that

-   * a box is splittable iff norm > 0.

-   * Since the differences are expressed in histogram-cell units,

-   * we have to shift back to JSAMPLE units to get consistent distances;

-   * after which, we scale according to the selected distance scale factors.

-   */

-  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;

-  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;

-  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;

-  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;

-  

-  /* Now scan remaining volume of box and compute population */

-  ccount = 0;

-  for (c0 = c0min; c0 <= c0max; c0++)

-    for (c1 = c1min; c1 <= c1max; c1++) {

-      histp = & histogram[c0][c1][c2min];

-      for (c2 = c2min; c2 <= c2max; c2++, histp++)

-	if (*histp != 0) {

-	  ccount++;

-	}

-    }

-  boxp->colorcount = ccount;

-}

-

-

-LOCAL(int)

-median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,

-	    int desired_colors)

-/* Repeatedly select and split the largest box until we have enough boxes */

-{

-  int n,lb;

-  int c0,c1,c2,cmax;

-  register boxptr b1,b2;

-

-  while (numboxes < desired_colors) {

-    /* Select box to split.

-     * Current algorithm: by population for first half, then by volume.

-     */

-    if (numboxes*2 <= desired_colors) {

-      b1 = find_biggest_color_pop(boxlist, numboxes);

-    } else {

-      b1 = find_biggest_volume(boxlist, numboxes);

-    }

-    if (b1 == NULL)		/* no splittable boxes left! */

-      break;

-    b2 = &boxlist[numboxes];	/* where new box will go */

-    /* Copy the color bounds to the new box. */

-    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;

-    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;

-    /* Choose which axis to split the box on.

-     * Current algorithm: longest scaled axis.

-     * See notes in update_box about scaling distances.

-     */

-    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;

-    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;

-    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;

-    /* We want to break any ties in favor of green, then red, blue last.

-     * This code does the right thing for R,G,B or B,G,R color orders only.

-     */

-#if RGB_RED == 0

-    cmax = c1; n = 1;

-    if (c0 > cmax) { cmax = c0; n = 0; }

-    if (c2 > cmax) { n = 2; }

-#else

-    cmax = c1; n = 1;

-    if (c2 > cmax) { cmax = c2; n = 2; }

-    if (c0 > cmax) { n = 0; }

-#endif

-    /* Choose split point along selected axis, and update box bounds.

-     * Current algorithm: split at halfway point.

-     * (Since the box has been shrunk to minimum volume,

-     * any split will produce two nonempty subboxes.)

-     * Note that lb value is max for lower box, so must be < old max.

-     */

-    switch (n) {

-    case 0:

-      lb = (b1->c0max + b1->c0min) / 2;

-      b1->c0max = lb;

-      b2->c0min = lb+1;

-      break;

-    case 1:

-      lb = (b1->c1max + b1->c1min) / 2;

-      b1->c1max = lb;

-      b2->c1min = lb+1;

-      break;

-    case 2:

-      lb = (b1->c2max + b1->c2min) / 2;

-      b1->c2max = lb;

-      b2->c2min = lb+1;

-      break;

-    }

-    /* Update stats for boxes */

-    update_box(cinfo, b1);

-    update_box(cinfo, b2);

-    numboxes++;

-  }

-  return numboxes;

-}

-

-

-LOCAL(void)

-compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)

-/* Compute representative color for a box, put it in colormap[icolor] */

-{

-  /* Current algorithm: mean weighted by pixels (not colors) */

-  /* Note it is important to get the rounding correct! */

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  histptr histp;

-  int c0,c1,c2;

-  int c0min,c0max,c1min,c1max,c2min,c2max;

-  long count;

-  long total = 0;

-  long c0total = 0;

-  long c1total = 0;

-  long c2total = 0;

-  

-  c0min = boxp->c0min;  c0max = boxp->c0max;

-  c1min = boxp->c1min;  c1max = boxp->c1max;

-  c2min = boxp->c2min;  c2max = boxp->c2max;

-  

-  for (c0 = c0min; c0 <= c0max; c0++)

-    for (c1 = c1min; c1 <= c1max; c1++) {

-      histp = & histogram[c0][c1][c2min];

-      for (c2 = c2min; c2 <= c2max; c2++) {

-	if ((count = *histp++) != 0) {

-	  total += count;

-	  c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;

-	  c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;

-	  c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;

-	}

-      }

-    }

-  

-  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);

-  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);

-  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);

-}

-

-

-LOCAL(void)

-select_colors (j_decompress_ptr cinfo, int desired_colors)

-/* Master routine for color selection */

-{

-  boxptr boxlist;

-  int numboxes;

-  int i;

-

-  /* Allocate workspace for box list */

-  boxlist = (boxptr) (*cinfo->mem->alloc_small)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));

-  /* Initialize one box containing whole space */

-  numboxes = 1;

-  boxlist[0].c0min = 0;

-  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;

-  boxlist[0].c1min = 0;

-  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;

-  boxlist[0].c2min = 0;

-  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;

-  /* Shrink it to actually-used volume and set its statistics */

-  update_box(cinfo, & boxlist[0]);

-  /* Perform median-cut to produce final box list */

-  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);

-  /* Compute the representative color for each box, fill colormap */

-  for (i = 0; i < numboxes; i++)

-    compute_color(cinfo, & boxlist[i], i);

-  cinfo->actual_number_of_colors = numboxes;

-  TRACEMS1(cinfo, 1, JTRC_QUANT_SELECTED, numboxes);

-}

-

-

-/*

- * These routines are concerned with the time-critical task of mapping input

- * colors to the nearest color in the selected colormap.

- *

- * We re-use the histogram space as an "inverse color map", essentially a

- * cache for the results of nearest-color searches.  All colors within a

- * histogram cell will be mapped to the same colormap entry, namely the one

- * closest to the cell's center.  This may not be quite the closest entry to

- * the actual input color, but it's almost as good.  A zero in the cache

- * indicates we haven't found the nearest color for that cell yet; the array

- * is cleared to zeroes before starting the mapping pass.  When we find the

- * nearest color for a cell, its colormap index plus one is recorded in the

- * cache for future use.  The pass2 scanning routines call fill_inverse_cmap

- * when they need to use an unfilled entry in the cache.

- *

- * Our method of efficiently finding nearest colors is based on the "locally

- * sorted search" idea described by Heckbert and on the incremental distance

- * calculation described by Spencer W. Thomas in chapter III.1 of Graphics

- * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that

- * the distances from a given colormap entry to each cell of the histogram can

- * be computed quickly using an incremental method: the differences between

- * distances to adjacent cells themselves differ by a constant.  This allows a

- * fairly fast implementation of the "brute force" approach of computing the

- * distance from every colormap entry to every histogram cell.  Unfortunately,

- * it needs a work array to hold the best-distance-so-far for each histogram

- * cell (because the inner loop has to be over cells, not colormap entries).

- * The work array elements have to be INT32s, so the work array would need

- * 256Kb at our recommended precision.  This is not feasible in DOS machines.

- *

- * To get around these problems, we apply Thomas' method to compute the

- * nearest colors for only the cells within a small subbox of the histogram.

- * The work array need be only as big as the subbox, so the memory usage

- * problem is solved.  Furthermore, we need not fill subboxes that are never

- * referenced in pass2; many images use only part of the color gamut, so a

- * fair amount of work is saved.  An additional advantage of this

- * approach is that we can apply Heckbert's locality criterion to quickly

- * eliminate colormap entries that are far away from the subbox; typically

- * three-fourths of the colormap entries are rejected by Heckbert's criterion,

- * and we need not compute their distances to individual cells in the subbox.

- * The speed of this approach is heavily influenced by the subbox size: too

- * small means too much overhead, too big loses because Heckbert's criterion

- * can't eliminate as many colormap entries.  Empirically the best subbox

- * size seems to be about 1/512th of the histogram (1/8th in each direction).

- *

- * Thomas' article also describes a refined method which is asymptotically

- * faster than the brute-force method, but it is also far more complex and

- * cannot efficiently be applied to small subboxes.  It is therefore not

- * useful for programs intended to be portable to DOS machines.  On machines

- * with plenty of memory, filling the whole histogram in one shot with Thomas'

- * refined method might be faster than the present code --- but then again,

- * it might not be any faster, and it's certainly more complicated.

- */

-

-

-/* log2(histogram cells in update box) for each axis; this can be adjusted */

-#define BOX_C0_LOG  (HIST_C0_BITS-3)

-#define BOX_C1_LOG  (HIST_C1_BITS-3)

-#define BOX_C2_LOG  (HIST_C2_BITS-3)

-

-#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */

-#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)

-#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)

-

-#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)

-#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)

-#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)

-

-

-/*

- * The next three routines implement inverse colormap filling.  They could

- * all be folded into one big routine, but splitting them up this way saves

- * some stack space (the mindist[] and bestdist[] arrays need not coexist)

- * and may allow some compilers to produce better code by registerizing more

- * inner-loop variables.

- */

-

-LOCAL(int)

-find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,

-		    JSAMPLE colorlist[])

-/* Locate the colormap entries close enough to an update box to be candidates

- * for the nearest entry to some cell(s) in the update box.  The update box

- * is specified by the center coordinates of its first cell.  The number of

- * candidate colormap entries is returned, and their colormap indexes are

- * placed in colorlist[].

- * This routine uses Heckbert's "locally sorted search" criterion to select

- * the colors that need further consideration.

- */

-{

-  int numcolors = cinfo->actual_number_of_colors;

-  int maxc0, maxc1, maxc2;

-  int centerc0, centerc1, centerc2;

-  int i, x, ncolors;

-  INT32 minmaxdist, min_dist, max_dist, tdist;

-  INT32 mindist[MAXNUMCOLORS];	/* min distance to colormap entry i */

-

-  /* Compute true coordinates of update box's upper corner and center.

-   * Actually we compute the coordinates of the center of the upper-corner

-   * histogram cell, which are the upper bounds of the volume we care about.

-   * Note that since ">>" rounds down, the "center" values may be closer to

-   * min than to max; hence comparisons to them must be "<=", not "<".

-   */

-  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));

-  centerc0 = (minc0 + maxc0) >> 1;

-  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));

-  centerc1 = (minc1 + maxc1) >> 1;

-  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));

-  centerc2 = (minc2 + maxc2) >> 1;

-

-  /* For each color in colormap, find:

-   *  1. its minimum squared-distance to any point in the update box

-   *     (zero if color is within update box);

-   *  2. its maximum squared-distance to any point in the update box.

-   * Both of these can be found by considering only the corners of the box.

-   * We save the minimum distance for each color in mindist[];

-   * only the smallest maximum distance is of interest.

-   */

-  minmaxdist = 0x7FFFFFFFL;

-

-  for (i = 0; i < numcolors; i++) {

-    /* We compute the squared-c0-distance term, then add in the other two. */

-    x = GETJSAMPLE(cinfo->colormap[0][i]);

-    if (x < minc0) {

-      tdist = (x - minc0) * C0_SCALE;

-      min_dist = tdist*tdist;

-      tdist = (x - maxc0) * C0_SCALE;

-      max_dist = tdist*tdist;

-    } else if (x > maxc0) {

-      tdist = (x - maxc0) * C0_SCALE;

-      min_dist = tdist*tdist;

-      tdist = (x - minc0) * C0_SCALE;

-      max_dist = tdist*tdist;

-    } else {

-      /* within cell range so no contribution to min_dist */

-      min_dist = 0;

-      if (x <= centerc0) {

-	tdist = (x - maxc0) * C0_SCALE;

-	max_dist = tdist*tdist;

-      } else {

-	tdist = (x - minc0) * C0_SCALE;

-	max_dist = tdist*tdist;

-      }

-    }

-

-    x = GETJSAMPLE(cinfo->colormap[1][i]);

-    if (x < minc1) {

-      tdist = (x - minc1) * C1_SCALE;

-      min_dist += tdist*tdist;

-      tdist = (x - maxc1) * C1_SCALE;

-      max_dist += tdist*tdist;

-    } else if (x > maxc1) {

-      tdist = (x - maxc1) * C1_SCALE;

-      min_dist += tdist*tdist;

-      tdist = (x - minc1) * C1_SCALE;

-      max_dist += tdist*tdist;

-    } else {

-      /* within cell range so no contribution to min_dist */

-      if (x <= centerc1) {

-	tdist = (x - maxc1) * C1_SCALE;

-	max_dist += tdist*tdist;

-      } else {

-	tdist = (x - minc1) * C1_SCALE;

-	max_dist += tdist*tdist;

-      }

-    }

-

-    x = GETJSAMPLE(cinfo->colormap[2][i]);

-    if (x < minc2) {

-      tdist = (x - minc2) * C2_SCALE;

-      min_dist += tdist*tdist;

-      tdist = (x - maxc2) * C2_SCALE;

-      max_dist += tdist*tdist;

-    } else if (x > maxc2) {

-      tdist = (x - maxc2) * C2_SCALE;

-      min_dist += tdist*tdist;

-      tdist = (x - minc2) * C2_SCALE;

-      max_dist += tdist*tdist;

-    } else {

-      /* within cell range so no contribution to min_dist */

-      if (x <= centerc2) {

-	tdist = (x - maxc2) * C2_SCALE;

-	max_dist += tdist*tdist;

-      } else {

-	tdist = (x - minc2) * C2_SCALE;

-	max_dist += tdist*tdist;

-      }

-    }

-

-    mindist[i] = min_dist;	/* save away the results */

-    if (max_dist < minmaxdist)

-      minmaxdist = max_dist;

-  }

-

-  /* Now we know that no cell in the update box is more than minmaxdist

-   * away from some colormap entry.  Therefore, only colors that are

-   * within minmaxdist of some part of the box need be considered.

-   */

-  ncolors = 0;

-  for (i = 0; i < numcolors; i++) {

-    if (mindist[i] <= minmaxdist)

-      colorlist[ncolors++] = (JSAMPLE) i;

-  }

-  return ncolors;

-}

-

-

-LOCAL(void)

-find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,

-		  int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])

-/* Find the closest colormap entry for each cell in the update box,

- * given the list of candidate colors prepared by find_nearby_colors.

- * Return the indexes of the closest entries in the bestcolor[] array.

- * This routine uses Thomas' incremental distance calculation method to

- * find the distance from a colormap entry to successive cells in the box.

- */

-{

-  int ic0, ic1, ic2;

-  int i, icolor;

-  register INT32 * bptr;	/* pointer into bestdist[] array */

-  JSAMPLE * cptr;		/* pointer into bestcolor[] array */

-  INT32 dist0, dist1;		/* initial distance values */

-  register INT32 dist2;		/* current distance in inner loop */

-  INT32 xx0, xx1;		/* distance increments */

-  register INT32 xx2;

-  INT32 inc0, inc1, inc2;	/* initial values for increments */

-  /* This array holds the distance to the nearest-so-far color for each cell */

-  INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];

-

-  /* Initialize best-distance for each cell of the update box */

-  bptr = bestdist;

-  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)

-    *bptr++ = 0x7FFFFFFFL;

-  

-  /* For each color selected by find_nearby_colors,

-   * compute its distance to the center of each cell in the box.

-   * If that's less than best-so-far, update best distance and color number.

-   */

-  

-  /* Nominal steps between cell centers ("x" in Thomas article) */

-#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)

-#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)

-#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)

-  

-  for (i = 0; i < numcolors; i++) {

-    icolor = GETJSAMPLE(colorlist[i]);

-    /* Compute (square of) distance from minc0/c1/c2 to this color */

-    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;

-    dist0 = inc0*inc0;

-    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;

-    dist0 += inc1*inc1;

-    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;

-    dist0 += inc2*inc2;

-    /* Form the initial difference increments */

-    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;

-    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;

-    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;

-    /* Now loop over all cells in box, updating distance per Thomas method */

-    bptr = bestdist;

-    cptr = bestcolor;

-    xx0 = inc0;

-    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {

-      dist1 = dist0;

-      xx1 = inc1;

-      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {

-	dist2 = dist1;

-	xx2 = inc2;

-	for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {

-	  if (dist2 < *bptr) {

-	    *bptr = dist2;

-	    *cptr = (JSAMPLE) icolor;

-	  }

-	  dist2 += xx2;

-	  xx2 += 2 * STEP_C2 * STEP_C2;

-	  bptr++;

-	  cptr++;

-	}

-	dist1 += xx1;

-	xx1 += 2 * STEP_C1 * STEP_C1;

-      }

-      dist0 += xx0;

-      xx0 += 2 * STEP_C0 * STEP_C0;

-    }

-  }

-}

-

-

-LOCAL(void)

-fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)

-/* Fill the inverse-colormap entries in the update box that contains */

-/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */

-/* we can fill as many others as we wish.) */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  int minc0, minc1, minc2;	/* lower left corner of update box */

-  int ic0, ic1, ic2;

-  register JSAMPLE * cptr;	/* pointer into bestcolor[] array */

-  register histptr cachep;	/* pointer into main cache array */

-  /* This array lists the candidate colormap indexes. */

-  JSAMPLE colorlist[MAXNUMCOLORS];

-  int numcolors;		/* number of candidate colors */

-  /* This array holds the actually closest colormap index for each cell. */

-  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];

-

-  /* Convert cell coordinates to update box ID */

-  c0 >>= BOX_C0_LOG;

-  c1 >>= BOX_C1_LOG;

-  c2 >>= BOX_C2_LOG;

-

-  /* Compute true coordinates of update box's origin corner.

-   * Actually we compute the coordinates of the center of the corner

-   * histogram cell, which are the lower bounds of the volume we care about.

-   */

-  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);

-  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);

-  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);

-  

-  /* Determine which colormap entries are close enough to be candidates

-   * for the nearest entry to some cell in the update box.

-   */

-  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);

-

-  /* Determine the actually nearest colors. */

-  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,

-		   bestcolor);

-

-  /* Save the best color numbers (plus 1) in the main cache array */

-  c0 <<= BOX_C0_LOG;		/* convert ID back to base cell indexes */

-  c1 <<= BOX_C1_LOG;

-  c2 <<= BOX_C2_LOG;

-  cptr = bestcolor;

-  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {

-    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {

-      cachep = & histogram[c0+ic0][c1+ic1][c2];

-      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {

-	*cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);

-      }

-    }

-  }

-}

-

-

-/*

- * Map some rows of pixels to the output colormapped representation.

- */

-

-METHODDEF(void)

-pass2_no_dither (j_decompress_ptr cinfo,

-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)

-/* This version performs no dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  register JSAMPROW inptr, outptr;

-  register histptr cachep;

-  register int c0, c1, c2;

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-

-  for (row = 0; row < num_rows; row++) {

-    inptr = input_buf[row];

-    outptr = output_buf[row];

-    for (col = width; col > 0; col--) {

-      /* get pixel value and index into the cache */

-      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;

-      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;

-      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;

-      cachep = & histogram[c0][c1][c2];

-      /* If we have not seen this color before, find nearest colormap entry */

-      /* and update the cache */

-      if (*cachep == 0)

-	fill_inverse_cmap(cinfo, c0,c1,c2);

-      /* Now emit the colormap index for this cell */

-      *outptr++ = (JSAMPLE) (*cachep - 1);

-    }

-  }

-}

-

-

-METHODDEF(void)

-pass2_fs_dither (j_decompress_ptr cinfo,

-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)

-/* This version performs Floyd-Steinberg dithering */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  register LOCFSERROR cur0, cur1, cur2;	/* current error or pixel value */

-  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */

-  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */

-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */

-  JSAMPROW inptr;		/* => current input pixel */

-  JSAMPROW outptr;		/* => current output pixel */

-  histptr cachep;

-  int dir;			/* +1 or -1 depending on direction */

-  int dir3;			/* 3*dir, for advancing inptr & errorptr */

-  int row;

-  JDIMENSION col;

-  JDIMENSION width = cinfo->output_width;

-  JSAMPLE *range_limit = cinfo->sample_range_limit;

-  int *error_limit = cquantize->error_limiter;

-  JSAMPROW colormap0 = cinfo->colormap[0];

-  JSAMPROW colormap1 = cinfo->colormap[1];

-  JSAMPROW colormap2 = cinfo->colormap[2];

-  SHIFT_TEMPS

-

-  for (row = 0; row < num_rows; row++) {

-    inptr = input_buf[row];

-    outptr = output_buf[row];

-    if (cquantize->on_odd_row) {

-      /* work right to left in this row */

-      inptr += (width-1) * 3;	/* so point to rightmost pixel */

-      outptr += width-1;

-      dir = -1;

-      dir3 = -3;

-      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */

-      cquantize->on_odd_row = FALSE; /* flip for next time */

-    } else {

-      /* work left to right in this row */

-      dir = 1;

-      dir3 = 3;

-      errorptr = cquantize->fserrors; /* => entry before first real column */

-      cquantize->on_odd_row = TRUE; /* flip for next time */

-    }

-    /* Preset error values: no error propagated to first pixel from left */

-    cur0 = cur1 = cur2 = 0;

-    /* and no error propagated to row below yet */

-    belowerr0 = belowerr1 = belowerr2 = 0;

-    bpreverr0 = bpreverr1 = bpreverr2 = 0;

-

-    for (col = width; col > 0; col--) {

-      /* curN holds the error propagated from the previous pixel on the

-       * current line.  Add the error propagated from the previous line

-       * to form the complete error correction term for this pixel, and

-       * round the error term (which is expressed * 16) to an integer.

-       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct

-       * for either sign of the error value.

-       * Note: errorptr points to *previous* column's array entry.

-       */

-      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);

-      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);

-      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);

-      /* Limit the error using transfer function set by init_error_limit.

-       * See comments with init_error_limit for rationale.

-       */

-      cur0 = error_limit[cur0];

-      cur1 = error_limit[cur1];

-      cur2 = error_limit[cur2];

-      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.

-       * The maximum error is +- MAXJSAMPLE (or less with error limiting);

-       * this sets the required size of the range_limit array.

-       */

-      cur0 += GETJSAMPLE(inptr[0]);

-      cur1 += GETJSAMPLE(inptr[1]);

-      cur2 += GETJSAMPLE(inptr[2]);

-      cur0 = GETJSAMPLE(range_limit[cur0]);

-      cur1 = GETJSAMPLE(range_limit[cur1]);

-      cur2 = GETJSAMPLE(range_limit[cur2]);

-      /* Index into the cache with adjusted pixel value */

-      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];

-      /* If we have not seen this color before, find nearest colormap */

-      /* entry and update the cache */

-      if (*cachep == 0)

-	fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);

-      /* Now emit the colormap index for this cell */

-      { register int pixcode = *cachep - 1;

-	*outptr = (JSAMPLE) pixcode;

-	/* Compute representation error for this pixel */

-	cur0 -= GETJSAMPLE(colormap0[pixcode]);

-	cur1 -= GETJSAMPLE(colormap1[pixcode]);

-	cur2 -= GETJSAMPLE(colormap2[pixcode]);

-      }

-      /* Compute error fractions to be propagated to adjacent pixels.

-       * Add these into the running sums, and simultaneously shift the

-       * next-line error sums left by 1 column.

-       */

-      { register LOCFSERROR bnexterr, delta;

-

-	bnexterr = cur0;	/* Process component 0 */

-	delta = cur0 * 2;

-	cur0 += delta;		/* form error * 3 */

-	errorptr[0] = (FSERROR) (bpreverr0 + cur0);

-	cur0 += delta;		/* form error * 5 */

-	bpreverr0 = belowerr0 + cur0;

-	belowerr0 = bnexterr;

-	cur0 += delta;		/* form error * 7 */

-	bnexterr = cur1;	/* Process component 1 */

-	delta = cur1 * 2;

-	cur1 += delta;		/* form error * 3 */

-	errorptr[1] = (FSERROR) (bpreverr1 + cur1);

-	cur1 += delta;		/* form error * 5 */

-	bpreverr1 = belowerr1 + cur1;

-	belowerr1 = bnexterr;

-	cur1 += delta;		/* form error * 7 */

-	bnexterr = cur2;	/* Process component 2 */

-	delta = cur2 * 2;

-	cur2 += delta;		/* form error * 3 */

-	errorptr[2] = (FSERROR) (bpreverr2 + cur2);

-	cur2 += delta;		/* form error * 5 */

-	bpreverr2 = belowerr2 + cur2;

-	belowerr2 = bnexterr;

-	cur2 += delta;		/* form error * 7 */

-      }

-      /* At this point curN contains the 7/16 error value to be propagated

-       * to the next pixel on the current line, and all the errors for the

-       * next line have been shifted over.  We are therefore ready to move on.

-       */

-      inptr += dir3;		/* Advance pixel pointers to next column */

-      outptr += dir;

-      errorptr += dir3;		/* advance errorptr to current column */

-    }

-    /* Post-loop cleanup: we must unload the final error values into the

-     * final fserrors[] entry.  Note we need not unload belowerrN because

-     * it is for the dummy column before or after the actual array.

-     */

-    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */

-    errorptr[1] = (FSERROR) bpreverr1;

-    errorptr[2] = (FSERROR) bpreverr2;

-  }

-}

-

-

-/*

- * Initialize the error-limiting transfer function (lookup table).

- * The raw F-S error computation can potentially compute error values of up to

- * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be

- * much less, otherwise obviously wrong pixels will be created.  (Typical

- * effects include weird fringes at color-area boundaries, isolated bright

- * pixels in a dark area, etc.)  The standard advice for avoiding this problem

- * is to ensure that the "corners" of the color cube are allocated as output

- * colors; then repeated errors in the same direction cannot cause cascading

- * error buildup.  However, that only prevents the error from getting

- * completely out of hand; Aaron Giles reports that error limiting improves

- * the results even with corner colors allocated.

- * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty

- * well, but the smoother transfer function used below is even better.  Thanks

- * to Aaron Giles for this idea.

- */

-

-LOCAL(void)

-init_error_limit (j_decompress_ptr cinfo)

-/* Allocate and fill in the error_limiter table */

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  int * table;

-  int in, out;

-

-  table = (int *) (*cinfo->mem->alloc_small)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE*2+1) * SIZEOF(int));

-  table += MAXJSAMPLE;		/* so can index -MAXJSAMPLE .. +MAXJSAMPLE */

-  cquantize->error_limiter = table;

-

-#define STEPSIZE ((MAXJSAMPLE+1)/16)

-  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */

-  out = 0;

-  for (in = 0; in < STEPSIZE; in++, out++) {

-    table[in] = out; table[-in] = -out;

-  }

-  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */

-  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {

-    table[in] = out; table[-in] = -out;

-  }

-  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */

-  for (; in <= MAXJSAMPLE; in++) {

-    table[in] = out; table[-in] = -out;

-  }

-#undef STEPSIZE

-}

-

-

-/*

- * Finish up at the end of each pass.

- */

-

-METHODDEF(void)

-finish_pass1 (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-

-  /* Select the representative colors and fill in cinfo->colormap */

-  cinfo->colormap = cquantize->sv_colormap;

-  select_colors(cinfo, cquantize->desired);

-  /* Force next pass to zero the color index table */

-  cquantize->needs_zeroed = TRUE;

-}

-

-

-METHODDEF(void)

-finish_pass2 (j_decompress_ptr cinfo)

-{

-  /* no work */

-}

-

-

-/*

- * Initialize for each processing pass.

- */

-

-METHODDEF(void)

-start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-  hist3d histogram = cquantize->histogram;

-  int i;

-

-  /* Only F-S dithering or no dithering is supported. */

-  /* If user asks for ordered dither, give him F-S. */

-  if (cinfo->dither_mode != JDITHER_NONE)

-    cinfo->dither_mode = JDITHER_FS;

-

-  if (is_pre_scan) {

-    /* Set up method pointers */

-    cquantize->pub.color_quantize = prescan_quantize;

-    cquantize->pub.finish_pass = finish_pass1;

-    cquantize->needs_zeroed = TRUE; /* Always zero histogram */

-  } else {

-    /* Set up method pointers */

-    if (cinfo->dither_mode == JDITHER_FS)

-      cquantize->pub.color_quantize = pass2_fs_dither;

-    else

-      cquantize->pub.color_quantize = pass2_no_dither;

-    cquantize->pub.finish_pass = finish_pass2;

-

-    /* Make sure color count is acceptable */

-    i = cinfo->actual_number_of_colors;

-    if (i < 1)

-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 1);

-    if (i > MAXNUMCOLORS)

-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);

-

-    if (cinfo->dither_mode == JDITHER_FS) {

-      size_t arraysize = (size_t) ((cinfo->output_width + 2) *

-				   (3 * SIZEOF(FSERROR)));

-      /* Allocate Floyd-Steinberg workspace if we didn't already. */

-      if (cquantize->fserrors == NULL)

-	cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)

-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);

-      /* Initialize the propagated errors to zero. */

-      FMEMZERO((void FAR *) cquantize->fserrors, arraysize);

-      /* Make the error-limit table if we didn't already. */

-      if (cquantize->error_limiter == NULL)

-	init_error_limit(cinfo);

-      cquantize->on_odd_row = FALSE;

-    }

-

-  }

-  /* Zero the histogram or inverse color map, if necessary */

-  if (cquantize->needs_zeroed) {

-    for (i = 0; i < HIST_C0_ELEMS; i++) {

-      FMEMZERO((void FAR *) histogram[i],

-	       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));

-    }

-    cquantize->needs_zeroed = FALSE;

-  }

-}

-

-

-/*

- * Switch to a new external colormap between output passes.

- */

-

-METHODDEF(void)

-new_color_map_2_quant (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;

-

-  /* Reset the inverse color map */

-  cquantize->needs_zeroed = TRUE;

-}

-

-

-/*

- * Module initialization routine for 2-pass color quantization.

- */

-

-GLOBAL(void)

-jinit_2pass_quantizer (j_decompress_ptr cinfo)

-{

-  my_cquantize_ptr cquantize;

-  int i;

-

-  cquantize = (my_cquantize_ptr)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				SIZEOF(my_cquantizer));

-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;

-  cquantize->pub.start_pass = start_pass_2_quant;

-  cquantize->pub.new_color_map = new_color_map_2_quant;

-  cquantize->fserrors = NULL;	/* flag optional arrays not allocated */

-  cquantize->error_limiter = NULL;

-

-  /* Make sure jdmaster didn't give me a case I can't handle */

-  if (cinfo->out_color_components != 3)

-    ERREXIT(cinfo, JERR_NOTIMPL);

-

-  /* Allocate the histogram/inverse colormap storage */

-  cquantize->histogram = (hist3d) (*cinfo->mem->alloc_small)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, HIST_C0_ELEMS * SIZEOF(hist2d));

-  for (i = 0; i < HIST_C0_ELEMS; i++) {

-    cquantize->histogram[i] = (hist2d) (*cinfo->mem->alloc_large)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));

-  }

-  cquantize->needs_zeroed = TRUE; /* histogram is garbage now */

-

-  /* Allocate storage for the completed colormap, if required.

-   * We do this now since it is FAR storage and may affect

-   * the memory manager's space calculations.

-   */

-  if (cinfo->enable_2pass_quant) {

-    /* Make sure color count is acceptable */

-    int desired = cinfo->desired_number_of_colors;

-    /* Lower bound on # of colors ... somewhat arbitrary as long as > 0 */

-    if (desired < 8)

-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 8);

-    /* Make sure colormap indexes can be represented by JSAMPLEs */

-    if (desired > MAXNUMCOLORS)

-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);

-    cquantize->sv_colormap = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo,JPOOL_IMAGE, (JDIMENSION) desired, (JDIMENSION) 3);

-    cquantize->desired = desired;

-  } else

-    cquantize->sv_colormap = NULL;

-

-  /* Only F-S dithering or no dithering is supported. */

-  /* If user asks for ordered dither, give him F-S. */

-  if (cinfo->dither_mode != JDITHER_NONE)

-    cinfo->dither_mode = JDITHER_FS;

-

-  /* Allocate Floyd-Steinberg workspace if necessary.

-   * This isn't really needed until pass 2, but again it is FAR storage.

-   * Although we will cope with a later change in dither_mode,

-   * we do not promise to honor max_memory_to_use if dither_mode changes.

-   */

-  if (cinfo->dither_mode == JDITHER_FS) {

-    cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (size_t) ((cinfo->output_width + 2) * (3 * SIZEOF(FSERROR))));

-    /* Might as well create the error-limiting table too. */

-    init_error_limit(cinfo);

-  }

-}

-

-#endif /* QUANT_2PASS_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/jutils.c b/plugins/AdvaImg/src/LibJPEG/jutils.c
deleted file mode 100644
index 037a795290..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jutils.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*

- * jutils.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2009-2011 by Guido Vollbeding.

- * 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 tables and miscellaneous utility routines needed

- * for both compression and decompression.

- * Note we prefix all global names with "j" to minimize conflicts with

- * a surrounding application.

- */

-

-#define JPEG_INTERNALS

-#include "jinclude.h"

-#include "jpeglib.h"

-

-

-/*

- * jpeg_zigzag_order[i] is the zigzag-order position of the i'th element

- * of a DCT block read in natural order (left to right, top to bottom).

- */

-

-#if 0				/* This table is not actually needed in v6a */

-

-const int jpeg_zigzag_order[DCTSIZE2] = {

-   0,  1,  5,  6, 14, 15, 27, 28,

-   2,  4,  7, 13, 16, 26, 29, 42,

-   3,  8, 12, 17, 25, 30, 41, 43,

-   9, 11, 18, 24, 31, 40, 44, 53,

-  10, 19, 23, 32, 39, 45, 52, 54,

-  20, 22, 33, 38, 46, 51, 55, 60,

-  21, 34, 37, 47, 50, 56, 59, 61,

-  35, 36, 48, 49, 57, 58, 62, 63

-};

-

-#endif

-

-/*

- * jpeg_natural_order[i] is the natural-order position of the i'th element

- * of zigzag order.

- *

- * When reading corrupted data, the Huffman decoders could attempt

- * to reference an entry beyond the end of this array (if the decoded

- * zero run length reaches past the end of the block).  To prevent

- * wild stores without adding an inner-loop test, we put some extra

- * "63"s after the real entries.  This will cause the extra coefficient

- * to be stored in location 63 of the block, not somewhere random.

- * The worst case would be a run-length of 15, which means we need 16

- * fake entries.

- */

-

-const int jpeg_natural_order[DCTSIZE2+16] = {

-  0,  1,  8, 16,  9,  2,  3, 10,

- 17, 24, 32, 25, 18, 11,  4,  5,

- 12, 19, 26, 33, 40, 48, 41, 34,

- 27, 20, 13,  6,  7, 14, 21, 28,

- 35, 42, 49, 56, 57, 50, 43, 36,

- 29, 22, 15, 23, 30, 37, 44, 51,

- 58, 59, 52, 45, 38, 31, 39, 46,

- 53, 60, 61, 54, 47, 55, 62, 63,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order7[7*7+16] = {

-  0,  1,  8, 16,  9,  2,  3, 10,

- 17, 24, 32, 25, 18, 11,  4,  5,

- 12, 19, 26, 33, 40, 48, 41, 34,

- 27, 20, 13,  6, 14, 21, 28, 35,

- 42, 49, 50, 43, 36, 29, 22, 30,

- 37, 44, 51, 52, 45, 38, 46, 53,

- 54,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order6[6*6+16] = {

-  0,  1,  8, 16,  9,  2,  3, 10,

- 17, 24, 32, 25, 18, 11,  4,  5,

- 12, 19, 26, 33, 40, 41, 34, 27,

- 20, 13, 21, 28, 35, 42, 43, 36,

- 29, 37, 44, 45,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order5[5*5+16] = {

-  0,  1,  8, 16,  9,  2,  3, 10,

- 17, 24, 32, 25, 18, 11,  4, 12,

- 19, 26, 33, 34, 27, 20, 28, 35,

- 36,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order4[4*4+16] = {

-  0,  1,  8, 16,  9,  2,  3, 10,

- 17, 24, 25, 18, 11, 19, 26, 27,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order3[3*3+16] = {

-  0,  1,  8, 16,  9,  2, 10, 17,

- 18,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-const int jpeg_natural_order2[2*2+16] = {

-  0,  1,  8,  9,

- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */

- 63, 63, 63, 63, 63, 63, 63, 63

-};

-

-

-/*

- * Arithmetic utilities

- */

-

-GLOBAL(long)

-jdiv_round_up (long a, long b)

-/* Compute a/b rounded up to next integer, ie, ceil(a/b) */

-/* Assumes a >= 0, b > 0 */

-{

-  return (a + b - 1L) / b;

-}

-

-

-GLOBAL(long)

-jround_up (long a, long b)

-/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */

-/* Assumes a >= 0, b > 0 */

-{

-  a += b - 1L;

-  return a - (a % b);

-}

-

-

-/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays

- * and coefficient-block arrays.  This won't work on 80x86 because the arrays

- * are FAR and we're assuming a small-pointer memory model.  However, some

- * DOS compilers provide far-pointer versions of memcpy() and memset() even

- * in the small-model libraries.  These will be used if USE_FMEM is defined.

- * Otherwise, the routines below do it the hard way.  (The performance cost

- * is not all that great, because these routines aren't very heavily used.)

- */

-

-#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macro */

-#define FMEMCOPY(dest,src,size)	MEMCOPY(dest,src,size)

-#else				/* 80x86 case, define if we can */

-#ifdef USE_FMEM

-#define FMEMCOPY(dest,src,size)	_fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))

-#else

-/* This function is for use by the FMEMZERO macro defined in jpegint.h.

- * Do not call this function directly, use the FMEMZERO macro instead.

- */

-GLOBAL(void)

-jzero_far (void FAR * target, size_t bytestozero)

-/* Zero out a chunk of FAR memory. */

-/* This might be sample-array data, block-array data, or alloc_large data. */

-{

-  register char FAR * ptr = (char FAR *) target;

-  register size_t count;

-

-  for (count = bytestozero; count > 0; count--) {

-    *ptr++ = 0;

-  }

-}

-#endif

-#endif

-

-

-GLOBAL(void)

-jcopy_sample_rows (JSAMPARRAY input_array, int source_row,

-		   JSAMPARRAY output_array, int dest_row,

-		   int num_rows, JDIMENSION num_cols)

-/* Copy some rows of samples from one place to another.

- * num_rows rows are copied from input_array[source_row++]

- * to output_array[dest_row++]; these areas may overlap for duplication.

- * The source and destination arrays must be at least as wide as num_cols.

- */

-{

-  register JSAMPROW inptr, outptr;

-#ifdef FMEMCOPY

-  register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE));

-#else

-  register JDIMENSION count;

-#endif

-  register int row;

-

-  input_array += source_row;

-  output_array += dest_row;

-

-  for (row = num_rows; row > 0; row--) {

-    inptr = *input_array++;

-    outptr = *output_array++;

-#ifdef FMEMCOPY

-    FMEMCOPY(outptr, inptr, count);

-#else

-    for (count = num_cols; count > 0; count--)

-      *outptr++ = *inptr++;	/* needn't bother with GETJSAMPLE() here */

-#endif

-  }

-}

-

-

-GLOBAL(void)

-jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,

-		 JDIMENSION num_blocks)

-/* Copy a row of coefficient blocks from one place to another. */

-{

-#ifdef FMEMCOPY

-  FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));

-#else

-  register JCOEFPTR inptr, outptr;

-  register long count;

-

-  inptr = (JCOEFPTR) input_row;

-  outptr = (JCOEFPTR) output_row;

-  for (count = (long) num_blocks * DCTSIZE2; count > 0; count--) {

-    *outptr++ = *inptr++;

-  }

-#endif

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/jversion.h b/plugins/AdvaImg/src/LibJPEG/jversion.h
deleted file mode 100644
index bb53ffe712..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/jversion.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*

- * jversion.h

- *

- * Copyright (C) 1991-2016, 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.

- *

- * This file contains software version identification.

- */

-

-

-#define JVERSION	"9b  17-Jan-2016"

-

-#define JCOPYRIGHT	"Copyright (C) 2016, Thomas G. Lane, Guido Vollbeding"

diff --git a/plugins/AdvaImg/src/LibJPEG/libjpeg.txt b/plugins/AdvaImg/src/LibJPEG/libjpeg.txt
deleted file mode 100644
index b602ab3095..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/libjpeg.txt
+++ /dev/null
@@ -1,3111 +0,0 @@
-USING THE IJG JPEG LIBRARY

-

-Copyright (C) 1994-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.

-

-

-This file describes how to use the IJG JPEG library within an application

-program.  Read it if you want to write a program that uses the library.

-

-The file example.c provides heavily commented skeleton code for calling the

-JPEG library.  Also see jpeglib.h (the include file to be used by application

-programs) for full details about data structures and function parameter lists.

-The library source code, of course, is the ultimate reference.

-

-Note that there have been *major* changes from the application interface

-presented by IJG version 4 and earlier versions.  The old design had several

-inherent limitations, and it had accumulated a lot of cruft as we added

-features while trying to minimize application-interface changes.  We have

-sacrificed backward compatibility in the version 5 rewrite, but we think the

-improvements justify this.

-

-

-TABLE OF CONTENTS

------------------

-

-Overview:

-	Functions provided by the library

-	Outline of typical usage

-Basic library usage:

-	Data formats

-	Compression details

-	Decompression details

-	Mechanics of usage: include files, linking, etc

-Advanced features:

-	Compression parameter selection

-	Decompression parameter selection

-	Special color spaces

-	Error handling

-	Compressed data handling (source and destination managers)

-	I/O suspension

-	Progressive JPEG support

-	Buffered-image mode

-	Abbreviated datastreams and multiple images

-	Special markers

-	Raw (downsampled) image data

-	Really raw data: DCT coefficients

-	Progress monitoring

-	Memory management

-	Memory usage

-	Library compile-time options

-	Portability considerations

-	Notes for MS-DOS implementors

-

-You should read at least the overview and basic usage sections before trying

-to program with the library.  The sections on advanced features can be read

-if and when you need them.

-

-

-OVERVIEW

-========

-

-Functions provided by the library

----------------------------------

-

-The IJG JPEG library provides C code to read and write JPEG-compressed image

-files.  The surrounding application program receives or supplies image data a

-scanline at a time, using a straightforward uncompressed image format.  All

-details of color conversion and other preprocessing/postprocessing can be

-handled by the library.

-

-The library includes a substantial amount of code that is not covered by the

-JPEG standard but is necessary for typical applications of JPEG.  These

-functions preprocess the image before JPEG compression or postprocess it after

-decompression.  They include colorspace conversion, downsampling/upsampling,

-and color quantization.  The application indirectly selects use of this code

-by specifying the format in which it wishes to supply or receive image data.

-For example, if colormapped output is requested, then the decompression

-library automatically invokes color quantization.

-

-A wide range of quality vs. speed tradeoffs are possible in JPEG processing,

-and even more so in decompression postprocessing.  The decompression library

-provides multiple implementations that cover most of the useful tradeoffs,

-ranging from very-high-quality down to fast-preview operation.  On the

-compression side we have generally not provided low-quality choices, since

-compression is normally less time-critical.  It should be understood that the

-low-quality modes may not meet the JPEG standard's accuracy requirements;

-nonetheless, they are useful for viewers.

-

-A word about functions *not* provided by the library.  We handle a subset of

-the ISO JPEG standard; most baseline, extended-sequential, and progressive

-JPEG processes are supported.  (Our subset includes all features now in common

-use.)  Unsupported ISO options include:

-	* Hierarchical storage

-	* Lossless JPEG

-	* DNL marker

-	* Nonintegral subsampling ratios

-We support 8-bit to 12-bit data precision, but this is a compile-time choice

-rather than a run-time choice; hence it is difficult to use different

-precisions in a single application.

-

-By itself, the library handles only interchange JPEG datastreams --- in

-particular the widely used JFIF file format.  The library can be used by

-surrounding code to process interchange or abbreviated JPEG datastreams that

-are embedded in more complex file formats.  (For example, this library is

-used by the free LIBTIFF library to support JPEG compression in TIFF.)

-

-

-Outline of typical usage

-------------------------

-

-The rough outline of a JPEG compression operation is:

-

-	Allocate and initialize a JPEG compression object

-	Specify the destination for the compressed data (eg, a file)

-	Set parameters for compression, including image size & colorspace

-	jpeg_start_compress(...);

-	while (scan lines remain to be written)

-		jpeg_write_scanlines(...);

-	jpeg_finish_compress(...);

-	Release the JPEG compression object

-

-A JPEG compression object holds parameters and working state for the JPEG

-library.  We make creation/destruction of the object separate from starting

-or finishing compression of an image; the same object can be re-used for a

-series of image compression operations.  This makes it easy to re-use the

-same parameter settings for a sequence of images.  Re-use of a JPEG object

-also has important implications for processing abbreviated JPEG datastreams,

-as discussed later.

-

-The image data to be compressed is supplied to jpeg_write_scanlines() from

-in-memory buffers.  If the application is doing file-to-file compression,

-reading image data from the source file is the application's responsibility.

-The library emits compressed data by calling a "data destination manager",

-which typically will write the data into a file; but the application can

-provide its own destination manager to do something else.

-

-Similarly, the rough outline of a JPEG decompression operation is:

-

-	Allocate and initialize a JPEG decompression object

-	Specify the source of the compressed data (eg, a file)

-	Call jpeg_read_header() to obtain image info

-	Set parameters for decompression

-	jpeg_start_decompress(...);

-	while (scan lines remain to be read)

-		jpeg_read_scanlines(...);

-	jpeg_finish_decompress(...);

-	Release the JPEG decompression object

-

-This is comparable to the compression outline except that reading the

-datastream header is a separate step.  This is helpful because information

-about the image's size, colorspace, etc is available when the application

-selects decompression parameters.  For example, the application can choose an

-output scaling ratio that will fit the image into the available screen size.

-

-The decompression library obtains compressed data by calling a data source

-manager, which typically will read the data from a file; but other behaviors

-can be obtained with a custom source manager.  Decompressed data is delivered

-into in-memory buffers passed to jpeg_read_scanlines().

-

-It is possible to abort an incomplete compression or decompression operation

-by calling jpeg_abort(); or, if you do not need to retain the JPEG object,

-simply release it by calling jpeg_destroy().

-

-JPEG compression and decompression objects are two separate struct types.

-However, they share some common fields, and certain routines such as

-jpeg_destroy() can work on either type of object.

-

-The JPEG library has no static variables: all state is in the compression

-or decompression object.  Therefore it is possible to process multiple

-compression and decompression operations concurrently, using multiple JPEG

-objects.

-

-Both compression and decompression can be done in an incremental memory-to-

-memory fashion, if suitable source/destination managers are used.  See the

-section on "I/O suspension" for more details.

-

-

-BASIC LIBRARY USAGE

-===================

-

-Data formats

-------------

-

-Before diving into procedural details, it is helpful to understand the

-image data format that the JPEG library expects or returns.

-

-The standard input image format is a rectangular array of pixels, with each

-pixel having the same number of "component" or "sample" values (color

-channels).  You must specify how many components there are and the colorspace

-interpretation of the components.  Most applications will use RGB data

-(three components per pixel) or grayscale data (one component per pixel).

-PLEASE NOTE THAT RGB DATA IS THREE SAMPLES PER PIXEL, GRAYSCALE ONLY ONE.

-A remarkable number of people manage to miss this, only to find that their

-programs don't work with grayscale JPEG files.

-

-There is no provision for colormapped input.  JPEG files are always full-color

-or full grayscale (or sometimes another colorspace such as CMYK).  You can

-feed in a colormapped image by expanding it to full-color format.  However

-JPEG often doesn't work very well with source data that has been colormapped,

-because of dithering noise.  This is discussed in more detail in the JPEG FAQ

-and the other references mentioned in the README file.

-

-Pixels are stored by scanlines, with each scanline running from left to

-right.  The component values for each pixel are adjacent in the row; for

-example, R,G,B,R,G,B,R,G,B,... for 24-bit RGB color.  Each scanline is an

-array of data type JSAMPLE --- which is typically "unsigned char", unless

-you've changed jmorecfg.h.  (You can also change the RGB pixel layout, say

-to B,G,R order, by modifying jmorecfg.h.  But see the restrictions listed in

-that file before doing so.)

-

-A 2-D array of pixels is formed by making a list of pointers to the starts of

-scanlines; so the scanlines need not be physically adjacent in memory.  Even

-if you process just one scanline at a time, you must make a one-element

-pointer array to conform to this structure.  Pointers to JSAMPLE rows are of

-type JSAMPROW, and the pointer to the pointer array is of type JSAMPARRAY.

-

-The library accepts or supplies one or more complete scanlines per call.

-It is not possible to process part of a row at a time.  Scanlines are always

-processed top-to-bottom.  You can process an entire image in one call if you

-have it all in memory, but usually it's simplest to process one scanline at

-a time.

-

-For best results, source data values should have the precision specified by

-BITS_IN_JSAMPLE (normally 8 bits).  For instance, if you choose to compress

-data that's only 6 bits/channel, you should left-justify each value in a

-byte before passing it to the compressor.  If you need to compress data

-that has more than 8 bits/channel, compile with BITS_IN_JSAMPLE = 9 to 12.

-(See "Library compile-time options", later.)

-

-

-The data format returned by the decompressor is the same in all details,

-except that colormapped output is supported.  (Again, a JPEG file is never

-colormapped.  But you can ask the decompressor to perform on-the-fly color

-quantization to deliver colormapped output.)  If you request colormapped

-output then the returned data array contains a single JSAMPLE per pixel;

-its value is an index into a color map.  The color map is represented as

-a 2-D JSAMPARRAY in which each row holds the values of one color component,

-that is, colormap[i][j] is the value of the i'th color component for pixel

-value (map index) j.  Note that since the colormap indexes are stored in

-JSAMPLEs, the maximum number of colors is limited by the size of JSAMPLE

-(ie, at most 256 colors for an 8-bit JPEG library).

-

-

-Compression details

--------------------

-

-Here we revisit the JPEG compression outline given in the overview.

-

-1. Allocate and initialize a JPEG compression object.

-

-A JPEG compression object is a "struct jpeg_compress_struct".  (It also has

-a bunch of subsidiary structures which are allocated via malloc(), but the

-application doesn't control those directly.)  This struct can be just a local

-variable in the calling routine, if a single routine is going to execute the

-whole JPEG compression sequence.  Otherwise it can be static or allocated

-from malloc().

-

-You will also need a structure representing a JPEG error handler.  The part

-of this that the library cares about is a "struct jpeg_error_mgr".  If you

-are providing your own error handler, you'll typically want to embed the

-jpeg_error_mgr struct in a larger structure; this is discussed later under

-"Error handling".  For now we'll assume you are just using the default error

-handler.  The default error handler will print JPEG error/warning messages

-on stderr, and it will call exit() if a fatal error occurs.

-

-You must initialize the error handler structure, store a pointer to it into

-the JPEG object's "err" field, and then call jpeg_create_compress() to

-initialize the rest of the JPEG object.

-

-Typical code for this step, if you are using the default error handler, is

-

-	struct jpeg_compress_struct cinfo;

-	struct jpeg_error_mgr jerr;

-	...

-	cinfo.err = jpeg_std_error(&jerr);

-	jpeg_create_compress(&cinfo);

-

-jpeg_create_compress allocates a small amount of memory, so it could fail

-if you are out of memory.  In that case it will exit via the error handler;

-that's why the error handler must be initialized first.

-

-

-2. Specify the destination for the compressed data (eg, a file).

-

-As previously mentioned, the JPEG library delivers compressed data to a

-"data destination" module.  The library includes one data destination

-module which knows how to write to a stdio stream.  You can use your own

-destination module if you want to do something else, as discussed later.

-

-If you use the standard destination module, you must open the target stdio

-stream beforehand.  Typical code for this step looks like:

-

-	FILE * outfile;

-	...

-	if ((outfile = fopen(filename, "wb")) == NULL) {

-	    fprintf(stderr, "can't open %s\n", filename);

-	    exit(1);

-	}

-	jpeg_stdio_dest(&cinfo, outfile);

-

-where the last line invokes the standard destination module.

-

-WARNING: it is critical that the binary compressed data be delivered to the

-output file unchanged.  On non-Unix systems the stdio library may perform

-newline translation or otherwise corrupt binary data.  To suppress this

-behavior, you may need to use a "b" option to fopen (as shown above), or use

-setmode() or another routine to put the stdio stream in binary mode.  See

-cjpeg.c and djpeg.c for code that has been found to work on many systems.

-

-You can select the data destination after setting other parameters (step 3),

-if that's more convenient.  You may not change the destination between

-calling jpeg_start_compress() and jpeg_finish_compress().

-

-

-3. Set parameters for compression, including image size & colorspace.

-

-You must supply information about the source image by setting the following

-fields in the JPEG object (cinfo structure):

-

-	image_width		Width of image, in pixels

-	image_height		Height of image, in pixels

-	input_components	Number of color channels (samples per pixel)

-	in_color_space		Color space of source image

-

-The image dimensions are, hopefully, obvious.  JPEG supports image dimensions

-of 1 to 64K pixels in either direction.  The input color space is typically

-RGB or grayscale, and input_components is 3 or 1 accordingly.  (See "Special

-color spaces", later, for more info.)  The in_color_space field must be

-assigned one of the J_COLOR_SPACE enum constants, typically JCS_RGB or

-JCS_GRAYSCALE.

-

-JPEG has a large number of compression parameters that determine how the

-image is encoded.  Most applications don't need or want to know about all

-these parameters.  You can set all the parameters to reasonable defaults by

-calling jpeg_set_defaults(); then, if there are particular values you want

-to change, you can do so after that.  The "Compression parameter selection"

-section tells about all the parameters.

-

-You must set in_color_space correctly before calling jpeg_set_defaults(),

-because the defaults depend on the source image colorspace.  However the

-other three source image parameters need not be valid until you call

-jpeg_start_compress().  There's no harm in calling jpeg_set_defaults() more

-than once, if that happens to be convenient.

-

-Typical code for a 24-bit RGB source image is

-

-	cinfo.image_width = Width; 	/* image width and height, in pixels */

-	cinfo.image_height = Height;

-	cinfo.input_components = 3;	/* # of color components per pixel */

-	cinfo.in_color_space = JCS_RGB; /* colorspace of input image */

-

-	jpeg_set_defaults(&cinfo);

-	/* Make optional parameter settings here */

-

-

-4. jpeg_start_compress(...);

-

-After you have established the data destination and set all the necessary

-source image info and other parameters, call jpeg_start_compress() to begin

-a compression cycle.  This will initialize internal state, allocate working

-storage, and emit the first few bytes of the JPEG datastream header.

-

-Typical code:

-

-	jpeg_start_compress(&cinfo, TRUE);

-

-The "TRUE" parameter ensures that a complete JPEG interchange datastream

-will be written.  This is appropriate in most cases.  If you think you might

-want to use an abbreviated datastream, read the section on abbreviated

-datastreams, below.

-

-Once you have called jpeg_start_compress(), you may not alter any JPEG

-parameters or other fields of the JPEG object until you have completed

-the compression cycle.

-

-

-5. while (scan lines remain to be written)

-	jpeg_write_scanlines(...);

-

-Now write all the required image data by calling jpeg_write_scanlines()

-one or more times.  You can pass one or more scanlines in each call, up

-to the total image height.  In most applications it is convenient to pass

-just one or a few scanlines at a time.  The expected format for the passed

-data is discussed under "Data formats", above.

-

-Image data should be written in top-to-bottom scanline order.  The JPEG spec

-contains some weasel wording about how top and bottom are application-defined

-terms (a curious interpretation of the English language...) but if you want

-your files to be compatible with everyone else's, you WILL use top-to-bottom

-order.  If the source data must be read in bottom-to-top order, you can use

-the JPEG library's virtual array mechanism to invert the data efficiently.

-Examples of this can be found in the sample application cjpeg.

-

-The library maintains a count of the number of scanlines written so far

-in the next_scanline field of the JPEG object.  Usually you can just use

-this variable as the loop counter, so that the loop test looks like

-"while (cinfo.next_scanline < cinfo.image_height)".

-

-Code for this step depends heavily on the way that you store the source data.

-example.c shows the following code for the case of a full-size 2-D source

-array containing 3-byte RGB pixels:

-

-	JSAMPROW row_pointer[1];	/* pointer to a single row */

-	int row_stride;			/* physical row width in buffer */

-

-	row_stride = image_width * 3;	/* JSAMPLEs per row in image_buffer */

-

-	while (cinfo.next_scanline < cinfo.image_height) {

-	    row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride];

-	    jpeg_write_scanlines(&cinfo, row_pointer, 1);

-	}

-

-jpeg_write_scanlines() returns the number of scanlines actually written.

-This will normally be equal to the number passed in, so you can usually

-ignore the return value.  It is different in just two cases:

-  * If you try to write more scanlines than the declared image height,

-    the additional scanlines are ignored.

-  * If you use a suspending data destination manager, output buffer overrun

-    will cause the compressor to return before accepting all the passed lines.

-    This feature is discussed under "I/O suspension", below.  The normal

-    stdio destination manager will NOT cause this to happen.

-In any case, the return value is the same as the change in the value of

-next_scanline.

-

-

-6. jpeg_finish_compress(...);

-

-After all the image data has been written, call jpeg_finish_compress() to

-complete the compression cycle.  This step is ESSENTIAL to ensure that the

-last bufferload of data is written to the data destination.

-jpeg_finish_compress() also releases working memory associated with the JPEG

-object.

-

-Typical code:

-

-	jpeg_finish_compress(&cinfo);

-

-If using the stdio destination manager, don't forget to close the output

-stdio stream (if necessary) afterwards.

-

-If you have requested a multi-pass operating mode, such as Huffman code

-optimization, jpeg_finish_compress() will perform the additional passes using

-data buffered by the first pass.  In this case jpeg_finish_compress() may take

-quite a while to complete.  With the default compression parameters, this will

-not happen.

-

-It is an error to call jpeg_finish_compress() before writing the necessary

-total number of scanlines.  If you wish to abort compression, call

-jpeg_abort() as discussed below.

-

-After completing a compression cycle, you may dispose of the JPEG object

-as discussed next, or you may use it to compress another image.  In that case

-return to step 2, 3, or 4 as appropriate.  If you do not change the

-destination manager, the new datastream will be written to the same target.

-If you do not change any JPEG parameters, the new datastream will be written

-with the same parameters as before.  Note that you can change the input image

-dimensions freely between cycles, but if you change the input colorspace, you

-should call jpeg_set_defaults() to adjust for the new colorspace; and then

-you'll need to repeat all of step 3.

-

-

-7. Release the JPEG compression object.

-

-When you are done with a JPEG compression object, destroy it by calling

-jpeg_destroy_compress().  This will free all subsidiary memory (regardless of

-the previous state of the object).  Or you can call jpeg_destroy(), which

-works for either compression or decompression objects --- this may be more

-convenient if you are sharing code between compression and decompression

-cases.  (Actually, these routines are equivalent except for the declared type

-of the passed pointer.  To avoid gripes from ANSI C compilers, jpeg_destroy()

-should be passed a j_common_ptr.)

-

-If you allocated the jpeg_compress_struct structure from malloc(), freeing

-it is your responsibility --- jpeg_destroy() won't.  Ditto for the error

-handler structure.

-

-Typical code:

-

-	jpeg_destroy_compress(&cinfo);

-

-

-8. Aborting.

-

-If you decide to abort a compression cycle before finishing, you can clean up

-in either of two ways:

-

-* If you don't need the JPEG object any more, just call

-  jpeg_destroy_compress() or jpeg_destroy() to release memory.  This is

-  legitimate at any point after calling jpeg_create_compress() --- in fact,

-  it's safe even if jpeg_create_compress() fails.

-

-* If you want to re-use the JPEG object, call jpeg_abort_compress(), or call

-  jpeg_abort() which works on both compression and decompression objects.

-  This will return the object to an idle state, releasing any working memory.

-  jpeg_abort() is allowed at any time after successful object creation.

-

-Note that cleaning up the data destination, if required, is your

-responsibility; neither of these routines will call term_destination().

-(See "Compressed data handling", below, for more about that.)

-

-jpeg_destroy() and jpeg_abort() are the only safe calls to make on a JPEG

-object that has reported an error by calling error_exit (see "Error handling"

-for more info).  The internal state of such an object is likely to be out of

-whack.  Either of these two routines will return the object to a known state.

-

-

-Decompression details

----------------------

-

-Here we revisit the JPEG decompression outline given in the overview.

-

-1. Allocate and initialize a JPEG decompression object.

-

-This is just like initialization for compression, as discussed above,

-except that the object is a "struct jpeg_decompress_struct" and you

-call jpeg_create_decompress().  Error handling is exactly the same.

-

-Typical code:

-

-	struct jpeg_decompress_struct cinfo;

-	struct jpeg_error_mgr jerr;

-	...

-	cinfo.err = jpeg_std_error(&jerr);

-	jpeg_create_decompress(&cinfo);

-

-(Both here and in the IJG code, we usually use variable name "cinfo" for

-both compression and decompression objects.)

-

-

-2. Specify the source of the compressed data (eg, a file).

-

-As previously mentioned, the JPEG library reads compressed data from a "data

-source" module.  The library includes one data source module which knows how

-to read from a stdio stream.  You can use your own source module if you want

-to do something else, as discussed later.

-

-If you use the standard source module, you must open the source stdio stream

-beforehand.  Typical code for this step looks like:

-

-	FILE * infile;

-	...

-	if ((infile = fopen(filename, "rb")) == NULL) {

-	    fprintf(stderr, "can't open %s\n", filename);

-	    exit(1);

-	}

-	jpeg_stdio_src(&cinfo, infile);

-

-where the last line invokes the standard source module.

-

-WARNING: it is critical that the binary compressed data be read unchanged.

-On non-Unix systems the stdio library may perform newline translation or

-otherwise corrupt binary data.  To suppress this behavior, you may need to use

-a "b" option to fopen (as shown above), or use setmode() or another routine to

-put the stdio stream in binary mode.  See cjpeg.c and djpeg.c for code that

-has been found to work on many systems.

-

-You may not change the data source between calling jpeg_read_header() and

-jpeg_finish_decompress().  If you wish to read a series of JPEG images from

-a single source file, you should repeat the jpeg_read_header() to

-jpeg_finish_decompress() sequence without reinitializing either the JPEG

-object or the data source module; this prevents buffered input data from

-being discarded.

-

-

-3. Call jpeg_read_header() to obtain image info.

-

-Typical code for this step is just

-

-	jpeg_read_header(&cinfo, TRUE);

-

-This will read the source datastream header markers, up to the beginning

-of the compressed data proper.  On return, the image dimensions and other

-info have been stored in the JPEG object.  The application may wish to

-consult this information before selecting decompression parameters.

-

-More complex code is necessary if

-  * A suspending data source is used --- in that case jpeg_read_header()

-    may return before it has read all the header data.  See "I/O suspension",

-    below.  The normal stdio source manager will NOT cause this to happen.

-  * Abbreviated JPEG files are to be processed --- see the section on

-    abbreviated datastreams.  Standard applications that deal only in

-    interchange JPEG files need not be concerned with this case either.

-

-It is permissible to stop at this point if you just wanted to find out the

-image dimensions and other header info for a JPEG file.  In that case,

-call jpeg_destroy() when you are done with the JPEG object, or call

-jpeg_abort() to return it to an idle state before selecting a new data

-source and reading another header.

-

-

-4. Set parameters for decompression.

-

-jpeg_read_header() sets appropriate default decompression parameters based on

-the properties of the image (in particular, its colorspace).  However, you

-may well want to alter these defaults before beginning the decompression.

-For example, the default is to produce full color output from a color file.

-If you want colormapped output you must ask for it.  Other options allow the

-returned image to be scaled and allow various speed/quality tradeoffs to be

-selected.  "Decompression parameter selection", below, gives details.

-

-If the defaults are appropriate, nothing need be done at this step.

-

-Note that all default values are set by each call to jpeg_read_header().

-If you reuse a decompression object, you cannot expect your parameter

-settings to be preserved across cycles, as you can for compression.

-You must set desired parameter values each time.

-

-

-5. jpeg_start_decompress(...);

-

-Once the parameter values are satisfactory, call jpeg_start_decompress() to

-begin decompression.  This will initialize internal state, allocate working

-memory, and prepare for returning data.

-

-Typical code is just

-

-	jpeg_start_decompress(&cinfo);

-

-If you have requested a multi-pass operating mode, such as 2-pass color

-quantization, jpeg_start_decompress() will do everything needed before data

-output can begin.  In this case jpeg_start_decompress() may take quite a while

-to complete.  With a single-scan (non progressive) JPEG file and default

-decompression parameters, this will not happen; jpeg_start_decompress() will

-return quickly.

-

-After this call, the final output image dimensions, including any requested

-scaling, are available in the JPEG object; so is the selected colormap, if

-colormapped output has been requested.  Useful fields include

-

-	output_width		image width and height, as scaled

-	output_height

-	out_color_components	# of color components in out_color_space

-	output_components	# of color components returned per pixel

-	colormap		the selected colormap, if any

-	actual_number_of_colors		number of entries in colormap

-

-output_components is 1 (a colormap index) when quantizing colors; otherwise it

-equals out_color_components.  It is the number of JSAMPLE values that will be

-emitted per pixel in the output arrays.

-

-Typically you will need to allocate data buffers to hold the incoming image.

-You will need output_width * output_components JSAMPLEs per scanline in your

-output buffer, and a total of output_height scanlines will be returned.

-

-Note: if you are using the JPEG library's internal memory manager to allocate

-data buffers (as djpeg does), then the manager's protocol requires that you

-request large buffers *before* calling jpeg_start_decompress().  This is a

-little tricky since the output_XXX fields are not normally valid then.  You

-can make them valid by calling jpeg_calc_output_dimensions() after setting the

-relevant parameters (scaling, output color space, and quantization flag).

-

-

-6. while (scan lines remain to be read)

-	jpeg_read_scanlines(...);

-

-Now you can read the decompressed image data by calling jpeg_read_scanlines()

-one or more times.  At each call, you pass in the maximum number of scanlines

-to be read (ie, the height of your working buffer); jpeg_read_scanlines()

-will return up to that many lines.  The return value is the number of lines

-actually read.  The format of the returned data is discussed under "Data

-formats", above.  Don't forget that grayscale and color JPEGs will return

-different data formats!

-

-Image data is returned in top-to-bottom scanline order.  If you must write

-out the image in bottom-to-top order, you can use the JPEG library's virtual

-array mechanism to invert the data efficiently.  Examples of this can be

-found in the sample application djpeg.

-

-The library maintains a count of the number of scanlines returned so far

-in the output_scanline field of the JPEG object.  Usually you can just use

-this variable as the loop counter, so that the loop test looks like

-"while (cinfo.output_scanline < cinfo.output_height)".  (Note that the test

-should NOT be against image_height, unless you never use scaling.  The

-image_height field is the height of the original unscaled image.)

-The return value always equals the change in the value of output_scanline.

-

-If you don't use a suspending data source, it is safe to assume that

-jpeg_read_scanlines() reads at least one scanline per call, until the

-bottom of the image has been reached.

-

-If you use a buffer larger than one scanline, it is NOT safe to assume that

-jpeg_read_scanlines() fills it.  (The current implementation returns only a

-few scanlines per call, no matter how large a buffer you pass.)  So you must

-always provide a loop that calls jpeg_read_scanlines() repeatedly until the

-whole image has been read.

-

-

-7. jpeg_finish_decompress(...);

-

-After all the image data has been read, call jpeg_finish_decompress() to

-complete the decompression cycle.  This causes working memory associated

-with the JPEG object to be released.

-

-Typical code:

-

-	jpeg_finish_decompress(&cinfo);

-

-If using the stdio source manager, don't forget to close the source stdio

-stream if necessary.

-

-It is an error to call jpeg_finish_decompress() before reading the correct

-total number of scanlines.  If you wish to abort decompression, call

-jpeg_abort() as discussed below.

-

-After completing a decompression cycle, you may dispose of the JPEG object as

-discussed next, or you may use it to decompress another image.  In that case

-return to step 2 or 3 as appropriate.  If you do not change the source

-manager, the next image will be read from the same source.

-

-

-8. Release the JPEG decompression object.

-

-When you are done with a JPEG decompression object, destroy it by calling

-jpeg_destroy_decompress() or jpeg_destroy().  The previous discussion of

-destroying compression objects applies here too.

-

-Typical code:

-

-	jpeg_destroy_decompress(&cinfo);

-

-

-9. Aborting.

-

-You can abort a decompression cycle by calling jpeg_destroy_decompress() or

-jpeg_destroy() if you don't need the JPEG object any more, or

-jpeg_abort_decompress() or jpeg_abort() if you want to reuse the object.

-The previous discussion of aborting compression cycles applies here too.

-

-

-Mechanics of usage: include files, linking, etc

------------------------------------------------

-

-Applications using the JPEG library should include the header file jpeglib.h

-to obtain declarations of data types and routines.  Before including

-jpeglib.h, include system headers that define at least the typedefs FILE and

-size_t.  On ANSI-conforming systems, including <stdio.h> is sufficient; on

-older Unix systems, you may need <sys/types.h> to define size_t.

-

-If the application needs to refer to individual JPEG library error codes, also

-include jerror.h to define those symbols.

-

-jpeglib.h indirectly includes the files jconfig.h and jmorecfg.h.  If you are

-installing the JPEG header files in a system directory, you will want to

-install all four files: jpeglib.h, jerror.h, jconfig.h, jmorecfg.h.

-

-The most convenient way to include the JPEG code into your executable program

-is to prepare a library file ("libjpeg.a", or a corresponding name on non-Unix

-machines) and reference it at your link step.  If you use only half of the

-library (only compression or only decompression), only that much code will be

-included from the library, unless your linker is hopelessly brain-damaged.

-The supplied makefiles build libjpeg.a automatically (see install.txt).

-

-While you can build the JPEG library as a shared library if the whim strikes

-you, we don't really recommend it.  The trouble with shared libraries is that

-at some point you'll probably try to substitute a new version of the library

-without recompiling the calling applications.  That generally doesn't work

-because the parameter struct declarations usually change with each new

-version.  In other words, the library's API is *not* guaranteed binary

-compatible across versions; we only try to ensure source-code compatibility.

-(In hindsight, it might have been smarter to hide the parameter structs from

-applications and introduce a ton of access functions instead.  Too late now,

-however.)

-

-On some systems your application may need to set up a signal handler to ensure

-that temporary files are deleted if the program is interrupted.  This is most

-critical if you are on MS-DOS and use the jmemdos.c memory manager back end;

-it will try to grab extended memory for temp files, and that space will NOT be

-freed automatically.  See cjpeg.c or djpeg.c for an example signal handler.

-

-It may be worth pointing out that the core JPEG library does not actually

-require the stdio library: only the default source/destination managers and

-error handler need it.  You can use the library in a stdio-less environment

-if you replace those modules and use jmemnobs.c (or another memory manager of

-your own devising).  More info about the minimum system library requirements

-may be found in jinclude.h.

-

-

-ADVANCED FEATURES

-=================

-

-Compression parameter selection

--------------------------------

-

-This section describes all the optional parameters you can set for JPEG

-compression, as well as the "helper" routines provided to assist in this

-task.  Proper setting of some parameters requires detailed understanding

-of the JPEG standard; if you don't know what a parameter is for, it's best

-not to mess with it!  See REFERENCES in the README file for pointers to

-more info about JPEG.

-

-It's a good idea to call jpeg_set_defaults() first, even if you plan to set

-all the parameters; that way your code is more likely to work with future JPEG

-libraries that have additional parameters.  For the same reason, we recommend

-you use a helper routine where one is provided, in preference to twiddling

-cinfo fields directly.

-

-The helper routines are:

-

-jpeg_set_defaults (j_compress_ptr cinfo)

-	This routine sets all JPEG parameters to reasonable defaults, using

-	only the input image's color space (field in_color_space, which must

-	already be set in cinfo).  Many applications will only need to use

-	this routine and perhaps jpeg_set_quality().

-

-jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)

-	Sets the JPEG file's colorspace (field jpeg_color_space) as specified,

-	and sets other color-space-dependent parameters appropriately.  See

-	"Special color spaces", below, before using this.  A large number of

-	parameters, including all per-component parameters, are set by this

-	routine; if you want to twiddle individual parameters you should call

-	jpeg_set_colorspace() before rather than after.

-

-jpeg_default_colorspace (j_compress_ptr cinfo)

-	Selects an appropriate JPEG colorspace based on cinfo->in_color_space,

-	and calls jpeg_set_colorspace().  This is actually a subroutine of

-	jpeg_set_defaults().  It's broken out in case you want to change

-	just the colorspace-dependent JPEG parameters.

-

-jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline)

-	Constructs JPEG quantization tables appropriate for the indicated

-	quality setting.  The quality value is expressed on the 0..100 scale

-	recommended by IJG (cjpeg's "-quality" switch uses this routine).

-	Note that the exact mapping from quality values to tables may change

-	in future IJG releases as more is learned about DCT quantization.

-	If the force_baseline parameter is TRUE, then the quantization table

-	entries are constrained to the range 1..255 for full JPEG baseline

-	compatibility.  In the current implementation, this only makes a

-	difference for quality settings below 25, and it effectively prevents

-	very small/low quality files from being generated.  The IJG decoder

-	is capable of reading the non-baseline files generated at low quality

-	settings when force_baseline is FALSE, but other decoders may not be.

-

-jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,

-			 boolean force_baseline)

-	Same as jpeg_set_quality() except that the generated tables are the

-	sample tables given in the JPEC spec section K.1, multiplied by the

-	specified scale factor (which is expressed as a percentage; thus

-	scale_factor = 100 reproduces the spec's tables).  Note that larger

-	scale factors give lower quality.  This entry point is useful for

-	conforming to the Adobe PostScript DCT conventions, but we do not

-	recommend linear scaling as a user-visible quality scale otherwise.

-	force_baseline again constrains the computed table entries to 1..255.

-

-int jpeg_quality_scaling (int quality)

-	Converts a value on the IJG-recommended quality scale to a linear

-	scaling percentage.  Note that this routine may change or go away

-	in future releases --- IJG may choose to adopt a scaling method that

-	can't be expressed as a simple scalar multiplier, in which case the

-	premise of this routine collapses.  Caveat user.

-

-jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline)

-	Set default quantization tables with linear q_scale_factor[] values

-	(see below).

-

-jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,

-		      const unsigned int *basic_table,

-		      int scale_factor, boolean force_baseline)

-	Allows an arbitrary quantization table to be created.  which_tbl

-	indicates which table slot to fill.  basic_table points to an array

-	of 64 unsigned ints given in normal array order.  These values are

-	multiplied by scale_factor/100 and then clamped to the range 1..65535

-	(or to 1..255 if force_baseline is TRUE).

-	CAUTION: prior to library version 6a, jpeg_add_quant_table expected

-	the basic table to be given in JPEG zigzag order.  If you need to

-	write code that works with either older or newer versions of this

-	routine, you must check the library version number.  Something like

-	"#if JPEG_LIB_VERSION >= 61" is the right test.

-

-jpeg_simple_progression (j_compress_ptr cinfo)

-	Generates a default scan script for writing a progressive-JPEG file.

-	This is the recommended method of creating a progressive file,

-	unless you want to make a custom scan sequence.  You must ensure that

-	the JPEG color space is set correctly before calling this routine.

-

-

-Compression parameters (cinfo fields) include:

-

-boolean arith_code

-	If TRUE, use arithmetic coding.

-	If FALSE, use Huffman coding.

-

-int block_size

-	Set DCT block size.  All N from 1 to 16 are possible.

-	Default is 8 (baseline format).

-	Larger values produce higher compression,

-	smaller values produce higher quality.

-	An exact DCT stage is possible with 1 or 2.

-	With the default quality of 75 and default Luminance qtable

-	the DCT+Quantization stage is lossless for value 1.

-	Note that values other than 8 require a SmartScale capable decoder,

-	introduced with IJG JPEG 8.  Setting the block_size parameter for

-	compression works with version 8c and later.

-

-J_DCT_METHOD dct_method

-	Selects the algorithm used for the DCT step.  Choices are:

-		JDCT_ISLOW: slow but accurate integer algorithm

-		JDCT_IFAST: faster, less accurate integer method

-		JDCT_FLOAT: floating-point method

-		JDCT_DEFAULT: default method (normally JDCT_ISLOW)

-		JDCT_FASTEST: fastest method (normally JDCT_IFAST)

-	The FLOAT method is very slightly more accurate than the ISLOW method,

-	but may give different results on different machines due to varying

-	roundoff behavior.  The integer methods should give the same results

-	on all machines.  On machines with sufficiently fast FP hardware, the

-	floating-point method may also be the fastest.  The IFAST method is

-	considerably less accurate than the other two; its use is not

-	recommended if high quality is a concern.  JDCT_DEFAULT and

-	JDCT_FASTEST are macros configurable by each installation.

-

-unsigned int scale_num, scale_denom

-	Scale the image by the fraction scale_num/scale_denom.  Default is

-	1/1, or no scaling.  Currently, the supported scaling ratios are

-	M/N with all N from 1 to 16, where M is the destination DCT size,

-	which is 8 by default (see block_size parameter above).

-	(The library design allows for arbitrary scaling ratios but this

-	is not likely to be implemented any time soon.)

-

-J_COLOR_SPACE jpeg_color_space

-int num_components

-	The JPEG color space and corresponding number of components; see

-	"Special color spaces", below, for more info.  We recommend using

-	jpeg_set_colorspace() if you want to change these.

-

-J_COLOR_TRANSFORM color_transform

-	Internal color transform identifier, writes LSE marker if nonzero

-	(requires decoder with inverse color transform support, introduced

-	with IJG JPEG 9).

-	Two values are currently possible: JCT_NONE and JCT_SUBTRACT_GREEN.

-	Set this value for lossless RGB application *before* calling

-	jpeg_set_colorspace(), because entropy table assignment in

-	jpeg_set_colorspace() depends on color_transform.

-

-boolean optimize_coding

-	TRUE causes the compressor to compute optimal Huffman coding tables

-	for the image.  This requires an extra pass over the data and

-	therefore costs a good deal of space and time.  The default is

-	FALSE, which tells the compressor to use the supplied or default

-	Huffman tables.  In most cases optimal tables save only a few percent

-	of file size compared to the default tables.  Note that when this is

-	TRUE, you need not supply Huffman tables at all, and any you do

-	supply will be overwritten.

-

-unsigned int restart_interval

-int restart_in_rows

-	To emit restart markers in the JPEG file, set one of these nonzero.

-	Set restart_interval to specify the exact interval in MCU blocks.

-	Set restart_in_rows to specify the interval in MCU rows.  (If

-	restart_in_rows is not 0, then restart_interval is set after the

-	image width in MCUs is computed.)  Defaults are zero (no restarts).

-	One restart marker per MCU row is often a good choice.

-	NOTE: the overhead of restart markers is higher in grayscale JPEG

-	files than in color files, and MUCH higher in progressive JPEGs.

-	If you use restarts, you may want to use larger intervals in those

-	cases.

-

-const jpeg_scan_info * scan_info

-int num_scans

-	By default, scan_info is NULL; this causes the compressor to write a

-	single-scan sequential JPEG file.  If not NULL, scan_info points to

-	an array of scan definition records of length num_scans.  The

-	compressor will then write a JPEG file having one scan for each scan

-	definition record.  This is used to generate noninterleaved or

-	progressive JPEG files.  The library checks that the scan array

-	defines a valid JPEG scan sequence.  (jpeg_simple_progression creates

-	a suitable scan definition array for progressive JPEG.)  This is

-	discussed further under "Progressive JPEG support".

-

-boolean do_fancy_downsampling

-	If TRUE, use direct DCT scaling with DCT size > 8 for downsampling

-	of chroma components.

-	If FALSE, use only DCT size <= 8 and simple separate downsampling.

-	Default is TRUE.

-	For better image stability in multiple generation compression cycles

-	it is preferable that this value matches the corresponding

-	do_fancy_upsampling value in decompression.

-

-int smoothing_factor

-	If non-zero, the input image is smoothed; the value should be 1 for

-	minimal smoothing to 100 for maximum smoothing.  Consult jcsample.c

-	for details of the smoothing algorithm.  The default is zero.

-

-boolean write_JFIF_header

-	If TRUE, a JFIF APP0 marker is emitted.  jpeg_set_defaults() and

-	jpeg_set_colorspace() set this TRUE if a JFIF-legal JPEG color space

-	(ie, YCbCr or grayscale) is selected, otherwise FALSE.

-

-UINT8 JFIF_major_version

-UINT8 JFIF_minor_version

-	The version number to be written into the JFIF marker.

-	jpeg_set_defaults() initializes the version to 1.01 (major=minor=1).

-	You should set it to 1.02 (major=1, minor=2) if you plan to write

-	any JFIF 1.02 extension markers.

-

-UINT8 density_unit

-UINT16 X_density

-UINT16 Y_density

-	The resolution information to be written into the JFIF marker;

-	not used otherwise.  density_unit may be 0 for unknown,

-	1 for dots/inch, or 2 for dots/cm.  The default values are 0,1,1

-	indicating square pixels of unknown size.

-

-boolean write_Adobe_marker

-	If TRUE, an Adobe APP14 marker is emitted.  jpeg_set_defaults() and

-	jpeg_set_colorspace() set this TRUE if JPEG color space RGB, CMYK,

-	or YCCK is selected, otherwise FALSE.  It is generally a bad idea

-	to set both write_JFIF_header and write_Adobe_marker.  In fact,

-	you probably shouldn't change the default settings at all --- the

-	default behavior ensures that the JPEG file's color space can be

-	recognized by the decoder.

-

-JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS]

-	Pointers to coefficient quantization tables, one per table slot,

-	or NULL if no table is defined for a slot.  Usually these should

-	be set via one of the above helper routines; jpeg_add_quant_table()

-	is general enough to define any quantization table.  The other

-	routines will set up table slot 0 for luminance quality and table

-	slot 1 for chrominance.

-

-int q_scale_factor[NUM_QUANT_TBLS]

-	Linear quantization scaling factors (percentage, initialized 100)

-	for use with jpeg_default_qtables().

-	See rdswitch.c and cjpeg.c for an example of usage.

-	Note that the q_scale_factor[] fields are the "linear" scales, so you

-	have to convert from user-defined ratings via jpeg_quality_scaling().

-	Here is an example code which corresponds to cjpeg -quality 90,70:

-

-		jpeg_set_defaults(cinfo);

-

-		/* Set luminance quality 90. */

-		cinfo->q_scale_factor[0] = jpeg_quality_scaling(90);

-		/* Set chrominance quality 70. */

-		cinfo->q_scale_factor[1] = jpeg_quality_scaling(70);

-

-		jpeg_default_qtables(cinfo, force_baseline);

-

-	CAUTION: You must also set 1x1 subsampling for efficient separate

-	color quality selection, since the default value used by library

-	is 2x2:

-

-		cinfo->comp_info[0].v_samp_factor = 1;

-		cinfo->comp_info[0].h_samp_factor = 1;

-

-JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS]

-JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS]

-	Pointers to Huffman coding tables, one per table slot, or NULL if

-	no table is defined for a slot.  Slots 0 and 1 are filled with the

-	JPEG sample tables by jpeg_set_defaults().  If you need to allocate

-	more table structures, jpeg_alloc_huff_table() may be used.

-	Note that optimal Huffman tables can be computed for an image

-	by setting optimize_coding, as discussed above; there's seldom

-	any need to mess with providing your own Huffman tables.

-

-

-The actual dimensions of the JPEG image that will be written to the file are

-given by the following fields.  These are computed from the input image

-dimensions and the compression parameters by jpeg_start_compress().  You can

-also call jpeg_calc_jpeg_dimensions() to obtain the values that will result

-from the current parameter settings.  This can be useful if you are trying

-to pick a scaling ratio that will get close to a desired target size.

-

-JDIMENSION jpeg_width		Actual dimensions of output image.

-JDIMENSION jpeg_height

-

-

-Per-component parameters are stored in the struct cinfo.comp_info[i] for

-component number i.  Note that components here refer to components of the

-JPEG color space, *not* the source image color space.  A suitably large

-comp_info[] array is allocated by jpeg_set_defaults(); if you choose not

-to use that routine, it's up to you to allocate the array.

-

-int component_id

-	The one-byte identifier code to be recorded in the JPEG file for

-	this component.  For the standard color spaces, we recommend you

-	leave the default values alone.

-

-int h_samp_factor

-int v_samp_factor

-	Horizontal and vertical sampling factors for the component; must

-	be 1..4 according to the JPEG standard.  Note that larger sampling

-	factors indicate a higher-resolution component; many people find

-	this behavior quite unintuitive.  The default values are 2,2 for

-	luminance components and 1,1 for chrominance components, except

-	for grayscale where 1,1 is used.

-

-int quant_tbl_no

-	Quantization table number for component.  The default value is

-	0 for luminance components and 1 for chrominance components.

-

-int dc_tbl_no

-int ac_tbl_no

-	DC and AC entropy coding table numbers.  The default values are

-	0 for luminance components and 1 for chrominance components.

-

-int component_index

-	Must equal the component's index in comp_info[].  (Beginning in

-	release v6, the compressor library will fill this in automatically;

-	you don't have to.)

-

-

-Decompression parameter selection

----------------------------------

-

-Decompression parameter selection is somewhat simpler than compression

-parameter selection, since all of the JPEG internal parameters are

-recorded in the source file and need not be supplied by the application.

-(Unless you are working with abbreviated files, in which case see

-"Abbreviated datastreams", below.)  Decompression parameters control

-the postprocessing done on the image to deliver it in a format suitable

-for the application's use.  Many of the parameters control speed/quality

-tradeoffs, in which faster decompression may be obtained at the price of

-a poorer-quality image.  The defaults select the highest quality (slowest)

-processing.

-

-The following fields in the JPEG object are set by jpeg_read_header() and

-may be useful to the application in choosing decompression parameters:

-

-JDIMENSION image_width			Width and height of image

-JDIMENSION image_height

-int num_components			Number of color components

-J_COLOR_SPACE jpeg_color_space		Colorspace of image

-boolean saw_JFIF_marker			TRUE if a JFIF APP0 marker was seen

-  UINT8 JFIF_major_version		Version information from JFIF marker

-  UINT8 JFIF_minor_version

-  UINT8 density_unit			Resolution data from JFIF marker

-  UINT16 X_density

-  UINT16 Y_density

-boolean saw_Adobe_marker		TRUE if an Adobe APP14 marker was seen

-  UINT8 Adobe_transform			Color transform code from Adobe marker

-

-The JPEG color space, unfortunately, is something of a guess since the JPEG

-standard proper does not provide a way to record it.  In practice most files

-adhere to the JFIF or Adobe conventions, and the decoder will recognize these

-correctly.  See "Special color spaces", below, for more info.

-

-

-The decompression parameters that determine the basic properties of the

-returned image are:

-

-J_COLOR_SPACE out_color_space

-	Output color space.  jpeg_read_header() sets an appropriate default

-	based on jpeg_color_space; typically it will be RGB or grayscale.

-	The application can change this field to request output in a different

-	colorspace.  For example, set it to JCS_GRAYSCALE to get grayscale

-	output from a color file.  (This is useful for previewing: grayscale

-	output is faster than full color since the color components need not

-	be processed.)  Note that not all possible color space transforms are

-	currently implemented; you may need to extend jdcolor.c if you want an

-	unusual conversion.

-

-unsigned int scale_num, scale_denom

-	Scale the image by the fraction scale_num/scale_denom.  Currently,

-	the supported scaling ratios are M/N with all M from 1 to 16, where

-	N is the source DCT size, which is 8 for baseline JPEG.  (The library

-	design allows for arbitrary scaling ratios but this is not likely

-	to be implemented any time soon.)  The values are initialized by

-	jpeg_read_header() with the source DCT size.  For baseline JPEG

-	this is 8/8.  If you change only the scale_num value while leaving

-	the other unchanged, then this specifies the DCT scaled size to be

-	applied on the given input.  For baseline JPEG this is equivalent

-	to M/8 scaling, since the source DCT size for baseline JPEG is 8.

-	Smaller scaling ratios permit significantly faster decoding since

-	fewer pixels need be processed and a simpler IDCT method can be used.

-

-boolean quantize_colors

-	If set TRUE, colormapped output will be delivered.  Default is FALSE,

-	meaning that full-color output will be delivered.

-

-The next three parameters are relevant only if quantize_colors is TRUE.

-

-int desired_number_of_colors

-	Maximum number of colors to use in generating a library-supplied color

-	map (the actual number of colors is returned in a different field).

-	Default 256.  Ignored when the application supplies its own color map.

-

-boolean two_pass_quantize

-	If TRUE, an extra pass over the image is made to select a custom color

-	map for the image.  This usually looks a lot better than the one-size-

-	fits-all colormap that is used otherwise.  Default is TRUE.  Ignored

-	when the application supplies its own color map.

-

-J_DITHER_MODE dither_mode

-	Selects color dithering method.  Supported values are:

-		JDITHER_NONE	no dithering: fast, very low quality

-		JDITHER_ORDERED	ordered dither: moderate speed and quality

-		JDITHER_FS	Floyd-Steinberg dither: slow, high quality

-	Default is JDITHER_FS.  (At present, ordered dither is implemented

-	only in the single-pass, standard-colormap case.  If you ask for

-	ordered dither when two_pass_quantize is TRUE or when you supply

-	an external color map, you'll get F-S dithering.)

-

-When quantize_colors is TRUE, the target color map is described by the next

-two fields.  colormap is set to NULL by jpeg_read_header().  The application

-can supply a color map by setting colormap non-NULL and setting

-actual_number_of_colors to the map size.  Otherwise, jpeg_start_decompress()

-selects a suitable color map and sets these two fields itself.

-[Implementation restriction: at present, an externally supplied colormap is

-only accepted for 3-component output color spaces.]

-

-JSAMPARRAY colormap

-	The color map, represented as a 2-D pixel array of out_color_components

-	rows and actual_number_of_colors columns.  Ignored if not quantizing.

-	CAUTION: if the JPEG library creates its own colormap, the storage

-	pointed to by this field is released by jpeg_finish_decompress().

-	Copy the colormap somewhere else first, if you want to save it.

-

-int actual_number_of_colors

-	The number of colors in the color map.

-

-Additional decompression parameters that the application may set include:

-

-J_DCT_METHOD dct_method

-	Selects the algorithm used for the DCT step.  Choices are the same

-	as described above for compression.

-

-boolean do_fancy_upsampling

-	If TRUE, use direct DCT scaling with DCT size > 8 for upsampling

-	of chroma components.

-	If FALSE, use only DCT size <= 8 and simple separate upsampling.

-	Default is TRUE.

-	For better image stability in multiple generation compression cycles

-	it is preferable that this value matches the corresponding

-	do_fancy_downsampling value in compression.

-

-boolean do_block_smoothing

-	If TRUE, interblock smoothing is applied in early stages of decoding

-	progressive JPEG files; if FALSE, not.  Default is TRUE.  Early

-	progression stages look "fuzzy" with smoothing, "blocky" without.

-	In any case, block smoothing ceases to be applied after the first few

-	AC coefficients are known to full accuracy, so it is relevant only

-	when using buffered-image mode for progressive images.

-

-boolean enable_1pass_quant

-boolean enable_external_quant

-boolean enable_2pass_quant

-	These are significant only in buffered-image mode, which is

-	described in its own section below.

-

-

-The output image dimensions are given by the following fields.  These are

-computed from the source image dimensions and the decompression parameters

-by jpeg_start_decompress().  You can also call jpeg_calc_output_dimensions()

-to obtain the values that will result from the current parameter settings.

-This can be useful if you are trying to pick a scaling ratio that will get

-close to a desired target size.  It's also important if you are using the

-JPEG library's memory manager to allocate output buffer space, because you

-are supposed to request such buffers *before* jpeg_start_decompress().

-

-JDIMENSION output_width		Actual dimensions of output image.

-JDIMENSION output_height

-int out_color_components	Number of color components in out_color_space.

-int output_components		Number of color components returned.

-int rec_outbuf_height		Recommended height of scanline buffer.

-

-When quantizing colors, output_components is 1, indicating a single color map

-index per pixel.  Otherwise it equals out_color_components.  The output arrays

-are required to be output_width * output_components JSAMPLEs wide.

-

-rec_outbuf_height is the recommended minimum height (in scanlines) of the

-buffer passed to jpeg_read_scanlines().  If the buffer is smaller, the

-library will still work, but time will be wasted due to unnecessary data

-copying.  In high-quality modes, rec_outbuf_height is always 1, but some

-faster, lower-quality modes set it to larger values (typically 2 to 4).

-If you are going to ask for a high-speed processing mode, you may as well

-go to the trouble of honoring rec_outbuf_height so as to avoid data copying.

-(An output buffer larger than rec_outbuf_height lines is OK, but won't

-provide any material speed improvement over that height.)

-

-

-Special color spaces

---------------------

-

-The JPEG standard itself is "color blind" and doesn't specify any particular

-color space.  It is customary to convert color data to a luminance/chrominance

-color space before compressing, since this permits greater compression.  The

-existing JPEG file interchange format standards specify YCbCr or GRAYSCALE

-data (JFIF version 1), GRAYSCALE, RGB, YCbCr, CMYK, or YCCK (Adobe), or BG_RGB

-or BG_YCC (big gamut color spaces, JFIF version 2).  For special applications

-such as multispectral images, other color spaces can be used,

-but it must be understood that such files will be unportable.

-

-The JPEG library can handle the most common colorspace conversions (namely

-RGB <=> YCbCr and CMYK <=> YCCK).  It can also deal with data of an unknown

-color space, passing it through without conversion.  If you deal extensively

-with an unusual color space, you can easily extend the library to understand

-additional color spaces and perform appropriate conversions.

-

-For compression, the source data's color space is specified by field

-in_color_space.  This is transformed to the JPEG file's color space given

-by jpeg_color_space.  jpeg_set_defaults() chooses a reasonable JPEG color

-space depending on in_color_space, but you can override this by calling

-jpeg_set_colorspace().  Of course you must select a supported transformation.

-jccolor.c currently supports the following transformations:

-	RGB => YCbCr

-	RGB => GRAYSCALE

-	RGB => BG_YCC

-	YCbCr => GRAYSCALE

-	YCbCr => BG_YCC

-	CMYK => YCCK

-plus the null transforms: GRAYSCALE => GRAYSCALE, RGB => RGB,

-BG_RGB => BG_RGB, YCbCr => YCbCr, BG_YCC => BG_YCC, CMYK => CMYK,

-YCCK => YCCK, and UNKNOWN => UNKNOWN.

-

-The file interchange format standards (JFIF and Adobe) specify APPn markers

-that indicate the color space of the JPEG file.  It is important to ensure

-that these are written correctly, or omitted if the JPEG file's color space

-is not one of the ones supported by the interchange standards.

-jpeg_set_colorspace() will set the compression parameters to include or omit

-the APPn markers properly, so long as it is told the truth about the JPEG

-color space.  For example, if you are writing some random 3-component color

-space without conversion, don't try to fake out the library by setting

-in_color_space and jpeg_color_space to JCS_YCbCr; use JCS_UNKNOWN.

-You may want to write an APPn marker of your own devising to identify

-the colorspace --- see "Special markers", below.

-

-When told that the color space is UNKNOWN, the library will default to using

-luminance-quality compression parameters for all color components.  You may

-well want to change these parameters.  See the source code for

-jpeg_set_colorspace(), in jcparam.c, for details.

-

-For decompression, the JPEG file's color space is given in jpeg_color_space,

-and this is transformed to the output color space out_color_space.

-jpeg_read_header's setting of jpeg_color_space can be relied on if the file

-conforms to JFIF or Adobe conventions, but otherwise it is no better than a

-guess.  If you know the JPEG file's color space for certain, you can override

-jpeg_read_header's guess by setting jpeg_color_space.  jpeg_read_header also

-selects a default output color space based on (its guess of) jpeg_color_space;

-set out_color_space to override this.  Again, you must select a supported

-transformation.  jdcolor.c currently supports

-	YCbCr => RGB

-	YCbCr => GRAYSCALE

-	BG_YCC => RGB

-	BG_YCC => GRAYSCALE

-	RGB => GRAYSCALE

-	GRAYSCALE => RGB

-	YCCK => CMYK

-as well as the null transforms.  (Since GRAYSCALE=>RGB is provided, an

-application can force grayscale JPEGs to look like color JPEGs if it only

-wants to handle one case.)

-

-The two-pass color quantizer, jquant2.c, is specialized to handle RGB data

-(it weights distances appropriately for RGB colors).  You'll need to modify

-the code if you want to use it for non-RGB output color spaces.  Note that

-jquant2.c is used to map to an application-supplied colormap as well as for

-the normal two-pass colormap selection process.

-

-CAUTION: it appears that Adobe Photoshop writes inverted data in CMYK JPEG

-files: 0 represents 100% ink coverage, rather than 0% ink as you'd expect.

-This is arguably a bug in Photoshop, but if you need to work with Photoshop

-CMYK files, you will have to deal with it in your application.  We cannot

-"fix" this in the library by inverting the data during the CMYK<=>YCCK

-transform, because that would break other applications, notably Ghostscript.

-Photoshop versions prior to 3.0 write EPS files containing JPEG-encoded CMYK

-data in the same inverted-YCCK representation used in bare JPEG files, but

-the surrounding PostScript code performs an inversion using the PS image

-operator.  I am told that Photoshop 3.0 will write uninverted YCCK in

-EPS/JPEG files, and will omit the PS-level inversion.  (But the data

-polarity used in bare JPEG files will not change in 3.0.)  In either case,

-the JPEG library must not invert the data itself, or else Ghostscript would

-read these EPS files incorrectly.

-

-

-Error handling

---------------

-

-When the default error handler is used, any error detected inside the JPEG

-routines will cause a message to be printed on stderr, followed by exit().

-You can supply your own error handling routines to override this behavior

-and to control the treatment of nonfatal warnings and trace/debug messages.

-The file example.c illustrates the most common case, which is to have the

-application regain control after an error rather than exiting.

-

-The JPEG library never writes any message directly; it always goes through

-the error handling routines.  Three classes of messages are recognized:

-  * Fatal errors: the library cannot continue.

-  * Warnings: the library can continue, but the data is corrupt, and a

-    damaged output image is likely to result.

-  * Trace/informational messages.  These come with a trace level indicating

-    the importance of the message; you can control the verbosity of the

-    program by adjusting the maximum trace level that will be displayed.

-

-You may, if you wish, simply replace the entire JPEG error handling module

-(jerror.c) with your own code.  However, you can avoid code duplication by

-only replacing some of the routines depending on the behavior you need.

-This is accomplished by calling jpeg_std_error() as usual, but then overriding

-some of the method pointers in the jpeg_error_mgr struct, as illustrated by

-example.c.

-

-All of the error handling routines will receive a pointer to the JPEG object

-(a j_common_ptr which points to either a jpeg_compress_struct or a

-jpeg_decompress_struct; if you need to tell which, test the is_decompressor

-field).  This struct includes a pointer to the error manager struct in its

-"err" field.  Frequently, custom error handler routines will need to access

-additional data which is not known to the JPEG library or the standard error

-handler.  The most convenient way to do this is to embed either the JPEG

-object or the jpeg_error_mgr struct in a larger structure that contains

-additional fields; then casting the passed pointer provides access to the

-additional fields.  Again, see example.c for one way to do it.  (Beginning

-with IJG version 6b, there is also a void pointer "client_data" in each

-JPEG object, which the application can also use to find related data.

-The library does not touch client_data at all.)

-

-The individual methods that you might wish to override are:

-

-error_exit (j_common_ptr cinfo)

-	Receives control for a fatal error.  Information sufficient to

-	generate the error message has been stored in cinfo->err; call

-	output_message to display it.  Control must NOT return to the caller;

-	generally this routine will exit() or longjmp() somewhere.

-	Typically you would override this routine to get rid of the exit()

-	default behavior.  Note that if you continue processing, you should

-	clean up the JPEG object with jpeg_abort() or jpeg_destroy().

-

-output_message (j_common_ptr cinfo)

-	Actual output of any JPEG message.  Override this to send messages

-	somewhere other than stderr.  Note that this method does not know

-	how to generate a message, only where to send it.

-

-format_message (j_common_ptr cinfo, char * buffer)

-	Constructs a readable error message string based on the error info

-	stored in cinfo->err.  This method is called by output_message.  Few

-	applications should need to override this method.  One possible

-	reason for doing so is to implement dynamic switching of error message

-	language.

-

-emit_message (j_common_ptr cinfo, int msg_level)

-	Decide whether or not to emit a warning or trace message; if so,

-	calls output_message.  The main reason for overriding this method

-	would be to abort on warnings.  msg_level is -1 for warnings,

-	0 and up for trace messages.

-

-Only error_exit() and emit_message() are called from the rest of the JPEG

-library; the other two are internal to the error handler.

-

-The actual message texts are stored in an array of strings which is pointed to

-by the field err->jpeg_message_table.  The messages are numbered from 0 to

-err->last_jpeg_message, and it is these code numbers that are used in the

-JPEG library code.  You could replace the message texts (for instance, with

-messages in French or German) by changing the message table pointer.  See

-jerror.h for the default texts.  CAUTION: this table will almost certainly

-change or grow from one library version to the next.

-

-It may be useful for an application to add its own message texts that are

-handled by the same mechanism.  The error handler supports a second "add-on"

-message table for this purpose.  To define an addon table, set the pointer

-err->addon_message_table and the message numbers err->first_addon_message and

-err->last_addon_message.  If you number the addon messages beginning at 1000

-or so, you won't have to worry about conflicts with the library's built-in

-messages.  See the sample applications cjpeg/djpeg for an example of using

-addon messages (the addon messages are defined in cderror.h).

-

-Actual invocation of the error handler is done via macros defined in jerror.h:

-	ERREXITn(...)	for fatal errors

-	WARNMSn(...)	for corrupt-data warnings

-	TRACEMSn(...)	for trace and informational messages.

-These macros store the message code and any additional parameters into the

-error handler struct, then invoke the error_exit() or emit_message() method.

-The variants of each macro are for varying numbers of additional parameters.

-The additional parameters are inserted into the generated message using

-standard printf() format codes.

-

-See jerror.h and jerror.c for further details.

-

-

-Compressed data handling (source and destination managers)

-----------------------------------------------------------

-

-The JPEG compression library sends its compressed data to a "destination

-manager" module.  The default destination manager just writes the data to a

-memory buffer or to a stdio stream, but you can provide your own manager to

-do something else.  Similarly, the decompression library calls a "source

-manager" to obtain the compressed data; you can provide your own source

-manager if you want the data to come from somewhere other than a memory

-buffer or a stdio stream.

-

-In both cases, compressed data is processed a bufferload at a time: the

-destination or source manager provides a work buffer, and the library invokes

-the manager only when the buffer is filled or emptied.  (You could define a

-one-character buffer to force the manager to be invoked for each byte, but

-that would be rather inefficient.)  The buffer's size and location are

-controlled by the manager, not by the library.  For example, the memory

-source manager just makes the buffer pointer and length point to the original

-data in memory.  In this case the buffer-reload procedure will be invoked

-only if the decompressor ran off the end of the datastream, which would

-indicate an erroneous datastream.

-

-The work buffer is defined as an array of datatype JOCTET, which is generally

-"char" or "unsigned char".  On a machine where char is not exactly 8 bits

-wide, you must define JOCTET as a wider data type and then modify the data

-source and destination modules to transcribe the work arrays into 8-bit units

-on external storage.

-

-A data destination manager struct contains a pointer and count defining the

-next byte to write in the work buffer and the remaining free space:

-

-	JOCTET * next_output_byte;  /* => next byte to write in buffer */

-	size_t free_in_buffer;      /* # of byte spaces remaining in buffer */

-

-The library increments the pointer and decrements the count until the buffer

-is filled.  The manager's empty_output_buffer method must reset the pointer

-and count.  The manager is expected to remember the buffer's starting address

-and total size in private fields not visible to the library.

-

-A data destination manager provides three methods:

-

-init_destination (j_compress_ptr cinfo)

-	Initialize destination.  This is called by jpeg_start_compress()

-	before any data is actually written.  It must initialize

-	next_output_byte and free_in_buffer.  free_in_buffer must be

-	initialized to a positive value.

-

-empty_output_buffer (j_compress_ptr cinfo)

-	This is called whenever the buffer has filled (free_in_buffer

-	reaches zero).  In typical applications, it should write out the

-	*entire* buffer (use the saved start address and buffer length;

-	ignore the current state of next_output_byte and free_in_buffer).

-	Then reset the pointer & count to the start of the buffer, and

-	return TRUE indicating that the buffer has been dumped.

-	free_in_buffer must be set to a positive value when TRUE is

-	returned.  A FALSE return should only be used when I/O suspension is

-	desired (this operating mode is discussed in the next section).

-

-term_destination (j_compress_ptr cinfo)

-	Terminate destination --- called by jpeg_finish_compress() after all

-	data has been written.  In most applications, this must flush any

-	data remaining in the buffer.  Use either next_output_byte or

-	free_in_buffer to determine how much data is in the buffer.

-

-term_destination() is NOT called by jpeg_abort() or jpeg_destroy().  If you

-want the destination manager to be cleaned up during an abort, you must do it

-yourself.

-

-You will also need code to create a jpeg_destination_mgr struct, fill in its

-method pointers, and insert a pointer to the struct into the "dest" field of

-the JPEG compression object.  This can be done in-line in your setup code if

-you like, but it's probably cleaner to provide a separate routine similar to

-the jpeg_stdio_dest() or jpeg_mem_dest() routines of the supplied destination

-managers.

-

-Decompression source managers follow a parallel design, but with some

-additional frammishes.  The source manager struct contains a pointer and count

-defining the next byte to read from the work buffer and the number of bytes

-remaining:

-

-	const JOCTET * next_input_byte; /* => next byte to read from buffer */

-	size_t bytes_in_buffer;         /* # of bytes remaining in buffer */

-

-The library increments the pointer and decrements the count until the buffer

-is emptied.  The manager's fill_input_buffer method must reset the pointer and

-count.  In most applications, the manager must remember the buffer's starting

-address and total size in private fields not visible to the library.

-

-A data source manager provides five methods:

-

-init_source (j_decompress_ptr cinfo)

-	Initialize source.  This is called by jpeg_read_header() before any

-	data is actually read.  Unlike init_destination(), it may leave

-	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call

-	will occur immediately).

-

-fill_input_buffer (j_decompress_ptr cinfo)

-	This is called whenever bytes_in_buffer has reached zero and more

-	data is wanted.  In typical applications, it should read fresh data

-	into the buffer (ignoring the current state of next_input_byte and

-	bytes_in_buffer), reset the pointer & count to the start of the

-	buffer, and return TRUE indicating that the buffer has been reloaded.

-	It is not necessary to fill the buffer entirely, only to obtain at

-	least one more byte.  bytes_in_buffer MUST be set to a positive value

-	if TRUE is returned.  A FALSE return should only be used when I/O

-	suspension is desired (this mode is discussed in the next section).

-

-skip_input_data (j_decompress_ptr cinfo, long num_bytes)

-	Skip num_bytes worth of data.  The buffer pointer and count should

-	be advanced over num_bytes input bytes, refilling the buffer as

-	needed.  This is used to skip over a potentially large amount of

-	uninteresting data (such as an APPn marker).  In some applications

-	it may be possible to optimize away the reading of the skipped data,

-	but it's not clear that being smart is worth much trouble; large

-	skips are uncommon.  bytes_in_buffer may be zero on return.

-	A zero or negative skip count should be treated as a no-op.

-

-resync_to_restart (j_decompress_ptr cinfo, int desired)

-	This routine is called only when the decompressor has failed to find

-	a restart (RSTn) marker where one is expected.  Its mission is to

-	find a suitable point for resuming decompression.  For most

-	applications, we recommend that you just use the default resync

-	procedure, jpeg_resync_to_restart().  However, if you are able to back

-	up in the input data stream, or if you have a-priori knowledge about

-	the likely location of restart markers, you may be able to do better.

-	Read the read_restart_marker() and jpeg_resync_to_restart() routines

-	in jdmarker.c if you think you'd like to implement your own resync

-	procedure.

-

-term_source (j_decompress_ptr cinfo)

-	Terminate source --- called by jpeg_finish_decompress() after all

-	data has been read.  Often a no-op.

-

-For both fill_input_buffer() and skip_input_data(), there is no such thing

-as an EOF return.  If the end of the file has been reached, the routine has

-a choice of exiting via ERREXIT() or inserting fake data into the buffer.

-In most cases, generating a warning message and inserting a fake EOI marker

-is the best course of action --- this will allow the decompressor to output

-however much of the image is there.  In pathological cases, the decompressor

-may swallow the EOI and again demand data ... just keep feeding it fake EOIs.

-jdatasrc.c illustrates the recommended error recovery behavior.

-

-term_source() is NOT called by jpeg_abort() or jpeg_destroy().  If you want

-the source manager to be cleaned up during an abort, you must do it yourself.

-

-You will also need code to create a jpeg_source_mgr struct, fill in its method

-pointers, and insert a pointer to the struct into the "src" field of the JPEG

-decompression object.  This can be done in-line in your setup code if you

-like, but it's probably cleaner to provide a separate routine similar to the

-jpeg_stdio_src() or jpeg_mem_src() routines of the supplied source managers.

-

-For more information, consult the memory and stdio source and destination

-managers in jdatasrc.c and jdatadst.c.

-

-

-I/O suspension

---------------

-

-Some applications need to use the JPEG library as an incremental memory-to-

-memory filter: when the compressed data buffer is filled or emptied, they want

-control to return to the outer loop, rather than expecting that the buffer can

-be emptied or reloaded within the data source/destination manager subroutine.

-The library supports this need by providing an "I/O suspension" mode, which we

-describe in this section.

-

-The I/O suspension mode is not a panacea: nothing is guaranteed about the

-maximum amount of time spent in any one call to the library, so it will not

-eliminate response-time problems in single-threaded applications.  If you

-need guaranteed response time, we suggest you "bite the bullet" and implement

-a real multi-tasking capability.

-

-To use I/O suspension, cooperation is needed between the calling application

-and the data source or destination manager; you will always need a custom

-source/destination manager.  (Please read the previous section if you haven't

-already.)  The basic idea is that the empty_output_buffer() or

-fill_input_buffer() routine is a no-op, merely returning FALSE to indicate

-that it has done nothing.  Upon seeing this, the JPEG library suspends

-operation and returns to its caller.  The surrounding application is

-responsible for emptying or refilling the work buffer before calling the

-JPEG library again.

-

-Compression suspension:

-

-For compression suspension, use an empty_output_buffer() routine that returns

-FALSE; typically it will not do anything else.  This will cause the

-compressor to return to the caller of jpeg_write_scanlines(), with the return

-value indicating that not all the supplied scanlines have been accepted.

-The application must make more room in the output buffer, adjust the output

-buffer pointer/count appropriately, and then call jpeg_write_scanlines()

-again, pointing to the first unconsumed scanline.

-

-When forced to suspend, the compressor will backtrack to a convenient stopping

-point (usually the start of the current MCU); it will regenerate some output

-data when restarted.  Therefore, although empty_output_buffer() is only

-called when the buffer is filled, you should NOT write out the entire buffer

-after a suspension.  Write only the data up to the current position of

-next_output_byte/free_in_buffer.  The data beyond that point will be

-regenerated after resumption.

-

-Because of the backtracking behavior, a good-size output buffer is essential

-for efficiency; you don't want the compressor to suspend often.  (In fact, an

-overly small buffer could lead to infinite looping, if a single MCU required

-more data than would fit in the buffer.)  We recommend a buffer of at least

-several Kbytes.  You may want to insert explicit code to ensure that you don't

-call jpeg_write_scanlines() unless there is a reasonable amount of space in

-the output buffer; in other words, flush the buffer before trying to compress

-more data.

-

-The compressor does not allow suspension while it is trying to write JPEG

-markers at the beginning and end of the file.  This means that:

-  * At the beginning of a compression operation, there must be enough free

-    space in the output buffer to hold the header markers (typically 600 or

-    so bytes).  The recommended buffer size is bigger than this anyway, so

-    this is not a problem as long as you start with an empty buffer.  However,

-    this restriction might catch you if you insert large special markers, such

-    as a JFIF thumbnail image, without flushing the buffer afterwards.

-  * When you call jpeg_finish_compress(), there must be enough space in the

-    output buffer to emit any buffered data and the final EOI marker.  In the

-    current implementation, half a dozen bytes should suffice for this, but

-    for safety's sake we recommend ensuring that at least 100 bytes are free

-    before calling jpeg_finish_compress().

-

-A more significant restriction is that jpeg_finish_compress() cannot suspend.

-This means you cannot use suspension with multi-pass operating modes, namely

-Huffman code optimization and multiple-scan output.  Those modes write the

-whole file during jpeg_finish_compress(), which will certainly result in

-buffer overrun.  (Note that this restriction applies only to compression,

-not decompression.  The decompressor supports input suspension in all of its

-operating modes.)

-

-Decompression suspension:

-

-For decompression suspension, use a fill_input_buffer() routine that simply

-returns FALSE (except perhaps during error recovery, as discussed below).

-This will cause the decompressor to return to its caller with an indication

-that suspension has occurred.  This can happen at four places:

-  * jpeg_read_header(): will return JPEG_SUSPENDED.

-  * jpeg_start_decompress(): will return FALSE, rather than its usual TRUE.

-  * jpeg_read_scanlines(): will return the number of scanlines already

-	completed (possibly 0).

-  * jpeg_finish_decompress(): will return FALSE, rather than its usual TRUE.

-The surrounding application must recognize these cases, load more data into

-the input buffer, and repeat the call.  In the case of jpeg_read_scanlines(),

-increment the passed pointers past any scanlines successfully read.

-

-Just as with compression, the decompressor will typically backtrack to a

-convenient restart point before suspending.  When fill_input_buffer() is

-called, next_input_byte/bytes_in_buffer point to the current restart point,

-which is where the decompressor will backtrack to if FALSE is returned.

-The data beyond that position must NOT be discarded if you suspend; it needs

-to be re-read upon resumption.  In most implementations, you'll need to shift

-this data down to the start of your work buffer and then load more data after

-it.  Again, this behavior means that a several-Kbyte work buffer is essential

-for decent performance; furthermore, you should load a reasonable amount of

-new data before resuming decompression.  (If you loaded, say, only one new

-byte each time around, you could waste a LOT of cycles.)

-

-The skip_input_data() source manager routine requires special care in a

-suspension scenario.  This routine is NOT granted the ability to suspend the

-decompressor; it can decrement bytes_in_buffer to zero, but no more.  If the

-requested skip distance exceeds the amount of data currently in the input

-buffer, then skip_input_data() must set bytes_in_buffer to zero and record the

-additional skip distance somewhere else.  The decompressor will immediately

-call fill_input_buffer(), which should return FALSE, which will cause a

-suspension return.  The surrounding application must then arrange to discard

-the recorded number of bytes before it resumes loading the input buffer.

-(Yes, this design is rather baroque, but it avoids complexity in the far more

-common case where a non-suspending source manager is used.)

-

-If the input data has been exhausted, we recommend that you emit a warning

-and insert dummy EOI markers just as a non-suspending data source manager

-would do.  This can be handled either in the surrounding application logic or

-within fill_input_buffer(); the latter is probably more efficient.  If

-fill_input_buffer() knows that no more data is available, it can set the

-pointer/count to point to a dummy EOI marker and then return TRUE just as

-though it had read more data in a non-suspending situation.

-

-The decompressor does not attempt to suspend within standard JPEG markers;

-instead it will backtrack to the start of the marker and reprocess the whole

-marker next time.  Hence the input buffer must be large enough to hold the

-longest standard marker in the file.  Standard JPEG markers should normally

-not exceed a few hundred bytes each (DHT tables are typically the longest).

-We recommend at least a 2K buffer for performance reasons, which is much

-larger than any correct marker is likely to be.  For robustness against

-damaged marker length counts, you may wish to insert a test in your

-application for the case that the input buffer is completely full and yet

-the decoder has suspended without consuming any data --- otherwise, if this

-situation did occur, it would lead to an endless loop.  (The library can't

-provide this test since it has no idea whether "the buffer is full", or

-even whether there is a fixed-size input buffer.)

-

-The input buffer would need to be 64K to allow for arbitrary COM or APPn

-markers, but these are handled specially: they are either saved into allocated

-memory, or skipped over by calling skip_input_data().  In the former case,

-suspension is handled correctly, and in the latter case, the problem of

-buffer overrun is placed on skip_input_data's shoulders, as explained above.

-Note that if you provide your own marker handling routine for large markers,

-you should consider how to deal with buffer overflow.

-

-Multiple-buffer management:

-

-In some applications it is desirable to store the compressed data in a linked

-list of buffer areas, so as to avoid data copying.  This can be handled by

-having empty_output_buffer() or fill_input_buffer() set the pointer and count

-to reference the next available buffer; FALSE is returned only if no more

-buffers are available.  Although seemingly straightforward, there is a

-pitfall in this approach: the backtrack that occurs when FALSE is returned

-could back up into an earlier buffer.  For example, when fill_input_buffer()

-is called, the current pointer & count indicate the backtrack restart point.

-Since fill_input_buffer() will set the pointer and count to refer to a new

-buffer, the restart position must be saved somewhere else.  Suppose a second

-call to fill_input_buffer() occurs in the same library call, and no

-additional input data is available, so fill_input_buffer must return FALSE.

-If the JPEG library has not moved the pointer/count forward in the current

-buffer, then *the correct restart point is the saved position in the prior

-buffer*.  Prior buffers may be discarded only after the library establishes

-a restart point within a later buffer.  Similar remarks apply for output into

-a chain of buffers.

-

-The library will never attempt to backtrack over a skip_input_data() call,

-so any skipped data can be permanently discarded.  You still have to deal

-with the case of skipping not-yet-received data, however.

-

-It's much simpler to use only a single buffer; when fill_input_buffer() is

-called, move any unconsumed data (beyond the current pointer/count) down to

-the beginning of this buffer and then load new data into the remaining buffer

-space.  This approach requires a little more data copying but is far easier

-to get right.

-

-

-Progressive JPEG support

-------------------------

-

-Progressive JPEG rearranges the stored data into a series of scans of

-increasing quality.  In situations where a JPEG file is transmitted across a

-slow communications link, a decoder can generate a low-quality image very

-quickly from the first scan, then gradually improve the displayed quality as

-more scans are received.  The final image after all scans are complete is

-identical to that of a regular (sequential) JPEG file of the same quality

-setting.  Progressive JPEG files are often slightly smaller than equivalent

-sequential JPEG files, but the possibility of incremental display is the main

-reason for using progressive JPEG.

-

-The IJG encoder library generates progressive JPEG files when given a

-suitable "scan script" defining how to divide the data into scans.

-Creation of progressive JPEG files is otherwise transparent to the encoder.

-Progressive JPEG files can also be read transparently by the decoder library.

-If the decoding application simply uses the library as defined above, it

-will receive a final decoded image without any indication that the file was

-progressive.  Of course, this approach does not allow incremental display.

-To perform incremental display, an application needs to use the decoder

-library's "buffered-image" mode, in which it receives a decoded image

-multiple times.

-

-Each displayed scan requires about as much work to decode as a full JPEG

-image of the same size, so the decoder must be fairly fast in relation to the

-data transmission rate in order to make incremental display useful.  However,

-it is possible to skip displaying the image and simply add the incoming bits

-to the decoder's coefficient buffer.  This is fast because only Huffman

-decoding need be done, not IDCT, upsampling, colorspace conversion, etc.

-The IJG decoder library allows the application to switch dynamically between

-displaying the image and simply absorbing the incoming bits.  A properly

-coded application can automatically adapt the number of display passes to

-suit the time available as the image is received.  Also, a final

-higher-quality display cycle can be performed from the buffered data after

-the end of the file is reached.

-

-Progressive compression:

-

-To create a progressive JPEG file (or a multiple-scan sequential JPEG file),

-set the scan_info cinfo field to point to an array of scan descriptors, and

-perform compression as usual.  Instead of constructing your own scan list,

-you can call the jpeg_simple_progression() helper routine to create a

-recommended progression sequence; this method should be used by all

-applications that don't want to get involved in the nitty-gritty of

-progressive scan sequence design.  (If you want to provide user control of

-scan sequences, you may wish to borrow the scan script reading code found

-in rdswitch.c, so that you can read scan script files just like cjpeg's.)

-When scan_info is not NULL, the compression library will store DCT'd data

-into a buffer array as jpeg_write_scanlines() is called, and will emit all

-the requested scans during jpeg_finish_compress().  This implies that

-multiple-scan output cannot be created with a suspending data destination

-manager, since jpeg_finish_compress() does not support suspension.  We

-should also note that the compressor currently forces Huffman optimization

-mode when creating a progressive JPEG file, because the default Huffman

-tables are unsuitable for progressive files.

-

-Progressive decompression:

-

-When buffered-image mode is not used, the decoder library will read all of

-a multi-scan file during jpeg_start_decompress(), so that it can provide a

-final decoded image.  (Here "multi-scan" means either progressive or

-multi-scan sequential.)  This makes multi-scan files transparent to the

-decoding application.  However, existing applications that used suspending

-input with version 5 of the IJG library will need to be modified to check

-for a suspension return from jpeg_start_decompress().

-

-To perform incremental display, an application must use the library's

-buffered-image mode.  This is described in the next section.

-

-

-Buffered-image mode

--------------------

-

-In buffered-image mode, the library stores the partially decoded image in a

-coefficient buffer, from which it can be read out as many times as desired.

-This mode is typically used for incremental display of progressive JPEG files,

-but it can be used with any JPEG file.  Each scan of a progressive JPEG file

-adds more data (more detail) to the buffered image.  The application can

-display in lockstep with the source file (one display pass per input scan),

-or it can allow input processing to outrun display processing.  By making

-input and display processing run independently, it is possible for the

-application to adapt progressive display to a wide range of data transmission

-rates.

-

-The basic control flow for buffered-image decoding is

-

-	jpeg_create_decompress()

-	set data source

-	jpeg_read_header()

-	set overall decompression parameters

-	cinfo.buffered_image = TRUE;	/* select buffered-image mode */

-	jpeg_start_decompress()

-	for (each output pass) {

-	    adjust output decompression parameters if required

-	    jpeg_start_output()		/* start a new output pass */

-	    for (all scanlines in image) {

-	        jpeg_read_scanlines()

-	        display scanlines

-	    }

-	    jpeg_finish_output()	/* terminate output pass */

-	}

-	jpeg_finish_decompress()

-	jpeg_destroy_decompress()

-

-This differs from ordinary unbuffered decoding in that there is an additional

-level of looping.  The application can choose how many output passes to make

-and how to display each pass.

-

-The simplest approach to displaying progressive images is to do one display

-pass for each scan appearing in the input file.  In this case the outer loop

-condition is typically

-	while (! jpeg_input_complete(&cinfo))

-and the start-output call should read

-	jpeg_start_output(&cinfo, cinfo.input_scan_number);

-The second parameter to jpeg_start_output() indicates which scan of the input

-file is to be displayed; the scans are numbered starting at 1 for this

-purpose.  (You can use a loop counter starting at 1 if you like, but using

-the library's input scan counter is easier.)  The library automatically reads

-data as necessary to complete each requested scan, and jpeg_finish_output()

-advances to the next scan or end-of-image marker (hence input_scan_number

-will be incremented by the time control arrives back at jpeg_start_output()).

-With this technique, data is read from the input file only as needed, and

-input and output processing run in lockstep.

-

-After reading the final scan and reaching the end of the input file, the

-buffered image remains available; it can be read additional times by

-repeating the jpeg_start_output()/jpeg_read_scanlines()/jpeg_finish_output()

-sequence.  For example, a useful technique is to use fast one-pass color

-quantization for display passes made while the image is arriving, followed by

-a final display pass using two-pass quantization for highest quality.  This

-is done by changing the library parameters before the final output pass.

-Changing parameters between passes is discussed in detail below.

-

-In general the last scan of a progressive file cannot be recognized as such

-until after it is read, so a post-input display pass is the best approach if

-you want special processing in the final pass.

-

-When done with the image, be sure to call jpeg_finish_decompress() to release

-the buffered image (or just use jpeg_destroy_decompress()).

-

-If input data arrives faster than it can be displayed, the application can

-cause the library to decode input data in advance of what's needed to produce

-output.  This is done by calling the routine jpeg_consume_input().

-The return value is one of the following:

-	JPEG_REACHED_SOS:    reached an SOS marker (the start of a new scan)

-	JPEG_REACHED_EOI:    reached the EOI marker (end of image)

-	JPEG_ROW_COMPLETED:  completed reading one MCU row of compressed data

-	JPEG_SCAN_COMPLETED: completed reading last MCU row of current scan

-	JPEG_SUSPENDED:      suspended before completing any of the above

-(JPEG_SUSPENDED can occur only if a suspending data source is used.)  This

-routine can be called at any time after initializing the JPEG object.  It

-reads some additional data and returns when one of the indicated significant

-events occurs.  (If called after the EOI marker is reached, it will

-immediately return JPEG_REACHED_EOI without attempting to read more data.)

-

-The library's output processing will automatically call jpeg_consume_input()

-whenever the output processing overtakes the input; thus, simple lockstep

-display requires no direct calls to jpeg_consume_input().  But by adding

-calls to jpeg_consume_input(), you can absorb data in advance of what is

-being displayed.  This has two benefits:

-  * You can limit buildup of unprocessed data in your input buffer.

-  * You can eliminate extra display passes by paying attention to the

-    state of the library's input processing.

-

-The first of these benefits only requires interspersing calls to

-jpeg_consume_input() with your display operations and any other processing

-you may be doing.  To avoid wasting cycles due to backtracking, it's best to

-call jpeg_consume_input() only after a hundred or so new bytes have arrived.

-This is discussed further under "I/O suspension", above.  (Note: the JPEG

-library currently is not thread-safe.  You must not call jpeg_consume_input()

-from one thread of control if a different library routine is working on the

-same JPEG object in another thread.)

-

-When input arrives fast enough that more than one new scan is available

-before you start a new output pass, you may as well skip the output pass

-corresponding to the completed scan.  This occurs for free if you pass

-cinfo.input_scan_number as the target scan number to jpeg_start_output().

-The input_scan_number field is simply the index of the scan currently being

-consumed by the input processor.  You can ensure that this is up-to-date by

-emptying the input buffer just before calling jpeg_start_output(): call

-jpeg_consume_input() repeatedly until it returns JPEG_SUSPENDED or

-JPEG_REACHED_EOI.

-

-The target scan number passed to jpeg_start_output() is saved in the

-cinfo.output_scan_number field.  The library's output processing calls

-jpeg_consume_input() whenever the current input scan number and row within

-that scan is less than or equal to the current output scan number and row.

-Thus, input processing can "get ahead" of the output processing but is not

-allowed to "fall behind".  You can achieve several different effects by

-manipulating this interlock rule.  For example, if you pass a target scan

-number greater than the current input scan number, the output processor will

-wait until that scan starts to arrive before producing any output.  (To avoid

-an infinite loop, the target scan number is automatically reset to the last

-scan number when the end of image is reached.  Thus, if you specify a large

-target scan number, the library will just absorb the entire input file and

-then perform an output pass.  This is effectively the same as what

-jpeg_start_decompress() does when you don't select buffered-image mode.)

-When you pass a target scan number equal to the current input scan number,

-the image is displayed no faster than the current input scan arrives.  The

-final possibility is to pass a target scan number less than the current input

-scan number; this disables the input/output interlock and causes the output

-processor to simply display whatever it finds in the image buffer, without

-waiting for input.  (However, the library will not accept a target scan

-number less than one, so you can't avoid waiting for the first scan.)

-

-When data is arriving faster than the output display processing can advance

-through the image, jpeg_consume_input() will store data into the buffered

-image beyond the point at which the output processing is reading data out

-again.  If the input arrives fast enough, it may "wrap around" the buffer to

-the point where the input is more than one whole scan ahead of the output.

-If the output processing simply proceeds through its display pass without

-paying attention to the input, the effect seen on-screen is that the lower

-part of the image is one or more scans better in quality than the upper part.

-Then, when the next output scan is started, you have a choice of what target

-scan number to use.  The recommended choice is to use the current input scan

-number at that time, which implies that you've skipped the output scans

-corresponding to the input scans that were completed while you processed the

-previous output scan.  In this way, the decoder automatically adapts its

-speed to the arriving data, by skipping output scans as necessary to keep up

-with the arriving data.

-

-When using this strategy, you'll want to be sure that you perform a final

-output pass after receiving all the data; otherwise your last display may not

-be full quality across the whole screen.  So the right outer loop logic is

-something like this:

-	do {

-	    absorb any waiting input by calling jpeg_consume_input()

-	    final_pass = jpeg_input_complete(&cinfo);

-	    adjust output decompression parameters if required

-	    jpeg_start_output(&cinfo, cinfo.input_scan_number);

-	    ...

-	    jpeg_finish_output()

-	} while (! final_pass);

-rather than quitting as soon as jpeg_input_complete() returns TRUE.  This

-arrangement makes it simple to use higher-quality decoding parameters

-for the final pass.  But if you don't want to use special parameters for

-the final pass, the right loop logic is like this:

-	for (;;) {

-	    absorb any waiting input by calling jpeg_consume_input()

-	    jpeg_start_output(&cinfo, cinfo.input_scan_number);

-	    ...

-	    jpeg_finish_output()

-	    if (jpeg_input_complete(&cinfo) &&

-	        cinfo.input_scan_number == cinfo.output_scan_number)

-	      break;

-	}

-In this case you don't need to know in advance whether an output pass is to

-be the last one, so it's not necessary to have reached EOF before starting

-the final output pass; rather, what you want to test is whether the output

-pass was performed in sync with the final input scan.  This form of the loop

-will avoid an extra output pass whenever the decoder is able (or nearly able)

-to keep up with the incoming data.

-

-When the data transmission speed is high, you might begin a display pass,

-then find that much or all of the file has arrived before you can complete

-the pass.  (You can detect this by noting the JPEG_REACHED_EOI return code

-from jpeg_consume_input(), or equivalently by testing jpeg_input_complete().)

-In this situation you may wish to abort the current display pass and start a

-new one using the newly arrived information.  To do so, just call

-jpeg_finish_output() and then start a new pass with jpeg_start_output().

-

-A variant strategy is to abort and restart display if more than one complete

-scan arrives during an output pass; this can be detected by noting

-JPEG_REACHED_SOS returns and/or examining cinfo.input_scan_number.  This

-idea should be employed with caution, however, since the display process

-might never get to the bottom of the image before being aborted, resulting

-in the lower part of the screen being several passes worse than the upper.

-In most cases it's probably best to abort an output pass only if the whole

-file has arrived and you want to begin the final output pass immediately.

-

-When receiving data across a communication link, we recommend always using

-the current input scan number for the output target scan number; if a

-higher-quality final pass is to be done, it should be started (aborting any

-incomplete output pass) as soon as the end of file is received.  However,

-many other strategies are possible.  For example, the application can examine

-the parameters of the current input scan and decide whether to display it or

-not.  If the scan contains only chroma data, one might choose not to use it

-as the target scan, expecting that the scan will be small and will arrive

-quickly.  To skip to the next scan, call jpeg_consume_input() until it

-returns JPEG_REACHED_SOS or JPEG_REACHED_EOI.  Or just use the next higher

-number as the target scan for jpeg_start_output(); but that method doesn't

-let you inspect the next scan's parameters before deciding to display it.

-

-

-In buffered-image mode, jpeg_start_decompress() never performs input and

-thus never suspends.  An application that uses input suspension with

-buffered-image mode must be prepared for suspension returns from these

-routines:

-* jpeg_start_output() performs input only if you request 2-pass quantization

-  and the target scan isn't fully read yet.  (This is discussed below.)

-* jpeg_read_scanlines(), as always, returns the number of scanlines that it

-  was able to produce before suspending.

-* jpeg_finish_output() will read any markers following the target scan,

-  up to the end of the file or the SOS marker that begins another scan.

-  (But it reads no input if jpeg_consume_input() has already reached the

-  end of the file or a SOS marker beyond the target output scan.)

-* jpeg_finish_decompress() will read until the end of file, and thus can

-  suspend if the end hasn't already been reached (as can be tested by

-  calling jpeg_input_complete()).

-jpeg_start_output(), jpeg_finish_output(), and jpeg_finish_decompress()

-all return TRUE if they completed their tasks, FALSE if they had to suspend.

-In the event of a FALSE return, the application must load more input data

-and repeat the call.  Applications that use non-suspending data sources need

-not check the return values of these three routines.

-

-

-It is possible to change decoding parameters between output passes in the

-buffered-image mode.  The decoder library currently supports only very

-limited changes of parameters.  ONLY THE FOLLOWING parameter changes are

-allowed after jpeg_start_decompress() is called:

-* dct_method can be changed before each call to jpeg_start_output().

-  For example, one could use a fast DCT method for early scans, changing

-  to a higher quality method for the final scan.

-* dither_mode can be changed before each call to jpeg_start_output();

-  of course this has no impact if not using color quantization.  Typically

-  one would use ordered dither for initial passes, then switch to

-  Floyd-Steinberg dither for the final pass.  Caution: changing dither mode

-  can cause more memory to be allocated by the library.  Although the amount

-  of memory involved is not large (a scanline or so), it may cause the

-  initial max_memory_to_use specification to be exceeded, which in the worst

-  case would result in an out-of-memory failure.

-* do_block_smoothing can be changed before each call to jpeg_start_output().

-  This setting is relevant only when decoding a progressive JPEG image.

-  During the first DC-only scan, block smoothing provides a very "fuzzy" look

-  instead of the very "blocky" look seen without it; which is better seems a

-  matter of personal taste.  But block smoothing is nearly always a win

-  during later stages, especially when decoding a successive-approximation

-  image: smoothing helps to hide the slight blockiness that otherwise shows

-  up on smooth gradients until the lowest coefficient bits are sent.

-* Color quantization mode can be changed under the rules described below.

-  You *cannot* change between full-color and quantized output (because that

-  would alter the required I/O buffer sizes), but you can change which

-  quantization method is used.

-

-When generating color-quantized output, changing quantization method is a

-very useful way of switching between high-speed and high-quality display.

-The library allows you to change among its three quantization methods:

-1. Single-pass quantization to a fixed color cube.

-   Selected by cinfo.two_pass_quantize = FALSE and cinfo.colormap = NULL.

-2. Single-pass quantization to an application-supplied colormap.

-   Selected by setting cinfo.colormap to point to the colormap (the value of

-   two_pass_quantize is ignored); also set cinfo.actual_number_of_colors.

-3. Two-pass quantization to a colormap chosen specifically for the image.

-   Selected by cinfo.two_pass_quantize = TRUE and cinfo.colormap = NULL.

-   (This is the default setting selected by jpeg_read_header, but it is

-   probably NOT what you want for the first pass of progressive display!)

-These methods offer successively better quality and lesser speed.  However,

-only the first method is available for quantizing in non-RGB color spaces.

-

-IMPORTANT: because the different quantizer methods have very different

-working-storage requirements, the library requires you to indicate which

-one(s) you intend to use before you call jpeg_start_decompress().  (If we did

-not require this, the max_memory_to_use setting would be a complete fiction.)

-You do this by setting one or more of these three cinfo fields to TRUE:

-	enable_1pass_quant		Fixed color cube colormap

-	enable_external_quant		Externally-supplied colormap

-	enable_2pass_quant		Two-pass custom colormap

-All three are initialized FALSE by jpeg_read_header().  But

-jpeg_start_decompress() automatically sets TRUE the one selected by the

-current two_pass_quantize and colormap settings, so you only need to set the

-enable flags for any other quantization methods you plan to change to later.

-

-After setting the enable flags correctly at jpeg_start_decompress() time, you

-can change to any enabled quantization method by setting two_pass_quantize

-and colormap properly just before calling jpeg_start_output().  The following

-special rules apply:

-1. You must explicitly set cinfo.colormap to NULL when switching to 1-pass

-   or 2-pass mode from a different mode, or when you want the 2-pass

-   quantizer to be re-run to generate a new colormap.

-2. To switch to an external colormap, or to change to a different external

-   colormap than was used on the prior pass, you must call

-   jpeg_new_colormap() after setting cinfo.colormap.

-NOTE: if you want to use the same colormap as was used in the prior pass,

-you should not do either of these things.  This will save some nontrivial

-switchover costs.

-(These requirements exist because cinfo.colormap will always be non-NULL

-after completing a prior output pass, since both the 1-pass and 2-pass

-quantizers set it to point to their output colormaps.  Thus you have to

-do one of these two things to notify the library that something has changed.

-Yup, it's a bit klugy, but it's necessary to do it this way for backwards

-compatibility.)

-

-Note that in buffered-image mode, the library generates any requested colormap

-during jpeg_start_output(), not during jpeg_start_decompress().

-

-When using two-pass quantization, jpeg_start_output() makes a pass over the

-buffered image to determine the optimum color map; it therefore may take a

-significant amount of time, whereas ordinarily it does little work.  The

-progress monitor hook is called during this pass, if defined.  It is also

-important to realize that if the specified target scan number is greater than

-or equal to the current input scan number, jpeg_start_output() will attempt

-to consume input as it makes this pass.  If you use a suspending data source,

-you need to check for a FALSE return from jpeg_start_output() under these

-conditions.  The combination of 2-pass quantization and a not-yet-fully-read

-target scan is the only case in which jpeg_start_output() will consume input.

-

-

-Application authors who support buffered-image mode may be tempted to use it

-for all JPEG images, even single-scan ones.  This will work, but it is

-inefficient: there is no need to create an image-sized coefficient buffer for

-single-scan images.  Requesting buffered-image mode for such an image wastes

-memory.  Worse, it can cost time on large images, since the buffered data has

-to be swapped out or written to a temporary file.  If you are concerned about

-maximum performance on baseline JPEG files, you should use buffered-image

-mode only when the incoming file actually has multiple scans.  This can be

-tested by calling jpeg_has_multiple_scans(), which will return a correct

-result at any time after jpeg_read_header() completes.

-

-It is also worth noting that when you use jpeg_consume_input() to let input

-processing get ahead of output processing, the resulting pattern of access to

-the coefficient buffer is quite nonsequential.  It's best to use the memory

-manager jmemnobs.c if you can (ie, if you have enough real or virtual main

-memory).  If not, at least make sure that max_memory_to_use is set as high as

-possible.  If the JPEG memory manager has to use a temporary file, you will

-probably see a lot of disk traffic and poor performance.  (This could be

-improved with additional work on the memory manager, but we haven't gotten

-around to it yet.)

-

-In some applications it may be convenient to use jpeg_consume_input() for all

-input processing, including reading the initial markers; that is, you may

-wish to call jpeg_consume_input() instead of jpeg_read_header() during

-startup.  This works, but note that you must check for JPEG_REACHED_SOS and

-JPEG_REACHED_EOI return codes as the equivalent of jpeg_read_header's codes.

-Once the first SOS marker has been reached, you must call

-jpeg_start_decompress() before jpeg_consume_input() will consume more input;

-it'll just keep returning JPEG_REACHED_SOS until you do.  If you read a

-tables-only file this way, jpeg_consume_input() will return JPEG_REACHED_EOI

-without ever returning JPEG_REACHED_SOS; be sure to check for this case.

-If this happens, the decompressor will not read any more input until you call

-jpeg_abort() to reset it.  It is OK to call jpeg_consume_input() even when not

-using buffered-image mode, but in that case it's basically a no-op after the

-initial markers have been read: it will just return JPEG_SUSPENDED.

-

-

-Abbreviated datastreams and multiple images

--------------------------------------------

-

-A JPEG compression or decompression object can be reused to process multiple

-images.  This saves a small amount of time per image by eliminating the

-"create" and "destroy" operations, but that isn't the real purpose of the

-feature.  Rather, reuse of an object provides support for abbreviated JPEG

-datastreams.  Object reuse can also simplify processing a series of images in

-a single input or output file.  This section explains these features.

-

-A JPEG file normally contains several hundred bytes worth of quantization

-and Huffman tables.  In a situation where many images will be stored or

-transmitted with identical tables, this may represent an annoying overhead.

-The JPEG standard therefore permits tables to be omitted.  The standard

-defines three classes of JPEG datastreams:

-  * "Interchange" datastreams contain an image and all tables needed to decode

-     the image.  These are the usual kind of JPEG file.

-  * "Abbreviated image" datastreams contain an image, but are missing some or

-    all of the tables needed to decode that image.

-  * "Abbreviated table specification" (henceforth "tables-only") datastreams

-    contain only table specifications.

-To decode an abbreviated image, it is necessary to load the missing table(s)

-into the decoder beforehand.  This can be accomplished by reading a separate

-tables-only file.  A variant scheme uses a series of images in which the first

-image is an interchange (complete) datastream, while subsequent ones are

-abbreviated and rely on the tables loaded by the first image.  It is assumed

-that once the decoder has read a table, it will remember that table until a

-new definition for the same table number is encountered.

-

-It is the application designer's responsibility to figure out how to associate

-the correct tables with an abbreviated image.  While abbreviated datastreams

-can be useful in a closed environment, their use is strongly discouraged in

-any situation where data exchange with other applications might be needed.

-Caveat designer.

-

-The JPEG library provides support for reading and writing any combination of

-tables-only datastreams and abbreviated images.  In both compression and

-decompression objects, a quantization or Huffman table will be retained for

-the lifetime of the object, unless it is overwritten by a new table definition.

-

-

-To create abbreviated image datastreams, it is only necessary to tell the

-compressor not to emit some or all of the tables it is using.  Each

-quantization and Huffman table struct contains a boolean field "sent_table",

-which normally is initialized to FALSE.  For each table used by the image, the

-header-writing process emits the table and sets sent_table = TRUE unless it is

-already TRUE.  (In normal usage, this prevents outputting the same table

-definition multiple times, as would otherwise occur because the chroma

-components typically share tables.)  Thus, setting this field to TRUE before

-calling jpeg_start_compress() will prevent the table from being written at

-all.

-

-If you want to create a "pure" abbreviated image file containing no tables,

-just call "jpeg_suppress_tables(&cinfo, TRUE)" after constructing all the

-tables.  If you want to emit some but not all tables, you'll need to set the

-individual sent_table fields directly.

-

-To create an abbreviated image, you must also call jpeg_start_compress()

-with a second parameter of FALSE, not TRUE.  Otherwise jpeg_start_compress()

-will force all the sent_table fields to FALSE.  (This is a safety feature to

-prevent abbreviated images from being created accidentally.)

-

-To create a tables-only file, perform the same parameter setup that you

-normally would, but instead of calling jpeg_start_compress() and so on, call

-jpeg_write_tables(&cinfo).  This will write an abbreviated datastream

-containing only SOI, DQT and/or DHT markers, and EOI.  All the quantization

-and Huffman tables that are currently defined in the compression object will

-be emitted unless their sent_tables flag is already TRUE, and then all the

-sent_tables flags will be set TRUE.

-

-A sure-fire way to create matching tables-only and abbreviated image files

-is to proceed as follows:

-

-	create JPEG compression object

-	set JPEG parameters

-	set destination to tables-only file

-	jpeg_write_tables(&cinfo);

-	set destination to image file

-	jpeg_start_compress(&cinfo, FALSE);

-	write data...

-	jpeg_finish_compress(&cinfo);

-

-Since the JPEG parameters are not altered between writing the table file and

-the abbreviated image file, the same tables are sure to be used.  Of course,

-you can repeat the jpeg_start_compress() ... jpeg_finish_compress() sequence

-many times to produce many abbreviated image files matching the table file.

-

-You cannot suppress output of the computed Huffman tables when Huffman

-optimization is selected.  (If you could, there'd be no way to decode the

-image...)  Generally, you don't want to set optimize_coding = TRUE when

-you are trying to produce abbreviated files.

-

-In some cases you might want to compress an image using tables which are

-not stored in the application, but are defined in an interchange or

-tables-only file readable by the application.  This can be done by setting up

-a JPEG decompression object to read the specification file, then copying the

-tables into your compression object.  See jpeg_copy_critical_parameters()

-for an example of copying quantization tables.

-

-

-To read abbreviated image files, you simply need to load the proper tables

-into the decompression object before trying to read the abbreviated image.

-If the proper tables are stored in the application program, you can just

-allocate the table structs and fill in their contents directly.  For example,

-to load a fixed quantization table into table slot "n":

-

-    if (cinfo.quant_tbl_ptrs[n] == NULL)

-      cinfo.quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) &cinfo);

-    quant_ptr = cinfo.quant_tbl_ptrs[n];	/* quant_ptr is JQUANT_TBL* */

-    for (i = 0; i < 64; i++) {

-      /* Qtable[] is desired quantization table, in natural array order */

-      quant_ptr->quantval[i] = Qtable[i];

-    }

-

-Code to load a fixed Huffman table is typically (for AC table "n"):

-

-    if (cinfo.ac_huff_tbl_ptrs[n] == NULL)

-      cinfo.ac_huff_tbl_ptrs[n] = jpeg_alloc_huff_table((j_common_ptr) &cinfo);

-    huff_ptr = cinfo.ac_huff_tbl_ptrs[n];	/* huff_ptr is JHUFF_TBL* */

-    for (i = 1; i <= 16; i++) {

-      /* counts[i] is number of Huffman codes of length i bits, i=1..16 */

-      huff_ptr->bits[i] = counts[i];

-    }

-    for (i = 0; i < 256; i++) {

-      /* symbols[] is the list of Huffman symbols, in code-length order */

-      huff_ptr->huffval[i] = symbols[i];

-    }

-

-(Note that trying to set cinfo.quant_tbl_ptrs[n] to point directly at a

-constant JQUANT_TBL object is not safe.  If the incoming file happened to

-contain a quantization table definition, your master table would get

-overwritten!  Instead allocate a working table copy and copy the master table

-into it, as illustrated above.  Ditto for Huffman tables, of course.)

-

-You might want to read the tables from a tables-only file, rather than

-hard-wiring them into your application.  The jpeg_read_header() call is

-sufficient to read a tables-only file.  You must pass a second parameter of

-FALSE to indicate that you do not require an image to be present.  Thus, the

-typical scenario is

-

-	create JPEG decompression object

-	set source to tables-only file

-	jpeg_read_header(&cinfo, FALSE);

-	set source to abbreviated image file

-	jpeg_read_header(&cinfo, TRUE);

-	set decompression parameters

-	jpeg_start_decompress(&cinfo);

-	read data...

-	jpeg_finish_decompress(&cinfo);

-

-In some cases, you may want to read a file without knowing whether it contains

-an image or just tables.  In that case, pass FALSE and check the return value

-from jpeg_read_header(): it will be JPEG_HEADER_OK if an image was found,

-JPEG_HEADER_TABLES_ONLY if only tables were found.  (A third return value,

-JPEG_SUSPENDED, is possible when using a suspending data source manager.)

-Note that jpeg_read_header() will not complain if you read an abbreviated

-image for which you haven't loaded the missing tables; the missing-table check

-occurs later, in jpeg_start_decompress().

-

-

-It is possible to read a series of images from a single source file by

-repeating the jpeg_read_header() ... jpeg_finish_decompress() sequence,

-without releasing/recreating the JPEG object or the data source module.

-(If you did reinitialize, any partial bufferload left in the data source

-buffer at the end of one image would be discarded, causing you to lose the

-start of the next image.)  When you use this method, stored tables are

-automatically carried forward, so some of the images can be abbreviated images

-that depend on tables from earlier images.

-

-If you intend to write a series of images into a single destination file,

-you might want to make a specialized data destination module that doesn't

-flush the output buffer at term_destination() time.  This would speed things

-up by some trifling amount.  Of course, you'd need to remember to flush the

-buffer after the last image.  You can make the later images be abbreviated

-ones by passing FALSE to jpeg_start_compress().

-

-

-Special markers

----------------

-

-Some applications may need to insert or extract special data in the JPEG

-datastream.  The JPEG standard provides marker types "COM" (comment) and

-"APP0" through "APP15" (application) to hold application-specific data.

-Unfortunately, the use of these markers is not specified by the standard.

-COM markers are fairly widely used to hold user-supplied text.  The JFIF file

-format spec uses APP0 markers with specified initial strings to hold certain

-data.  Adobe applications use APP14 markers beginning with the string "Adobe"

-for miscellaneous data.  Other APPn markers are rarely seen, but might

-contain almost anything.

-

-If you wish to store user-supplied text, we recommend you use COM markers

-and place readable 7-bit ASCII text in them.  Newline conventions are not

-standardized --- expect to find LF (Unix style), CR/LF (DOS style), or CR

-(Mac style).  A robust COM reader should be able to cope with random binary

-garbage, including nulls, since some applications generate COM markers

-containing non-ASCII junk.  (But yours should not be one of them.)

-

-For program-supplied data, use an APPn marker, and be sure to begin it with an

-identifying string so that you can tell whether the marker is actually yours.

-It's probably best to avoid using APP0 or APP14 for any private markers.

-(NOTE: the upcoming SPIFF standard will use APP8 markers; we recommend you

-not use APP8 markers for any private purposes, either.)

-

-Keep in mind that at most 65533 bytes can be put into one marker, but you

-can have as many markers as you like.

-

-By default, the IJG compression library will write a JFIF APP0 marker if the

-selected JPEG colorspace is grayscale or YCbCr, or an Adobe APP14 marker if

-the selected colorspace is RGB, CMYK, or YCCK.  You can disable this, but

-we don't recommend it.  The decompression library will recognize JFIF and

-Adobe markers and will set the JPEG colorspace properly when one is found.

-

-

-You can write special markers immediately following the datastream header by

-calling jpeg_write_marker() after jpeg_start_compress() and before the first

-call to jpeg_write_scanlines().  When you do this, the markers appear after

-the SOI and the JFIF APP0 and Adobe APP14 markers (if written), but before

-all else.  Specify the marker type parameter as "JPEG_COM" for COM or

-"JPEG_APP0 + n" for APPn.  (Actually, jpeg_write_marker will let you write

-any marker type, but we don't recommend writing any other kinds of marker.)

-For example, to write a user comment string pointed to by comment_text:

-	jpeg_write_marker(cinfo, JPEG_COM, comment_text, strlen(comment_text));

-

-If it's not convenient to store all the marker data in memory at once,

-you can instead call jpeg_write_m_header() followed by multiple calls to

-jpeg_write_m_byte().  If you do it this way, it's your responsibility to

-call jpeg_write_m_byte() exactly the number of times given in the length

-parameter to jpeg_write_m_header().  (This method lets you empty the

-output buffer partway through a marker, which might be important when

-using a suspending data destination module.  In any case, if you are using

-a suspending destination, you should flush its buffer after inserting

-any special markers.  See "I/O suspension".)

-

-Or, if you prefer to synthesize the marker byte sequence yourself,

-you can just cram it straight into the data destination module.

-

-If you are writing JFIF 1.02 extension markers (thumbnail images), don't

-forget to set cinfo.JFIF_minor_version = 2 so that the encoder will write the

-correct JFIF version number in the JFIF header marker.  The library's default

-is to write version 1.01, but that's wrong if you insert any 1.02 extension

-markers.  (We could probably get away with just defaulting to 1.02, but there

-used to be broken decoders that would complain about unknown minor version

-numbers.  To reduce compatibility risks it's safest not to write 1.02 unless

-you are actually using 1.02 extensions.)

-

-

-When reading, two methods of handling special markers are available:

-1. You can ask the library to save the contents of COM and/or APPn markers

-into memory, and then examine them at your leisure afterwards.

-2. You can supply your own routine to process COM and/or APPn markers

-on-the-fly as they are read.

-The first method is simpler to use, especially if you are using a suspending

-data source; writing a marker processor that copes with input suspension is

-not easy (consider what happens if the marker is longer than your available

-input buffer).  However, the second method conserves memory since the marker

-data need not be kept around after it's been processed.

-

-For either method, you'd normally set up marker handling after creating a

-decompression object and before calling jpeg_read_header(), because the

-markers of interest will typically be near the head of the file and so will

-be scanned by jpeg_read_header.  Once you've established a marker handling

-method, it will be used for the life of that decompression object

-(potentially many datastreams), unless you change it.  Marker handling is

-determined separately for COM markers and for each APPn marker code.

-

-

-To save the contents of special markers in memory, call

-	jpeg_save_markers(cinfo, marker_code, length_limit)

-where marker_code is the marker type to save, JPEG_COM or JPEG_APP0+n.

-(To arrange to save all the special marker types, you need to call this

-routine 17 times, for COM and APP0-APP15.)  If the incoming marker is longer

-than length_limit data bytes, only length_limit bytes will be saved; this

-parameter allows you to avoid chewing up memory when you only need to see the

-first few bytes of a potentially large marker.  If you want to save all the

-data, set length_limit to 0xFFFF; that is enough since marker lengths are only

-16 bits.  As a special case, setting length_limit to 0 prevents that marker

-type from being saved at all.  (That is the default behavior, in fact.)

-

-After jpeg_read_header() completes, you can examine the special markers by

-following the cinfo->marker_list pointer chain.  All the special markers in

-the file appear in this list, in order of their occurrence in the file (but

-omitting any markers of types you didn't ask for).  Both the original data

-length and the saved data length are recorded for each list entry; the latter

-will not exceed length_limit for the particular marker type.  Note that these

-lengths exclude the marker length word, whereas the stored representation

-within the JPEG file includes it.  (Hence the maximum data length is really

-only 65533.)

-

-It is possible that additional special markers appear in the file beyond the

-SOS marker at which jpeg_read_header stops; if so, the marker list will be

-extended during reading of the rest of the file.  This is not expected to be

-common, however.  If you are short on memory you may want to reset the length

-limit to zero for all marker types after finishing jpeg_read_header, to

-ensure that the max_memory_to_use setting cannot be exceeded due to addition

-of later markers.

-

-The marker list remains stored until you call jpeg_finish_decompress or

-jpeg_abort, at which point the memory is freed and the list is set to empty.

-(jpeg_destroy also releases the storage, of course.)

-

-Note that the library is internally interested in APP0 and APP14 markers;

-if you try to set a small nonzero length limit on these types, the library

-will silently force the length up to the minimum it wants.  (But you can set

-a zero length limit to prevent them from being saved at all.)  Also, in a

-16-bit environment, the maximum length limit may be constrained to less than

-65533 by malloc() limitations.  It is therefore best not to assume that the

-effective length limit is exactly what you set it to be.

-

-

-If you want to supply your own marker-reading routine, you do it by calling

-jpeg_set_marker_processor().  A marker processor routine must have the

-signature

-	boolean jpeg_marker_parser_method (j_decompress_ptr cinfo)

-Although the marker code is not explicitly passed, the routine can find it

-in cinfo->unread_marker.  At the time of call, the marker proper has been

-read from the data source module.  The processor routine is responsible for

-reading the marker length word and the remaining parameter bytes, if any.

-Return TRUE to indicate success.  (FALSE should be returned only if you are

-using a suspending data source and it tells you to suspend.  See the standard

-marker processors in jdmarker.c for appropriate coding methods if you need to

-use a suspending data source.)

-

-If you override the default APP0 or APP14 processors, it is up to you to

-recognize JFIF and Adobe markers if you want colorspace recognition to occur

-properly.  We recommend copying and extending the default processors if you

-want to do that.  (A better idea is to save these marker types for later

-examination by calling jpeg_save_markers(); that method doesn't interfere

-with the library's own processing of these markers.)

-

-jpeg_set_marker_processor() and jpeg_save_markers() are mutually exclusive

---- if you call one it overrides any previous call to the other, for the

-particular marker type specified.

-

-A simple example of an external COM processor can be found in djpeg.c.

-Also, see jpegtran.c for an example of using jpeg_save_markers.

-

-

-Raw (downsampled) image data

-----------------------------

-

-Some applications need to supply already-downsampled image data to the JPEG

-compressor, or to receive raw downsampled data from the decompressor.  The

-library supports this requirement by allowing the application to write or

-read raw data, bypassing the normal preprocessing or postprocessing steps.

-The interface is different from the standard one and is somewhat harder to

-use.  If your interest is merely in bypassing color conversion, we recommend

-that you use the standard interface and simply set jpeg_color_space =

-in_color_space (or jpeg_color_space = out_color_space for decompression).

-The mechanism described in this section is necessary only to supply or

-receive downsampled image data, in which not all components have the same

-dimensions.

-

-

-To compress raw data, you must supply the data in the colorspace to be used

-in the JPEG file (please read the earlier section on Special color spaces)

-and downsampled to the sampling factors specified in the JPEG parameters.

-You must supply the data in the format used internally by the JPEG library,

-namely a JSAMPIMAGE array.  This is an array of pointers to two-dimensional

-arrays, each of type JSAMPARRAY.  Each 2-D array holds the values for one

-color component.  This structure is necessary since the components are of

-different sizes.  If the image dimensions are not a multiple of the MCU size,

-you must also pad the data correctly (usually, this is done by replicating

-the last column and/or row).  The data must be padded to a multiple of a DCT

-block in each component: that is, each downsampled row must contain a

-multiple of block_size valid samples, and there must be a multiple of

-block_size sample rows for each component.  (For applications such as

-conversion of digital TV images, the standard image size is usually a

-multiple of the DCT block size, so that no padding need actually be done.)

-

-The procedure for compression of raw data is basically the same as normal

-compression, except that you call jpeg_write_raw_data() in place of

-jpeg_write_scanlines().  Before calling jpeg_start_compress(), you must do

-the following:

-  * Set cinfo->raw_data_in to TRUE.  (It is set FALSE by jpeg_set_defaults().)

-    This notifies the library that you will be supplying raw data.

-    Furthermore, set cinfo->do_fancy_downsampling to FALSE if you want to use

-    real downsampled data.  (It is set TRUE by jpeg_set_defaults().)

-  * Ensure jpeg_color_space is correct --- an explicit jpeg_set_colorspace()

-    call is a good idea.  Note that since color conversion is bypassed,

-    in_color_space is ignored, except that jpeg_set_defaults() uses it to

-    choose the default jpeg_color_space setting.

-  * Ensure the sampling factors, cinfo->comp_info[i].h_samp_factor and

-    cinfo->comp_info[i].v_samp_factor, are correct.  Since these indicate the

-    dimensions of the data you are supplying, it's wise to set them

-    explicitly, rather than assuming the library's defaults are what you want.

-

-To pass raw data to the library, call jpeg_write_raw_data() in place of

-jpeg_write_scanlines().  The two routines work similarly except that

-jpeg_write_raw_data takes a JSAMPIMAGE data array rather than JSAMPARRAY.

-The scanlines count passed to and returned from jpeg_write_raw_data is

-measured in terms of the component with the largest v_samp_factor.

-

-jpeg_write_raw_data() processes one MCU row per call, which is to say

-v_samp_factor*block_size sample rows of each component.  The passed num_lines

-value must be at least max_v_samp_factor*block_size, and the return value

-will be exactly that amount (or possibly some multiple of that amount, in

-future library versions).  This is true even on the last call at the bottom

-of the image; don't forget to pad your data as necessary.

-

-The required dimensions of the supplied data can be computed for each

-component as

-	cinfo->comp_info[i].width_in_blocks*block_size  samples per row

-	cinfo->comp_info[i].height_in_blocks*block_size rows in image

-after jpeg_start_compress() has initialized those fields.  If the valid data

-is smaller than this, it must be padded appropriately.  For some sampling

-factors and image sizes, additional dummy DCT blocks are inserted to make

-the image a multiple of the MCU dimensions.  The library creates such dummy

-blocks itself; it does not read them from your supplied data.  Therefore you

-need never pad by more than block_size samples.  An example may help here.

-Assume 2h2v downsampling of YCbCr data, that is

-	cinfo->comp_info[0].h_samp_factor = 2		for Y

-	cinfo->comp_info[0].v_samp_factor = 2

-	cinfo->comp_info[1].h_samp_factor = 1		for Cb

-	cinfo->comp_info[1].v_samp_factor = 1

-	cinfo->comp_info[2].h_samp_factor = 1		for Cr

-	cinfo->comp_info[2].v_samp_factor = 1

-and suppose that the nominal image dimensions (cinfo->image_width and

-cinfo->image_height) are 101x101 pixels.  Then jpeg_start_compress() will

-compute downsampled_width = 101 and width_in_blocks = 13 for Y,

-downsampled_width = 51 and width_in_blocks = 7 for Cb and Cr (and the same

-for the height fields).  You must pad the Y data to at least 13*8 = 104

-columns and rows, the Cb/Cr data to at least 7*8 = 56 columns and rows.  The

-MCU height is max_v_samp_factor = 2 DCT rows so you must pass at least 16

-scanlines on each call to jpeg_write_raw_data(), which is to say 16 actual

-sample rows of Y and 8 each of Cb and Cr.  A total of 7 MCU rows are needed,

-so you must pass a total of 7*16 = 112 "scanlines".  The last DCT block row

-of Y data is dummy, so it doesn't matter what you pass for it in the data

-arrays, but the scanlines count must total up to 112 so that all of the Cb

-and Cr data gets passed.

-

-Output suspension is supported with raw-data compression: if the data

-destination module suspends, jpeg_write_raw_data() will return 0.

-In this case the same data rows must be passed again on the next call.

-

-

-Decompression with raw data output implies bypassing all postprocessing.

-You must deal with the color space and sampling factors present in the

-incoming file.  If your application only handles, say, 2h1v YCbCr data,

-you must check for and fail on other color spaces or other sampling factors.

-The library will not convert to a different color space for you.

-

-To obtain raw data output, set cinfo->raw_data_out = TRUE before

-jpeg_start_decompress() (it is set FALSE by jpeg_read_header()).  Be sure to

-verify that the color space and sampling factors are ones you can handle.

-Furthermore, set cinfo->do_fancy_upsampling = FALSE if you want to get real

-downsampled data (it is set TRUE by jpeg_read_header()).

-Then call jpeg_read_raw_data() in place of jpeg_read_scanlines().  The

-decompression process is otherwise the same as usual.

-

-jpeg_read_raw_data() returns one MCU row per call, and thus you must pass a

-buffer of at least max_v_samp_factor*block_size scanlines (scanline counting

-is the same as for raw-data compression).  The buffer you pass must be large

-enough to hold the actual data plus padding to DCT-block boundaries.  As with

-compression, any entirely dummy DCT blocks are not processed so you need not

-allocate space for them, but the total scanline count includes them.  The

-above example of computing buffer dimensions for raw-data compression is

-equally valid for decompression.

-

-Input suspension is supported with raw-data decompression: if the data source

-module suspends, jpeg_read_raw_data() will return 0.  You can also use

-buffered-image mode to read raw data in multiple passes.

-

-

-Really raw data: DCT coefficients

----------------------------------

-

-It is possible to read or write the contents of a JPEG file as raw DCT

-coefficients.  This facility is mainly intended for use in lossless

-transcoding between different JPEG file formats.  Other possible applications

-include lossless cropping of a JPEG image, lossless reassembly of a

-multi-strip or multi-tile TIFF/JPEG file into a single JPEG datastream, etc.

-

-To read the contents of a JPEG file as DCT coefficients, open the file and do

-jpeg_read_header() as usual.  But instead of calling jpeg_start_decompress()

-and jpeg_read_scanlines(), call jpeg_read_coefficients().  This will read the

-entire image into a set of virtual coefficient-block arrays, one array per

-component.  The return value is a pointer to an array of virtual-array

-descriptors.  Each virtual array can be accessed directly using the JPEG

-memory manager's access_virt_barray method (see Memory management, below,

-and also read structure.txt's discussion of virtual array handling).  Or,

-for simple transcoding to a different JPEG file format, the array list can

-just be handed directly to jpeg_write_coefficients().

-

-Each block in the block arrays contains quantized coefficient values in

-normal array order (not JPEG zigzag order).  The block arrays contain only

-DCT blocks containing real data; any entirely-dummy blocks added to fill out

-interleaved MCUs at the right or bottom edges of the image are discarded

-during reading and are not stored in the block arrays.  (The size of each

-block array can be determined from the width_in_blocks and height_in_blocks

-fields of the component's comp_info entry.)  This is also the data format

-expected by jpeg_write_coefficients().

-

-When you are done using the virtual arrays, call jpeg_finish_decompress()

-to release the array storage and return the decompression object to an idle

-state; or just call jpeg_destroy() if you don't need to reuse the object.

-

-If you use a suspending data source, jpeg_read_coefficients() will return

-NULL if it is forced to suspend; a non-NULL return value indicates successful

-completion.  You need not test for a NULL return value when using a

-non-suspending data source.

-

-It is also possible to call jpeg_read_coefficients() to obtain access to the

-decoder's coefficient arrays during a normal decode cycle in buffered-image

-mode.  This frammish might be useful for progressively displaying an incoming

-image and then re-encoding it without loss.  To do this, decode in buffered-

-image mode as discussed previously, then call jpeg_read_coefficients() after

-the last jpeg_finish_output() call.  The arrays will be available for your use

-until you call jpeg_finish_decompress().

-

-

-To write the contents of a JPEG file as DCT coefficients, you must provide

-the DCT coefficients stored in virtual block arrays.  You can either pass

-block arrays read from an input JPEG file by jpeg_read_coefficients(), or

-allocate virtual arrays from the JPEG compression object and fill them

-yourself.  In either case, jpeg_write_coefficients() is substituted for

-jpeg_start_compress() and jpeg_write_scanlines().  Thus the sequence is

-  * Create compression object

-  * Set all compression parameters as necessary

-  * Request virtual arrays if needed

-  * jpeg_write_coefficients()

-  * jpeg_finish_compress()

-  * Destroy or re-use compression object

-jpeg_write_coefficients() is passed a pointer to an array of virtual block

-array descriptors; the number of arrays is equal to cinfo.num_components.

-

-The virtual arrays need only have been requested, not realized, before

-jpeg_write_coefficients() is called.  A side-effect of

-jpeg_write_coefficients() is to realize any virtual arrays that have been

-requested from the compression object's memory manager.  Thus, when obtaining

-the virtual arrays from the compression object, you should fill the arrays

-after calling jpeg_write_coefficients().  The data is actually written out

-when you call jpeg_finish_compress(); jpeg_write_coefficients() only writes

-the file header.

-

-When writing raw DCT coefficients, it is crucial that the JPEG quantization

-tables and sampling factors match the way the data was encoded, or the

-resulting file will be invalid.  For transcoding from an existing JPEG file,

-we recommend using jpeg_copy_critical_parameters().  This routine initializes

-all the compression parameters to default values (like jpeg_set_defaults()),

-then copies the critical information from a source decompression object.

-The decompression object should have just been used to read the entire

-JPEG input file --- that is, it should be awaiting jpeg_finish_decompress().

-

-jpeg_write_coefficients() marks all tables stored in the compression object

-as needing to be written to the output file (thus, it acts like

-jpeg_start_compress(cinfo, TRUE)).  This is for safety's sake, to avoid

-emitting abbreviated JPEG files by accident.  If you really want to emit an

-abbreviated JPEG file, call jpeg_suppress_tables(), or set the tables'

-individual sent_table flags, between calling jpeg_write_coefficients() and

-jpeg_finish_compress().

-

-

-Progress monitoring

--------------------

-

-Some applications may need to regain control from the JPEG library every so

-often.  The typical use of this feature is to produce a percent-done bar or

-other progress display.  (For a simple example, see cjpeg.c or djpeg.c.)

-Although you do get control back frequently during the data-transferring pass

-(the jpeg_read_scanlines or jpeg_write_scanlines loop), any additional passes

-will occur inside jpeg_finish_compress or jpeg_start_decompress; those

-routines may take a long time to execute, and you don't get control back

-until they are done.

-

-You can define a progress-monitor routine which will be called periodically

-by the library.  No guarantees are made about how often this call will occur,

-so we don't recommend you use it for mouse tracking or anything like that.

-At present, a call will occur once per MCU row, scanline, or sample row

-group, whichever unit is convenient for the current processing mode; so the

-wider the image, the longer the time between calls.  During the data

-transferring pass, only one call occurs per call of jpeg_read_scanlines or

-jpeg_write_scanlines, so don't pass a large number of scanlines at once if

-you want fine resolution in the progress count.  (If you really need to use

-the callback mechanism for time-critical tasks like mouse tracking, you could

-insert additional calls inside some of the library's inner loops.)

-

-To establish a progress-monitor callback, create a struct jpeg_progress_mgr,

-fill in its progress_monitor field with a pointer to your callback routine,

-and set cinfo->progress to point to the struct.  The callback will be called

-whenever cinfo->progress is non-NULL.  (This pointer is set to NULL by

-jpeg_create_compress or jpeg_create_decompress; the library will not change

-it thereafter.  So if you allocate dynamic storage for the progress struct,

-make sure it will live as long as the JPEG object does.  Allocating from the

-JPEG memory manager with lifetime JPOOL_PERMANENT will work nicely.)  You

-can use the same callback routine for both compression and decompression.

-

-The jpeg_progress_mgr struct contains four fields which are set by the library:

-	long pass_counter;	/* work units completed in this pass */

-	long pass_limit;	/* total number of work units in this pass */

-	int completed_passes;	/* passes completed so far */

-	int total_passes;	/* total number of passes expected */

-During any one pass, pass_counter increases from 0 up to (not including)

-pass_limit; the step size is usually but not necessarily 1.  The pass_limit

-value may change from one pass to another.  The expected total number of

-passes is in total_passes, and the number of passes already completed is in

-completed_passes.  Thus the fraction of work completed may be estimated as

-		completed_passes + (pass_counter/pass_limit)

-		--------------------------------------------

-				total_passes

-ignoring the fact that the passes may not be equal amounts of work.

-

-When decompressing, pass_limit can even change within a pass, because it

-depends on the number of scans in the JPEG file, which isn't always known in

-advance.  The computed fraction-of-work-done may jump suddenly (if the library

-discovers it has overestimated the number of scans) or even decrease (in the

-opposite case).  It is not wise to put great faith in the work estimate.

-

-When using the decompressor's buffered-image mode, the progress monitor work

-estimate is likely to be completely unhelpful, because the library has no way

-to know how many output passes will be demanded of it.  Currently, the library

-sets total_passes based on the assumption that there will be one more output

-pass if the input file end hasn't yet been read (jpeg_input_complete() isn't

-TRUE), but no more output passes if the file end has been reached when the

-output pass is started.  This means that total_passes will rise as additional

-output passes are requested.  If you have a way of determining the input file

-size, estimating progress based on the fraction of the file that's been read

-will probably be more useful than using the library's value.

-

-

-Memory management

------------------

-

-This section covers some key facts about the JPEG library's built-in memory

-manager.  For more info, please read structure.txt's section about the memory

-manager, and consult the source code if necessary.

-

-All memory and temporary file allocation within the library is done via the

-memory manager.  If necessary, you can replace the "back end" of the memory

-manager to control allocation yourself (for example, if you don't want the

-library to use malloc() and free() for some reason).

-

-Some data is allocated "permanently" and will not be freed until the JPEG

-object is destroyed.  Most data is allocated "per image" and is freed by

-jpeg_finish_compress, jpeg_finish_decompress, or jpeg_abort.  You can call the

-memory manager yourself to allocate structures that will automatically be

-freed at these times.  Typical code for this is

-  ptr = (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, size);

-Use JPOOL_PERMANENT to get storage that lasts as long as the JPEG object.

-Use alloc_large instead of alloc_small for anything bigger than a few Kbytes.

-There are also alloc_sarray and alloc_barray routines that automatically

-build 2-D sample or block arrays.

-

-The library's minimum space requirements to process an image depend on the

-image's width, but not on its height, because the library ordinarily works

-with "strip" buffers that are as wide as the image but just a few rows high.

-Some operating modes (eg, two-pass color quantization) require full-image

-buffers.  Such buffers are treated as "virtual arrays": only the current strip

-need be in memory, and the rest can be swapped out to a temporary file.

-

-If you use the simplest memory manager back end (jmemnobs.c), then no

-temporary files are used; virtual arrays are simply malloc()'d.  Images bigger

-than memory can be processed only if your system supports virtual memory.

-The other memory manager back ends support temporary files of various flavors

-and thus work in machines without virtual memory.  They may also be useful on

-Unix machines if you need to process images that exceed available swap space.

-

-When using temporary files, the library will make the in-memory buffers for

-its virtual arrays just big enough to stay within a "maximum memory" setting.

-Your application can set this limit by setting cinfo->mem->max_memory_to_use

-after creating the JPEG object.  (Of course, there is still a minimum size for

-the buffers, so the max-memory setting is effective only if it is bigger than

-the minimum space needed.)  If you allocate any large structures yourself, you

-must allocate them before jpeg_start_compress() or jpeg_start_decompress() in

-order to have them counted against the max memory limit.  Also keep in mind

-that space allocated with alloc_small() is ignored, on the assumption that

-it's too small to be worth worrying about; so a reasonable safety margin

-should be left when setting max_memory_to_use.

-

-If you use the jmemname.c or jmemdos.c memory manager back end, it is

-important to clean up the JPEG object properly to ensure that the temporary

-files get deleted.  (This is especially crucial with jmemdos.c, where the

-"temporary files" may be extended-memory segments; if they are not freed,

-DOS will require a reboot to recover the memory.)  Thus, with these memory

-managers, it's a good idea to provide a signal handler that will trap any

-early exit from your program.  The handler should call either jpeg_abort()

-or jpeg_destroy() for any active JPEG objects.  A handler is not needed with

-jmemnobs.c, and shouldn't be necessary with jmemansi.c or jmemmac.c either,

-since the C library is supposed to take care of deleting files made with

-tmpfile().

-

-

-Memory usage

-------------

-

-Working memory requirements while performing compression or decompression

-depend on image dimensions, image characteristics (such as colorspace and

-JPEG process), and operating mode (application-selected options).

-

-As of v6b, the decompressor requires:

- 1. About 24K in more-or-less-fixed-size data.  This varies a bit depending

-    on operating mode and image characteristics (particularly color vs.

-    grayscale), but it doesn't depend on image dimensions.

- 2. Strip buffers (of size proportional to the image width) for IDCT and

-    upsampling results.  The worst case for commonly used sampling factors

-    is about 34 bytes * width in pixels for a color image.  A grayscale image

-    only needs about 8 bytes per pixel column.

- 3. A full-image DCT coefficient buffer is needed to decode a multi-scan JPEG

-    file (including progressive JPEGs), or whenever you select buffered-image

-    mode.  This takes 2 bytes/coefficient.  At typical 2x2 sampling, that's

-    3 bytes per pixel for a color image.  Worst case (1x1 sampling) requires

-    6 bytes/pixel.  For grayscale, figure 2 bytes/pixel.

- 4. To perform 2-pass color quantization, the decompressor also needs a

-    128K color lookup table and a full-image pixel buffer (3 bytes/pixel).

-This does not count any memory allocated by the application, such as a

-buffer to hold the final output image.

-

-The above figures are valid for 8-bit JPEG data precision and a machine with

-32-bit ints.  For 9-bit to 12-bit JPEG data, double the size of the strip

-buffers and quantization pixel buffer.  The "fixed-size" data will be

-somewhat smaller with 16-bit ints, larger with 64-bit ints.  Also, CMYK

-or other unusual color spaces will require different amounts of space.

-

-The full-image coefficient and pixel buffers, if needed at all, do not

-have to be fully RAM resident; you can have the library use temporary

-files instead when the total memory usage would exceed a limit you set.

-(But if your OS supports virtual memory, it's probably better to just use

-jmemnobs and let the OS do the swapping.)

-

-The compressor's memory requirements are similar, except that it has no need

-for color quantization.  Also, it needs a full-image DCT coefficient buffer

-if Huffman-table optimization is asked for, even if progressive mode is not

-requested.

-

-If you need more detailed information about memory usage in a particular

-situation, you can enable the MEM_STATS code in jmemmgr.c.

-

-

-Library compile-time options

-----------------------------

-

-A number of compile-time options are available by modifying jmorecfg.h.

-

-The IJG code currently supports 8-bit to 12-bit sample data precision by

-defining BITS_IN_JSAMPLE as 8, 9, 10, 11, or 12.

-Note that a value larger than 8 causes JSAMPLE to be larger than a char,

-so it affects the surrounding application's image data.

-The sample applications cjpeg and djpeg can support deeper than 8-bit data

-only for PPM and GIF file formats; you must disable the other file formats

-to compile a 9-bit to 12-bit cjpeg or djpeg.  (install.txt has more

-information about that.)

-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.

-(If you need to include an 8-bit library and a 9-bit to 12-bit library for

-compression or decompression in a single application, you could probably do

-it by defining NEED_SHORT_EXTERNAL_NAMES for just one of the copies.  You'd

-have to access the 8-bit and the 9-bit to 12-bit copies from separate

-application source files.  This is untested ... if you try it, we'd like to

-hear whether it works!)

-

-Note that 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.  You may also want to supply your

-own DCT quantization tables; the existing quality-scaling code has been

-developed for 8-bit use, and probably doesn't generate especially good tables

-for 9-bit to 12-bit.

-

-The maximum number of components (color channels) in the image is determined

-by MAX_COMPONENTS.  The JPEG standard allows up to 255 components, but we

-expect that few applications will need more than four or so.

-

-On machines with unusual data type sizes, you may be able to improve

-performance or reduce memory space by tweaking the various typedefs in

-jmorecfg.h.  In particular, on some RISC CPUs, access to arrays of "short"s

-is quite slow; consider trading memory for speed by making JCOEF, INT16, and

-UINT16 be "int" or "unsigned int".  UINT8 is also a candidate to become int.

-You probably don't want to make JSAMPLE be int unless you have lots of memory

-to burn.

-

-You can reduce the size of the library by compiling out various optional

-functions.  To do this, undefine xxx_SUPPORTED symbols as necessary.

-

-You can also save a few K by not having text error messages in the library;

-the standard error message table occupies about 5Kb.  This is particularly

-reasonable for embedded applications where there's no good way to display 

-a message anyway.  To do this, remove the creation of the message table

-(jpeg_std_message_table[]) from jerror.c, and alter format_message to do

-something reasonable without it.  You could output the numeric value of the

-message code number, for example.  If you do this, you can also save a couple

-more K by modifying the TRACEMSn() macros in jerror.h to expand to nothing;

-you don't need trace capability anyway, right?

-

-

-Portability considerations

---------------------------

-

-The JPEG library has been written to be extremely portable; the sample

-applications cjpeg and djpeg are slightly less so.  This section summarizes

-the design goals in this area.  (If you encounter any bugs that cause the

-library to be less portable than is claimed here, we'd appreciate hearing

-about them.)

-

-The code works fine on ANSI C, C++, and pre-ANSI C compilers, using any of

-the popular system include file setups, and some not-so-popular ones too.

-See install.txt for configuration procedures.

-

-The code is not dependent on the exact sizes of the C data types.  As

-distributed, we make the assumptions that

-	char	is at least 8 bits wide

-	short	is at least 16 bits wide

-	int	is at least 16 bits wide

-	long	is at least 32 bits wide

-(These are the minimum requirements of the ANSI C standard.)  Wider types will

-work fine, although memory may be used inefficiently if char is much larger

-than 8 bits or short is much bigger than 16 bits.  The code should work

-equally well with 16- or 32-bit ints.

-

-In a system where these assumptions are not met, you may be able to make the

-code work by modifying the typedefs in jmorecfg.h.  However, you will probably

-have difficulty if int is less than 16 bits wide, since references to plain

-int abound in the code.

-

-char can be either signed or unsigned, although the code runs faster if an

-unsigned char type is available.  If char is wider than 8 bits, you will need

-to redefine JOCTET and/or provide custom data source/destination managers so

-that JOCTET represents exactly 8 bits of data on external storage.

-

-The JPEG library proper does not assume ASCII representation of characters.

-But some of the image file I/O modules in cjpeg/djpeg do have ASCII

-dependencies in file-header manipulation; so does cjpeg's select_file_type()

-routine.

-

-The JPEG library does not rely heavily on the C library.  In particular, C

-stdio is used only by the data source/destination modules and the error

-handler, all of which are application-replaceable.  (cjpeg/djpeg are more

-heavily dependent on stdio.)  malloc and free are called only from the memory

-manager "back end" module, so you can use a different memory allocator by

-replacing that one file.

-

-The code generally assumes that C names must be unique in the first 15

-characters.  However, global function names can be made unique in the

-first 6 characters by defining NEED_SHORT_EXTERNAL_NAMES.

-

-More info about porting the code may be gleaned by reading jconfig.txt,

-jmorecfg.h, and jinclude.h.

-

-

-Notes for MS-DOS implementors

------------------------------

-

-The IJG code is designed to work efficiently in 80x86 "small" or "medium"

-memory models (i.e., data pointers are 16 bits unless explicitly declared

-"far"; code pointers can be either size).  You may be able to use small

-model to compile cjpeg or djpeg by itself, but you will probably have to use

-medium model for any larger application.  This won't make much difference in

-performance.  You *will* take a noticeable performance hit if you use a

-large-data memory model (perhaps 10%-25%), and you should avoid "huge" model

-if at all possible.

-

-The JPEG library typically needs 2Kb-3Kb of stack space.  It will also

-malloc about 20K-30K of near heap space while executing (and lots of far

-heap, but that doesn't count in this calculation).  This figure will vary

-depending on selected operating mode, and to a lesser extent on image size.

-There is also about 5Kb-6Kb of constant data which will be allocated in the

-near data segment (about 4Kb of this is the error message table).

-Thus you have perhaps 20K available for other modules' static data and near

-heap space before you need to go to a larger memory model.  The C library's

-static data will account for several K of this, but that still leaves a good

-deal for your needs.  (If you are tight on space, you could reduce the sizes

-of the I/O buffers allocated by jdatasrc.c and jdatadst.c, say from 4K to

-1K.  Another possibility is to move the error message table to far memory;

-this should be doable with only localized hacking on jerror.c.)

-

-About 2K of the near heap space is "permanent" memory that will not be

-released until you destroy the JPEG object.  This is only an issue if you

-save a JPEG object between compression or decompression operations.

-

-Far data space may also be a tight resource when you are dealing with large

-images.  The most memory-intensive case is decompression with two-pass color

-quantization, or single-pass quantization to an externally supplied color

-map.  This requires a 128Kb color lookup table plus strip buffers amounting

-to about 40 bytes per column for typical sampling ratios (eg, about 25600

-bytes for a 640-pixel-wide image).  You may not be able to process wide

-images if you have large data structures of your own.

-

-Of course, all of these concerns vanish if you use a 32-bit flat-memory-model

-compiler, such as DJGPP or Watcom C.  We highly recommend flat model if you

-can use it; the JPEG library is significantly faster in flat model.

diff --git a/plugins/AdvaImg/src/LibJPEG/rdbmp.c b/plugins/AdvaImg/src/LibJPEG/rdbmp.c
deleted file mode 100644
index dfdf96ff5c..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdbmp.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*

- * rdbmp.c

- *

- * Copyright (C) 1994-1996, Thomas G. Lane.

- * Modified 2009-2010 by Guido Vollbeding.

- * 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 routines to read input images in Microsoft "BMP"

- * format (MS Windows 3.x, OS/2 1.x, and OS/2 2.x flavors).

- * Currently, only 8-bit and 24-bit images are supported, not 1-bit or

- * 4-bit (feeding such low-depth images into JPEG would be silly anyway).

- * Also, we don't support RLE-compressed files.

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume input from

- * an ordinary stdio stream.  They further assume that reading begins

- * at the start of the file; start_input may need work if the

- * user interface has already read some data (e.g., to determine that

- * the file is indeed BMP format).

- *

- * This code contributed by James Arthur Boucher.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef BMP_SUPPORTED

-

-

-/* Macros to deal with unsigned chars as efficiently as compiler allows */

-

-#ifdef HAVE_UNSIGNED_CHAR

-typedef unsigned char U_CHAR;

-#define UCH(x)	((int) (x))

-#else /* !HAVE_UNSIGNED_CHAR */

-#ifdef CHAR_IS_UNSIGNED

-typedef char U_CHAR;

-#define UCH(x)	((int) (x))

-#else

-typedef char U_CHAR;

-#define UCH(x)	((int) (x) & 0xFF)

-#endif

-#endif /* HAVE_UNSIGNED_CHAR */

-

-

-#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))

-

-

-/* Private version of data source object */

-

-typedef struct _bmp_source_struct * bmp_source_ptr;

-

-typedef struct _bmp_source_struct {

-  struct cjpeg_source_struct pub; /* public fields */

-

-  j_compress_ptr cinfo;		/* back link saves passing separate parm */

-

-  JSAMPARRAY colormap;		/* BMP colormap (converted to my format) */

-

-  jvirt_sarray_ptr whole_image;	/* Needed to reverse row order */

-  JDIMENSION source_row;	/* Current source row number */

-  JDIMENSION row_width;		/* Physical width of scanlines in file */

-

-  int bits_per_pixel;		/* remembers 8- or 24-bit format */

-} bmp_source_struct;

-

-

-LOCAL(int)

-read_byte (bmp_source_ptr sinfo)

-/* Read next byte from BMP file */

-{

-  register FILE *infile = sinfo->pub.input_file;

-  register int c;

-

-  if ((c = getc(infile)) == EOF)

-    ERREXIT(sinfo->cinfo, JERR_INPUT_EOF);

-  return c;

-}

-

-

-LOCAL(void)

-read_colormap (bmp_source_ptr sinfo, int cmaplen, int mapentrysize)

-/* Read the colormap from a BMP file */

-{

-  int i;

-

-  switch (mapentrysize) {

-  case 3:

-    /* BGR format (occurs in OS/2 files) */

-    for (i = 0; i < cmaplen; i++) {

-      sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);

-      sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);

-      sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);

-    }

-    break;

-  case 4:

-    /* BGR0 format (occurs in MS Windows files) */

-    for (i = 0; i < cmaplen; i++) {

-      sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);

-      sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);

-      sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);

-      (void) read_byte(sinfo);

-    }

-    break;

-  default:

-    ERREXIT(sinfo->cinfo, JERR_BMP_BADCMAP);

-    break;

-  }

-}

-

-

-/*

- * Read one row of pixels.

- * The image has been read into the whole_image array, but is otherwise

- * unprocessed.  We must read it out in top-to-bottom row order, and if

- * it is an 8-bit image, we must expand colormapped pixels to 24bit format.

- */

-

-METHODDEF(JDIMENSION)

-get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 8-bit colormap indexes */

-{

-  bmp_source_ptr source = (bmp_source_ptr) sinfo;

-  register JSAMPARRAY colormap = source->colormap;

-  JSAMPARRAY image_ptr;

-  register int t;

-  register JSAMPROW inptr, outptr;

-  register JDIMENSION col;

-

-  /* Fetch next row from virtual array */

-  source->source_row--;

-  image_ptr = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->whole_image,

-     source->source_row, (JDIMENSION) 1, FALSE);

-

-  /* Expand the colormap indexes to real data */

-  inptr = image_ptr[0];

-  outptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    t = GETJSAMPLE(*inptr++);

-    *outptr++ = colormap[0][t];	/* can omit GETJSAMPLE() safely */

-    *outptr++ = colormap[1][t];

-    *outptr++ = colormap[2][t];

-  }

-

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 24-bit pixels */

-{

-  bmp_source_ptr source = (bmp_source_ptr) sinfo;

-  JSAMPARRAY image_ptr;

-  register JSAMPROW inptr, outptr;

-  register JDIMENSION col;

-

-  /* Fetch next row from virtual array */

-  source->source_row--;

-  image_ptr = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->whole_image,

-     source->source_row, (JDIMENSION) 1, FALSE);

-

-  /* Transfer data.  Note source values are in BGR order

-   * (even though Microsoft's own documents say the opposite).

-   */

-  inptr = image_ptr[0];

-  outptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    outptr[2] = *inptr++;	/* can omit GETJSAMPLE() safely */

-    outptr[1] = *inptr++;

-    outptr[0] = *inptr++;

-    outptr += 3;

-  }

-

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_32bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 32-bit pixels */

-{

-  bmp_source_ptr source = (bmp_source_ptr) sinfo;

-  JSAMPARRAY image_ptr;

-  register JSAMPROW inptr, outptr;

-  register JDIMENSION col;

-

-  /* Fetch next row from virtual array */

-  source->source_row--;

-  image_ptr = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->whole_image,

-     source->source_row, (JDIMENSION) 1, FALSE);

-  /* Transfer data.  Note source values are in BGR order

-   * (even though Microsoft's own documents say the opposite).

-   */

-  inptr = image_ptr[0];

-  outptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    outptr[2] = *inptr++;	/* can omit GETJSAMPLE() safely */

-    outptr[1] = *inptr++;

-    outptr[0] = *inptr++;

-    inptr++;			/* skip the 4th byte (Alpha channel) */

-    outptr += 3;

-  }

-

-  return 1;

-}

-

-

-/*

- * This method loads the image into whole_image during the first call on

- * get_pixel_rows.  The get_pixel_rows pointer is then adjusted to call

- * get_8bit_row, get_24bit_row, or get_32bit_row on subsequent calls.

- */

-

-METHODDEF(JDIMENSION)

-preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  bmp_source_ptr source = (bmp_source_ptr) sinfo;

-  register FILE *infile = source->pub.input_file;

-  register int c;

-  register JSAMPROW out_ptr;

-  JSAMPARRAY image_ptr;

-  JDIMENSION row, col;

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-

-  /* Read the data into a virtual array in input-file row order. */

-  for (row = 0; row < cinfo->image_height; row++) {

-    if (progress != NULL) {

-      progress->pub.pass_counter = (long) row;

-      progress->pub.pass_limit = (long) cinfo->image_height;

-      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-    }

-    image_ptr = (*cinfo->mem->access_virt_sarray)

-      ((j_common_ptr) cinfo, source->whole_image,

-       row, (JDIMENSION) 1, TRUE);

-    out_ptr = image_ptr[0];

-    for (col = source->row_width; col > 0; col--) {

-      /* inline copy of read_byte() for speed */

-      if ((c = getc(infile)) == EOF)

-	ERREXIT(cinfo, JERR_INPUT_EOF);

-      *out_ptr++ = (JSAMPLE) c;

-    }

-  }

-  if (progress != NULL)

-    progress->completed_extra_passes++;

-

-  /* Set up to read from the virtual array in top-to-bottom order */

-  switch (source->bits_per_pixel) {

-  case 8:

-    source->pub.get_pixel_rows = get_8bit_row;

-    break;

-  case 24:

-    source->pub.get_pixel_rows = get_24bit_row;

-    break;

-  case 32:

-    source->pub.get_pixel_rows = get_32bit_row;

-    break;

-  default:

-    ERREXIT(cinfo, JERR_BMP_BADDEPTH);

-  }

-  source->source_row = cinfo->image_height;

-

-  /* And read the first row */

-  return (*source->pub.get_pixel_rows) (cinfo, sinfo);

-}

-

-

-/*

- * Read the file header; return image size and component count.

- */

-

-METHODDEF(void)

-start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  bmp_source_ptr source = (bmp_source_ptr) sinfo;

-  U_CHAR bmpfileheader[14];

-  U_CHAR bmpinfoheader[64];

-#define GET_2B(array,offset)  ((unsigned int) UCH(array[offset]) + \

-			       (((unsigned int) UCH(array[offset+1])) << 8))

-#define GET_4B(array,offset)  ((INT32) UCH(array[offset]) + \

-			       (((INT32) UCH(array[offset+1])) << 8) + \

-			       (((INT32) UCH(array[offset+2])) << 16) + \

-			       (((INT32) UCH(array[offset+3])) << 24))

-  INT32 bfOffBits;

-  INT32 headerSize;

-  INT32 biWidth;

-  INT32 biHeight;

-  unsigned int biPlanes;

-  INT32 biCompression;

-  INT32 biXPelsPerMeter,biYPelsPerMeter;

-  INT32 biClrUsed = 0;

-  int mapentrysize = 0;		/* 0 indicates no colormap */

-  INT32 bPad;

-  JDIMENSION row_width;

-

-  /* Read and verify the bitmap file header */

-  if (! ReadOK(source->pub.input_file, bmpfileheader, 14))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  if (GET_2B(bmpfileheader,0) != 0x4D42) /* 'BM' */

-    ERREXIT(cinfo, JERR_BMP_NOT);

-  bfOffBits = (INT32) GET_4B(bmpfileheader,10);

-  /* We ignore the remaining fileheader fields */

-

-  /* The infoheader might be 12 bytes (OS/2 1.x), 40 bytes (Windows),

-   * or 64 bytes (OS/2 2.x).  Check the first 4 bytes to find out which.

-   */

-  if (! ReadOK(source->pub.input_file, bmpinfoheader, 4))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  headerSize = (INT32) GET_4B(bmpinfoheader,0);

-  if (headerSize < 12 || headerSize > 64)

-    ERREXIT(cinfo, JERR_BMP_BADHEADER);

-  if (! ReadOK(source->pub.input_file, bmpinfoheader+4, headerSize-4))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-

-  switch ((int) headerSize) {

-  case 12:

-    /* Decode OS/2 1.x header (Microsoft calls this a BITMAPCOREHEADER) */

-    biWidth = (INT32) GET_2B(bmpinfoheader,4);

-    biHeight = (INT32) GET_2B(bmpinfoheader,6);

-    biPlanes = GET_2B(bmpinfoheader,8);

-    source->bits_per_pixel = (int) GET_2B(bmpinfoheader,10);

-

-    switch (source->bits_per_pixel) {

-    case 8:			/* colormapped image */

-      mapentrysize = 3;		/* OS/2 uses RGBTRIPLE colormap */

-      TRACEMS2(cinfo, 1, JTRC_BMP_OS2_MAPPED, (int) biWidth, (int) biHeight);

-      break;

-    case 24:			/* RGB image */

-      TRACEMS2(cinfo, 1, JTRC_BMP_OS2, (int) biWidth, (int) biHeight);

-      break;

-    default:

-      ERREXIT(cinfo, JERR_BMP_BADDEPTH);

-      break;

-    }

-    break;

-  case 40:

-  case 64:

-    /* Decode Windows 3.x header (Microsoft calls this a BITMAPINFOHEADER) */

-    /* or OS/2 2.x header, which has additional fields that we ignore */

-    biWidth = GET_4B(bmpinfoheader,4);

-    biHeight = GET_4B(bmpinfoheader,8);

-    biPlanes = GET_2B(bmpinfoheader,12);

-    source->bits_per_pixel = (int) GET_2B(bmpinfoheader,14);

-    biCompression = GET_4B(bmpinfoheader,16);

-    biXPelsPerMeter = GET_4B(bmpinfoheader,24);

-    biYPelsPerMeter = GET_4B(bmpinfoheader,28);

-    biClrUsed = GET_4B(bmpinfoheader,32);

-    /* biSizeImage, biClrImportant fields are ignored */

-

-    switch (source->bits_per_pixel) {

-    case 8:			/* colormapped image */

-      mapentrysize = 4;		/* Windows uses RGBQUAD colormap */

-      TRACEMS2(cinfo, 1, JTRC_BMP_MAPPED, (int) biWidth, (int) biHeight);

-      break;

-    case 24:			/* RGB image */

-      TRACEMS2(cinfo, 1, JTRC_BMP, (int) biWidth, (int) biHeight);

-      break;

-    case 32:			/* RGB image + Alpha channel */

-      TRACEMS2(cinfo, 1, JTRC_BMP, (int) biWidth, (int) biHeight);

-      break;

-    default:

-      ERREXIT(cinfo, JERR_BMP_BADDEPTH);

-      break;

-    }

-    if (biCompression != 0)

-      ERREXIT(cinfo, JERR_BMP_COMPRESSED);

-

-    if (biXPelsPerMeter > 0 && biYPelsPerMeter > 0) {

-      /* Set JFIF density parameters from the BMP data */

-      cinfo->X_density = (UINT16) (biXPelsPerMeter/100); /* 100 cm per meter */

-      cinfo->Y_density = (UINT16) (biYPelsPerMeter/100);

-      cinfo->density_unit = 2;	/* dots/cm */

-    }

-    break;

-  default:

-    ERREXIT(cinfo, JERR_BMP_BADHEADER);

-    return;

-  }

-

-  if (biWidth <= 0 || biHeight <= 0)

-    ERREXIT(cinfo, JERR_BMP_EMPTY);

-  if (biPlanes != 1)

-    ERREXIT(cinfo, JERR_BMP_BADPLANES);

-

-  /* Compute distance to bitmap data --- will adjust for colormap below */

-  bPad = bfOffBits - (headerSize + 14);

-

-  /* Read the colormap, if any */

-  if (mapentrysize > 0) {

-    if (biClrUsed <= 0)

-      biClrUsed = 256;		/* assume it's 256 */

-    else if (biClrUsed > 256)

-      ERREXIT(cinfo, JERR_BMP_BADCMAP);

-    /* Allocate space to store the colormap */

-    source->colormap = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) biClrUsed, (JDIMENSION) 3);

-    /* and read it from the file */

-    read_colormap(source, (int) biClrUsed, mapentrysize);

-    /* account for size of colormap */

-    bPad -= biClrUsed * mapentrysize;

-  }

-

-  /* Skip any remaining pad bytes */

-  if (bPad < 0)			/* incorrect bfOffBits value? */

-    ERREXIT(cinfo, JERR_BMP_BADHEADER);

-  while (--bPad >= 0) {

-    (void) read_byte(source);

-  }

-

-  /* Compute row width in file, including padding to 4-byte boundary */

-  if (source->bits_per_pixel == 24)

-    row_width = (JDIMENSION) (biWidth * 3);

-  else if (source->bits_per_pixel == 32)

-    row_width = (JDIMENSION) (biWidth * 4);

-  else

-    row_width = (JDIMENSION) biWidth;

-  while ((row_width & 3) != 0) row_width++;

-  source->row_width = row_width;

-

-  /* Allocate space for inversion array, prepare for preload pass */

-  source->whole_image = (*cinfo->mem->request_virt_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-     row_width, (JDIMENSION) biHeight, (JDIMENSION) 1);

-  source->pub.get_pixel_rows = preload_image;

-  if (cinfo->progress != NULL) {

-    cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-    progress->total_extra_passes++; /* count file input as separate pass */

-  }

-

-  /* Allocate one-row buffer for returned data */

-  source->pub.buffer = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE,

-     (JDIMENSION) (biWidth * 3), (JDIMENSION) 1);

-  source->pub.buffer_height = 1;

-

-  cinfo->in_color_space = JCS_RGB;

-  cinfo->input_components = 3;

-  cinfo->data_precision = 8;

-  cinfo->image_width = (JDIMENSION) biWidth;

-  cinfo->image_height = (JDIMENSION) biHeight;

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  /* no work */

-}

-

-

-/*

- * The module selection routine for BMP format input.

- */

-

-GLOBAL(cjpeg_source_ptr)

-jinit_read_bmp (j_compress_ptr cinfo)

-{

-  bmp_source_ptr source;

-

-  /* Create module interface object */

-  source = (bmp_source_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(bmp_source_struct));

-  source->cinfo = cinfo;	/* make back link for subroutines */

-  /* Fill in method ptrs, except get_pixel_rows which start_input sets */

-  source->pub.start_input = start_input_bmp;

-  source->pub.finish_input = finish_input_bmp;

-

-  return (cjpeg_source_ptr) source;

-}

-

-#endif /* BMP_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/rdcolmap.c b/plugins/AdvaImg/src/LibJPEG/rdcolmap.c
deleted file mode 100644
index eebf8346c5..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdcolmap.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*

- * rdcolmap.c

- *

- * Copyright (C) 1994-1996, 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 implements djpeg's "-map file" switch.  It reads a source image

- * and constructs a colormap to be supplied to the JPEG decompressor.

- *

- * Currently, these file formats are supported for the map file:

- *   GIF: the contents of the GIF's global colormap are used.

- *   PPM (either text or raw flavor): the entire file is read and

- *      each unique pixel value is entered in the map.

- * Note that reading a large PPM file will be horrendously slow.

- * Typically, a PPM-format map file should contain just one pixel

- * of each desired color.  Such a file can be extracted from an

- * ordinary image PPM file with ppmtomap(1).

- *

- * Rescaling a PPM that has a maxval unequal to MAXJSAMPLE is not

- * currently implemented.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef QUANT_2PASS_SUPPORTED	/* otherwise can't quantize to supplied map */

-

-/* Portions of this code are based on the PBMPLUS library, which is:

-**

-** Copyright (C) 1988 by Jef Poskanzer.

-**

-** Permission to use, copy, modify, and distribute this software and its

-** documentation for any purpose and without fee is hereby granted, provided

-** that the above copyright notice appear in all copies and that both that

-** copyright notice and this permission notice appear in supporting

-** documentation.  This software is provided "as is" without express or

-** implied warranty.

-*/

-

-

-/*

- * Add a (potentially) new color to the color map.

- */

-

-LOCAL(void)

-add_map_entry (j_decompress_ptr cinfo, int R, int G, int B)

-{

-  JSAMPROW colormap0 = cinfo->colormap[0];

-  JSAMPROW colormap1 = cinfo->colormap[1];

-  JSAMPROW colormap2 = cinfo->colormap[2];

-  int ncolors = cinfo->actual_number_of_colors;

-  int index;

-

-  /* Check for duplicate color. */

-  for (index = 0; index < ncolors; index++) {

-    if (GETJSAMPLE(colormap0[index]) == R &&

-	GETJSAMPLE(colormap1[index]) == G &&

-	GETJSAMPLE(colormap2[index]) == B)

-      return;			/* color is already in map */

-  }

-

-  /* Check for map overflow. */

-  if (ncolors >= (MAXJSAMPLE+1))

-    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, (MAXJSAMPLE+1));

-

-  /* OK, add color to map. */

-  colormap0[ncolors] = (JSAMPLE) R;

-  colormap1[ncolors] = (JSAMPLE) G;

-  colormap2[ncolors] = (JSAMPLE) B;

-  cinfo->actual_number_of_colors++;

-}

-

-

-/*

- * Extract color map from a GIF file.

- */

-

-LOCAL(void)

-read_gif_map (j_decompress_ptr cinfo, FILE * infile)

-{

-  int header[13];

-  int i, colormaplen;

-  int R, G, B;

-

-  /* Initial 'G' has already been read by read_color_map */

-  /* Read the rest of the GIF header and logical screen descriptor */

-  for (i = 1; i < 13; i++) {

-    if ((header[i] = getc(infile)) == EOF)

-      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-  }

-

-  /* Verify GIF Header */

-  if (header[1] != 'I' || header[2] != 'F')

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-

-  /* There must be a global color map. */

-  if ((header[10] & 0x80) == 0)

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-

-  /* OK, fetch it. */

-  colormaplen = 2 << (header[10] & 0x07);

-

-  for (i = 0; i < colormaplen; i++) {

-    R = getc(infile);

-    G = getc(infile);

-    B = getc(infile);

-    if (R == EOF || G == EOF || B == EOF)

-      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-    add_map_entry(cinfo,

-		  R << (BITS_IN_JSAMPLE-8),

-		  G << (BITS_IN_JSAMPLE-8),

-		  B << (BITS_IN_JSAMPLE-8));

-  }

-}

-

-

-/* Support routines for reading PPM */

-

-

-LOCAL(int)

-pbm_getc (FILE * infile)

-/* Read next char, skipping over any comments */

-/* A comment/newline sequence is returned as a newline */

-{

-  register int ch;

-  

-  ch = getc(infile);

-  if (ch == '#') {

-    do {

-      ch = getc(infile);

-    } while (ch != '\n' && ch != EOF);

-  }

-  return ch;

-}

-

-

-LOCAL(unsigned int)

-read_pbm_integer (j_decompress_ptr cinfo, FILE * infile)

-/* Read an unsigned decimal integer from the PPM file */

-/* Swallows one trailing character after the integer */

-/* Note that on a 16-bit-int machine, only values up to 64k can be read. */

-/* This should not be a problem in practice. */

-{

-  register int ch;

-  register unsigned int val;

-  

-  /* Skip any leading whitespace */

-  do {

-    ch = pbm_getc(infile);

-    if (ch == EOF)

-      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-  } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');

-  

-  if (ch < '0' || ch > '9')

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-  

-  val = ch - '0';

-  while ((ch = pbm_getc(infile)) >= '0' && ch <= '9') {

-    val *= 10;

-    val += ch - '0';

-  }

-  return val;

-}

-

-

-/*

- * Extract color map from a PPM file.

- */

-

-LOCAL(void)

-read_ppm_map (j_decompress_ptr cinfo, FILE * infile)

-{

-  int c;

-  unsigned int w, h, maxval, row, col;

-  int R, G, B;

-

-  /* Initial 'P' has already been read by read_color_map */

-  c = getc(infile);		/* save format discriminator for a sec */

-

-  /* while we fetch the remaining header info */

-  w = read_pbm_integer(cinfo, infile);

-  h = read_pbm_integer(cinfo, infile);

-  maxval = read_pbm_integer(cinfo, infile);

-

-  if (w <= 0 || h <= 0 || maxval <= 0) /* error check */

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-

-  /* For now, we don't support rescaling from an unusual maxval. */

-  if (maxval != (unsigned int) MAXJSAMPLE)

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-

-  switch (c) {

-  case '3':			/* it's a text-format PPM file */

-    for (row = 0; row < h; row++) {

-      for (col = 0; col < w; col++) {

-	R = read_pbm_integer(cinfo, infile);

-	G = read_pbm_integer(cinfo, infile);

-	B = read_pbm_integer(cinfo, infile);

-	add_map_entry(cinfo, R, G, B);

-      }

-    }

-    break;

-

-  case '6':			/* it's a raw-format PPM file */

-    for (row = 0; row < h; row++) {

-      for (col = 0; col < w; col++) {

-	R = getc(infile);

-	G = getc(infile);

-	B = getc(infile);

-	if (R == EOF || G == EOF || B == EOF)

-	  ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-	add_map_entry(cinfo, R, G, B);

-      }

-    }

-    break;

-

-  default:

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-    break;

-  }

-}

-

-

-/*

- * Main entry point from djpeg.c.

- *  Input: opened input file (from file name argument on command line).

- *  Output: colormap and actual_number_of_colors fields are set in cinfo.

- */

-

-GLOBAL(void)

-read_color_map (j_decompress_ptr cinfo, FILE * infile)

-{

-  /* Allocate space for a color map of maximum supported size. */

-  cinfo->colormap = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE,

-     (JDIMENSION) (MAXJSAMPLE+1), (JDIMENSION) 3);

-  cinfo->actual_number_of_colors = 0; /* initialize map to empty */

-

-  /* Read first byte to determine file format */

-  switch (getc(infile)) {

-  case 'G':

-    read_gif_map(cinfo, infile);

-    break;

-  case 'P':

-    read_ppm_map(cinfo, infile);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);

-    break;

-  }

-}

-

-#endif /* QUANT_2PASS_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/rdgif.c b/plugins/AdvaImg/src/LibJPEG/rdgif.c
deleted file mode 100644
index b0757e718f..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdgif.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * rdgif.c

- *

- * Copyright (C) 1991-1997, 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 routines to read input images in GIF format.

- *

- *****************************************************************************

- * NOTE: to avoid entanglements with Unisys' patent on LZW compression,      *

- * the ability to read GIF files has been removed from the IJG distribution. *

- * Sorry about that.                                                         *

- *****************************************************************************

- *

- * 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."

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef GIF_SUPPORTED

-

-/*

- * The module selection routine for GIF format input.

- */

-

-GLOBAL(cjpeg_source_ptr)

-jinit_read_gif (j_compress_ptr cinfo)

-{

-  fprintf(stderr, "GIF input is unsupported for legal reasons.  Sorry.\n");

-  exit(EXIT_FAILURE);

-  return NULL;			/* keep compiler happy */

-}

-

-#endif /* GIF_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c b/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c
deleted file mode 100644
index ab09b443ff..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*

- * rdjpgcom.c

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 2009 by Bill Allombert, Guido Vollbeding.

- * 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 a very simple stand-alone application that displays

- * the text in COM (comment) markers in a JFIF file.

- * This may be useful as an example of the minimum logic needed to parse

- * JPEG markers.

- */

-

-#define JPEG_CJPEG_DJPEG	/* to get the command-line config symbols */

-#include "jinclude.h"		/* get auto-config symbols, <stdio.h> */

-

-#ifdef HAVE_LOCALE_H

-#include <locale.h>		/* Bill Allombert: use locale for isprint */

-#endif

-#include <ctype.h>		/* to declare isupper(), tolower() */

-#ifdef USE_SETMODE

-#include <fcntl.h>		/* to declare setmode()'s parameter macros */

-/* If you have setmode() but not <io.h>, just delete this line: */

-#include <io.h>			/* to declare setmode() */

-#endif

-

-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */

-#ifdef __MWERKS__

-#include <SIOUX.h>              /* Metrowerks needs this */

-#include <console.h>		/* ... and this */

-#endif

-#ifdef THINK_C

-#include <console.h>		/* Think declares it here */

-#endif

-#endif

-

-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */

-#define READ_BINARY	"r"

-#else

-#ifdef VMS			/* VMS is very nonstandard */

-#define READ_BINARY	"rb", "ctx=stm"

-#else				/* standard ANSI-compliant case */

-#define READ_BINARY	"rb"

-#endif

-#endif

-

-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */

-#define EXIT_FAILURE  1

-#endif

-#ifndef EXIT_SUCCESS

-#ifdef VMS

-#define EXIT_SUCCESS  1		/* VMS is very nonstandard */

-#else

-#define EXIT_SUCCESS  0

-#endif

-#endif

-

-

-/*

- * These macros are used to read the input file.

- * To reuse this code in another application, you might need to change these.

- */

-

-static FILE * infile;		/* input JPEG file */

-

-/* Return next input byte, or EOF if no more */

-#define NEXTBYTE()  getc(infile)

-

-

-/* Error exit handler */

-#define ERREXIT(msg)  (fprintf(stderr, "%s\n", msg), exit(EXIT_FAILURE))

-

-

-/* Read one byte, testing for EOF */

-static int

-read_1_byte (void)

-{

-  int c;

-

-  c = NEXTBYTE();

-  if (c == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  return c;

-}

-

-/* Read 2 bytes, convert to unsigned int */

-/* All 2-byte quantities in JPEG markers are MSB first */

-static unsigned int

-read_2_bytes (void)

-{

-  int c1, c2;

-

-  c1 = NEXTBYTE();

-  if (c1 == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  c2 = NEXTBYTE();

-  if (c2 == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  return (((unsigned int) c1) << 8) + ((unsigned int) c2);

-}

-

-

-/*

- * JPEG markers consist of one or more 0xFF bytes, followed by a marker

- * code byte (which is not an FF).  Here are the marker codes of interest

- * in this program.  (See jdmarker.c for a more complete list.)

- */

-

-#define M_SOF0  0xC0		/* Start Of Frame N */

-#define M_SOF1  0xC1		/* N indicates which compression process */

-#define M_SOF2  0xC2		/* Only SOF0-SOF2 are now in common use */

-#define M_SOF3  0xC3

-#define M_SOF5  0xC5		/* NB: codes C4 and CC are NOT SOF markers */

-#define M_SOF6  0xC6

-#define M_SOF7  0xC7

-#define M_SOF9  0xC9

-#define M_SOF10 0xCA

-#define M_SOF11 0xCB

-#define M_SOF13 0xCD

-#define M_SOF14 0xCE

-#define M_SOF15 0xCF

-#define M_SOI   0xD8		/* Start Of Image (beginning of datastream) */

-#define M_EOI   0xD9		/* End Of Image (end of datastream) */

-#define M_SOS   0xDA		/* Start Of Scan (begins compressed data) */

-#define M_APP0	0xE0		/* Application-specific marker, type N */

-#define M_APP12	0xEC		/* (we don't bother to list all 16 APPn's) */

-#define M_COM   0xFE		/* COMment */

-

-

-/*

- * Find the next JPEG marker and return its marker code.

- * We expect at least one FF byte, possibly more if the compressor used FFs

- * to pad the file.

- * There could also be non-FF garbage between markers.  The treatment of such

- * garbage is unspecified; we choose to skip over it but emit a warning msg.

- * NB: this routine must not be used after seeing SOS marker, since it will

- * not deal correctly with FF/00 sequences in the compressed image data...

- */

-

-static int

-next_marker (void)

-{

-  int c;

-  int discarded_bytes = 0;

-

-  /* Find 0xFF byte; count and skip any non-FFs. */

-  c = read_1_byte();

-  while (c != 0xFF) {

-    discarded_bytes++;

-    c = read_1_byte();

-  }

-  /* Get marker code byte, swallowing any duplicate FF bytes.  Extra FFs

-   * are legal as pad bytes, so don't count them in discarded_bytes.

-   */

-  do {

-    c = read_1_byte();

-  } while (c == 0xFF);

-

-  if (discarded_bytes != 0) {

-    fprintf(stderr, "Warning: garbage data found in JPEG file\n");

-  }

-

-  return c;

-}

-

-

-/*

- * Read the initial marker, which should be SOI.

- * For a JFIF file, the first two bytes of the file should be literally

- * 0xFF M_SOI.  To be more general, we could use next_marker, but if the

- * input file weren't actually JPEG at all, next_marker might read the whole

- * file and then return a misleading error message...

- */

-

-static int

-first_marker (void)

-{

-  int c1, c2;

-

-  c1 = NEXTBYTE();

-  c2 = NEXTBYTE();

-  if (c1 != 0xFF || c2 != M_SOI)

-    ERREXIT("Not a JPEG file");

-  return c2;

-}

-

-

-/*

- * Most types of marker are followed by a variable-length parameter segment.

- * This routine skips over the parameters for any marker we don't otherwise

- * want to process.

- * Note that we MUST skip the parameter segment explicitly in order not to

- * be fooled by 0xFF bytes that might appear within the parameter segment;

- * such bytes do NOT introduce new markers.

- */

-

-static void

-skip_variable (void)

-/* Skip over an unknown or uninteresting variable-length marker */

-{

-  unsigned int length;

-

-  /* Get the marker parameter length count */

-  length = read_2_bytes();

-  /* Length includes itself, so must be at least 2 */

-  if (length < 2)

-    ERREXIT("Erroneous JPEG marker length");

-  length -= 2;

-  /* Skip over the remaining bytes */

-  while (length > 0) {

-    (void) read_1_byte();

-    length--;

-  }

-}

-

-

-/*

- * Process a COM marker.

- * We want to print out the marker contents as legible text;

- * we must guard against non-text junk and varying newline representations.

- */

-

-static void

-process_COM (int raw)

-{

-  unsigned int length;

-  int ch;

-  int lastch = 0;

-

-  /* Bill Allombert: set locale properly for isprint */

-#ifdef HAVE_LOCALE_H

-  setlocale(LC_CTYPE, "");

-#endif

-

-  /* Get the marker parameter length count */

-  length = read_2_bytes();

-  /* Length includes itself, so must be at least 2 */

-  if (length < 2)

-    ERREXIT("Erroneous JPEG marker length");

-  length -= 2;

-

-  while (length > 0) {

-    ch = read_1_byte();

-    if (raw) {

-      putc(ch, stdout);

-    /* Emit the character in a readable form.

-     * Nonprintables are converted to \nnn form,

-     * while \ is converted to \\.

-     * Newlines in CR, CR/LF, or LF form will be printed as one newline.

-     */

-    } else if (ch == '\r') {

-      printf("\n");

-    } else if (ch == '\n') {

-      if (lastch != '\r')

-	printf("\n");

-    } else if (ch == '\\') {

-      printf("\\\\");

-    } else if (isprint(ch)) {

-      putc(ch, stdout);

-    } else {

-      printf("\\%03o", ch);

-    }

-    lastch = ch;

-    length--;

-  }

-  printf("\n");

-

-  /* Bill Allombert: revert to C locale */

-#ifdef HAVE_LOCALE_H

-  setlocale(LC_CTYPE, "C");

-#endif

-}

-

-

-/*

- * Process a SOFn marker.

- * This code is only needed if you want to know the image dimensions...

- */

-

-static void

-process_SOFn (int marker)

-{

-  unsigned int length;

-  unsigned int image_height, image_width;

-  int data_precision, num_components;

-  const char * process;

-  int ci;

-

-  length = read_2_bytes();	/* usual parameter length count */

-

-  data_precision = read_1_byte();

-  image_height = read_2_bytes();

-  image_width = read_2_bytes();

-  num_components = read_1_byte();

-

-  switch (marker) {

-  case M_SOF0:	process = "Baseline";  break;

-  case M_SOF1:	process = "Extended sequential";  break;

-  case M_SOF2:	process = "Progressive";  break;

-  case M_SOF3:	process = "Lossless";  break;

-  case M_SOF5:	process = "Differential sequential";  break;

-  case M_SOF6:	process = "Differential progressive";  break;

-  case M_SOF7:	process = "Differential lossless";  break;

-  case M_SOF9:	process = "Extended sequential, arithmetic coding";  break;

-  case M_SOF10:	process = "Progressive, arithmetic coding";  break;

-  case M_SOF11:	process = "Lossless, arithmetic coding";  break;

-  case M_SOF13:	process = "Differential sequential, arithmetic coding";  break;

-  case M_SOF14:	process = "Differential progressive, arithmetic coding"; break;

-  case M_SOF15:	process = "Differential lossless, arithmetic coding";  break;

-  default:	process = "Unknown";  break;

-  }

-

-  printf("JPEG image is %uw * %uh, %d color components, %d bits per sample\n",

-	 image_width, image_height, num_components, data_precision);

-  printf("JPEG process: %s\n", process);

-

-  if (length != (unsigned int) (8 + num_components * 3))

-    ERREXIT("Bogus SOF marker length");

-

-  for (ci = 0; ci < num_components; ci++) {

-    (void) read_1_byte();	/* Component ID code */

-    (void) read_1_byte();	/* H, V sampling factors */

-    (void) read_1_byte();	/* Quantization table number */

-  }

-}

-

-

-/*

- * Parse the marker stream until SOS or EOI is seen;

- * display any COM markers.

- * While the companion program wrjpgcom will always insert COM markers before

- * SOFn, other implementations might not, so we scan to SOS before stopping.

- * If we were only interested in the image dimensions, we would stop at SOFn.

- * (Conversely, if we only cared about COM markers, there would be no need

- * for special code to handle SOFn; we could treat it like other markers.)

- */

-

-static int

-scan_JPEG_header (int verbose, int raw)

-{

-  int marker;

-

-  /* Expect SOI at start of file */

-  if (first_marker() != M_SOI)

-    ERREXIT("Expected SOI marker first");

-

-  /* Scan miscellaneous markers until we reach SOS. */

-  for (;;) {

-    marker = next_marker();

-    switch (marker) {

-      /* Note that marker codes 0xC4, 0xC8, 0xCC are not, and must not be,

-       * treated as SOFn.  C4 in particular is actually DHT.

-       */

-    case M_SOF0:		/* Baseline */

-    case M_SOF1:		/* Extended sequential, Huffman */

-    case M_SOF2:		/* Progressive, Huffman */

-    case M_SOF3:		/* Lossless, Huffman */

-    case M_SOF5:		/* Differential sequential, Huffman */

-    case M_SOF6:		/* Differential progressive, Huffman */

-    case M_SOF7:		/* Differential lossless, Huffman */

-    case M_SOF9:		/* Extended sequential, arithmetic */

-    case M_SOF10:		/* Progressive, arithmetic */

-    case M_SOF11:		/* Lossless, arithmetic */

-    case M_SOF13:		/* Differential sequential, arithmetic */

-    case M_SOF14:		/* Differential progressive, arithmetic */

-    case M_SOF15:		/* Differential lossless, arithmetic */

-      if (verbose)

-	process_SOFn(marker);

-      else

-	skip_variable();

-      break;

-

-    case M_SOS:			/* stop before hitting compressed data */

-      return marker;

-

-    case M_EOI:			/* in case it's a tables-only JPEG stream */

-      return marker;

-

-    case M_COM:

-      process_COM(raw);

-      break;

-

-    case M_APP12:

-      /* Some digital camera makers put useful textual information into

-       * APP12 markers, so we print those out too when in -verbose mode.

-       */

-      if (verbose) {

-	printf("APP12 contains:\n");

-	process_COM(raw);

-      } else

-	skip_variable();

-      break;

-

-    default:			/* Anything else just gets skipped */

-      skip_variable();		/* we assume it has a parameter count... */

-      break;

-    }

-  } /* end loop */

-}

-

-

-/* Command line parsing code */

-

-static const char * progname;	/* program name for error messages */

-

-

-static void

-usage (void)

-/* complain about bad command line */

-{

-  fprintf(stderr, "rdjpgcom displays any textual comments in a JPEG file.\n");

-

-  fprintf(stderr, "Usage: %s [switches] [inputfile]\n", progname);

-

-  fprintf(stderr, "Switches (names may be abbreviated):\n");

-  fprintf(stderr, "  -raw        Display non-printable characters in comments (unsafe)\n");

-  fprintf(stderr, "  -verbose    Also display dimensions of JPEG image\n");

-

-  exit(EXIT_FAILURE);

-}

-

-

-static int

-keymatch (char * arg, const char * keyword, int minchars)

-/* Case-insensitive matching of (possibly abbreviated) keyword switches. */

-/* keyword is the constant keyword (must be lower case already), */

-/* minchars is length of minimum legal abbreviation. */

-{

-  register int ca, ck;

-  register int nmatched = 0;

-

-  while ((ca = *arg++) != '\0') {

-    if ((ck = *keyword++) == '\0')

-      return 0;			/* arg longer than keyword, no good */

-    if (isupper(ca))		/* force arg to lcase (assume ck is already) */

-      ca = tolower(ca);

-    if (ca != ck)

-      return 0;			/* no good */

-    nmatched++;			/* count matched characters */

-  }

-  /* reached end of argument; fail if it's too short for unique abbrev */

-  if (nmatched < minchars)

-    return 0;

-  return 1;			/* A-OK */

-}

-

-

-/*

- * The main program.

- */

-

-int

-main (int argc, char **argv)

-{

-  int argn;

-  char * arg;

-  int verbose = 0, raw = 0;

-

-  /* On Mac, fetch a command line. */

-#ifdef USE_CCOMMAND

-  argc = ccommand(&argv);

-#endif

-

-  progname = argv[0];

-  if (progname == NULL || progname[0] == 0)

-    progname = "rdjpgcom";	/* in case C library doesn't provide it */

-

-  /* Parse switches, if any */

-  for (argn = 1; argn < argc; argn++) {

-    arg = argv[argn];

-    if (arg[0] != '-')

-      break;			/* not switch, must be file name */

-    arg++;			/* advance over '-' */

-    if (keymatch(arg, "verbose", 1)) {

-      verbose++;

-    } else if (keymatch(arg, "raw", 1)) {

-      raw = 1;

-    } else

-      usage();

-  }

-

-  /* Open the input file. */

-  /* Unix style: expect zero or one file name */

-  if (argn < argc-1) {

-    fprintf(stderr, "%s: only one input file\n", progname);

-    usage();

-  }

-  if (argn < argc) {

-    if ((infile = fopen(argv[argn], READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default input file is stdin */

-#ifdef USE_SETMODE		/* need to hack file mode? */

-    setmode(fileno(stdin), O_BINARY);

-#endif

-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */

-    if ((infile = fdopen(fileno(stdin), READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open stdin\n", progname);

-      exit(EXIT_FAILURE);

-    }

-#else

-    infile = stdin;

-#endif

-  }

-

-  /* Scan the JPEG headers. */

-  (void) scan_JPEG_header(verbose, raw);

-

-  /* All done. */

-  exit(EXIT_SUCCESS);

-  return 0;			/* suppress no-return-value warnings */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/rdppm.c b/plugins/AdvaImg/src/LibJPEG/rdppm.c
deleted file mode 100644
index 9dcd2dc216..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdppm.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*

- * rdppm.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2009 by Bill Allombert, Guido Vollbeding.

- * 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 routines to read input images in PPM/PGM format.

- * The extended 2-byte-per-sample raw PPM/PGM formats are supported.

- * The PBMPLUS library is NOT required to compile this software

- * (but it is highly useful as a set of PPM image manipulation programs).

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume input from

- * an ordinary stdio stream.  They further assume that reading begins

- * at the start of the file; start_input may need work if the

- * user interface has already read some data (e.g., to determine that

- * the file is indeed PPM format).

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef PPM_SUPPORTED

-

-

-/* Portions of this code are based on the PBMPLUS library, which is:

-**

-** Copyright (C) 1988 by Jef Poskanzer.

-**

-** Permission to use, copy, modify, and distribute this software and its

-** documentation for any purpose and without fee is hereby granted, provided

-** that the above copyright notice appear in all copies and that both that

-** copyright notice and this permission notice appear in supporting

-** documentation.  This software is provided "as is" without express or

-** implied warranty.

-*/

-

-

-/* Macros to deal with unsigned chars as efficiently as compiler allows */

-

-#ifdef HAVE_UNSIGNED_CHAR

-typedef unsigned char U_CHAR;

-#define UCH(x)	((int) (x))

-#else /* !HAVE_UNSIGNED_CHAR */

-#ifdef CHAR_IS_UNSIGNED

-typedef char U_CHAR;

-#define UCH(x)	((int) (x))

-#else

-typedef char U_CHAR;

-#define UCH(x)	((int) (x) & 0xFF)

-#endif

-#endif /* HAVE_UNSIGNED_CHAR */

-

-

-#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))

-

-

-/*

- * On most systems, reading individual bytes with getc() is drastically less

- * efficient than buffering a row at a time with fread().  On PCs, we must

- * allocate the buffer in near data space, because we are assuming small-data

- * memory model, wherein fread() can't reach far memory.  If you need to

- * process very wide images on a PC, you might have to compile in large-memory

- * model, or else replace fread() with a getc() loop --- which will be much

- * slower.

- */

-

-

-/* Private version of data source object */

-

-typedef struct {

-  struct cjpeg_source_struct pub; /* public fields */

-

-  U_CHAR *iobuffer;		/* non-FAR pointer to I/O buffer */

-  JSAMPROW pixrow;		/* FAR pointer to same */

-  size_t buffer_width;		/* width of I/O buffer */

-  JSAMPLE *rescale;		/* => maxval-remapping array, or NULL */

-} ppm_source_struct;

-

-typedef ppm_source_struct * ppm_source_ptr;

-

-

-LOCAL(int)

-pbm_getc (FILE * infile)

-/* Read next char, skipping over any comments */

-/* A comment/newline sequence is returned as a newline */

-{

-  register int ch;

-

-  ch = getc(infile);

-  if (ch == '#') {

-    do {

-      ch = getc(infile);

-    } while (ch != '\n' && ch != EOF);

-  }

-  return ch;

-}

-

-

-LOCAL(unsigned int)

-read_pbm_integer (j_compress_ptr cinfo, FILE * infile)

-/* Read an unsigned decimal integer from the PPM file */

-/* Swallows one trailing character after the integer */

-/* Note that on a 16-bit-int machine, only values up to 64k can be read. */

-/* This should not be a problem in practice. */

-{

-  register int ch;

-  register unsigned int val;

-

-  /* Skip any leading whitespace */

-  do {

-    ch = pbm_getc(infile);

-    if (ch == EOF)

-      ERREXIT(cinfo, JERR_INPUT_EOF);

-  } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');

-

-  if (ch < '0' || ch > '9')

-    ERREXIT(cinfo, JERR_PPM_NONNUMERIC);

-

-  val = ch - '0';

-  while ((ch = pbm_getc(infile)) >= '0' && ch <= '9') {

-    val *= 10;

-    val += ch - '0';

-  }

-  return val;

-}

-

-

-/*

- * Read one row of pixels.

- *

- * We provide several different versions depending on input file format.

- * In all cases, input is scaled to the size of JSAMPLE.

- *

- * A really fast path is provided for reading byte/sample raw files with

- * maxval = MAXJSAMPLE, which is the normal case for 8-bit data.

- */

-

-

-METHODDEF(JDIMENSION)

-get_text_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading text-format PGM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  FILE * infile = source->pub.input_file;

-  register JSAMPROW ptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

-  }

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_text_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading text-format PPM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  FILE * infile = source->pub.input_file;

-  register JSAMPROW ptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

-    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

-    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

-  }

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_scaled_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading raw-byte-format PGM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register U_CHAR * bufferptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  ptr = source->pub.buffer[0];

-  bufferptr = source->iobuffer;

-  for (col = cinfo->image_width; col > 0; col--) {

-    *ptr++ = rescale[UCH(*bufferptr++)];

-  }

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_scaled_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading raw-byte-format PPM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register U_CHAR * bufferptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  ptr = source->pub.buffer[0];

-  bufferptr = source->iobuffer;

-  for (col = cinfo->image_width; col > 0; col--) {

-    *ptr++ = rescale[UCH(*bufferptr++)];

-    *ptr++ = rescale[UCH(*bufferptr++)];

-    *ptr++ = rescale[UCH(*bufferptr++)];

-  }

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_raw_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading raw-byte-format files with maxval = MAXJSAMPLE.

- * In this case we just read right into the JSAMPLE buffer!

- * Note that same code works for PPM and PGM files.

- */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-

-  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_word_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading raw-word-format PGM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register U_CHAR * bufferptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  ptr = source->pub.buffer[0];

-  bufferptr = source->iobuffer;

-  for (col = cinfo->image_width; col > 0; col--) {

-    register int temp;

-    temp  = UCH(*bufferptr++) << 8;

-    temp |= UCH(*bufferptr++);

-    *ptr++ = rescale[temp];

-  }

-  return 1;

-}

-

-

-METHODDEF(JDIMENSION)

-get_word_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading raw-word-format PPM files with any maxval */

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register U_CHAR * bufferptr;

-  register JSAMPLE *rescale = source->rescale;

-  JDIMENSION col;

-

-  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-  ptr = source->pub.buffer[0];

-  bufferptr = source->iobuffer;

-  for (col = cinfo->image_width; col > 0; col--) {

-    register int temp;

-    temp  = UCH(*bufferptr++) << 8;

-    temp |= UCH(*bufferptr++);

-    *ptr++ = rescale[temp];

-    temp  = UCH(*bufferptr++) << 8;

-    temp |= UCH(*bufferptr++);

-    *ptr++ = rescale[temp];

-    temp  = UCH(*bufferptr++) << 8;

-    temp |= UCH(*bufferptr++);

-    *ptr++ = rescale[temp];

-  }

-  return 1;

-}

-

-

-/*

- * Read the file header; return image size and component count.

- */

-

-METHODDEF(void)

-start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  ppm_source_ptr source = (ppm_source_ptr) sinfo;

-  int c;

-  unsigned int w, h, maxval;

-  boolean need_iobuffer, use_raw_buffer, need_rescale;

-

-  if (getc(source->pub.input_file) != 'P')

-    ERREXIT(cinfo, JERR_PPM_NOT);

-

-  c = getc(source->pub.input_file); /* subformat discriminator character */

-

-  /* detect unsupported variants (ie, PBM) before trying to read header */

-  switch (c) {

-  case '2':			/* it's a text-format PGM file */

-  case '3':			/* it's a text-format PPM file */

-  case '5':			/* it's a raw-format PGM file */

-  case '6':			/* it's a raw-format PPM file */

-    break;

-  default:

-    ERREXIT(cinfo, JERR_PPM_NOT);

-    break;

-  }

-

-  /* fetch the remaining header info */

-  w = read_pbm_integer(cinfo, source->pub.input_file);

-  h = read_pbm_integer(cinfo, source->pub.input_file);

-  maxval = read_pbm_integer(cinfo, source->pub.input_file);

-

-  if (w <= 0 || h <= 0 || maxval <= 0) /* error check */

-    ERREXIT(cinfo, JERR_PPM_NOT);

-

-  cinfo->data_precision = BITS_IN_JSAMPLE; /* we always rescale data to this */

-  cinfo->image_width = (JDIMENSION) w;

-  cinfo->image_height = (JDIMENSION) h;

-

-  /* initialize flags to most common settings */

-  need_iobuffer = TRUE;		/* do we need an I/O buffer? */

-  use_raw_buffer = FALSE;	/* do we map input buffer onto I/O buffer? */

-  need_rescale = TRUE;		/* do we need a rescale array? */

-

-  switch (c) {

-  case '2':			/* it's a text-format PGM file */

-    cinfo->input_components = 1;

-    cinfo->in_color_space = JCS_GRAYSCALE;

-    TRACEMS2(cinfo, 1, JTRC_PGM_TEXT, w, h);

-    source->pub.get_pixel_rows = get_text_gray_row;

-    need_iobuffer = FALSE;

-    break;

-

-  case '3':			/* it's a text-format PPM file */

-    cinfo->input_components = 3;

-    cinfo->in_color_space = JCS_RGB;

-    TRACEMS2(cinfo, 1, JTRC_PPM_TEXT, w, h);

-    source->pub.get_pixel_rows = get_text_rgb_row;

-    need_iobuffer = FALSE;

-    break;

-

-  case '5':			/* it's a raw-format PGM file */

-    cinfo->input_components = 1;

-    cinfo->in_color_space = JCS_GRAYSCALE;

-    TRACEMS2(cinfo, 1, JTRC_PGM, w, h);

-    if (maxval > 255) {

-      source->pub.get_pixel_rows = get_word_gray_row;

-    } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {

-      source->pub.get_pixel_rows = get_raw_row;

-      use_raw_buffer = TRUE;

-      need_rescale = FALSE;

-    } else {

-      source->pub.get_pixel_rows = get_scaled_gray_row;

-    }

-    break;

-

-  case '6':			/* it's a raw-format PPM file */

-    cinfo->input_components = 3;

-    cinfo->in_color_space = JCS_RGB;

-    TRACEMS2(cinfo, 1, JTRC_PPM, w, h);

-    if (maxval > 255) {

-      source->pub.get_pixel_rows = get_word_rgb_row;

-    } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {

-      source->pub.get_pixel_rows = get_raw_row;

-      use_raw_buffer = TRUE;

-      need_rescale = FALSE;

-    } else {

-      source->pub.get_pixel_rows = get_scaled_rgb_row;

-    }

-    break;

-  }

-

-  /* Allocate space for I/O buffer: 1 or 3 bytes or words/pixel. */

-  if (need_iobuffer) {

-    source->buffer_width = (size_t) w * cinfo->input_components *

-      ((maxval<=255) ? SIZEOF(U_CHAR) : (2*SIZEOF(U_CHAR)));

-    source->iobuffer = (U_CHAR *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  source->buffer_width);

-  }

-

-  /* Create compressor input buffer. */

-  if (use_raw_buffer) {

-    /* For unscaled raw-input case, we can just map it onto the I/O buffer. */

-    /* Synthesize a JSAMPARRAY pointer structure */

-    /* Cast here implies near->far pointer conversion on PCs */

-    source->pixrow = (JSAMPROW) source->iobuffer;

-    source->pub.buffer = & source->pixrow;

-    source->pub.buffer_height = 1;

-  } else {

-    /* Need to translate anyway, so make a separate sample buffer. */

-    source->pub.buffer = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) w * cinfo->input_components, (JDIMENSION) 1);

-    source->pub.buffer_height = 1;

-  }

-

-  /* Compute the rescaling array if required. */

-  if (need_rescale) {

-    INT32 val, half_maxval;

-

-    /* On 16-bit-int machines we have to be careful of maxval = 65535 */

-    source->rescale = (JSAMPLE *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  (size_t) (((long) maxval + 1L) * SIZEOF(JSAMPLE)));

-    half_maxval = maxval / 2;

-    for (val = 0; val <= (INT32) maxval; val++) {

-      /* The multiplication here must be done in 32 bits to avoid overflow */

-      source->rescale[val] = (JSAMPLE) ((val*MAXJSAMPLE + half_maxval)/maxval);

-    }

-  }

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  /* no work */

-}

-

-

-/*

- * The module selection routine for PPM format input.

- */

-

-GLOBAL(cjpeg_source_ptr)

-jinit_read_ppm (j_compress_ptr cinfo)

-{

-  ppm_source_ptr source;

-

-  /* Create module interface object */

-  source = (ppm_source_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(ppm_source_struct));

-  /* Fill in method ptrs, except get_pixel_rows which start_input sets */

-  source->pub.start_input = start_input_ppm;

-  source->pub.finish_input = finish_input_ppm;

-

-  return (cjpeg_source_ptr) source;

-}

-

-#endif /* PPM_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/rdrle.c b/plugins/AdvaImg/src/LibJPEG/rdrle.c
deleted file mode 100644
index df871e00a4..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdrle.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*

- * rdrle.c

- *

- * Copyright (C) 1991-1996, 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 routines to read input images in Utah RLE format.

- * The Utah Raster Toolkit library is required (version 3.1 or later).

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume input from

- * an ordinary stdio stream.  They further assume that reading begins

- * at the start of the file; start_input may need work if the

- * user interface has already read some data (e.g., to determine that

- * the file is indeed RLE format).

- *

- * Based on code contributed by Mike Lijewski,

- * with updates from Robert Hutchinson.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef RLE_SUPPORTED

-

-/* rle.h is provided by the Utah Raster Toolkit. */

-

-#include <rle.h>

-

-/*

- * We assume that JSAMPLE has the same representation as rle_pixel,

- * to wit, "unsigned char".  Hence we can't cope with 12- or 16-bit samples.

- */

-

-#if BITS_IN_JSAMPLE != 8

-  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */

-#endif

-

-/*

- * We support the following types of RLE files:

- *   

- *   GRAYSCALE   - 8 bits, no colormap

- *   MAPPEDGRAY  - 8 bits, 1 channel colomap

- *   PSEUDOCOLOR - 8 bits, 3 channel colormap

- *   TRUECOLOR   - 24 bits, 3 channel colormap

- *   DIRECTCOLOR - 24 bits, no colormap

- *

- * For now, we ignore any alpha channel in the image.

- */

-

-typedef enum

-  { GRAYSCALE, MAPPEDGRAY, PSEUDOCOLOR, TRUECOLOR, DIRECTCOLOR } rle_kind;

-

-

-/*

- * Since RLE stores scanlines bottom-to-top, we have to invert the image

- * to conform to JPEG's top-to-bottom order.  To do this, we read the

- * incoming image into a virtual array on the first get_pixel_rows call,

- * then fetch the required row from the virtual array on subsequent calls.

- */

-

-typedef struct _rle_source_struct * rle_source_ptr;

-

-typedef struct _rle_source_struct {

-  struct cjpeg_source_struct pub; /* public fields */

-

-  rle_kind visual;              /* actual type of input file */

-  jvirt_sarray_ptr image;       /* virtual array to hold the image */

-  JDIMENSION row;		/* current row # in the virtual array */

-  rle_hdr header;               /* Input file information */

-  rle_pixel** rle_row;          /* holds a row returned by rle_getrow() */

-

-} rle_source_struct;

-

-

-/*

- * Read the file header; return image size and component count.

- */

-

-METHODDEF(void)

-start_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  rle_source_ptr source = (rle_source_ptr) sinfo;

-  JDIMENSION width, height;

-#ifdef PROGRESS_REPORT

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-#endif

-

-  /* Use RLE library routine to get the header info */

-  source->header = *rle_hdr_init(NULL);

-  source->header.rle_file = source->pub.input_file;

-  switch (rle_get_setup(&(source->header))) {

-  case RLE_SUCCESS:

-    /* A-OK */

-    break;

-  case RLE_NOT_RLE:

-    ERREXIT(cinfo, JERR_RLE_NOT);

-    break;

-  case RLE_NO_SPACE:

-    ERREXIT(cinfo, JERR_RLE_MEM);

-    break;

-  case RLE_EMPTY:

-    ERREXIT(cinfo, JERR_RLE_EMPTY);

-    break;

-  case RLE_EOF:

-    ERREXIT(cinfo, JERR_RLE_EOF);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_RLE_BADERROR);

-    break;

-  }

-

-  /* Figure out what we have, set private vars and return values accordingly */

-  

-  width  = source->header.xmax - source->header.xmin + 1;

-  height = source->header.ymax - source->header.ymin + 1;

-  source->header.xmin = 0;		/* realign horizontally */

-  source->header.xmax = width-1;

-

-  cinfo->image_width      = width;

-  cinfo->image_height     = height;

-  cinfo->data_precision   = 8;  /* we can only handle 8 bit data */

-

-  if (source->header.ncolors == 1 && source->header.ncmap == 0) {

-    source->visual     = GRAYSCALE;

-    TRACEMS2(cinfo, 1, JTRC_RLE_GRAY, width, height);

-  } else if (source->header.ncolors == 1 && source->header.ncmap == 1) {

-    source->visual     = MAPPEDGRAY;

-    TRACEMS3(cinfo, 1, JTRC_RLE_MAPGRAY, width, height,

-             1 << source->header.cmaplen);

-  } else if (source->header.ncolors == 1 && source->header.ncmap == 3) {

-    source->visual     = PSEUDOCOLOR;

-    TRACEMS3(cinfo, 1, JTRC_RLE_MAPPED, width, height,

-	     1 << source->header.cmaplen);

-  } else if (source->header.ncolors == 3 && source->header.ncmap == 3) {

-    source->visual     = TRUECOLOR;

-    TRACEMS3(cinfo, 1, JTRC_RLE_FULLMAP, width, height,

-	     1 << source->header.cmaplen);

-  } else if (source->header.ncolors == 3 && source->header.ncmap == 0) {

-    source->visual     = DIRECTCOLOR;

-    TRACEMS2(cinfo, 1, JTRC_RLE, width, height);

-  } else

-    ERREXIT(cinfo, JERR_RLE_UNSUPPORTED);

-  

-  if (source->visual == GRAYSCALE || source->visual == MAPPEDGRAY) {

-    cinfo->in_color_space   = JCS_GRAYSCALE;

-    cinfo->input_components = 1;

-  } else {

-    cinfo->in_color_space   = JCS_RGB;

-    cinfo->input_components = 3;

-  }

-

-  /*

-   * A place to hold each scanline while it's converted.

-   * (GRAYSCALE scanlines don't need converting)

-   */

-  if (source->visual != GRAYSCALE) {

-    source->rle_row = (rle_pixel**) (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) width, (JDIMENSION) cinfo->input_components);

-  }

-

-  /* request a virtual array to hold the image */

-  source->image = (*cinfo->mem->request_virt_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-     (JDIMENSION) (width * source->header.ncolors),

-     (JDIMENSION) height, (JDIMENSION) 1);

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL) {

-    /* count file input as separate pass */

-    progress->total_extra_passes++;

-  }

-#endif

-

-  source->pub.buffer_height = 1;

-}

-

-

-/*

- * Read one row of pixels.

- * Called only after load_image has read the image into the virtual array.

- * Used for GRAYSCALE, MAPPEDGRAY, TRUECOLOR, and DIRECTCOLOR images.

- */

-

-METHODDEF(JDIMENSION)

-get_rle_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  rle_source_ptr source = (rle_source_ptr) sinfo;

-

-  source->row--;

-  source->pub.buffer = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->image, source->row, (JDIMENSION) 1, FALSE);

-

-  return 1;

-}

-

-/*

- * Read one row of pixels.

- * Called only after load_image has read the image into the virtual array.

- * Used for PSEUDOCOLOR images.

- */

-

-METHODDEF(JDIMENSION)

-get_pseudocolor_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  rle_source_ptr source = (rle_source_ptr) sinfo;

-  JSAMPROW src_row, dest_row;

-  JDIMENSION col;

-  rle_map *colormap;

-  int val;

-

-  colormap = source->header.cmap;

-  dest_row = source->pub.buffer[0];

-  source->row--;

-  src_row = * (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->image, source->row, (JDIMENSION) 1, FALSE);

-

-  for (col = cinfo->image_width; col > 0; col--) {

-    val = GETJSAMPLE(*src_row++);

-    *dest_row++ = (JSAMPLE) (colormap[val      ] >> 8);

-    *dest_row++ = (JSAMPLE) (colormap[val + 256] >> 8);

-    *dest_row++ = (JSAMPLE) (colormap[val + 512] >> 8);

-  }

-

-  return 1;

-}

-

-

-/*

- * Load the image into a virtual array.  We have to do this because RLE

- * files start at the lower left while the JPEG standard has them starting

- * in the upper left.  This is called the first time we want to get a row

- * of input.  What we do is load the RLE data into the array and then call

- * the appropriate routine to read one row from the array.  Before returning,

- * we set source->pub.get_pixel_rows so that subsequent calls go straight to

- * the appropriate row-reading routine.

- */

-

-METHODDEF(JDIMENSION)

-load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  rle_source_ptr source = (rle_source_ptr) sinfo;

-  JDIMENSION row, col;

-  JSAMPROW  scanline, red_ptr, green_ptr, blue_ptr;

-  rle_pixel **rle_row;

-  rle_map *colormap;

-  char channel;

-#ifdef PROGRESS_REPORT

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-#endif

-

-  colormap = source->header.cmap;

-  rle_row = source->rle_row;

-

-  /* Read the RLE data into our virtual array.

-   * We assume here that (a) rle_pixel is represented the same as JSAMPLE,

-   * and (b) we are not on a machine where FAR pointers differ from regular.

-   */

-  RLE_CLR_BIT(source->header, RLE_ALPHA); /* don't read the alpha channel */

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL) {

-    progress->pub.pass_limit = cinfo->image_height;

-    progress->pub.pass_counter = 0;

-    (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-  }

-#endif

-

-  switch (source->visual) {

-

-  case GRAYSCALE:

-  case PSEUDOCOLOR:

-    for (row = 0; row < cinfo->image_height; row++) {

-      rle_row = (rle_pixel **) (*cinfo->mem->access_virt_sarray)

-         ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);

-      rle_getrow(&source->header, rle_row);

-#ifdef PROGRESS_REPORT

-      if (progress != NULL) {

-        progress->pub.pass_counter++;

-        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-      }

-#endif

-    }

-    break;

-

-  case MAPPEDGRAY:

-  case TRUECOLOR:

-    for (row = 0; row < cinfo->image_height; row++) {

-      scanline = * (*cinfo->mem->access_virt_sarray)

-        ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);

-      rle_row = source->rle_row;

-      rle_getrow(&source->header, rle_row);

-

-      for (col = 0; col < cinfo->image_width; col++) {

-        for (channel = 0; channel < source->header.ncolors; channel++) {

-          *scanline++ = (JSAMPLE)

-            (colormap[GETJSAMPLE(rle_row[channel][col]) + 256 * channel] >> 8);

-        }

-      }

-

-#ifdef PROGRESS_REPORT

-      if (progress != NULL) {

-        progress->pub.pass_counter++;

-        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-      }

-#endif

-    }

-    break;

-

-  case DIRECTCOLOR:

-    for (row = 0; row < cinfo->image_height; row++) {

-      scanline = * (*cinfo->mem->access_virt_sarray)

-        ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);

-      rle_getrow(&source->header, rle_row);

-

-      red_ptr   = rle_row[0];

-      green_ptr = rle_row[1];

-      blue_ptr  = rle_row[2];

-

-      for (col = cinfo->image_width; col > 0; col--) {

-        *scanline++ = *red_ptr++;

-        *scanline++ = *green_ptr++;

-        *scanline++ = *blue_ptr++;

-      }

-

-#ifdef PROGRESS_REPORT

-      if (progress != NULL) {

-        progress->pub.pass_counter++;

-        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-      }

-#endif

-    }

-  }

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL)

-    progress->completed_extra_passes++;

-#endif

-

-  /* Set up to call proper row-extraction routine in future */

-  if (source->visual == PSEUDOCOLOR) {

-    source->pub.buffer = source->rle_row;

-    source->pub.get_pixel_rows = get_pseudocolor_row;

-  } else {

-    source->pub.get_pixel_rows = get_rle_row;

-  }

-  source->row = cinfo->image_height;

-

-  /* And fetch the topmost (bottommost) row */

-  return (*source->pub.get_pixel_rows) (cinfo, sinfo);   

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  /* no work */

-}

-

-

-/*

- * The module selection routine for RLE format input.

- */

-

-GLOBAL(cjpeg_source_ptr)

-jinit_read_rle (j_compress_ptr cinfo)

-{

-  rle_source_ptr source;

-

-  /* Create module interface object */

-  source = (rle_source_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-                                  SIZEOF(rle_source_struct));

-  /* Fill in method ptrs */

-  source->pub.start_input = start_input_rle;

-  source->pub.finish_input = finish_input_rle;

-  source->pub.get_pixel_rows = load_image;

-

-  return (cjpeg_source_ptr) source;

-}

-

-#endif /* RLE_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/rdswitch.c b/plugins/AdvaImg/src/LibJPEG/rdswitch.c
deleted file mode 100644
index 05753a3020..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdswitch.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

- * rdswitch.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2003-2015 by Guido Vollbeding.

- * 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 routines to process some of cjpeg's more complicated

- * command-line switches.  Switches processed here are:

- *	-qtables file		Read quantization tables from text file

- *	-scans file		Read scan script from text file

- *	-quality N[,N,...]	Set quality ratings

- *	-qslots N[,N,...]	Set component quantization table selectors

- *	-sample HxV[,HxV,...]	Set component sampling factors

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-#include <ctype.h>		/* to declare isdigit(), isspace() */

-

-

-LOCAL(int)

-text_getc (FILE * file)

-/* Read next char, skipping over any comments (# to end of line) */

-/* A comment/newline sequence is returned as a newline */

-{

-  register int ch;

-  

-  ch = getc(file);

-  if (ch == '#') {

-    do {

-      ch = getc(file);

-    } while (ch != '\n' && ch != EOF);

-  }

-  return ch;

-}

-

-

-LOCAL(boolean)

-read_text_integer (FILE * file, long * result, int * termchar)

-/* Read an unsigned decimal integer from a file, store it in result */

-/* Reads one trailing character after the integer; returns it in termchar */

-{

-  register int ch;

-  register long val;

-  

-  /* Skip any leading whitespace, detect EOF */

-  do {

-    ch = text_getc(file);

-    if (ch == EOF) {

-      *termchar = ch;

-      return FALSE;

-    }

-  } while (isspace(ch));

-  

-  if (! isdigit(ch)) {

-    *termchar = ch;

-    return FALSE;

-  }

-

-  val = ch - '0';

-  while ((ch = text_getc(file)) != EOF) {

-    if (! isdigit(ch))

-      break;

-    val *= 10;

-    val += ch - '0';

-  }

-  *result = val;

-  *termchar = ch;

-  return TRUE;

-}

-

-

-GLOBAL(boolean)

-read_quant_tables (j_compress_ptr cinfo, char * filename, boolean force_baseline)

-/* Read a set of quantization tables from the specified file.

- * The file is plain ASCII text: decimal numbers with whitespace between.

- * Comments preceded by '#' may be included in the file.

- * There may be one to NUM_QUANT_TBLS tables in the file, each of 64 values.

- * The tables are implicitly numbered 0,1,etc.

- * NOTE: does not affect the qslots mapping, which will default to selecting

- * table 0 for luminance (or primary) components, 1 for chrominance components.

- * You must use -qslots if you want a different component->table mapping.

- */

-{

-  FILE * fp;

-  int tblno, i, termchar;

-  long val;

-  unsigned int table[DCTSIZE2];

-

-  if ((fp = fopen(filename, "r")) == NULL) {

-    fprintf(stderr, "Can't open table file %s\n", filename);

-    return FALSE;

-  }

-  tblno = 0;

-

-  while (read_text_integer(fp, &val, &termchar)) { /* read 1st element of table */

-    if (tblno >= NUM_QUANT_TBLS) {

-      fprintf(stderr, "Too many tables in file %s\n", filename);

-      fclose(fp);

-      return FALSE;

-    }

-    table[0] = (unsigned int) val;

-    for (i = 1; i < DCTSIZE2; i++) {

-      if (! read_text_integer(fp, &val, &termchar)) {

-	fprintf(stderr, "Invalid table data in file %s\n", filename);

-	fclose(fp);

-	return FALSE;

-      }

-      table[i] = (unsigned int) val;

-    }

-    jpeg_add_quant_table(cinfo, tblno, table, cinfo->q_scale_factor[tblno],

-			 force_baseline);

-    tblno++;

-  }

-

-  if (termchar != EOF) {

-    fprintf(stderr, "Non-numeric data in file %s\n", filename);

-    fclose(fp);

-    return FALSE;

-  }

-

-  fclose(fp);

-  return TRUE;

-}

-

-

-#ifdef C_MULTISCAN_FILES_SUPPORTED

-

-LOCAL(boolean)

-read_scan_integer (FILE * file, long * result, int * termchar)

-/* Variant of read_text_integer that always looks for a non-space termchar;

- * this simplifies parsing of punctuation in scan scripts.

- */

-{

-  register int ch;

-

-  if (! read_text_integer(file, result, termchar))

-    return FALSE;

-  ch = *termchar;

-  while (ch != EOF && isspace(ch))

-    ch = text_getc(file);

-  if (isdigit(ch)) {		/* oops, put it back */

-    if (ungetc(ch, file) == EOF)

-      return FALSE;

-    ch = ' ';

-  } else {

-    /* Any separators other than ';' and ':' are ignored;

-     * this allows user to insert commas, etc, if desired.

-     */

-    if (ch != EOF && ch != ';' && ch != ':')

-      ch = ' ';

-  }

-  *termchar = ch;

-  return TRUE;

-}

-

-

-GLOBAL(boolean)

-read_scan_script (j_compress_ptr cinfo, char * filename)

-/* Read a scan script from the specified text file.

- * Each entry in the file defines one scan to be emitted.

- * Entries are separated by semicolons ';'.

- * An entry contains one to four component indexes,

- * optionally followed by a colon ':' and four progressive-JPEG parameters.

- * The component indexes denote which component(s) are to be transmitted

- * in the current scan.  The first component has index 0.

- * Sequential JPEG is used if the progressive-JPEG parameters are omitted.

- * The file is free format text: any whitespace may appear between numbers

- * and the ':' and ';' punctuation marks.  Also, other punctuation (such

- * as commas or dashes) can be placed between numbers if desired.

- * Comments preceded by '#' may be included in the file.

- * Note: we do very little validity checking here;

- * jcmaster.c will validate the script parameters.

- */

-{

-  FILE * fp;

-  int scanno, ncomps, termchar;

-  long val;

-  jpeg_scan_info * scanptr;

-#define MAX_SCANS  100		/* quite arbitrary limit */

-  jpeg_scan_info scans[MAX_SCANS];

-

-  if ((fp = fopen(filename, "r")) == NULL) {

-    fprintf(stderr, "Can't open scan definition file %s\n", filename);

-    return FALSE;

-  }

-  scanptr = scans;

-  scanno = 0;

-

-  while (read_scan_integer(fp, &val, &termchar)) {

-    if (scanno >= MAX_SCANS) {

-      fprintf(stderr, "Too many scans defined in file %s\n", filename);

-      fclose(fp);

-      return FALSE;

-    }

-    scanptr->component_index[0] = (int) val;

-    ncomps = 1;

-    while (termchar == ' ') {

-      if (ncomps >= MAX_COMPS_IN_SCAN) {

-	fprintf(stderr, "Too many components in one scan in file %s\n",

-		filename);

-	fclose(fp);

-	return FALSE;

-      }

-      if (! read_scan_integer(fp, &val, &termchar))

-	goto bogus;

-      scanptr->component_index[ncomps] = (int) val;

-      ncomps++;

-    }

-    scanptr->comps_in_scan = ncomps;

-    if (termchar == ':') {

-      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')

-	goto bogus;

-      scanptr->Ss = (int) val;

-      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')

-	goto bogus;

-      scanptr->Se = (int) val;

-      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')

-	goto bogus;

-      scanptr->Ah = (int) val;

-      if (! read_scan_integer(fp, &val, &termchar))

-	goto bogus;

-      scanptr->Al = (int) val;

-    } else {

-      /* set non-progressive parameters */

-      scanptr->Ss = 0;

-      scanptr->Se = DCTSIZE2-1;

-      scanptr->Ah = 0;

-      scanptr->Al = 0;

-    }

-    if (termchar != ';' && termchar != EOF) {

-bogus:

-      fprintf(stderr, "Invalid scan entry format in file %s\n", filename);

-      fclose(fp);

-      return FALSE;

-    }

-    scanptr++, scanno++;

-  }

-

-  if (termchar != EOF) {

-    fprintf(stderr, "Non-numeric data in file %s\n", filename);

-    fclose(fp);

-    return FALSE;

-  }

-

-  if (scanno > 0) {

-    /* Stash completed scan list in cinfo structure.

-     * NOTE: for cjpeg's use, JPOOL_IMAGE is the right lifetime for this data,

-     * but if you want to compress multiple images you'd want JPOOL_PERMANENT.

-     */

-    scanptr = (jpeg_scan_info *)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  scanno * SIZEOF(jpeg_scan_info));

-    MEMCOPY(scanptr, scans, scanno * SIZEOF(jpeg_scan_info));

-    cinfo->scan_info = scanptr;

-    cinfo->num_scans = scanno;

-  }

-

-  fclose(fp);

-  return TRUE;

-}

-

-#endif /* C_MULTISCAN_FILES_SUPPORTED */

-

-

-GLOBAL(boolean)

-set_quality_ratings (j_compress_ptr cinfo, char *arg, boolean force_baseline)

-/* Process a quality-ratings parameter string, of the form

- *     N[,N,...]

- * If there are more q-table slots than parameters, the last value is replicated.

- */

-{

-  int val = 75;			/* default value */

-  int tblno;

-  char ch;

-

-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {

-    if (*arg) {

-      ch = ',';			/* if not set by sscanf, will be ',' */

-      if (sscanf(arg, "%d%c", &val, &ch) < 1)

-	return FALSE;

-      if (ch != ',')		/* syntax check */

-	return FALSE;

-      /* Convert user 0-100 rating to percentage scaling */

-      cinfo->q_scale_factor[tblno] = jpeg_quality_scaling(val);

-      while (*arg && *arg++ != ',') /* advance to next segment of arg string */

-	;

-    } else {

-      /* reached end of parameter, set remaining factors to last value */

-      cinfo->q_scale_factor[tblno] = jpeg_quality_scaling(val);

-    }

-  }

-  jpeg_default_qtables(cinfo, force_baseline);

-  return TRUE;

-}

-

-

-GLOBAL(boolean)

-set_quant_slots (j_compress_ptr cinfo, char *arg)

-/* Process a quantization-table-selectors parameter string, of the form

- *     N[,N,...]

- * If there are more components than parameters, the last value is replicated.

- */

-{

-  int val = 0;			/* default table # */

-  int ci;

-  char ch;

-

-  for (ci = 0; ci < MAX_COMPONENTS; ci++) {

-    if (*arg) {

-      ch = ',';			/* if not set by sscanf, will be ',' */

-      if (sscanf(arg, "%d%c", &val, &ch) < 1)

-	return FALSE;

-      if (ch != ',')		/* syntax check */

-	return FALSE;

-      if (val < 0 || val >= NUM_QUANT_TBLS) {

-	fprintf(stderr, "JPEG quantization tables are numbered 0..%d\n",

-		NUM_QUANT_TBLS-1);

-	return FALSE;

-      }

-      cinfo->comp_info[ci].quant_tbl_no = val;

-      while (*arg && *arg++ != ',') /* advance to next segment of arg string */

-	;

-    } else {

-      /* reached end of parameter, set remaining components to last table */

-      cinfo->comp_info[ci].quant_tbl_no = val;

-    }

-  }

-  return TRUE;

-}

-

-

-GLOBAL(boolean)

-set_sample_factors (j_compress_ptr cinfo, char *arg)

-/* Process a sample-factors parameter string, of the form

- *     HxV[,HxV,...]

- * If there are more components than parameters, "1x1" is assumed for the rest.

- */

-{

-  int ci, val1, val2;

-  char ch1, ch2;

-

-  for (ci = 0; ci < MAX_COMPONENTS; ci++) {

-    if (*arg) {

-      ch2 = ',';		/* if not set by sscanf, will be ',' */

-      if (sscanf(arg, "%d%c%d%c", &val1, &ch1, &val2, &ch2) < 3)

-	return FALSE;

-      if ((ch1 != 'x' && ch1 != 'X') || ch2 != ',') /* syntax check */

-	return FALSE;

-      if (val1 <= 0 || val1 > MAX_SAMP_FACTOR ||

-	  val2 <= 0 || val2 > MAX_SAMP_FACTOR) {

-	fprintf(stderr, "JPEG sampling factors must be 1..%d\n", MAX_SAMP_FACTOR);

-	return FALSE;

-      }

-      cinfo->comp_info[ci].h_samp_factor = val1;

-      cinfo->comp_info[ci].v_samp_factor = val2;

-      while (*arg && *arg++ != ',') /* advance to next segment of arg string */

-	;

-    } else {

-      /* reached end of parameter, set remaining components to 1x1 sampling */

-      cinfo->comp_info[ci].h_samp_factor = 1;

-      cinfo->comp_info[ci].v_samp_factor = 1;

-    }

-  }

-  return TRUE;

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/rdtarga.c b/plugins/AdvaImg/src/LibJPEG/rdtarga.c
deleted file mode 100644
index d7ffc33ebd..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/rdtarga.c
+++ /dev/null
@@ -1,500 +0,0 @@
-/*

- * rdtarga.c

- *

- * Copyright (C) 1991-1996, 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 routines to read input images in Targa format.

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume input from

- * an ordinary stdio stream.  They further assume that reading begins

- * at the start of the file; start_input may need work if the

- * user interface has already read some data (e.g., to determine that

- * the file is indeed Targa format).

- *

- * Based on code contributed by Lee Daniel Crocker.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef TARGA_SUPPORTED

-

-

-/* Macros to deal with unsigned chars as efficiently as compiler allows */

-

-#ifdef HAVE_UNSIGNED_CHAR

-typedef unsigned char U_CHAR;

-#define UCH(x)	((int) (x))

-#else /* !HAVE_UNSIGNED_CHAR */

-#ifdef CHAR_IS_UNSIGNED

-typedef char U_CHAR;

-#define UCH(x)	((int) (x))

-#else

-typedef char U_CHAR;

-#define UCH(x)	((int) (x) & 0xFF)

-#endif

-#endif /* HAVE_UNSIGNED_CHAR */

-

-

-#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))

-

-

-/* Private version of data source object */

-

-typedef struct _tga_source_struct * tga_source_ptr;

-

-typedef struct _tga_source_struct {

-  struct cjpeg_source_struct pub; /* public fields */

-

-  j_compress_ptr cinfo;		/* back link saves passing separate parm */

-

-  JSAMPARRAY colormap;		/* Targa colormap (converted to my format) */

-

-  jvirt_sarray_ptr whole_image;	/* Needed if funny input row order */

-  JDIMENSION current_row;	/* Current logical row number to read */

-

-  /* Pointer to routine to extract next Targa pixel from input file */

-  JMETHOD(void, read_pixel, (tga_source_ptr sinfo));

-

-  /* Result of read_pixel is delivered here: */

-  U_CHAR tga_pixel[4];

-

-  int pixel_size;		/* Bytes per Targa pixel (1 to 4) */

-

-  /* State info for reading RLE-coded pixels; both counts must be init to 0 */

-  int block_count;		/* # of pixels remaining in RLE block */

-  int dup_pixel_count;		/* # of times to duplicate previous pixel */

-

-  /* This saves the correct pixel-row-expansion method for preload_image */

-  JMETHOD(JDIMENSION, get_pixel_rows, (j_compress_ptr cinfo,

-				       cjpeg_source_ptr sinfo));

-} tga_source_struct;

-

-

-/* For expanding 5-bit pixel values to 8-bit with best rounding */

-

-static const UINT8 c5to8bits[32] = {

-    0,   8,  16,  25,  33,  41,  49,  58,

-   66,  74,  82,  90,  99, 107, 115, 123,

-  132, 140, 148, 156, 165, 173, 181, 189,

-  197, 206, 214, 222, 230, 239, 247, 255

-};

-

-

-

-LOCAL(int)

-read_byte (tga_source_ptr sinfo)

-/* Read next byte from Targa file */

-{

-  register FILE *infile = sinfo->pub.input_file;

-  register int c;

-

-  if ((c = getc(infile)) == EOF)

-    ERREXIT(sinfo->cinfo, JERR_INPUT_EOF);

-  return c;

-}

-

-

-LOCAL(void)

-read_colormap (tga_source_ptr sinfo, int cmaplen, int mapentrysize)

-/* Read the colormap from a Targa file */

-{

-  int i;

-

-  /* Presently only handles 24-bit BGR format */

-  if (mapentrysize != 24)

-    ERREXIT(sinfo->cinfo, JERR_TGA_BADCMAP);

-

-  for (i = 0; i < cmaplen; i++) {

-    sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);

-    sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);

-    sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);

-  }

-}

-

-

-/*

- * read_pixel methods: get a single pixel from Targa file into tga_pixel[]

- */

-

-METHODDEF(void)

-read_non_rle_pixel (tga_source_ptr sinfo)

-/* Read one Targa pixel from the input file; no RLE expansion */

-{

-  register FILE *infile = sinfo->pub.input_file;

-  register int i;

-

-  for (i = 0; i < sinfo->pixel_size; i++) {

-    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);

-  }

-}

-

-

-METHODDEF(void)

-read_rle_pixel (tga_source_ptr sinfo)

-/* Read one Targa pixel from the input file, expanding RLE data as needed */

-{

-  register FILE *infile = sinfo->pub.input_file;

-  register int i;

-

-  /* Duplicate previously read pixel? */

-  if (sinfo->dup_pixel_count > 0) {

-    sinfo->dup_pixel_count--;

-    return;

-  }

-

-  /* Time to read RLE block header? */

-  if (--sinfo->block_count < 0) { /* decrement pixels remaining in block */

-    i = read_byte(sinfo);

-    if (i & 0x80) {		/* Start of duplicate-pixel block? */

-      sinfo->dup_pixel_count = i & 0x7F; /* number of dups after this one */

-      sinfo->block_count = 0;	/* then read new block header */

-    } else {

-      sinfo->block_count = i & 0x7F; /* number of pixels after this one */

-    }

-  }

-

-  /* Read next pixel */

-  for (i = 0; i < sinfo->pixel_size; i++) {

-    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);

-  }

-}

-

-

-/*

- * Read one row of pixels.

- *

- * We provide several different versions depending on input file format.

- */

-

-

-METHODDEF(JDIMENSION)

-get_8bit_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 8-bit grayscale pixels */

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-  

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */

-    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[0]);

-  }

-  return 1;

-}

-

-METHODDEF(JDIMENSION)

-get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 8-bit colormap indexes */

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  register int t;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-  register JSAMPARRAY colormap = source->colormap;

-

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */

-    t = UCH(source->tga_pixel[0]);

-    *ptr++ = colormap[0][t];

-    *ptr++ = colormap[1][t];

-    *ptr++ = colormap[2][t];

-  }

-  return 1;

-}

-

-METHODDEF(JDIMENSION)

-get_16bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 16-bit pixels */

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  register int t;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-  

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */

-    t = UCH(source->tga_pixel[0]);

-    t += UCH(source->tga_pixel[1]) << 8;

-    /* We expand 5 bit data to 8 bit sample width.

-     * The format of the 16-bit (LSB first) input word is

-     *     xRRRRRGGGGGBBBBB

-     */

-    ptr[2] = (JSAMPLE) c5to8bits[t & 0x1F];

-    t >>= 5;

-    ptr[1] = (JSAMPLE) c5to8bits[t & 0x1F];

-    t >>= 5;

-    ptr[0] = (JSAMPLE) c5to8bits[t & 0x1F];

-    ptr += 3;

-  }

-  return 1;

-}

-

-METHODDEF(JDIMENSION)

-get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-/* This version is for reading 24-bit pixels */

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-  

-  ptr = source->pub.buffer[0];

-  for (col = cinfo->image_width; col > 0; col--) {

-    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */

-    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[2]); /* change BGR to RGB order */

-    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[1]);

-    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[0]);

-  }

-  return 1;

-}

-

-/*

- * Targa also defines a 32-bit pixel format with order B,G,R,A.

- * We presently ignore the attribute byte, so the code for reading

- * these pixels is identical to the 24-bit routine above.

- * This works because the actual pixel length is only known to read_pixel.

- */

-

-#define get_32bit_row  get_24bit_row

-

-

-/*

- * This method is for re-reading the input data in standard top-down

- * row order.  The entire image has already been read into whole_image

- * with proper conversion of pixel format, but it's in a funny row order.

- */

-

-METHODDEF(JDIMENSION)

-get_memory_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  JDIMENSION source_row;

-

-  /* Compute row of source that maps to current_row of normal order */

-  /* For now, assume image is bottom-up and not interlaced. */

-  /* NEEDS WORK to support interlaced images! */

-  source_row = cinfo->image_height - source->current_row - 1;

-

-  /* Fetch that row from virtual array */

-  source->pub.buffer = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, source->whole_image,

-     source_row, (JDIMENSION) 1, FALSE);

-

-  source->current_row++;

-  return 1;

-}

-

-

-/*

- * This method loads the image into whole_image during the first call on

- * get_pixel_rows.  The get_pixel_rows pointer is then adjusted to call

- * get_memory_row on subsequent calls.

- */

-

-METHODDEF(JDIMENSION)

-preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  JDIMENSION row;

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-

-  /* Read the data into a virtual array in input-file row order. */

-  for (row = 0; row < cinfo->image_height; row++) {

-    if (progress != NULL) {

-      progress->pub.pass_counter = (long) row;

-      progress->pub.pass_limit = (long) cinfo->image_height;

-      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-    }

-    source->pub.buffer = (*cinfo->mem->access_virt_sarray)

-      ((j_common_ptr) cinfo, source->whole_image, row, (JDIMENSION) 1, TRUE);

-    (*source->get_pixel_rows) (cinfo, sinfo);

-  }

-  if (progress != NULL)

-    progress->completed_extra_passes++;

-

-  /* Set up to read from the virtual array in unscrambled order */

-  source->pub.get_pixel_rows = get_memory_row;

-  source->current_row = 0;

-  /* And read the first row */

-  return get_memory_row(cinfo, sinfo);

-}

-

-

-/*

- * Read the file header; return image size and component count.

- */

-

-METHODDEF(void)

-start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  tga_source_ptr source = (tga_source_ptr) sinfo;

-  U_CHAR targaheader[18];

-  int idlen, cmaptype, subtype, flags, interlace_type, components;

-  unsigned int width, height, maplen;

-  boolean is_bottom_up;

-

-#define GET_2B(offset)	((unsigned int) UCH(targaheader[offset]) + \

-			 (((unsigned int) UCH(targaheader[offset+1])) << 8))

-

-  if (! ReadOK(source->pub.input_file, targaheader, 18))

-    ERREXIT(cinfo, JERR_INPUT_EOF);

-

-  /* Pretend "15-bit" pixels are 16-bit --- we ignore attribute bit anyway */

-  if (targaheader[16] == 15)

-    targaheader[16] = 16;

-

-  idlen = UCH(targaheader[0]);

-  cmaptype = UCH(targaheader[1]);

-  subtype = UCH(targaheader[2]);

-  maplen = GET_2B(5);

-  width = GET_2B(12);

-  height = GET_2B(14);

-  source->pixel_size = UCH(targaheader[16]) >> 3;

-  flags = UCH(targaheader[17]);	/* Image Descriptor byte */

-

-  is_bottom_up = ((flags & 0x20) == 0);	/* bit 5 set => top-down */

-  interlace_type = flags >> 6;	/* bits 6/7 are interlace code */

-

-  if (cmaptype > 1 ||		/* cmaptype must be 0 or 1 */

-      source->pixel_size < 1 || source->pixel_size > 4 ||

-      (UCH(targaheader[16]) & 7) != 0 || /* bits/pixel must be multiple of 8 */

-      interlace_type != 0)	/* currently don't allow interlaced image */

-    ERREXIT(cinfo, JERR_TGA_BADPARMS);

-  

-  if (subtype > 8) {

-    /* It's an RLE-coded file */

-    source->read_pixel = read_rle_pixel;

-    source->block_count = source->dup_pixel_count = 0;

-    subtype -= 8;

-  } else {

-    /* Non-RLE file */

-    source->read_pixel = read_non_rle_pixel;

-  }

-

-  /* Now should have subtype 1, 2, or 3 */

-  components = 3;		/* until proven different */

-  cinfo->in_color_space = JCS_RGB;

-

-  switch (subtype) {

-  case 1:			/* Colormapped image */

-    if (source->pixel_size == 1 && cmaptype == 1)

-      source->get_pixel_rows = get_8bit_row;

-    else

-      ERREXIT(cinfo, JERR_TGA_BADPARMS);

-    TRACEMS2(cinfo, 1, JTRC_TGA_MAPPED, width, height);

-    break;

-  case 2:			/* RGB image */

-    switch (source->pixel_size) {

-    case 2:

-      source->get_pixel_rows = get_16bit_row;

-      break;

-    case 3:

-      source->get_pixel_rows = get_24bit_row;

-      break;

-    case 4:

-      source->get_pixel_rows = get_32bit_row;

-      break;

-    default:

-      ERREXIT(cinfo, JERR_TGA_BADPARMS);

-      break;

-    }

-    TRACEMS2(cinfo, 1, JTRC_TGA, width, height);

-    break;

-  case 3:			/* Grayscale image */

-    components = 1;

-    cinfo->in_color_space = JCS_GRAYSCALE;

-    if (source->pixel_size == 1)

-      source->get_pixel_rows = get_8bit_gray_row;

-    else

-      ERREXIT(cinfo, JERR_TGA_BADPARMS);

-    TRACEMS2(cinfo, 1, JTRC_TGA_GRAY, width, height);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_TGA_BADPARMS);

-    break;

-  }

-

-  if (is_bottom_up) {

-    /* Create a virtual array to buffer the upside-down image. */

-    source->whole_image = (*cinfo->mem->request_virt_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-       (JDIMENSION) width * components, (JDIMENSION) height, (JDIMENSION) 1);

-    if (cinfo->progress != NULL) {

-      cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-      progress->total_extra_passes++; /* count file input as separate pass */

-    }

-    /* source->pub.buffer will point to the virtual array. */

-    source->pub.buffer_height = 1; /* in case anyone looks at it */

-    source->pub.get_pixel_rows = preload_image;

-  } else {

-    /* Don't need a virtual array, but do need a one-row input buffer. */

-    source->whole_image = NULL;

-    source->pub.buffer = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       (JDIMENSION) width * components, (JDIMENSION) 1);

-    source->pub.buffer_height = 1;

-    source->pub.get_pixel_rows = source->get_pixel_rows;

-  }

-  

-  while (idlen--)		/* Throw away ID field */

-    (void) read_byte(source);

-

-  if (maplen > 0) {

-    if (maplen > 256 || GET_2B(3) != 0)

-      ERREXIT(cinfo, JERR_TGA_BADCMAP);

-    /* Allocate space to store the colormap */

-    source->colormap = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE, (JDIMENSION) maplen, (JDIMENSION) 3);

-    /* and read it from the file */

-    read_colormap(source, (int) maplen, UCH(targaheader[7]));

-  } else {

-    if (cmaptype)		/* but you promised a cmap! */

-      ERREXIT(cinfo, JERR_TGA_BADPARMS);

-    source->colormap = NULL;

-  }

-

-  cinfo->input_components = components;

-  cinfo->data_precision = 8;

-  cinfo->image_width = width;

-  cinfo->image_height = height;

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

-{

-  /* no work */

-}

-

-

-/*

- * The module selection routine for Targa format input.

- */

-

-GLOBAL(cjpeg_source_ptr)

-jinit_read_targa (j_compress_ptr cinfo)

-{

-  tga_source_ptr source;

-

-  /* Create module interface object */

-  source = (tga_source_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(tga_source_struct));

-  source->cinfo = cinfo;	/* make back link for subroutines */

-  /* Fill in method ptrs, except get_pixel_rows which start_input sets */

-  source->pub.start_input = start_input_tga;

-  source->pub.finish_input = finish_input_tga;

-

-  return (cjpeg_source_ptr) source;

-}

-

-#endif /* TARGA_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/structure.txt b/plugins/AdvaImg/src/LibJPEG/structure.txt
deleted file mode 100644
index 04d957746e..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/structure.txt
+++ /dev/null
@@ -1,942 +0,0 @@
-IJG JPEG LIBRARY:  SYSTEM ARCHITECTURE

-

-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.

-

-

-This file provides an overview of the architecture of the IJG JPEG software;

-that is, the functions of the various modules in the system and the interfaces

-between modules.  For more precise details about any data structure or calling

-convention, see the include files and comments in the source code.

-

-We assume that the reader is already somewhat familiar with the JPEG standard.

-The README file includes references for learning about JPEG.  The file

-libjpeg.txt describes the library from the viewpoint of an application

-programmer using the library; it's best to read that file before this one.

-Also, the file coderules.txt describes the coding style conventions we use.

-

-In this document, JPEG-specific terminology follows the JPEG standard:

-  A "component" means a color channel, e.g., Red or Luminance.

-  A "sample" is a single component value (i.e., one number in the image data).

-  A "coefficient" is a frequency coefficient (a DCT transform output number).

-  A "block" is an array of samples or coefficients.

-  An "MCU" (minimum coded unit) is an interleaved set of blocks of size

-	determined by the sampling factors, or a single block in a

-	noninterleaved scan.

-We do not use the terms "pixel" and "sample" interchangeably.  When we say

-pixel, we mean an element of the full-size image, while a sample is an element

-of the downsampled image.  Thus the number of samples may vary across

-components while the number of pixels does not.  (This terminology is not used

-rigorously throughout the code, but it is used in places where confusion would

-otherwise result.)

-

-

-*** System features ***

-

-The IJG distribution contains two parts:

-  * A subroutine library for JPEG compression and decompression.

-  * cjpeg/djpeg, two sample applications that use the library to transform

-    JFIF JPEG files to and from several other image formats.

-cjpeg/djpeg are of no great intellectual complexity: they merely add a simple

-command-line user interface and I/O routines for several uncompressed image

-formats.  This document concentrates on the library itself.

-

-We desire the library to be capable of supporting all JPEG baseline, extended

-sequential, and progressive DCT processes.  The library does not support the

-hierarchical or lossless processes defined in the standard.

-

-Within these limits, any set of compression parameters allowed by the JPEG

-spec should be readable for decompression.  (We can be more restrictive about

-what formats we can generate.)  Although the system design allows for all

-parameter values, some uncommon settings are not yet implemented and may

-never be; nonintegral sampling ratios are the prime example.  Furthermore,

-we treat 8-bit vs. 12-bit data precision as a compile-time switch, not a

-run-time option, because most machines can store 8-bit pixels much more

-compactly than 12-bit.

-

-By itself, the library handles only interchange JPEG datastreams --- in

-particular the widely used JFIF file format.  The library can be used by

-surrounding code to process interchange or abbreviated JPEG datastreams that

-are embedded in more complex file formats.  (For example, libtiff uses this

-library to implement JPEG compression within the TIFF file format.)

-

-The library includes a substantial amount of code that is not covered by the

-JPEG standard but is necessary for typical applications of JPEG.  These

-functions preprocess the image before JPEG compression or postprocess it after

-decompression.  They include colorspace conversion, downsampling/upsampling,

-and color quantization.  This code can be omitted if not needed.

-

-A wide range of quality vs. speed tradeoffs are possible in JPEG processing,

-and even more so in decompression postprocessing.  The decompression library

-provides multiple implementations that cover most of the useful tradeoffs,

-ranging from very-high-quality down to fast-preview operation.  On the

-compression side we have generally not provided low-quality choices, since

-compression is normally less time-critical.  It should be understood that the

-low-quality modes may not meet the JPEG standard's accuracy requirements;

-nonetheless, they are useful for viewers.

-

-

-*** Portability issues ***

-

-Portability is an essential requirement for the library.  The key portability

-issues that show up at the level of system architecture are:

-

-1.  Memory usage.  We want the code to be able to run on PC-class machines

-with limited memory.  Images should therefore be processed sequentially (in

-strips), to avoid holding the whole image in memory at once.  Where a

-full-image buffer is necessary, we should be able to use either virtual memory

-or temporary files.

-

-2.  Near/far pointer distinction.  To run efficiently on 80x86 machines, the

-code should distinguish "small" objects (kept in near data space) from

-"large" ones (kept in far data space).  This is an annoying restriction, but

-fortunately it does not impact code quality for less brain-damaged machines,

-and the source code clutter turns out to be minimal with sufficient use of

-pointer typedefs.

-

-3. Data precision.  We assume that "char" is at least 8 bits, "short" and

-"int" at least 16, "long" at least 32.  The code will work fine with larger

-data sizes, although memory may be used inefficiently in some cases.  However,

-the JPEG compressed datastream must ultimately appear on external storage as a

-sequence of 8-bit bytes if it is to conform to the standard.  This may pose a

-problem on machines where char is wider than 8 bits.  The library represents

-compressed data as an array of values of typedef JOCTET.  If no data type

-exactly 8 bits wide is available, custom data source and data destination

-modules must be written to unpack and pack the chosen JOCTET datatype into

-8-bit external representation.

-

-

-*** System overview ***

-

-The compressor and decompressor are each divided into two main sections:

-the JPEG compressor or decompressor proper, and the preprocessing or

-postprocessing functions.  The interface between these two sections is the

-image data that the official JPEG spec regards as its input or output: this

-data is in the colorspace to be used for compression, and it is downsampled

-to the sampling factors to be used.  The preprocessing and postprocessing

-steps are responsible for converting a normal image representation to or from

-this form.  (Those few applications that want to deal with YCbCr downsampled

-data can skip the preprocessing or postprocessing step.)

-

-Looking more closely, the compressor library contains the following main

-elements:

-

-  Preprocessing:

-    * Color space conversion (e.g., RGB to YCbCr).

-    * Edge expansion and downsampling.  Optionally, this step can do simple

-      smoothing --- this is often helpful for low-quality source data.

-  JPEG proper:

-    * MCU assembly, DCT, quantization.

-    * Entropy coding (sequential or progressive, Huffman or arithmetic).

-

-In addition to these modules we need overall control, marker generation,

-and support code (memory management & error handling).  There is also a

-module responsible for physically writing the output data --- typically

-this is just an interface to fwrite(), but some applications may need to

-do something else with the data.

-

-The decompressor library contains the following main elements:

-

-  JPEG proper:

-    * Entropy decoding (sequential or progressive, Huffman or arithmetic).

-    * Dequantization, inverse DCT, MCU disassembly.

-  Postprocessing:

-    * Upsampling.  Optionally, this step may be able to do more general

-      rescaling of the image.

-    * Color space conversion (e.g., YCbCr to RGB).  This step may also

-      provide gamma adjustment [ currently it does not ].

-    * Optional color quantization (e.g., reduction to 256 colors).

-    * Optional color precision reduction (e.g., 24-bit to 15-bit color).

-      [This feature is not currently implemented.]

-

-We also need overall control, marker parsing, and a data source module.

-The support code (memory management & error handling) can be shared with

-the compression half of the library.

-

-There may be several implementations of each of these elements, particularly

-in the decompressor, where a wide range of speed/quality tradeoffs is very

-useful.  It must be understood that some of the best speedups involve

-merging adjacent steps in the pipeline.  For example, upsampling, color space

-conversion, and color quantization might all be done at once when using a

-low-quality ordered-dither technique.  The system architecture is designed to

-allow such merging where appropriate.

-

-

-Note: it is convenient to regard edge expansion (padding to block boundaries)

-as a preprocessing/postprocessing function, even though the JPEG spec includes

-it in compression/decompression.  We do this because downsampling/upsampling

-can be simplified a little if they work on padded data: it's not necessary to

-have special cases at the right and bottom edges.  Therefore the interface

-buffer is always an integral number of blocks wide and high, and we expect

-compression preprocessing to pad the source data properly.  Padding will occur

-only to the next block (block_size-sample) boundary.  In an interleaved-scan

-situation, additional dummy blocks may be used to fill out MCUs, but the MCU

-assembly and disassembly logic will create or discard these blocks internally.

-(This is advantageous for speed reasons, since we avoid DCTing the dummy

-blocks.  It also permits a small reduction in file size, because the

-compressor can choose dummy block contents so as to minimize their size

-in compressed form.  Finally, it makes the interface buffer specification

-independent of whether the file is actually interleaved or not.)

-Applications that wish to deal directly with the downsampled data must

-provide similar buffering and padding for odd-sized images.

-

-

-*** Poor man's object-oriented programming ***

-

-It should be clear by now that we have a lot of quasi-independent processing

-steps, many of which have several possible behaviors.  To avoid cluttering the

-code with lots of switch statements, we use a simple form of object-style

-programming to separate out the different possibilities.

-

-For example, two different color quantization algorithms could be implemented

-as two separate modules that present the same external interface; at runtime,

-the calling code will access the proper module indirectly through an "object".

-

-We can get the limited features we need while staying within portable C.

-The basic tool is a function pointer.  An "object" is just a struct

-containing one or more function pointer fields, each of which corresponds to

-a method name in real object-oriented languages.  During initialization we

-fill in the function pointers with references to whichever module we have

-determined we need to use in this run.  Then invocation of the module is done

-by indirecting through a function pointer; on most machines this is no more

-expensive than a switch statement, which would be the only other way of

-making the required run-time choice.  The really significant benefit, of

-course, is keeping the source code clean and well structured.

-

-We can also arrange to have private storage that varies between different

-implementations of the same kind of object.  We do this by making all the

-module-specific object structs be separately allocated entities, which will

-be accessed via pointers in the master compression or decompression struct.

-The "public" fields or methods for a given kind of object are specified by

-a commonly known struct.  But a module's initialization code can allocate

-a larger struct that contains the common struct as its first member, plus

-additional private fields.  With appropriate pointer casting, the module's

-internal functions can access these private fields.  (For a simple example,

-see jdatadst.c, which implements the external interface specified by struct

-jpeg_destination_mgr, but adds extra fields.)

-

-(Of course this would all be a lot easier if we were using C++, but we are

-not yet prepared to assume that everyone has a C++ compiler.)

-

-An important benefit of this scheme is that it is easy to provide multiple

-versions of any method, each tuned to a particular case.  While a lot of

-precalculation might be done to select an optimal implementation of a method,

-the cost per invocation is constant.  For example, the upsampling step might

-have a "generic" method, plus one or more "hardwired" methods for the most

-popular sampling factors; the hardwired methods would be faster because they'd

-use straight-line code instead of for-loops.  The cost to determine which

-method to use is paid only once, at startup, and the selection criteria are

-hidden from the callers of the method.

-

-This plan differs a little bit from usual object-oriented structures, in that

-only one instance of each object class will exist during execution.  The

-reason for having the class structure is that on different runs we may create

-different instances (choose to execute different modules).  You can think of

-the term "method" as denoting the common interface presented by a particular

-set of interchangeable functions, and "object" as denoting a group of related

-methods, or the total shared interface behavior of a group of modules.

-

-

-*** Overall control structure ***

-

-We previously mentioned the need for overall control logic in the compression

-and decompression libraries.  In IJG implementations prior to v5, overall

-control was mostly provided by "pipeline control" modules, which proved to be

-large, unwieldy, and hard to understand.  To improve the situation, the

-control logic has been subdivided into multiple modules.  The control modules

-consist of:

-

-1. Master control for module selection and initialization.  This has two

-responsibilities:

-

-   1A.  Startup initialization at the beginning of image processing.

-        The individual processing modules to be used in this run are selected

-        and given initialization calls.

-

-   1B.  Per-pass control.  This determines how many passes will be performed

-        and calls each active processing module to configure itself

-        appropriately at the beginning of each pass.  End-of-pass processing,

-	where necessary, is also invoked from the master control module.

-

-   Method selection is partially distributed, in that a particular processing

-   module may contain several possible implementations of a particular method,

-   which it will select among when given its initialization call.  The master

-   control code need only be concerned with decisions that affect more than

-   one module.

- 

-2. Data buffering control.  A separate control module exists for each

-   inter-processing-step data buffer.  This module is responsible for

-   invoking the processing steps that write or read that data buffer.

-

-Each buffer controller sees the world as follows:

-

-input data => processing step A => buffer => processing step B => output data

-                      |              |               |

-              ------------------ controller ------------------

-

-The controller knows the dataflow requirements of steps A and B: how much data

-they want to accept in one chunk and how much they output in one chunk.  Its

-function is to manage its buffer and call A and B at the proper times.

-

-A data buffer control module may itself be viewed as a processing step by a

-higher-level control module; thus the control modules form a binary tree with

-elementary processing steps at the leaves of the tree.

-

-The control modules are objects.  A considerable amount of flexibility can

-be had by replacing implementations of a control module.  For example:

-* Merging of adjacent steps in the pipeline is done by replacing a control

-  module and its pair of processing-step modules with a single processing-

-  step module.  (Hence the possible merges are determined by the tree of

-  control modules.)

-* In some processing modes, a given interstep buffer need only be a "strip"

-  buffer large enough to accommodate the desired data chunk sizes.  In other

-  modes, a full-image buffer is needed and several passes are required.

-  The control module determines which kind of buffer is used and manipulates

-  virtual array buffers as needed.  One or both processing steps may be

-  unaware of the multi-pass behavior.

-

-In theory, we might be able to make all of the data buffer controllers

-interchangeable and provide just one set of implementations for all.  In

-practice, each one contains considerable special-case processing for its

-particular job.  The buffer controller concept should be regarded as an

-overall system structuring principle, not as a complete description of the

-task performed by any one controller.

-

-

-*** Compression object structure ***

-

-Here is a sketch of the logical structure of the JPEG compression library:

-

-                                                 |-- Colorspace conversion

-                  |-- Preprocessing controller --|

-                  |                              |-- Downsampling

-Main controller --|

-                  |                            |-- Forward DCT, quantize

-                  |-- Coefficient controller --|

-                                               |-- Entropy encoding

-

-This sketch also describes the flow of control (subroutine calls) during

-typical image data processing.  Each of the components shown in the diagram is

-an "object" which may have several different implementations available.  One

-or more source code files contain the actual implementation(s) of each object.

-

-The objects shown above are:

-

-* Main controller: buffer controller for the subsampled-data buffer, which

-  holds the preprocessed input data.  This controller invokes preprocessing to

-  fill the subsampled-data buffer, and JPEG compression to empty it.  There is

-  usually no need for a full-image buffer here; a strip buffer is adequate.

-

-* Preprocessing controller: buffer controller for the downsampling input data

-  buffer, which lies between colorspace conversion and downsampling.  Note

-  that a unified conversion/downsampling module would probably replace this

-  controller entirely.

-

-* Colorspace conversion: converts application image data into the desired

-  JPEG color space; also changes the data from pixel-interleaved layout to

-  separate component planes.  Processes one pixel row at a time.

-

-* Downsampling: performs reduction of chroma components as required.

-  Optionally may perform pixel-level smoothing as well.  Processes a "row

-  group" at a time, where a row group is defined as Vmax pixel rows of each

-  component before downsampling, and Vk sample rows afterwards (remember Vk

-  differs across components).  Some downsampling or smoothing algorithms may

-  require context rows above and below the current row group; the

-  preprocessing controller is responsible for supplying these rows via proper

-  buffering.  The downsampler is responsible for edge expansion at the right

-  edge (i.e., extending each sample row to a multiple of block_size samples);

-  but the preprocessing controller is responsible for vertical edge expansion

-  (i.e., duplicating the bottom sample row as needed to make a multiple of

-  block_size rows).

-

-* Coefficient controller: buffer controller for the DCT-coefficient data.

-  This controller handles MCU assembly, including insertion of dummy DCT

-  blocks when needed at the right or bottom edge.  When performing

-  Huffman-code optimization or emitting a multiscan JPEG file, this

-  controller is responsible for buffering the full image.  The equivalent of

-  one fully interleaved MCU row of subsampled data is processed per call,

-  even when the JPEG file is noninterleaved.

-

-* Forward DCT and quantization: Perform DCT, quantize, and emit coefficients.

-  Works on one or more DCT blocks at a time.  (Note: the coefficients are now

-  emitted in normal array order, which the entropy encoder is expected to

-  convert to zigzag order as necessary.  Prior versions of the IJG code did

-  the conversion to zigzag order within the quantization step.)

-

-* Entropy encoding: Perform Huffman or arithmetic entropy coding and emit the

-  coded data to the data destination module.  Works on one MCU per call.

-  For progressive JPEG, the same DCT blocks are fed to the entropy coder

-  during each pass, and the coder must emit the appropriate subset of

-  coefficients.

-

-In addition to the above objects, the compression library includes these

-objects:

-

-* Master control: determines the number of passes required, controls overall

-  and per-pass initialization of the other modules.

-

-* Marker writing: generates JPEG markers (except for RSTn, which is emitted

-  by the entropy encoder when needed).

-

-* Data destination manager: writes the output JPEG datastream to its final

-  destination (e.g., a file).  The destination manager supplied with the

-  library knows how to write to a stdio stream or to a memory buffer;

-  for other behaviors, the surrounding application may provide its own

-  destination manager.

-

-* Memory manager: allocates and releases memory, controls virtual arrays

-  (with backing store management, where required).

-

-* Error handler: performs formatting and output of error and trace messages;

-  determines handling of nonfatal errors.  The surrounding application may

-  override some or all of this object's methods to change error handling.

-

-* Progress monitor: supports output of "percent-done" progress reports.

-  This object represents an optional callback to the surrounding application:

-  if wanted, it must be supplied by the application.

-

-The error handler, destination manager, and progress monitor objects are

-defined as separate objects in order to simplify application-specific

-customization of the JPEG library.  A surrounding application may override

-individual methods or supply its own all-new implementation of one of these

-objects.  The object interfaces for these objects are therefore treated as

-part of the application interface of the library, whereas the other objects

-are internal to the library.

-

-The error handler and memory manager are shared by JPEG compression and

-decompression; the progress monitor, if used, may be shared as well.

-

-

-*** Decompression object structure ***

-

-Here is a sketch of the logical structure of the JPEG decompression library:

-

-                                               |-- Entropy decoding

-                  |-- Coefficient controller --|

-                  |                            |-- Dequantize, Inverse DCT

-Main controller --|

-                  |                               |-- Upsampling

-                  |-- Postprocessing controller --|   |-- Colorspace conversion

-                                                  |-- Color quantization

-                                                  |-- Color precision reduction

-

-As before, this diagram also represents typical control flow.  The objects

-shown are:

-

-* Main controller: buffer controller for the subsampled-data buffer, which

-  holds the output of JPEG decompression proper.  This controller's primary

-  task is to feed the postprocessing procedure.  Some upsampling algorithms

-  may require context rows above and below the current row group; when this

-  is true, the main controller is responsible for managing its buffer so as

-  to make context rows available.  In the current design, the main buffer is

-  always a strip buffer; a full-image buffer is never required.

-

-* Coefficient controller: buffer controller for the DCT-coefficient data.

-  This controller handles MCU disassembly, including deletion of any dummy

-  DCT blocks at the right or bottom edge.  When reading a multiscan JPEG

-  file, this controller is responsible for buffering the full image.

-  (Buffering DCT coefficients, rather than samples, is necessary to support

-  progressive JPEG.)  The equivalent of one fully interleaved MCU row of

-  subsampled data is processed per call, even when the source JPEG file is

-  noninterleaved.

-

-* Entropy decoding: Read coded data from the data source module and perform

-  Huffman or arithmetic entropy decoding.  Works on one MCU per call.

-  For progressive JPEG decoding, the coefficient controller supplies the prior

-  coefficients of each MCU (initially all zeroes), which the entropy decoder

-  modifies in each scan.

-

-* Dequantization and inverse DCT: like it says.  Note that the coefficients

-  buffered by the coefficient controller have NOT been dequantized; we

-  merge dequantization and inverse DCT into a single step for speed reasons.

-  When scaled-down output is asked for, simplified DCT algorithms may be used

-  that need fewer coefficients and emit fewer samples per DCT block, not the

-  full 8x8.  Works on one DCT block at a time.

-

-* Postprocessing controller: buffer controller for the color quantization

-  input buffer, when quantization is in use.  (Without quantization, this

-  controller just calls the upsampler.)  For two-pass quantization, this

-  controller is responsible for buffering the full-image data.

-

-* Upsampling: restores chroma components to full size.  (May support more

-  general output rescaling, too.  Note that if undersized DCT outputs have

-  been emitted by the DCT module, this module must adjust so that properly

-  sized outputs are created.)  Works on one row group at a time.  This module

-  also calls the color conversion module, so its top level is effectively a

-  buffer controller for the upsampling->color conversion buffer.  However, in

-  all but the highest-quality operating modes, upsampling and color

-  conversion are likely to be merged into a single step.

-

-* Colorspace conversion: convert from JPEG color space to output color space,

-  and change data layout from separate component planes to pixel-interleaved.

-  Works on one pixel row at a time.

-

-* Color quantization: reduce the data to colormapped form, using either an

-  externally specified colormap or an internally generated one.  This module

-  is not used for full-color output.  Works on one pixel row at a time; may

-  require two passes to generate a color map.  Note that the output will

-  always be a single component representing colormap indexes.  In the current

-  design, the output values are JSAMPLEs, so an 8-bit compilation cannot

-  quantize to more than 256 colors.  This is unlikely to be a problem in

-  practice.

-

-* Color reduction: this module handles color precision reduction, e.g.,

-  generating 15-bit color (5 bits/primary) from JPEG's 24-bit output.

-  Not quite clear yet how this should be handled... should we merge it with

-  colorspace conversion???

-

-Note that some high-speed operating modes might condense the entire

-postprocessing sequence to a single module (upsample, color convert, and

-quantize in one step).

-

-In addition to the above objects, the decompression library includes these

-objects:

-

-* Master control: determines the number of passes required, controls overall

-  and per-pass initialization of the other modules.  This is subdivided into

-  input and output control: jdinput.c controls only input-side processing,

-  while jdmaster.c handles overall initialization and output-side control.

-

-* Marker reading: decodes JPEG markers (except for RSTn).

-

-* Data source manager: supplies the input JPEG datastream.  The source

-  manager supplied with the library knows how to read from a stdio stream

-  or from a memory buffer;  for other behaviors, the surrounding application

-  may provide its own source manager.

-

-* Memory manager: same as for compression library.

-

-* Error handler: same as for compression library.

-

-* Progress monitor: same as for compression library.

-

-As with compression, the data source manager, error handler, and progress

-monitor are candidates for replacement by a surrounding application.

-

-

-*** Decompression input and output separation ***

-

-To support efficient incremental display of progressive JPEG files, the

-decompressor is divided into two sections that can run independently:

-

-1. Data input includes marker parsing, entropy decoding, and input into the

-   coefficient controller's DCT coefficient buffer.  Note that this

-   processing is relatively cheap and fast.

-

-2. Data output reads from the DCT coefficient buffer and performs the IDCT

-   and all postprocessing steps.

-

-For a progressive JPEG file, the data input processing is allowed to get

-arbitrarily far ahead of the data output processing.  (This occurs only

-if the application calls jpeg_consume_input(); otherwise input and output

-run in lockstep, since the input section is called only when the output

-section needs more data.)  In this way the application can avoid making

-extra display passes when data is arriving faster than the display pass

-can run.  Furthermore, it is possible to abort an output pass without

-losing anything, since the coefficient buffer is read-only as far as the

-output section is concerned.  See libjpeg.txt for more detail.

-

-A full-image coefficient array is only created if the JPEG file has multiple

-scans (or if the application specifies buffered-image mode anyway).  When

-reading a single-scan file, the coefficient controller normally creates only

-a one-MCU buffer, so input and output processing must run in lockstep in this

-case.  jpeg_consume_input() is effectively a no-op in this situation.

-

-The main impact of dividing the decompressor in this fashion is that we must

-be very careful with shared variables in the cinfo data structure.  Each

-variable that can change during the course of decompression must be

-classified as belonging to data input or data output, and each section must

-look only at its own variables.  For example, the data output section may not

-depend on any of the variables that describe the current scan in the JPEG

-file, because these may change as the data input section advances into a new

-scan.

-

-The progress monitor is (somewhat arbitrarily) defined to treat input of the

-file as one pass when buffered-image mode is not used, and to ignore data

-input work completely when buffered-image mode is used.  Note that the

-library has no reliable way to predict the number of passes when dealing

-with a progressive JPEG file, nor can it predict the number of output passes

-in buffered-image mode.  So the work estimate is inherently bogus anyway.

-

-No comparable division is currently made in the compression library, because

-there isn't any real need for it.

-

-

-*** Data formats ***

-

-Arrays of pixel sample values use the following data structure:

-

-    typedef something JSAMPLE;		a pixel component value, 0..MAXJSAMPLE

-    typedef JSAMPLE *JSAMPROW;		ptr to a row of samples

-    typedef JSAMPROW *JSAMPARRAY;	ptr to a list of rows

-    typedef JSAMPARRAY *JSAMPIMAGE;	ptr to a list of color-component arrays

-

-The basic element type JSAMPLE will typically be one of unsigned char,

-(signed) char, or short.  Short will be used if samples wider than 8 bits are

-to be supported (this is a compile-time option).  Otherwise, unsigned char is

-used if possible.  If the compiler only supports signed chars, then it is

-necessary to mask off the value when reading.  Thus, all reads of JSAMPLE

-values must be coded as "GETJSAMPLE(value)", where the macro will be defined

-as "((value) & 0xFF)" on signed-char machines and "((int) (value))" elsewhere.

-

-With these conventions, JSAMPLE values can be assumed to be >= 0.  This helps

-simplify correct rounding during downsampling, etc.  The JPEG standard's

-specification that sample values run from -128..127 is accommodated by

-subtracting 128 from the sample value in the DCT step.  Similarly, during

-decompression the output of the IDCT step will be immediately shifted back to

-0..255.  (NB: different values are required when 12-bit samples are in use.

-The code is written in terms of MAXJSAMPLE and CENTERJSAMPLE, which will be

-defined as 255 and 128 respectively in an 8-bit implementation, and as 4095

-and 2048 in a 12-bit implementation.)

-

-We use a pointer per row, rather than a two-dimensional JSAMPLE array.  This

-choice costs only a small amount of memory and has several benefits:

-* Code using the data structure doesn't need to know the allocated width of

-  the rows.  This simplifies edge expansion/compression, since we can work

-  in an array that's wider than the logical picture width.

-* Indexing doesn't require multiplication; this is a performance win on many

-  machines.

-* Arrays with more than 64K total elements can be supported even on machines

-  where malloc() cannot allocate chunks larger than 64K.

-* The rows forming a component array may be allocated at different times

-  without extra copying.  This trick allows some speedups in smoothing steps

-  that need access to the previous and next rows.

-

-Note that each color component is stored in a separate array; we don't use the

-traditional layout in which the components of a pixel are stored together.

-This simplifies coding of modules that work on each component independently,

-because they don't need to know how many components there are.  Furthermore,

-we can read or write each component to a temporary file independently, which

-is helpful when dealing with noninterleaved JPEG files.

-

-In general, a specific sample value is accessed by code such as

-	GETJSAMPLE(image[colorcomponent][row][col])

-where col is measured from the image left edge, but row is measured from the

-first sample row currently in memory.  Either of the first two indexings can

-be precomputed by copying the relevant pointer.

-

-

-Since most image-processing applications prefer to work on images in which

-the components of a pixel are stored together, the data passed to or from the

-surrounding application uses the traditional convention: a single pixel is

-represented by N consecutive JSAMPLE values, and an image row is an array of

-(# of color components)*(image width) JSAMPLEs.  One or more rows of data can

-be represented by a pointer of type JSAMPARRAY in this scheme.  This scheme is

-converted to component-wise storage inside the JPEG library.  (Applications

-that want to skip JPEG preprocessing or postprocessing will have to contend

-with component-wise storage.)

-

-

-Arrays of DCT-coefficient values use the following data structure:

-

-    typedef short JCOEF;		a 16-bit signed integer

-    typedef JCOEF JBLOCK[DCTSIZE2];	an 8x8 block of coefficients

-    typedef JBLOCK *JBLOCKROW;		ptr to one horizontal row of 8x8 blocks

-    typedef JBLOCKROW *JBLOCKARRAY;	ptr to a list of such rows

-    typedef JBLOCKARRAY *JBLOCKIMAGE;	ptr to a list of color component arrays

-

-The underlying type is at least a 16-bit signed integer; while "short" is big

-enough on all machines of interest, on some machines it is preferable to use

-"int" for speed reasons, despite the storage cost.  Coefficients are grouped

-into 8x8 blocks (but we always use #defines DCTSIZE and DCTSIZE2 rather than

-"8" and "64").

-

-The contents of a coefficient block may be in either "natural" or zigzagged

-order, and may be true values or divided by the quantization coefficients,

-depending on where the block is in the processing pipeline.  In the current

-library, coefficient blocks are kept in natural order everywhere; the entropy

-codecs zigzag or dezigzag the data as it is written or read.  The blocks

-contain quantized coefficients everywhere outside the DCT/IDCT subsystems.

-(This latter decision may need to be revisited to support variable

-quantization a la JPEG Part 3.)

-

-Notice that the allocation unit is now a row of 8x8 coefficient blocks,

-corresponding to block_size rows of samples.  Otherwise the structure

-is much the same as for samples, and for the same reasons.

-

-On machines where malloc() can't handle a request bigger than 64Kb, this data

-structure limits us to rows of less than 512 JBLOCKs, or a picture width of

-4000+ pixels.  This seems an acceptable restriction.

-

-

-On 80x86 machines, the bottom-level pointer types (JSAMPROW and JBLOCKROW)

-must be declared as "far" pointers, but the upper levels can be "near"

-(implying that the pointer lists are allocated in the DS segment).

-We use a #define symbol FAR, which expands to the "far" keyword when

-compiling on 80x86 machines and to nothing elsewhere.

-

-

-*** Suspendable processing ***

-

-In some applications it is desirable to use the JPEG library as an

-incremental, memory-to-memory filter.  In this situation the data source or

-destination may be a limited-size buffer, and we can't rely on being able to

-empty or refill the buffer at arbitrary times.  Instead the application would

-like to have control return from the library at buffer overflow/underrun, and

-then resume compression or decompression at a later time.

-

-This scenario is supported for simple cases.  (For anything more complex, we

-recommend that the application "bite the bullet" and develop real multitasking

-capability.)  The libjpeg.txt file goes into more detail about the usage and

-limitations of this capability; here we address the implications for library

-structure.

-

-The essence of the problem is that the entropy codec (coder or decoder) must

-be prepared to stop at arbitrary times.  In turn, the controllers that call

-the entropy codec must be able to stop before having produced or consumed all

-the data that they normally would handle in one call.  That part is reasonably

-straightforward: we make the controller call interfaces include "progress

-counters" which indicate the number of data chunks successfully processed, and

-we require callers to test the counter rather than just assume all of the data

-was processed.

-

-Rather than trying to restart at an arbitrary point, the current Huffman

-codecs are designed to restart at the beginning of the current MCU after a

-suspension due to buffer overflow/underrun.  At the start of each call, the

-codec's internal state is loaded from permanent storage (in the JPEG object

-structures) into local variables.  On successful completion of the MCU, the

-permanent state is updated.  (This copying is not very expensive, and may even

-lead to *improved* performance if the local variables can be registerized.)

-If a suspension occurs, the codec simply returns without updating the state,

-thus effectively reverting to the start of the MCU.  Note that this implies

-leaving some data unprocessed in the source/destination buffer (ie, the

-compressed partial MCU).  The data source/destination module interfaces are

-specified so as to make this possible.  This also implies that the data buffer

-must be large enough to hold a worst-case compressed MCU; a couple thousand

-bytes should be enough.

-

-In a successive-approximation AC refinement scan, the progressive Huffman

-decoder has to be able to undo assignments of newly nonzero coefficients if it

-suspends before the MCU is complete, since decoding requires distinguishing

-previously-zero and previously-nonzero coefficients.  This is a bit tedious

-but probably won't have much effect on performance.  Other variants of Huffman

-decoding need not worry about this, since they will just store the same values

-again if forced to repeat the MCU.

-

-This approach would probably not work for an arithmetic codec, since its

-modifiable state is quite large and couldn't be copied cheaply.  Instead it

-would have to suspend and resume exactly at the point of the buffer end.

-

-The JPEG marker reader is designed to cope with suspension at an arbitrary

-point.  It does so by backing up to the start of the marker parameter segment,

-so the data buffer must be big enough to hold the largest marker of interest.

-Again, a couple KB should be adequate.  (A special "skip" convention is used

-to bypass COM and APPn markers, so these can be larger than the buffer size

-without causing problems; otherwise a 64K buffer would be needed in the worst

-case.)

-

-The JPEG marker writer currently does *not* cope with suspension.

-We feel that this is not necessary; it is much easier simply to require

-the application to ensure there is enough buffer space before starting.  (An

-empty 2K buffer is more than sufficient for the header markers; and ensuring

-there are a dozen or two bytes available before calling jpeg_finish_compress()

-will suffice for the trailer.)  This would not work for writing multi-scan

-JPEG files, but we simply do not intend to support that capability with

-suspension.

-

-

-*** Memory manager services ***

-

-The JPEG library's memory manager controls allocation and deallocation of

-memory, and it manages large "virtual" data arrays on machines where the

-operating system does not provide virtual memory.  Note that the same

-memory manager serves both compression and decompression operations.

-

-In all cases, allocated objects are tied to a particular compression or

-decompression master record, and they will be released when that master

-record is destroyed.

-

-The memory manager does not provide explicit deallocation of objects.

-Instead, objects are created in "pools" of free storage, and a whole pool

-can be freed at once.  This approach helps prevent storage-leak bugs, and

-it speeds up operations whenever malloc/free are slow (as they often are).

-The pools can be regarded as lifetime identifiers for objects.  Two

-pools/lifetimes are defined:

-  * JPOOL_PERMANENT	lasts until master record is destroyed

-  * JPOOL_IMAGE		lasts until done with image (JPEG datastream)

-Permanent lifetime is used for parameters and tables that should be carried

-across from one datastream to another; this includes all application-visible

-parameters.  Image lifetime is used for everything else.  (A third lifetime,

-JPOOL_PASS = one processing pass, was originally planned.  However it was

-dropped as not being worthwhile.  The actual usage patterns are such that the

-peak memory usage would be about the same anyway; and having per-pass storage

-substantially complicates the virtual memory allocation rules --- see below.)

-

-The memory manager deals with three kinds of object:

-1. "Small" objects.  Typically these require no more than 10K-20K total.

-2. "Large" objects.  These may require tens to hundreds of K depending on

-   image size.  Semantically they behave the same as small objects, but we

-   distinguish them for two reasons:

-     * On MS-DOS machines, large objects are referenced by FAR pointers,

-       small objects by NEAR pointers.

-     * Pool allocation heuristics may differ for large and small objects.

-   Note that individual "large" objects cannot exceed the size allowed by

-   type size_t, which may be 64K or less on some machines.

-3. "Virtual" objects.  These are large 2-D arrays of JSAMPLEs or JBLOCKs

-   (typically large enough for the entire image being processed).  The

-   memory manager provides stripwise access to these arrays.  On machines

-   without virtual memory, the rest of the array may be swapped out to a

-   temporary file.

-

-(Note: JSAMPARRAY and JBLOCKARRAY data structures are a combination of large

-objects for the data proper and small objects for the row pointers.  For

-convenience and speed, the memory manager provides single routines to create

-these structures.  Similarly, virtual arrays include a small control block

-and a JSAMPARRAY or JBLOCKARRAY working buffer, all created with one call.)

-

-In the present implementation, virtual arrays are only permitted to have image

-lifespan.  (Permanent lifespan would not be reasonable, and pass lifespan is

-not very useful since a virtual array's raison d'etre is to store data for

-multiple passes through the image.)  We also expect that only "small" objects

-will be given permanent lifespan, though this restriction is not required by

-the memory manager.

-

-In a non-virtual-memory machine, some performance benefit can be gained by

-making the in-memory buffers for virtual arrays be as large as possible.

-(For small images, the buffers might fit entirely in memory, so blind

-swapping would be very wasteful.)  The memory manager will adjust the height

-of the buffers to fit within a prespecified maximum memory usage.  In order

-to do this in a reasonably optimal fashion, the manager needs to allocate all

-of the virtual arrays at once.  Therefore, there isn't a one-step allocation

-routine for virtual arrays; instead, there is a "request" routine that simply

-allocates the control block, and a "realize" routine (called just once) that

-determines space allocation and creates all of the actual buffers.  The

-realize routine must allow for space occupied by non-virtual large objects.

-(We don't bother to factor in the space needed for small objects, on the

-grounds that it isn't worth the trouble.)

-

-To support all this, we establish the following protocol for doing business

-with the memory manager:

-  1. Modules must request virtual arrays (which may have only image lifespan)

-     during the initial setup phase, i.e., in their jinit_xxx routines.

-  2. All "large" objects (including JSAMPARRAYs and JBLOCKARRAYs) must also be

-     allocated during initial setup.

-  3. realize_virt_arrays will be called at the completion of initial setup.

-     The above conventions ensure that sufficient information is available

-     for it to choose a good size for virtual array buffers.

-Small objects of any lifespan may be allocated at any time.  We expect that

-the total space used for small objects will be small enough to be negligible

-in the realize_virt_arrays computation.

-

-In a virtual-memory machine, we simply pretend that the available space is

-infinite, thus causing realize_virt_arrays to decide that it can allocate all

-the virtual arrays as full-size in-memory buffers.  The overhead of the

-virtual-array access protocol is very small when no swapping occurs.

-

-A virtual array can be specified to be "pre-zeroed"; when this flag is set,

-never-yet-written sections of the array are set to zero before being made

-available to the caller.  If this flag is not set, never-written sections

-of the array contain garbage.  (This feature exists primarily because the

-equivalent logic would otherwise be needed in jdcoefct.c for progressive

-JPEG mode; we may as well make it available for possible other uses.)

-

-The first write pass on a virtual array is required to occur in top-to-bottom

-order; read passes, as well as any write passes after the first one, may

-access the array in any order.  This restriction exists partly to simplify

-the virtual array control logic, and partly because some file systems may not

-support seeking beyond the current end-of-file in a temporary file.  The main

-implication of this restriction is that rearrangement of rows (such as

-converting top-to-bottom data order to bottom-to-top) must be handled while

-reading data out of the virtual array, not while putting it in.

-

-

-*** Memory manager internal structure ***

-

-To isolate system dependencies as much as possible, we have broken the

-memory manager into two parts.  There is a reasonably system-independent

-"front end" (jmemmgr.c) and a "back end" that contains only the code

-likely to change across systems.  All of the memory management methods

-outlined above are implemented by the front end.  The back end provides

-the following routines for use by the front end (none of these routines

-are known to the rest of the JPEG code):

-

-jpeg_mem_init, jpeg_mem_term	system-dependent initialization/shutdown

-

-jpeg_get_small, jpeg_free_small	interface to malloc and free library routines

-				(or their equivalents)

-

-jpeg_get_large, jpeg_free_large	interface to FAR malloc/free in MSDOS machines;

-				else usually the same as

-				jpeg_get_small/jpeg_free_small

-

-jpeg_mem_available		estimate available memory

-

-jpeg_open_backing_store		create a backing-store object

-

-read_backing_store,		manipulate a backing-store object

-write_backing_store,

-close_backing_store

-

-On some systems there will be more than one type of backing-store object

-(specifically, in MS-DOS a backing store file might be an area of extended

-memory as well as a disk file).  jpeg_open_backing_store is responsible for

-choosing how to implement a given object.  The read/write/close routines

-are method pointers in the structure that describes a given object; this

-lets them be different for different object types.

-

-It may be necessary to ensure that backing store objects are explicitly

-released upon abnormal program termination.  For example, MS-DOS won't free

-extended memory by itself.  To support this, we will expect the main program

-or surrounding application to arrange to call self_destruct (typically via

-jpeg_destroy) upon abnormal termination.  This may require a SIGINT signal

-handler or equivalent.  We don't want to have the back end module install its

-own signal handler, because that would pre-empt the surrounding application's

-ability to control signal handling.

-

-The IJG distribution includes several memory manager back end implementations.

-Usually the same back end should be suitable for all applications on a given

-system, but it is possible for an application to supply its own back end at

-need.

-

-

-*** Implications of DNL marker ***

-

-Some JPEG files may use a DNL marker to postpone definition of the image

-height (this would be useful for a fax-like scanner's output, for instance).

-In these files the SOF marker claims the image height is 0, and you only

-find out the true image height at the end of the first scan.

-

-We could read these files as follows:

-1. Upon seeing zero image height, replace it by 65535 (the maximum allowed).

-2. When the DNL is found, update the image height in the global image

-   descriptor.

-This implies that control modules must avoid making copies of the image

-height, and must re-test for termination after each MCU row.  This would

-be easy enough to do.

-

-In cases where image-size data structures are allocated, this approach will

-result in very inefficient use of virtual memory or much-larger-than-necessary

-temporary files.  This seems acceptable for something that probably won't be a

-mainstream usage.  People might have to forgo use of memory-hogging options

-(such as two-pass color quantization or noninterleaved JPEG files) if they

-want efficient conversion of such files.  (One could improve efficiency by

-demanding a user-supplied upper bound for the height, less than 65536; in most

-cases it could be much less.)

-

-The standard also permits the SOF marker to overestimate the image height,

-with a DNL to give the true, smaller height at the end of the first scan.

-This would solve the space problems if the overestimate wasn't too great.

-However, it implies that you don't even know whether DNL will be used.

-

-This leads to a couple of very serious objections:

-1. Testing for a DNL marker must occur in the inner loop of the decompressor's

-   Huffman decoder; this implies a speed penalty whether the feature is used

-   or not.

-2. There is no way to hide the last-minute change in image height from an

-   application using the decoder.  Thus *every* application using the IJG

-   library would suffer a complexity penalty whether it cared about DNL or

-   not.

-We currently do not support DNL because of these problems.

-

-A different approach is to insist that DNL-using files be preprocessed by a

-separate program that reads ahead to the DNL, then goes back and fixes the SOF

-marker.  This is a much simpler solution and is probably far more efficient.

-Even if one wants piped input, buffering the first scan of the JPEG file needs

-a lot smaller temp file than is implied by the maximum-height method.  For

-this approach we'd simply treat DNL as a no-op in the decompressor (at most,

-check that it matches the SOF image height).

-

-We will not worry about making the compressor capable of outputting DNL.

-Something similar to the first scheme above could be applied if anyone ever

-wants to make that work.

diff --git a/plugins/AdvaImg/src/LibJPEG/transupp.c b/plugins/AdvaImg/src/LibJPEG/transupp.c
deleted file mode 100644
index 0524d1fc29..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/transupp.c
+++ /dev/null
@@ -1,1763 +0,0 @@
-/*

- * transupp.c

- *

- * Copyright (C) 1997-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.

- *

- * This file contains image transformation routines and other utility code

- * used by the jpegtran sample application.  These are NOT part of the core

- * JPEG library.  But we keep these routines separate from jpegtran.c to

- * ease the task of maintaining jpegtran-like programs that have other user

- * interfaces.

- */

-

-/* Although this file really shouldn't have access to the library internals,

- * it's helpful to let it call jround_up() and jcopy_block_row().

- */

-#define JPEG_INTERNALS

-

-#include "jinclude.h"

-#include "jpeglib.h"

-#include "transupp.h"		/* My own external interface */

-#include <ctype.h>		/* to declare isdigit() */

-

-

-#if TRANSFORMS_SUPPORTED

-

-/*

- * Lossless image transformation routines.  These routines work on DCT

- * coefficient arrays and thus do not require any lossy decompression

- * or recompression of the image.

- * Thanks to Guido Vollbeding for the initial design and code of this feature,

- * and to Ben Jackson for introducing the cropping feature.

- *

- * Horizontal flipping is done in-place, using a single top-to-bottom

- * pass through the virtual source array.  It will thus be much the

- * fastest option for images larger than main memory.

- *

- * The other routines require a set of destination virtual arrays, so they

- * need twice as much memory as jpegtran normally does.  The destination

- * arrays are always written in normal scan order (top to bottom) because

- * the virtual array manager expects this.  The source arrays will be scanned

- * in the corresponding order, which means multiple passes through the source

- * arrays for most of the transforms.  That could result in much thrashing

- * if the image is larger than main memory.

- *

- * If cropping or trimming is involved, the destination arrays may be smaller

- * than the source arrays.  Note it is not possible to do horizontal flip

- * in-place when a nonzero Y crop offset is specified, since we'd have to move

- * data from one block row to another but the virtual array manager doesn't

- * guarantee we can touch more than one row at a time.  So in that case,

- * we have to use a separate destination array.

- *

- * Some notes about the operating environment of the individual transform

- * routines:

- * 1. Both the source and destination virtual arrays are allocated from the

- *    source JPEG object, and therefore should be manipulated by calling the

- *    source's memory manager.

- * 2. The destination's component count should be used.  It may be smaller

- *    than the source's when forcing to grayscale.

- * 3. Likewise the destination's sampling factors should be used.  When

- *    forcing to grayscale the destination's sampling factors will be all 1,

- *    and we may as well take that as the effective iMCU size.

- * 4. When "trim" is in effect, the destination's dimensions will be the

- *    trimmed values but the source's will be untrimmed.

- * 5. When "crop" is in effect, the destination's dimensions will be the

- *    cropped values but the source's will be uncropped.  Each transform

- *    routine is responsible for picking up source data starting at the

- *    correct X and Y offset for the crop region.  (The X and Y offsets

- *    passed to the transform routines are measured in iMCU blocks of the

- *    destination.)

- * 6. All the routines assume that the source and destination buffers are

- *    padded out to a full iMCU boundary.  This is true, although for the

- *    source buffer it is an undocumented property of jdcoefct.c.

- */

-

-

-LOCAL(void)

-do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	 JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	 jvirt_barray_ptr *src_coef_arrays,

-	 jvirt_barray_ptr *dst_coef_arrays)

-/* Crop.  This is only used when no rotate/flip is requested with the crop. */

-{

-  JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;

-  int ci, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  jpeg_component_info *compptr;

-

-  /* We simply have to copy the right amount of data (the destination's

-   * image size) starting at the given X and Y offsets in the source.

-   */

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      src_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	 dst_blk_y + y_crop_blocks,

-	 (JDIMENSION) compptr->v_samp_factor, FALSE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,

-			dst_buffer[offset_y],

-			compptr->width_in_blocks);

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_crop_ext (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	     JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	     jvirt_barray_ptr *src_coef_arrays,

-	     jvirt_barray_ptr *dst_coef_arrays)

-/* Crop.  This is only used when no rotate/flip is requested with the crop.

- * Extension: If the destination size is larger than the source, we fill in

- * the extra area with zero (neutral gray).  Note we also have to zero partial

- * iMCUs at the right and bottom edge of the source image area in this case.

- */

-{

-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height;

-  JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;

-  int ci, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  jpeg_component_info *compptr;

-

-  MCU_cols = srcinfo->output_width /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-  MCU_rows = srcinfo->output_height /

-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    comp_height = MCU_rows * compptr->v_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      if (dstinfo->jpeg_height > srcinfo->output_height) {

-	if (dst_blk_y < y_crop_blocks ||

-	    dst_blk_y >= comp_height + y_crop_blocks) {

-	  for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	    FMEMZERO(dst_buffer[offset_y],

-		     compptr->width_in_blocks * SIZEOF(JBLOCK));

-	  }

-	  continue;

-	}

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   dst_blk_y - y_crop_blocks,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      } else {

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   dst_blk_y + y_crop_blocks,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      }

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	if (dstinfo->jpeg_width > srcinfo->output_width) {

-	  if (x_crop_blocks > 0) {

-	    FMEMZERO(dst_buffer[offset_y],

-		     x_crop_blocks * SIZEOF(JBLOCK));

-	  }

-	  jcopy_block_row(src_buffer[offset_y],

-			  dst_buffer[offset_y] + x_crop_blocks,

-			  comp_width);

-	  if (compptr->width_in_blocks > comp_width + x_crop_blocks) {

-	    FMEMZERO(dst_buffer[offset_y] +

-		       comp_width + x_crop_blocks,

-		     (compptr->width_in_blocks -

-		       comp_width - x_crop_blocks) * SIZEOF(JBLOCK));

-	  }

-	} else {

-	  jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,

-			  dst_buffer[offset_y],

-			  compptr->width_in_blocks);

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_wipe (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	 JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	 jvirt_barray_ptr *src_coef_arrays,

-	 JDIMENSION drop_width, JDIMENSION drop_height)

-/* Wipe - drop content of specified area, fill with zero (neutral gray) */

-{

-  JDIMENSION comp_width, comp_height;

-  JDIMENSION blk_y, x_wipe_blocks, y_wipe_blocks;

-  int ci, offset_y;

-  JBLOCKARRAY buffer;

-  jpeg_component_info *compptr;

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = drop_width * compptr->h_samp_factor;

-    comp_height = drop_height * compptr->v_samp_factor;

-    x_wipe_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_wipe_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (blk_y = 0; blk_y < comp_height; blk_y += compptr->v_samp_factor) {

-      buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y + y_wipe_blocks,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	FMEMZERO(buffer[offset_y] + x_wipe_blocks,

-		 comp_width * SIZEOF(JBLOCK));

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-		   JDIMENSION x_crop_offset,

-		   jvirt_barray_ptr *src_coef_arrays)

-/* Horizontal flip; done in-place, so no separate dest array is required.

- * NB: this only works when y_crop_offset is zero.

- */

-{

-  JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks;

-  int ci, k, offset_y;

-  JBLOCKARRAY buffer;

-  JCOEFPTR ptr1, ptr2;

-  JCOEF temp1, temp2;

-  jpeg_component_info *compptr;

-

-  /* Horizontal mirroring of DCT blocks is accomplished by swapping

-   * pairs of blocks in-place.  Within a DCT block, we perform horizontal

-   * mirroring by changing the signs of odd-numbered columns.

-   * Partial iMCUs at the right edge are left untouched.

-   */

-  MCU_cols = srcinfo->output_width /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    for (blk_y = 0; blk_y < compptr->height_in_blocks;

-	 blk_y += compptr->v_samp_factor) {

-      buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	/* Do the mirroring */

-	for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {

-	  ptr1 = buffer[offset_y][blk_x];

-	  ptr2 = buffer[offset_y][comp_width - blk_x - 1];

-	  /* this unrolled loop doesn't need to know which row it's on... */

-	  for (k = 0; k < DCTSIZE2; k += 2) {

-	    temp1 = *ptr1;	/* swap even column */

-	    temp2 = *ptr2;

-	    *ptr1++ = temp2;

-	    *ptr2++ = temp1;

-	    temp1 = *ptr1;	/* swap odd column with sign change */

-	    temp2 = *ptr2;

-	    *ptr1++ = -temp2;

-	    *ptr2++ = -temp1;

-	  }

-	}

-	if (x_crop_blocks > 0) {

-	  /* Now left-justify the portion of the data to be kept.

-	   * We can't use a single jcopy_block_row() call because that routine

-	   * depends on memcpy(), whose behavior is unspecified for overlapping

-	   * source and destination areas.  Sigh.

-	   */

-	  for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) {

-	    jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,

-			    buffer[offset_y] + blk_x,

-			    (JDIMENSION) 1);

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	   jvirt_barray_ptr *src_coef_arrays,

-	   jvirt_barray_ptr *dst_coef_arrays)

-/* Horizontal flip in general cropping case */

-{

-  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, k, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JBLOCKROW src_row_ptr, dst_row_ptr;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  /* Here we must output into a separate array because we can't touch

-   * different rows of a single virtual array simultaneously.  Otherwise,

-   * this is essentially the same as the routine above.

-   */

-  MCU_cols = srcinfo->output_width /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      src_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	 dst_blk_y + y_crop_blocks,

-	 (JDIMENSION) compptr->v_samp_factor, FALSE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	dst_row_ptr = dst_buffer[offset_y];

-	src_row_ptr = src_buffer[offset_y];

-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {

-	  if (x_crop_blocks + dst_blk_x < comp_width) {

-	    /* Do the mirrorable blocks */

-	    dst_ptr = dst_row_ptr[dst_blk_x];

-	    src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];

-	    /* this unrolled loop doesn't need to know which row it's on... */

-	    for (k = 0; k < DCTSIZE2; k += 2) {

-	      *dst_ptr++ = *src_ptr++;	 /* copy even column */

-	      *dst_ptr++ = - *src_ptr++; /* copy odd column with sign change */

-	    }

-	  } else {

-	    /* Copy last partial block(s) verbatim */

-	    jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,

-			    dst_row_ptr + dst_blk_x,

-			    (JDIMENSION) 1);

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	   jvirt_barray_ptr *src_coef_arrays,

-	   jvirt_barray_ptr *dst_coef_arrays)

-/* Vertical flip */

-{

-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JBLOCKROW src_row_ptr, dst_row_ptr;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  /* We output into a separate array because we can't touch different

-   * rows of the source virtual array simultaneously.  Otherwise, this

-   * is a pretty straightforward analog of horizontal flip.

-   * Within a DCT block, vertical mirroring is done by changing the signs

-   * of odd-numbered rows.

-   * Partial iMCUs at the bottom edge are copied verbatim.

-   */

-  MCU_rows = srcinfo->output_height /

-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_height = MCU_rows * compptr->v_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      if (y_crop_blocks + dst_blk_y < comp_height) {

-	/* Row is within the mirrorable area. */

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   comp_height - y_crop_blocks - dst_blk_y -

-	   (JDIMENSION) compptr->v_samp_factor,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      } else {

-	/* Bottom-edge blocks will be copied verbatim. */

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   dst_blk_y + y_crop_blocks,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      }

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	if (y_crop_blocks + dst_blk_y < comp_height) {

-	  /* Row is within the mirrorable area. */

-	  dst_row_ptr = dst_buffer[offset_y];

-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];

-	  src_row_ptr += x_crop_blocks;

-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;

-	       dst_blk_x++) {

-	    dst_ptr = dst_row_ptr[dst_blk_x];

-	    src_ptr = src_row_ptr[dst_blk_x];

-	    for (i = 0; i < DCTSIZE; i += 2) {

-	      /* copy even row */

-	      for (j = 0; j < DCTSIZE; j++)

-		*dst_ptr++ = *src_ptr++;

-	      /* copy odd row with sign change */

-	      for (j = 0; j < DCTSIZE; j++)

-		*dst_ptr++ = - *src_ptr++;

-	    }

-	  }

-	} else {

-	  /* Just copy row verbatim. */

-	  jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,

-			  dst_buffer[offset_y],

-			  compptr->width_in_blocks);

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	      JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	      jvirt_barray_ptr *src_coef_arrays,

-	      jvirt_barray_ptr *dst_coef_arrays)

-/* Transpose source into destination */

-{

-  JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_x, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  /* Transposing pixels within a block just requires transposing the

-   * DCT coefficients.

-   * Partial iMCUs at the edges require no special treatment; we simply

-   * process all the available DCT blocks for every component.

-   */

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;

-	     dst_blk_x += compptr->h_samp_factor) {

-	  src_buffer = (*srcinfo->mem->access_virt_barray)

-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	     dst_blk_x + x_crop_blocks,

-	     (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {

-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];

-	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks];

-	    for (i = 0; i < DCTSIZE; i++)

-	      for (j = 0; j < DCTSIZE; j++)

-		dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	   jvirt_barray_ptr *src_coef_arrays,

-	   jvirt_barray_ptr *dst_coef_arrays)

-/* 90 degree rotation is equivalent to

- *   1. Transposing the image;

- *   2. Horizontal mirroring.

- * These two steps are merged into a single processing routine.

- */

-{

-  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_x, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  /* Because of the horizontal mirror step, we can't process partial iMCUs

-   * at the (output) right edge properly.  They just get transposed and

-   * not mirrored.

-   */

-  MCU_cols = srcinfo->output_height /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;

-	     dst_blk_x += compptr->h_samp_factor) {

-	  if (x_crop_blocks + dst_blk_x < comp_width) {

-	    /* Block is within the mirrorable area. */

-	    src_buffer = (*srcinfo->mem->access_virt_barray)

-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	       comp_width - x_crop_blocks - dst_blk_x -

-	       (JDIMENSION) compptr->h_samp_factor,

-	       (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  } else {

-	    /* Edge blocks are transposed but not mirrored. */

-	    src_buffer = (*srcinfo->mem->access_virt_barray)

-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	       dst_blk_x + x_crop_blocks,

-	       (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  }

-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {

-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];

-	    if (x_crop_blocks + dst_blk_x < comp_width) {

-	      /* Block is within the mirrorable area. */

-	      src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]

-		[dst_blk_y + offset_y + y_crop_blocks];

-	      for (i = 0; i < DCTSIZE; i++) {

-		for (j = 0; j < DCTSIZE; j++)

-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		i++;

-		for (j = 0; j < DCTSIZE; j++)

-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-	      }

-	    } else {

-	      /* Edge blocks are transposed but not mirrored. */

-	      src_ptr = src_buffer[offset_x]

-		[dst_blk_y + offset_y + y_crop_blocks];

-	      for (i = 0; i < DCTSIZE; i++)

-		for (j = 0; j < DCTSIZE; j++)

-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-	    }

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	    JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	    jvirt_barray_ptr *src_coef_arrays,

-	    jvirt_barray_ptr *dst_coef_arrays)

-/* 270 degree rotation is equivalent to

- *   1. Horizontal mirroring;

- *   2. Transposing the image.

- * These two steps are merged into a single processing routine.

- */

-{

-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_x, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  /* Because of the horizontal mirror step, we can't process partial iMCUs

-   * at the (output) bottom edge properly.  They just get transposed and

-   * not mirrored.

-   */

-  MCU_rows = srcinfo->output_width /

-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_height = MCU_rows * compptr->v_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;

-	     dst_blk_x += compptr->h_samp_factor) {

-	  src_buffer = (*srcinfo->mem->access_virt_barray)

-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	     dst_blk_x + x_crop_blocks,

-	     (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {

-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];

-	    if (y_crop_blocks + dst_blk_y < comp_height) {

-	      /* Block is within the mirrorable area. */

-	      src_ptr = src_buffer[offset_x]

-		[comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];

-	      for (i = 0; i < DCTSIZE; i++) {

-		for (j = 0; j < DCTSIZE; j++) {

-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		  j++;

-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-		}

-	      }

-	    } else {

-	      /* Edge blocks are transposed but not mirrored. */

-	      src_ptr = src_buffer[offset_x]

-		[dst_blk_y + offset_y + y_crop_blocks];

-	      for (i = 0; i < DCTSIZE; i++)

-		for (j = 0; j < DCTSIZE; j++)

-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-	    }

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	    JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	    jvirt_barray_ptr *src_coef_arrays,

-	    jvirt_barray_ptr *dst_coef_arrays)

-/* 180 degree rotation is equivalent to

- *   1. Vertical mirroring;

- *   2. Horizontal mirroring.

- * These two steps are merged into a single processing routine.

- */

-{

-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JBLOCKROW src_row_ptr, dst_row_ptr;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  MCU_cols = srcinfo->output_width /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-  MCU_rows = srcinfo->output_height /

-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    comp_height = MCU_rows * compptr->v_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      if (y_crop_blocks + dst_blk_y < comp_height) {

-	/* Row is within the vertically mirrorable area. */

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   comp_height - y_crop_blocks - dst_blk_y -

-	   (JDIMENSION) compptr->v_samp_factor,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      } else {

-	/* Bottom-edge rows are only mirrored horizontally. */

-	src_buffer = (*srcinfo->mem->access_virt_barray)

-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	   dst_blk_y + y_crop_blocks,

-	   (JDIMENSION) compptr->v_samp_factor, FALSE);

-      }

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	dst_row_ptr = dst_buffer[offset_y];

-	if (y_crop_blocks + dst_blk_y < comp_height) {

-	  /* Row is within the mirrorable area. */

-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];

-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {

-	    dst_ptr = dst_row_ptr[dst_blk_x];

-	    if (x_crop_blocks + dst_blk_x < comp_width) {

-	      /* Process the blocks that can be mirrored both ways. */

-	      src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];

-	      for (i = 0; i < DCTSIZE; i += 2) {

-		/* For even row, negate every odd column. */

-		for (j = 0; j < DCTSIZE; j += 2) {

-		  *dst_ptr++ = *src_ptr++;

-		  *dst_ptr++ = - *src_ptr++;

-		}

-		/* For odd row, negate every even column. */

-		for (j = 0; j < DCTSIZE; j += 2) {

-		  *dst_ptr++ = - *src_ptr++;

-		  *dst_ptr++ = *src_ptr++;

-		}

-	      }

-	    } else {

-	      /* Any remaining right-edge blocks are only mirrored vertically. */

-	      src_ptr = src_row_ptr[x_crop_blocks + dst_blk_x];

-	      for (i = 0; i < DCTSIZE; i += 2) {

-		for (j = 0; j < DCTSIZE; j++)

-		  *dst_ptr++ = *src_ptr++;

-		for (j = 0; j < DCTSIZE; j++)

-		  *dst_ptr++ = - *src_ptr++;

-	      }

-	    }

-	  }

-	} else {

-	  /* Remaining rows are just mirrored horizontally. */

-	  src_row_ptr = src_buffer[offset_y];

-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {

-	    if (x_crop_blocks + dst_blk_x < comp_width) {

-	      /* Process the blocks that can be mirrored. */

-	      dst_ptr = dst_row_ptr[dst_blk_x];

-	      src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];

-	      for (i = 0; i < DCTSIZE2; i += 2) {

-		*dst_ptr++ = *src_ptr++;

-		*dst_ptr++ = - *src_ptr++;

-	      }

-	    } else {

-	      /* Any remaining right-edge blocks are only copied. */

-	      jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,

-			      dst_row_ptr + dst_blk_x,

-			      (JDIMENSION) 1);

-	    }

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-LOCAL(void)

-do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	       JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,

-	       jvirt_barray_ptr *src_coef_arrays,

-	       jvirt_barray_ptr *dst_coef_arrays)

-/* Transverse transpose is equivalent to

- *   1. 180 degree rotation;

- *   2. Transposition;

- * or

- *   1. Horizontal mirroring;

- *   2. Transposition;

- *   3. Horizontal mirroring.

- * These steps are merged into a single processing routine.

- */

-{

-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;

-  JDIMENSION x_crop_blocks, y_crop_blocks;

-  int ci, i, j, offset_x, offset_y;

-  JBLOCKARRAY src_buffer, dst_buffer;

-  JCOEFPTR src_ptr, dst_ptr;

-  jpeg_component_info *compptr;

-

-  MCU_cols = srcinfo->output_height /

-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);

-  MCU_rows = srcinfo->output_width /

-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);

-

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    comp_width = MCU_cols * compptr->h_samp_factor;

-    comp_height = MCU_rows * compptr->v_samp_factor;

-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;

-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;

-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;

-	 dst_blk_y += compptr->v_samp_factor) {

-      dst_buffer = (*srcinfo->mem->access_virt_barray)

-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,

-	 (JDIMENSION) compptr->v_samp_factor, TRUE);

-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {

-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;

-	     dst_blk_x += compptr->h_samp_factor) {

-	  if (x_crop_blocks + dst_blk_x < comp_width) {

-	    /* Block is within the mirrorable area. */

-	    src_buffer = (*srcinfo->mem->access_virt_barray)

-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	       comp_width - x_crop_blocks - dst_blk_x -

-	       (JDIMENSION) compptr->h_samp_factor,

-	       (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  } else {

-	    src_buffer = (*srcinfo->mem->access_virt_barray)

-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],

-	       dst_blk_x + x_crop_blocks,

-	       (JDIMENSION) compptr->h_samp_factor, FALSE);

-	  }

-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {

-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];

-	    if (y_crop_blocks + dst_blk_y < comp_height) {

-	      if (x_crop_blocks + dst_blk_x < comp_width) {

-		/* Block is within the mirrorable area. */

-		src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]

-		  [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];

-		for (i = 0; i < DCTSIZE; i++) {

-		  for (j = 0; j < DCTSIZE; j++) {

-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		    j++;

-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-		  }

-		  i++;

-		  for (j = 0; j < DCTSIZE; j++) {

-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-		    j++;

-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		  }

-		}

-	      } else {

-		/* Right-edge blocks are mirrored in y only */

-		src_ptr = src_buffer[offset_x]

-		  [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];

-		for (i = 0; i < DCTSIZE; i++) {

-		  for (j = 0; j < DCTSIZE; j++) {

-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		    j++;

-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-		  }

-		}

-	      }

-	    } else {

-	      if (x_crop_blocks + dst_blk_x < comp_width) {

-		/* Bottom-edge blocks are mirrored in x only */

-		src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]

-		  [dst_blk_y + offset_y + y_crop_blocks];

-		for (i = 0; i < DCTSIZE; i++) {

-		  for (j = 0; j < DCTSIZE; j++)

-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-		  i++;

-		  for (j = 0; j < DCTSIZE; j++)

-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];

-		}

-	      } else {

-		/* At lower right corner, just transpose, no mirroring */

-		src_ptr = src_buffer[offset_x]

-		  [dst_blk_y + offset_y + y_crop_blocks];

-		for (i = 0; i < DCTSIZE; i++)

-		  for (j = 0; j < DCTSIZE; j++)

-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];

-	      }

-	    }

-	  }

-	}

-      }

-    }

-  }

-}

-

-

-/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec.

- * Returns TRUE if valid integer found, FALSE if not.

- * *strptr is advanced over the digit string, and *result is set to its value.

- */

-

-LOCAL(boolean)

-jt_read_integer (const char ** strptr, JDIMENSION * result)

-{

-  const char * ptr = *strptr;

-  JDIMENSION val = 0;

-

-  for (; isdigit(*ptr); ptr++) {

-    val = val * 10 + (JDIMENSION) (*ptr - '0');

-  }

-  *result = val;

-  if (ptr == *strptr)

-    return FALSE;		/* oops, no digits */

-  *strptr = ptr;

-  return TRUE;

-}

-

-

-/* Parse a crop specification (written in X11 geometry style).

- * The routine returns TRUE if the spec string is valid, FALSE if not.

- *

- * The crop spec string should have the format

- *	<width>[f]x<height>[f]{+-}<xoffset>{+-}<yoffset>

- * where width, height, xoffset, and yoffset are unsigned integers.

- * Each of the elements can be omitted to indicate a default value.

- * (A weakness of this style is that it is not possible to omit xoffset

- * while specifying yoffset, since they look alike.)

- *

- * This code is loosely based on XParseGeometry from the X11 distribution.

- */

-

-GLOBAL(boolean)

-jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)

-{

-  info->crop = FALSE;

-  info->crop_width_set = JCROP_UNSET;

-  info->crop_height_set = JCROP_UNSET;

-  info->crop_xoffset_set = JCROP_UNSET;

-  info->crop_yoffset_set = JCROP_UNSET;

-

-  if (isdigit(*spec)) {

-    /* fetch width */

-    if (! jt_read_integer(&spec, &info->crop_width))

-      return FALSE;

-    if (*spec == 'f' || *spec == 'F') {

-      spec++;

-      info->crop_width_set = JCROP_FORCE;

-    } else

-      info->crop_width_set = JCROP_POS;

-  }

-  if (*spec == 'x' || *spec == 'X') {

-    /* fetch height */

-    spec++;

-    if (! jt_read_integer(&spec, &info->crop_height))

-      return FALSE;

-    if (*spec == 'f' || *spec == 'F') {

-      spec++;

-      info->crop_height_set = JCROP_FORCE;

-    } else

-      info->crop_height_set = JCROP_POS;

-  }

-  if (*spec == '+' || *spec == '-') {

-    /* fetch xoffset */

-    info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;

-    spec++;

-    if (! jt_read_integer(&spec, &info->crop_xoffset))

-      return FALSE;

-  }

-  if (*spec == '+' || *spec == '-') {

-    /* fetch yoffset */

-    info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;

-    spec++;

-    if (! jt_read_integer(&spec, &info->crop_yoffset))

-      return FALSE;

-  }

-  /* We had better have gotten to the end of the string. */

-  if (*spec != '\0')

-    return FALSE;

-  info->crop = TRUE;

-  return TRUE;

-}

-

-

-/* Trim off any partial iMCUs on the indicated destination edge */

-

-LOCAL(void)

-trim_right_edge (jpeg_transform_info *info, JDIMENSION full_width)

-{

-  JDIMENSION MCU_cols;

-

-  MCU_cols = info->output_width / info->iMCU_sample_width;

-  if (MCU_cols > 0 && info->x_crop_offset + MCU_cols ==

-      full_width / info->iMCU_sample_width)

-    info->output_width = MCU_cols * info->iMCU_sample_width;

-}

-

-LOCAL(void)

-trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height)

-{

-  JDIMENSION MCU_rows;

-

-  MCU_rows = info->output_height / info->iMCU_sample_height;

-  if (MCU_rows > 0 && info->y_crop_offset + MCU_rows ==

-      full_height / info->iMCU_sample_height)

-    info->output_height = MCU_rows * info->iMCU_sample_height;

-}

-

-

-/* Request any required workspace.

- *

- * This routine figures out the size that the output image will be

- * (which implies that all the transform parameters must be set before

- * it is called).

- *

- * We allocate the workspace virtual arrays from the source decompression

- * object, so that all the arrays (both the original data and the workspace)

- * will be taken into account while making memory management decisions.

- * Hence, this routine must be called after jpeg_read_header (which reads

- * the image dimensions) and before jpeg_read_coefficients (which realizes

- * the source's virtual arrays).

- *

- * This function returns FALSE right away if -perfect is given

- * and transformation is not perfect.  Otherwise returns TRUE.

- */

-

-GLOBAL(boolean)

-jtransform_request_workspace (j_decompress_ptr srcinfo,

-			      jpeg_transform_info *info)

-{

-  jvirt_barray_ptr *coef_arrays;

-  boolean need_workspace, transpose_it;

-  jpeg_component_info *compptr;

-  JDIMENSION xoffset, yoffset;

-  JDIMENSION width_in_iMCUs, height_in_iMCUs;

-  JDIMENSION width_in_blocks, height_in_blocks;

-  int ci, h_samp_factor, v_samp_factor;

-

-  /* Determine number of components in output image */

-  if (info->force_grayscale &&

-      (srcinfo->jpeg_color_space == JCS_YCbCr ||

-       srcinfo->jpeg_color_space == JCS_BG_YCC) &&

-      srcinfo->num_components == 3)

-    /* We'll only process the first component */

-    info->num_components = 1;

-  else

-    /* Process all the components */

-    info->num_components = srcinfo->num_components;

-

-  /* Compute output image dimensions and related values. */

-  jpeg_core_output_dimensions(srcinfo);

-

-  /* Return right away if -perfect is given and transformation is not perfect.

-   */

-  if (info->perfect) {

-    if (info->num_components == 1) {

-      if (!jtransform_perfect_transform(srcinfo->output_width,

-	  srcinfo->output_height,

-	  srcinfo->min_DCT_h_scaled_size,

-	  srcinfo->min_DCT_v_scaled_size,

-	  info->transform))

-	return FALSE;

-    } else {

-      if (!jtransform_perfect_transform(srcinfo->output_width,

-	  srcinfo->output_height,

-	  srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size,

-	  srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size,

-	  info->transform))

-	return FALSE;

-    }

-  }

-

-  /* If there is only one output component, force the iMCU size to be 1;

-   * else use the source iMCU size.  (This allows us to do the right thing

-   * when reducing color to grayscale, and also provides a handy way of

-   * cleaning up "funny" grayscale images whose sampling factors are not 1x1.)

-   */

-  switch (info->transform) {

-  case JXFORM_TRANSPOSE:

-  case JXFORM_TRANSVERSE:

-  case JXFORM_ROT_90:

-  case JXFORM_ROT_270:

-    info->output_width = srcinfo->output_height;

-    info->output_height = srcinfo->output_width;

-    if (info->num_components == 1) {

-      info->iMCU_sample_width = srcinfo->min_DCT_v_scaled_size;

-      info->iMCU_sample_height = srcinfo->min_DCT_h_scaled_size;

-    } else {

-      info->iMCU_sample_width =

-	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;

-      info->iMCU_sample_height =

-	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;

-    }

-    break;

-  default:

-    info->output_width = srcinfo->output_width;

-    info->output_height = srcinfo->output_height;

-    if (info->num_components == 1) {

-      info->iMCU_sample_width = srcinfo->min_DCT_h_scaled_size;

-      info->iMCU_sample_height = srcinfo->min_DCT_v_scaled_size;

-    } else {

-      info->iMCU_sample_width =

-	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;

-      info->iMCU_sample_height =

-	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;

-    }

-    break;

-  }

-

-  /* If cropping has been requested, compute the crop area's position and

-   * dimensions, ensuring that its upper left corner falls at an iMCU boundary.

-   */

-  if (info->crop) {

-    /* Insert default values for unset crop parameters */

-    if (info->crop_xoffset_set == JCROP_UNSET)

-      info->crop_xoffset = 0;	/* default to +0 */

-    if (info->crop_yoffset_set == JCROP_UNSET)

-      info->crop_yoffset = 0;	/* default to +0 */

-    if (info->crop_width_set == JCROP_UNSET) {

-      if (info->crop_xoffset >= info->output_width)

-	ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      info->crop_width = info->output_width - info->crop_xoffset;

-    } else {

-      /* Check for crop extension */

-      if (info->crop_width > info->output_width) {

-	/* Crop extension does not work when transforming! */

-	if (info->transform != JXFORM_NONE ||

-	    info->crop_xoffset >= info->crop_width ||

-	    info->crop_xoffset > info->crop_width - info->output_width)

-	  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      } else {

-	if (info->crop_xoffset >= info->output_width ||

-	    info->crop_width <= 0 ||

-	    info->crop_xoffset > info->output_width - info->crop_width)

-	  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      }

-    }

-    if (info->crop_height_set == JCROP_UNSET) {

-      if (info->crop_yoffset >= info->output_height)

-	ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      info->crop_height = info->output_height - info->crop_yoffset;

-    } else {

-      /* Check for crop extension */

-      if (info->crop_height > info->output_height) {

-	/* Crop extension does not work when transforming! */

-	if (info->transform != JXFORM_NONE ||

-	    info->crop_yoffset >= info->crop_height ||

-	    info->crop_yoffset > info->crop_height - info->output_height)

-	  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      } else {

-	if (info->crop_yoffset >= info->output_height ||

-	    info->crop_height <= 0 ||

-	    info->crop_yoffset > info->output_height - info->crop_height)

-	  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);

-      }

-    }

-    /* Convert negative crop offsets into regular offsets */

-    if (info->crop_xoffset_set != JCROP_NEG)

-      xoffset = info->crop_xoffset;

-    else if (info->crop_width > info->output_width) /* crop extension */

-      xoffset = info->crop_width - info->output_width - info->crop_xoffset;

-    else

-      xoffset = info->output_width - info->crop_width - info->crop_xoffset;

-    if (info->crop_yoffset_set != JCROP_NEG)

-      yoffset = info->crop_yoffset;

-    else if (info->crop_height > info->output_height) /* crop extension */

-      yoffset = info->crop_height - info->output_height - info->crop_yoffset;

-    else

-      yoffset = info->output_height - info->crop_height - info->crop_yoffset;

-    /* Now adjust so that upper left corner falls at an iMCU boundary */

-    if (info->transform == JXFORM_WIPE) {

-      /* Ensure the effective wipe region will cover the requested */

-      info->drop_width = (JDIMENSION) jdiv_round_up

-	((long) (info->crop_width + (xoffset % info->iMCU_sample_width)),

-	 (long) info->iMCU_sample_width);

-      info->drop_height = (JDIMENSION) jdiv_round_up

-	((long) (info->crop_height + (yoffset % info->iMCU_sample_height)),

-	 (long) info->iMCU_sample_height);

-    } else {

-      /* Ensure the effective crop region will cover the requested */

-      if (info->crop_width_set == JCROP_FORCE ||

-	  info->crop_width > info->output_width)

-	info->output_width = info->crop_width;

-      else

-	info->output_width =

-	  info->crop_width + (xoffset % info->iMCU_sample_width);

-      if (info->crop_height_set == JCROP_FORCE ||

-	  info->crop_height > info->output_height)

-	info->output_height = info->crop_height;

-      else

-	info->output_height =

-	  info->crop_height + (yoffset % info->iMCU_sample_height);

-    }

-    /* Save x/y offsets measured in iMCUs */

-    info->x_crop_offset = xoffset / info->iMCU_sample_width;

-    info->y_crop_offset = yoffset / info->iMCU_sample_height;

-  } else {

-    info->x_crop_offset = 0;

-    info->y_crop_offset = 0;

-  }

-

-  /* Figure out whether we need workspace arrays,

-   * and if so whether they are transposed relative to the source.

-   */

-  need_workspace = FALSE;

-  transpose_it = FALSE;

-  switch (info->transform) {

-  case JXFORM_NONE:

-    if (info->x_crop_offset != 0 || info->y_crop_offset != 0 ||

-	info->output_width > srcinfo->output_width ||

-	info->output_height > srcinfo->output_height)

-      need_workspace = TRUE;

-    /* No workspace needed if neither cropping nor transforming */

-    break;

-  case JXFORM_FLIP_H:

-    if (info->trim)

-      trim_right_edge(info, srcinfo->output_width);

-    if (info->y_crop_offset != 0)

-      need_workspace = TRUE;

-    /* do_flip_h_no_crop doesn't need a workspace array */

-    break;

-  case JXFORM_FLIP_V:

-    if (info->trim)

-      trim_bottom_edge(info, srcinfo->output_height);

-    /* Need workspace arrays having same dimensions as source image. */

-    need_workspace = TRUE;

-    break;

-  case JXFORM_TRANSPOSE:

-    /* transpose does NOT have to trim anything */

-    /* Need workspace arrays having transposed dimensions. */

-    need_workspace = TRUE;

-    transpose_it = TRUE;

-    break;

-  case JXFORM_TRANSVERSE:

-    if (info->trim) {

-      trim_right_edge(info, srcinfo->output_height);

-      trim_bottom_edge(info, srcinfo->output_width);

-    }

-    /* Need workspace arrays having transposed dimensions. */

-    need_workspace = TRUE;

-    transpose_it = TRUE;

-    break;

-  case JXFORM_ROT_90:

-    if (info->trim)

-      trim_right_edge(info, srcinfo->output_height);

-    /* Need workspace arrays having transposed dimensions. */

-    need_workspace = TRUE;

-    transpose_it = TRUE;

-    break;

-  case JXFORM_ROT_180:

-    if (info->trim) {

-      trim_right_edge(info, srcinfo->output_width);

-      trim_bottom_edge(info, srcinfo->output_height);

-    }

-    /* Need workspace arrays having same dimensions as source image. */

-    need_workspace = TRUE;

-    break;

-  case JXFORM_ROT_270:

-    if (info->trim)

-      trim_bottom_edge(info, srcinfo->output_width);

-    /* Need workspace arrays having transposed dimensions. */

-    need_workspace = TRUE;

-    transpose_it = TRUE;

-    break;

-  case JXFORM_WIPE:

-    break;

-  }

-

-  /* Allocate workspace if needed.

-   * Note that we allocate arrays padded out to the next iMCU boundary,

-   * so that transform routines need not worry about missing edge blocks.

-   */

-  if (need_workspace) {

-    coef_arrays = (jvirt_barray_ptr *)

-      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,

-	SIZEOF(jvirt_barray_ptr) * info->num_components);

-    width_in_iMCUs = (JDIMENSION)

-      jdiv_round_up((long) info->output_width,

-		    (long) info->iMCU_sample_width);

-    height_in_iMCUs = (JDIMENSION)

-      jdiv_round_up((long) info->output_height,

-		    (long) info->iMCU_sample_height);

-    for (ci = 0; ci < info->num_components; ci++) {

-      compptr = srcinfo->comp_info + ci;

-      if (info->num_components == 1) {

-	/* we're going to force samp factors to 1x1 in this case */

-	h_samp_factor = v_samp_factor = 1;

-      } else if (transpose_it) {

-	h_samp_factor = compptr->v_samp_factor;

-	v_samp_factor = compptr->h_samp_factor;

-      } else {

-	h_samp_factor = compptr->h_samp_factor;

-	v_samp_factor = compptr->v_samp_factor;

-      }

-      width_in_blocks = width_in_iMCUs * h_samp_factor;

-      height_in_blocks = height_in_iMCUs * v_samp_factor;

-      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)

-	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,

-	 width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor);

-    }

-    info->workspace_coef_arrays = coef_arrays;

-  } else

-    info->workspace_coef_arrays = NULL;

-

-  return TRUE;

-}

-

-

-/* Transpose destination image parameters */

-

-LOCAL(void)

-transpose_critical_parameters (j_compress_ptr dstinfo)

-{

-  int tblno, i, j, ci, itemp;

-  jpeg_component_info *compptr;

-  JQUANT_TBL *qtblptr;

-  JDIMENSION jtemp;

-  UINT16 qtemp;

-

-  /* Transpose image dimensions */

-  jtemp = dstinfo->image_width;

-  dstinfo->image_width = dstinfo->image_height;

-  dstinfo->image_height = jtemp;

-  itemp = dstinfo->min_DCT_h_scaled_size;

-  dstinfo->min_DCT_h_scaled_size = dstinfo->min_DCT_v_scaled_size;

-  dstinfo->min_DCT_v_scaled_size = itemp;

-

-  /* Transpose sampling factors */

-  for (ci = 0; ci < dstinfo->num_components; ci++) {

-    compptr = dstinfo->comp_info + ci;

-    itemp = compptr->h_samp_factor;

-    compptr->h_samp_factor = compptr->v_samp_factor;

-    compptr->v_samp_factor = itemp;

-  }

-

-  /* Transpose quantization tables */

-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {

-    qtblptr = dstinfo->quant_tbl_ptrs[tblno];

-    if (qtblptr != NULL) {

-      for (i = 0; i < DCTSIZE; i++) {

-	for (j = 0; j < i; j++) {

-	  qtemp = qtblptr->quantval[i*DCTSIZE+j];

-	  qtblptr->quantval[i*DCTSIZE+j] = qtblptr->quantval[j*DCTSIZE+i];

-	  qtblptr->quantval[j*DCTSIZE+i] = qtemp;

-	}

-      }

-    }

-  }

-}

-

-

-/* Adjust Exif image parameters.

- *

- * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible.

- */

-

-LOCAL(void)

-adjust_exif_parameters (JOCTET FAR * data, unsigned int length,

-			JDIMENSION new_width, JDIMENSION new_height)

-{

-  boolean is_motorola; /* Flag for byte order */

-  unsigned int number_of_tags, tagnum;

-  unsigned int firstoffset, offset;

-  JDIMENSION new_value;

-

-  if (length < 12) return; /* Length of an IFD entry */

-

-  /* Discover byte order */

-  if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)

-    is_motorola = FALSE;

-  else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)

-    is_motorola = TRUE;

-  else

-    return;

-

-  /* Check Tag Mark */

-  if (is_motorola) {

-    if (GETJOCTET(data[2]) != 0) return;

-    if (GETJOCTET(data[3]) != 0x2A) return;

-  } else {

-    if (GETJOCTET(data[3]) != 0) return;

-    if (GETJOCTET(data[2]) != 0x2A) return;

-  }

-

-  /* Get first IFD offset (offset to IFD0) */

-  if (is_motorola) {

-    if (GETJOCTET(data[4]) != 0) return;

-    if (GETJOCTET(data[5]) != 0) return;

-    firstoffset = GETJOCTET(data[6]);

-    firstoffset <<= 8;

-    firstoffset += GETJOCTET(data[7]);

-  } else {

-    if (GETJOCTET(data[7]) != 0) return;

-    if (GETJOCTET(data[6]) != 0) return;

-    firstoffset = GETJOCTET(data[5]);

-    firstoffset <<= 8;

-    firstoffset += GETJOCTET(data[4]);

-  }

-  if (firstoffset > length - 2) return; /* check end of data segment */

-

-  /* Get the number of directory entries contained in this IFD */

-  if (is_motorola) {

-    number_of_tags = GETJOCTET(data[firstoffset]);

-    number_of_tags <<= 8;

-    number_of_tags += GETJOCTET(data[firstoffset+1]);

-  } else {

-    number_of_tags = GETJOCTET(data[firstoffset+1]);

-    number_of_tags <<= 8;

-    number_of_tags += GETJOCTET(data[firstoffset]);

-  }

-  if (number_of_tags == 0) return;

-  firstoffset += 2;

-

-  /* Search for ExifSubIFD offset Tag in IFD0 */

-  for (;;) {

-    if (firstoffset > length - 12) return; /* check end of data segment */

-    /* Get Tag number */

-    if (is_motorola) {

-      tagnum = GETJOCTET(data[firstoffset]);

-      tagnum <<= 8;

-      tagnum += GETJOCTET(data[firstoffset+1]);

-    } else {

-      tagnum = GETJOCTET(data[firstoffset+1]);

-      tagnum <<= 8;

-      tagnum += GETJOCTET(data[firstoffset]);

-    }

-    if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */

-    if (--number_of_tags == 0) return;

-    firstoffset += 12;

-  }

-

-  /* Get the ExifSubIFD offset */

-  if (is_motorola) {

-    if (GETJOCTET(data[firstoffset+8]) != 0) return;

-    if (GETJOCTET(data[firstoffset+9]) != 0) return;

-    offset = GETJOCTET(data[firstoffset+10]);

-    offset <<= 8;

-    offset += GETJOCTET(data[firstoffset+11]);

-  } else {

-    if (GETJOCTET(data[firstoffset+11]) != 0) return;

-    if (GETJOCTET(data[firstoffset+10]) != 0) return;

-    offset = GETJOCTET(data[firstoffset+9]);

-    offset <<= 8;

-    offset += GETJOCTET(data[firstoffset+8]);

-  }

-  if (offset > length - 2) return; /* check end of data segment */

-

-  /* Get the number of directory entries contained in this SubIFD */

-  if (is_motorola) {

-    number_of_tags = GETJOCTET(data[offset]);

-    number_of_tags <<= 8;

-    number_of_tags += GETJOCTET(data[offset+1]);

-  } else {

-    number_of_tags = GETJOCTET(data[offset+1]);

-    number_of_tags <<= 8;

-    number_of_tags += GETJOCTET(data[offset]);

-  }

-  if (number_of_tags < 2) return;

-  offset += 2;

-

-  /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */

-  do {

-    if (offset > length - 12) return; /* check end of data segment */

-    /* Get Tag number */

-    if (is_motorola) {

-      tagnum = GETJOCTET(data[offset]);

-      tagnum <<= 8;

-      tagnum += GETJOCTET(data[offset+1]);

-    } else {

-      tagnum = GETJOCTET(data[offset+1]);

-      tagnum <<= 8;

-      tagnum += GETJOCTET(data[offset]);

-    }

-    if (tagnum == 0xA002 || tagnum == 0xA003) {

-      if (tagnum == 0xA002)

-	new_value = new_width; /* ExifImageWidth Tag */

-      else

-	new_value = new_height; /* ExifImageHeight Tag */

-      if (is_motorola) {

-	data[offset+2] = 0; /* Format = unsigned long (4 octets) */

-	data[offset+3] = 4;

-	data[offset+4] = 0; /* Number Of Components = 1 */

-	data[offset+5] = 0;

-	data[offset+6] = 0;

-	data[offset+7] = 1;

-	data[offset+8] = 0;

-	data[offset+9] = 0;

-	data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF);

-	data[offset+11] = (JOCTET)(new_value & 0xFF);

-      } else {

-	data[offset+2] = 4; /* Format = unsigned long (4 octets) */

-	data[offset+3] = 0;

-	data[offset+4] = 1; /* Number Of Components = 1 */

-	data[offset+5] = 0;

-	data[offset+6] = 0;

-	data[offset+7] = 0;

-	data[offset+8] = (JOCTET)(new_value & 0xFF);

-	data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF);

-	data[offset+10] = 0;

-	data[offset+11] = 0;

-      }

-    }

-    offset += 12;

-  } while (--number_of_tags);

-}

-

-

-/* Adjust output image parameters as needed.

- *

- * This must be called after jpeg_copy_critical_parameters()

- * and before jpeg_write_coefficients().

- *

- * The return value is the set of virtual coefficient arrays to be written

- * (either the ones allocated by jtransform_request_workspace, or the

- * original source data arrays).  The caller will need to pass this value

- * to jpeg_write_coefficients().

- */

-

-GLOBAL(jvirt_barray_ptr *)

-jtransform_adjust_parameters (j_decompress_ptr srcinfo,

-			      j_compress_ptr dstinfo,

-			      jvirt_barray_ptr *src_coef_arrays,

-			      jpeg_transform_info *info)

-{

-  /* If force-to-grayscale is requested, adjust destination parameters */

-  if (info->force_grayscale) {

-    /* First, ensure we have YCC or grayscale data, and that the source's

-     * Y channel is full resolution.  (No reasonable person would make Y

-     * be less than full resolution, so actually coping with that case

-     * isn't worth extra code space.  But we check it to avoid crashing.)

-     */

-    if ((((dstinfo->jpeg_color_space == JCS_YCbCr ||

-	   dstinfo->jpeg_color_space == JCS_BG_YCC) &&

-	  dstinfo->num_components == 3) ||

-	 (dstinfo->jpeg_color_space == JCS_GRAYSCALE &&

-	  dstinfo->num_components == 1)) &&

-	srcinfo->comp_info[0].h_samp_factor == srcinfo->max_h_samp_factor &&

-	srcinfo->comp_info[0].v_samp_factor == srcinfo->max_v_samp_factor) {

-      /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed

-       * properly.  Among other things, it sets the target h_samp_factor &

-       * v_samp_factor to 1, which typically won't match the source.

-       * We have to preserve the source's quantization table number, however.

-       */

-      int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;

-      jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);

-      dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;

-    } else {

-      /* Sorry, can't do it */

-      ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);

-    }

-  } else if (info->num_components == 1) {

-    /* For a single-component source, we force the destination sampling factors

-     * to 1x1, with or without force_grayscale.  This is useful because some

-     * decoders choke on grayscale images with other sampling factors.

-     */

-    dstinfo->comp_info[0].h_samp_factor = 1;

-    dstinfo->comp_info[0].v_samp_factor = 1;

-  }

-

-  /* Correct the destination's image dimensions as necessary

-   * for rotate/flip, resize, and crop operations.

-   */

-  dstinfo->jpeg_width = info->output_width;

-  dstinfo->jpeg_height = info->output_height;

-

-  /* Transpose destination image parameters */

-  switch (info->transform) {

-  case JXFORM_TRANSPOSE:

-  case JXFORM_TRANSVERSE:

-  case JXFORM_ROT_90:

-  case JXFORM_ROT_270:

-    transpose_critical_parameters(dstinfo);

-    break;

-  default:

-    break;

-  }

-

-  /* Adjust Exif properties */

-  if (srcinfo->marker_list != NULL &&

-      srcinfo->marker_list->marker == JPEG_APP0+1 &&

-      srcinfo->marker_list->data_length >= 6 &&

-      GETJOCTET(srcinfo->marker_list->data[0]) == 0x45 &&

-      GETJOCTET(srcinfo->marker_list->data[1]) == 0x78 &&

-      GETJOCTET(srcinfo->marker_list->data[2]) == 0x69 &&

-      GETJOCTET(srcinfo->marker_list->data[3]) == 0x66 &&

-      GETJOCTET(srcinfo->marker_list->data[4]) == 0 &&

-      GETJOCTET(srcinfo->marker_list->data[5]) == 0) {

-    /* Suppress output of JFIF marker */

-    dstinfo->write_JFIF_header = FALSE;

-    /* Adjust Exif image parameters */

-    if (dstinfo->jpeg_width != srcinfo->image_width ||

-	dstinfo->jpeg_height != srcinfo->image_height)

-      /* Align data segment to start of TIFF structure for parsing */

-      adjust_exif_parameters(srcinfo->marker_list->data + 6,

-	srcinfo->marker_list->data_length - 6,

-	dstinfo->jpeg_width, dstinfo->jpeg_height);

-  }

-

-  /* Return the appropriate output data set */

-  if (info->workspace_coef_arrays != NULL)

-    return info->workspace_coef_arrays;

-  return src_coef_arrays;

-}

-

-

-/* Execute the actual transformation, if any.

- *

- * This must be called *after* jpeg_write_coefficients, because it depends

- * on jpeg_write_coefficients to have computed subsidiary values such as

- * the per-component width and height fields in the destination object.

- *

- * Note that some transformations will modify the source data arrays!

- */

-

-GLOBAL(void)

-jtransform_execute_transform (j_decompress_ptr srcinfo,

-			      j_compress_ptr dstinfo,

-			      jvirt_barray_ptr *src_coef_arrays,

-			      jpeg_transform_info *info)

-{

-  jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;

-

-  /* Note: conditions tested here should match those in switch statement

-   * in jtransform_request_workspace()

-   */

-  switch (info->transform) {

-  case JXFORM_NONE:

-    if (info->output_width > srcinfo->output_width ||

-	info->output_height > srcinfo->output_height)

-      do_crop_ext(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-		  src_coef_arrays, dst_coef_arrays);

-    else if (info->x_crop_offset != 0 || info->y_crop_offset != 0)

-      do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	      src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_FLIP_H:

-    if (info->y_crop_offset != 0)

-      do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-		src_coef_arrays, dst_coef_arrays);

-    else

-      do_flip_h_no_crop(srcinfo, dstinfo, info->x_crop_offset,

-			src_coef_arrays);

-    break;

-  case JXFORM_FLIP_V:

-    do_flip_v(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	      src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_TRANSPOSE:

-    do_transpose(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-		 src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_TRANSVERSE:

-    do_transverse(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-		  src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_ROT_90:

-    do_rot_90(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	      src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_ROT_180:

-    do_rot_180(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	       src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_ROT_270:

-    do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	       src_coef_arrays, dst_coef_arrays);

-    break;

-  case JXFORM_WIPE:

-    do_wipe(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,

-	    src_coef_arrays, info->drop_width, info->drop_height);

-    break;

-  }

-}

-

-/* jtransform_perfect_transform

- *

- * Determine whether lossless transformation is perfectly

- * possible for a specified image and transformation.

- *

- * Inputs:

- *   image_width, image_height: source image dimensions.

- *   MCU_width, MCU_height: pixel dimensions of MCU.

- *   transform: transformation identifier.

- * Parameter sources from initialized jpeg_struct

- * (after reading source header):

- *   image_width = cinfo.image_width

- *   image_height = cinfo.image_height

- *   MCU_width = cinfo.max_h_samp_factor * cinfo.block_size

- *   MCU_height = cinfo.max_v_samp_factor * cinfo.block_size

- * Result:

- *   TRUE = perfect transformation possible

- *   FALSE = perfect transformation not possible

- *           (may use custom action then)

- */

-

-GLOBAL(boolean)

-jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,

-			     int MCU_width, int MCU_height,

-			     JXFORM_CODE transform)

-{

-  boolean result = TRUE; /* initialize TRUE */

-

-  switch (transform) {

-  case JXFORM_FLIP_H:

-  case JXFORM_ROT_270:

-    if (image_width % (JDIMENSION) MCU_width)

-      result = FALSE;

-    break;

-  case JXFORM_FLIP_V:

-  case JXFORM_ROT_90:

-    if (image_height % (JDIMENSION) MCU_height)

-      result = FALSE;

-    break;

-  case JXFORM_TRANSVERSE:

-  case JXFORM_ROT_180:

-    if (image_width % (JDIMENSION) MCU_width)

-      result = FALSE;

-    if (image_height % (JDIMENSION) MCU_height)

-      result = FALSE;

-    break;

-  default:

-    break;

-  }

-

-  return result;

-}

-

-#endif /* TRANSFORMS_SUPPORTED */

-

-

-/* Setup decompression object to save desired markers in memory.

- * This must be called before jpeg_read_header() to have the desired effect.

- */

-

-GLOBAL(void)

-jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)

-{

-#ifdef SAVE_MARKERS_SUPPORTED

-  int m;

-

-  /* Save comments except under NONE option */

-  if (option != JCOPYOPT_NONE) {

-    jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);

-  }

-  /* Save all types of APPn markers iff ALL option */

-  if (option == JCOPYOPT_ALL) {

-    for (m = 0; m < 16; m++)

-      jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);

-  }

-#endif /* SAVE_MARKERS_SUPPORTED */

-}

-

-/* Copy markers saved in the given source object to the destination object.

- * This should be called just after jpeg_start_compress() or

- * jpeg_write_coefficients().

- * Note that those routines will have written the SOI, and also the

- * JFIF APP0 or Adobe APP14 markers if selected.

- */

-

-GLOBAL(void)

-jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-		       JCOPY_OPTION option)

-{

-  jpeg_saved_marker_ptr marker;

-

-  /* In the current implementation, we don't actually need to examine the

-   * option flag here; we just copy everything that got saved.

-   * But to avoid confusion, we do not output JFIF and Adobe APP14 markers

-   * if the encoder library already wrote one.

-   */

-  for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {

-    if (dstinfo->write_JFIF_header &&

-	marker->marker == JPEG_APP0 &&

-	marker->data_length >= 5 &&

-	GETJOCTET(marker->data[0]) == 0x4A &&

-	GETJOCTET(marker->data[1]) == 0x46 &&

-	GETJOCTET(marker->data[2]) == 0x49 &&

-	GETJOCTET(marker->data[3]) == 0x46 &&

-	GETJOCTET(marker->data[4]) == 0)

-      continue;			/* reject duplicate JFIF */

-    if (dstinfo->write_Adobe_marker &&

-	marker->marker == JPEG_APP0+14 &&

-	marker->data_length >= 5 &&

-	GETJOCTET(marker->data[0]) == 0x41 &&

-	GETJOCTET(marker->data[1]) == 0x64 &&

-	GETJOCTET(marker->data[2]) == 0x6F &&

-	GETJOCTET(marker->data[3]) == 0x62 &&

-	GETJOCTET(marker->data[4]) == 0x65)

-      continue;			/* reject duplicate Adobe */

-#ifdef NEED_FAR_POINTERS

-    /* We could use jpeg_write_marker if the data weren't FAR... */

-    {

-      unsigned int i;

-      jpeg_write_m_header(dstinfo, marker->marker, marker->data_length);

-      for (i = 0; i < marker->data_length; i++)

-	jpeg_write_m_byte(dstinfo, marker->data[i]);

-    }

-#else

-    jpeg_write_marker(dstinfo, marker->marker,

-		      marker->data, marker->data_length);

-#endif

-  }

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/transupp.h b/plugins/AdvaImg/src/LibJPEG/transupp.h
deleted file mode 100644
index 28a1a9cb7a..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/transupp.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*

- * transupp.h

- *

- * Copyright (C) 1997-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.

- *

- * This file contains declarations for image transformation routines and

- * other utility code used by the jpegtran sample application.  These are

- * NOT part of the core JPEG library.  But we keep these routines separate

- * from jpegtran.c to ease the task of maintaining jpegtran-like programs

- * that have other user interfaces.

- *

- * NOTE: all the routines declared here have very specific requirements

- * about when they are to be executed during the reading and writing of the

- * source and destination files.  See the comments in transupp.c, or see

- * jpegtran.c for an example of correct usage.

- */

-

-/* If you happen not to want the image transform support, disable it here */

-#ifndef TRANSFORMS_SUPPORTED

-#define TRANSFORMS_SUPPORTED 1		/* 0 disables transform code */

-#endif

-

-/*

- * Although rotating and flipping data expressed as DCT coefficients is not

- * hard, there is an asymmetry in the JPEG format specification for images

- * whose dimensions aren't multiples of the iMCU size.  The right and bottom

- * image edges are padded out to the next iMCU boundary with junk data; but

- * no padding is possible at the top and left edges.  If we were to flip

- * the whole image including the pad data, then pad garbage would become

- * visible at the top and/or left, and real pixels would disappear into the

- * pad margins --- perhaps permanently, since encoders & decoders may not

- * bother to preserve DCT blocks that appear to be completely outside the

- * nominal image area.  So, we have to exclude any partial iMCUs from the

- * basic transformation.

- *

- * Transpose is the only transformation that can handle partial iMCUs at the

- * right and bottom edges completely cleanly.  flip_h can flip partial iMCUs

- * at the bottom, but leaves any partial iMCUs at the right edge untouched.

- * Similarly flip_v leaves any partial iMCUs at the bottom edge untouched.

- * The other transforms are defined as combinations of these basic transforms

- * and process edge blocks in a way that preserves the equivalence.

- *

- * The "trim" option causes untransformable partial iMCUs to be dropped;

- * this is not strictly lossless, but it usually gives the best-looking

- * result for odd-size images.  Note that when this option is active,

- * the expected mathematical equivalences between the transforms may not hold.

- * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim

- * followed by -rot 180 -trim trims both edges.)

- *

- * We also offer a lossless-crop option, which discards data outside a given

- * image region but losslessly preserves what is inside.  Like the rotate and

- * flip transforms, lossless crop is restricted by the current JPEG format: the

- * upper left corner of the selected region must fall on an iMCU boundary.  If

- * this does not hold for the given crop parameters, we silently move the upper

- * left corner up and/or left to make it so, simultaneously increasing the

- * region dimensions to keep the lower right crop corner unchanged.  (Thus, the

- * output image covers at least the requested region, but may cover more.)

- * The adjustment of the region dimensions may be optionally disabled.

- *

- * A complementary lossless-wipe option is provided to discard (gray out) data

- * inside a given image region while losslessly preserving what is outside.

- *

- * We also provide a lossless-resize option, which is kind of a lossless-crop

- * operation in the DCT coefficient block domain - it discards higher-order

- * coefficients and losslessly preserves lower-order coefficients of a

- * sub-block.

- *

- * Rotate/flip transform, resize, and crop can be requested together in a

- * single invocation.  The crop is applied last --- that is, the crop region

- * is specified in terms of the destination image after transform/resize.

- *

- * We also offer a "force to grayscale" option, which simply discards the

- * chrominance channels of a YCbCr image.  This is lossless in the sense that

- * the luminance channel is preserved exactly.  It's not the same kind of

- * thing as the rotate/flip transformations, but it's convenient to handle it

- * as part of this package, mainly because the transformation routines have to

- * be aware of the option to know how many components to work on.

- */

-

-

-/* Short forms of external names for systems with brain-damaged linkers. */

-

-#ifdef NEED_SHORT_EXTERNAL_NAMES

-#define jtransform_parse_crop_spec	jTrParCrop

-#define jtransform_request_workspace	jTrRequest

-#define jtransform_adjust_parameters	jTrAdjust

-#define jtransform_execute_transform	jTrExec

-#define jtransform_perfect_transform	jTrPerfect

-#define jcopy_markers_setup		jCMrkSetup

-#define jcopy_markers_execute		jCMrkExec

-#endif /* NEED_SHORT_EXTERNAL_NAMES */

-

-

-/*

- * Codes for supported types of image transformations.

- */

-

-typedef enum {

-	JXFORM_NONE,		/* no transformation */

-	JXFORM_FLIP_H,		/* horizontal flip */

-	JXFORM_FLIP_V,		/* vertical flip */

-	JXFORM_TRANSPOSE,	/* transpose across UL-to-LR axis */

-	JXFORM_TRANSVERSE,	/* transpose across UR-to-LL axis */

-	JXFORM_ROT_90,		/* 90-degree clockwise rotation */

-	JXFORM_ROT_180,		/* 180-degree rotation */

-	JXFORM_ROT_270,		/* 270-degree clockwise (or 90 ccw) */

-	JXFORM_WIPE		/* wipe */

-} JXFORM_CODE;

-

-/*

- * Codes for crop parameters, which can individually be unspecified,

- * positive or negative for xoffset or yoffset,

- * positive or forced for width or height.

- */

-

-typedef enum {

-        JCROP_UNSET,

-        JCROP_POS,

-        JCROP_NEG,

-        JCROP_FORCE

-} JCROP_CODE;

-

-/*

- * Transform parameters struct.

- * NB: application must not change any elements of this struct after

- * calling jtransform_request_workspace.

- */

-

-typedef struct {

-  /* Options: set by caller */

-  JXFORM_CODE transform;	/* image transform operator */

-  boolean perfect;		/* if TRUE, fail if partial MCUs are requested */

-  boolean trim;			/* if TRUE, trim partial MCUs as needed */

-  boolean force_grayscale;	/* if TRUE, convert color image to grayscale */

-  boolean crop;			/* if TRUE, crop or wipe source image */

-

-  /* Crop parameters: application need not set these unless crop is TRUE.

-   * These can be filled in by jtransform_parse_crop_spec().

-   */

-  JDIMENSION crop_width;	/* Width of selected region */

-  JCROP_CODE crop_width_set;	/* (forced disables adjustment) */

-  JDIMENSION crop_height;	/* Height of selected region */

-  JCROP_CODE crop_height_set;	/* (forced disables adjustment) */

-  JDIMENSION crop_xoffset;	/* X offset of selected region */

-  JCROP_CODE crop_xoffset_set;	/* (negative measures from right edge) */

-  JDIMENSION crop_yoffset;	/* Y offset of selected region */

-  JCROP_CODE crop_yoffset_set;	/* (negative measures from bottom edge) */

-

-  /* Internal workspace: caller should not touch these */

-  int num_components;		/* # of components in workspace */

-  jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */

-  JDIMENSION output_width;	/* cropped destination dimensions */

-  JDIMENSION output_height;

-  JDIMENSION x_crop_offset;	/* destination crop offsets measured in iMCUs */

-  JDIMENSION y_crop_offset;

-  JDIMENSION drop_width;	/* drop/wipe dimensions measured in iMCUs */

-  JDIMENSION drop_height;

-  int iMCU_sample_width;	/* destination iMCU size */

-  int iMCU_sample_height;

-} jpeg_transform_info;

-

-

-#if TRANSFORMS_SUPPORTED

-

-/* Parse a crop specification (written in X11 geometry style) */

-EXTERN(boolean) jtransform_parse_crop_spec

-	JPP((jpeg_transform_info *info, const char *spec));

-/* Request any required workspace */

-EXTERN(boolean) jtransform_request_workspace

-	JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));

-/* Adjust output image parameters */

-EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters

-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	     jvirt_barray_ptr *src_coef_arrays,

-	     jpeg_transform_info *info));

-/* Execute the actual transformation, if any */

-EXTERN(void) jtransform_execute_transform

-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	     jvirt_barray_ptr *src_coef_arrays,

-	     jpeg_transform_info *info));

-/* Determine whether lossless transformation is perfectly

- * possible for a specified image and transformation.

- */

-EXTERN(boolean) jtransform_perfect_transform

-	JPP((JDIMENSION image_width, JDIMENSION image_height,

-	     int MCU_width, int MCU_height,

-	     JXFORM_CODE transform));

-

-/* jtransform_execute_transform used to be called

- * jtransform_execute_transformation, but some compilers complain about

- * routine names that long.  This macro is here to avoid breaking any

- * old source code that uses the original name...

- */

-#define jtransform_execute_transformation	jtransform_execute_transform

-

-#endif /* TRANSFORMS_SUPPORTED */

-

-

-/*

- * Support for copying optional markers from source to destination file.

- */

-

-typedef enum {

-	JCOPYOPT_NONE,		/* copy no optional markers */

-	JCOPYOPT_COMMENTS,	/* copy only comment (COM) markers */

-	JCOPYOPT_ALL		/* copy all optional markers */

-} JCOPY_OPTION;

-

-#define JCOPYOPT_DEFAULT  JCOPYOPT_COMMENTS	/* recommended default */

-

-/* Setup decompression object to save desired markers in memory */

-EXTERN(void) jcopy_markers_setup

-	JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));

-/* Copy markers saved in the given source object to the destination object */

-EXTERN(void) jcopy_markers_execute

-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,

-	     JCOPY_OPTION option));

diff --git a/plugins/AdvaImg/src/LibJPEG/usage.txt b/plugins/AdvaImg/src/LibJPEG/usage.txt
deleted file mode 100644
index fc3aafb3f3..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/usage.txt
+++ /dev/null
@@ -1,687 +0,0 @@
-USAGE instructions for the Independent JPEG Group's JPEG software

-=================================================================

-

-This file describes usage of the JPEG conversion programs cjpeg and djpeg,

-as well as the utility programs jpegtran, rdjpgcom and wrjpgcom.  (See

-the other documentation files if you wish to use the JPEG library within

-your own programs.)

-

-If you are on a Unix machine you may prefer to read the Unix-style manual

-pages in files cjpeg.1, djpeg.1, jpegtran.1, rdjpgcom.1, wrjpgcom.1.

-

-

-INTRODUCTION

-

-These programs implement JPEG image encoding, decoding, and transcoding.

-JPEG (pronounced "jay-peg") is a standardized compression method for

-full-color and grayscale images.

-

-

-GENERAL USAGE

-

-We provide two programs, cjpeg to compress an image file into JPEG format,

-and djpeg to decompress a JPEG file back into a conventional image format.

-

-On Unix-like systems, you say:

-	cjpeg [switches] [imagefile] >jpegfile

-or

-	djpeg [switches] [jpegfile]  >imagefile

-The programs read the specified input file, or standard input if none is

-named.  They always write to standard output (with trace/error messages to

-standard error).  These conventions are handy for piping images between

-programs.

-

-On most non-Unix systems, you say:

-	cjpeg [switches] imagefile jpegfile

-or

-	djpeg [switches] jpegfile  imagefile

-i.e., both the input and output files are named on the command line.  This

-style is a little more foolproof, and it loses no functionality if you don't

-have pipes.  (You can get this style on Unix too, if you prefer, by defining

-TWO_FILE_COMMANDLINE when you compile the programs; see install.txt.)

-

-You can also say:

-	cjpeg [switches] -outfile jpegfile  imagefile

-or

-	djpeg [switches] -outfile imagefile  jpegfile

-This syntax works on all systems, so it is useful for scripts.

-

-The currently supported image file formats are: PPM (PBMPLUS color format),

-PGM (PBMPLUS grayscale format), BMP, Targa, and RLE (Utah Raster Toolkit

-format).  (RLE is supported only if the URT library is available, which it

-isn't on most non-Unix systems.)  cjpeg recognizes the input image format

-automatically, with the exception of some Targa-format files.  You have to

-tell djpeg which format to generate.

-

-JPEG files are in the standard JFIF file format.  There are other,

-less widely used JPEG-based file formats, but we don't support them.

-

-All switch names may be abbreviated; for example, -grayscale may be written

--gray or -gr.  Most of the "basic" switches can be abbreviated to as little as

-one letter.  Upper and lower case are equivalent (-BMP is the same as -bmp).

-British spellings are also accepted (e.g., -greyscale), though for brevity

-these are not mentioned below.

-

-

-CJPEG DETAILS

-

-The basic command line switches for cjpeg are:

-

-	-quality N[,...]  Scale quantization tables to adjust image quality.

-			Quality is 0 (worst) to 100 (best); default is 75.

-			(See below for more info.)

-

-	-grayscale	Create monochrome JPEG file from color input.

-			Be sure to use this switch when compressing a grayscale

-			BMP file, because cjpeg isn't bright enough to notice

-			whether a BMP file uses only shades of gray.  By

-			saying -grayscale, you'll get a smaller JPEG file that

-			takes less time to process.

-

-	-rgb		Create RGB JPEG file.

-			Using this switch suppresses the conversion from RGB

-			colorspace input to the default YCbCr JPEG colorspace.

-			You can use this switch in combination with the

-			-block N switch (see below) for lossless JPEG coding.

-			See also the -rgb1 switch below.

-

-	-optimize	Perform optimization of entropy encoding parameters.

-			Without this, default encoding parameters are used.

-			-optimize usually makes the JPEG file a little smaller,

-			but cjpeg runs somewhat slower and needs much more

-			memory.  Image quality and speed of decompression are

-			unaffected by -optimize.

-

-	-progressive	Create progressive JPEG file (see below).

-

-	-scale M/N	Scale the output image by a factor M/N.  Currently

-			supported scale factors are M/N with all N from 1 to

-			16, where M is the destination DCT size, which is 8 by

-			default (see -block N switch below).

-

-	-targa		Input file is Targa format.  Targa files that contain

-			an "identification" field will not be automatically

-			recognized by cjpeg; for such files you must specify

-			-targa to make cjpeg treat the input as Targa format.

-			For most Targa files, you won't need this switch.

-

-The -quality switch lets you trade off compressed file size against quality of

-the reconstructed image: the higher the quality setting, the larger the JPEG

-file, and the closer the output image will be to the original input.  Normally

-you want to use the lowest quality setting (smallest file) that decompresses

-into something visually indistinguishable from the original image.  For this

-purpose the quality setting should be between 50 and 95; the default of 75 is

-often about right.  If you see defects at -quality 75, then go up 5 or 10

-counts at a time until you are happy with the output image.  (The optimal

-setting will vary from one image to another.)

-

--quality 100 will generate a quantization table of all 1's, minimizing loss

-in the quantization step (but there is still information loss in subsampling,

-as well as roundoff error).  This setting is mainly of interest for

-experimental purposes.  Quality values above about 95 are NOT recommended for

-normal use; the compressed file size goes up dramatically for hardly any gain

-in output image quality.

-

-In the other direction, quality values below 50 will produce very small files

-of low image quality.  Settings around 5 to 10 might be useful in preparing an

-index of a large image library, for example.  Try -quality 2 (or so) for some

-amusing Cubist effects.  (Note: quality values below about 25 generate 2-byte

-quantization tables, which are considered optional in the JPEG standard.

-cjpeg emits a warning message when you give such a quality value, because some

-other JPEG programs may be unable to decode the resulting file.  Use -baseline

-if you need to ensure compatibility at low quality values.)

-

-The -quality option has been extended in IJG version 7 for support of separate

-quality settings for luminance and chrominance (or in general, for every

-provided quantization table slot).  This feature is useful for high-quality

-applications which cannot accept the damage of color data by coarse

-subsampling settings.  You can now easily reduce the color data amount more

-smoothly with finer control without separate subsampling.  The resulting file

-is fully compliant with standard JPEG decoders.

-Note that the -quality ratings refer to the quantization table slots, and that

-the last value is replicated if there are more q-table slots than parameters.

-The default q-table slots are 0 for luminance and 1 for chrominance with

-default tables as given in the JPEG standard.  This is compatible with the old

-behaviour in case that only one parameter is given, which is then used for

-both luminance and chrominance (slots 0 and 1).  More or custom quantization

-tables can be set with -qtables and assigned to components with -qslots

-parameter (see the "wizard" switches below).

-CAUTION: You must explicitly add -sample 1x1 for efficient separate color

-quality selection, since the default value used by library is 2x2!

-

-The -progressive switch creates a "progressive JPEG" file.  In this type of

-JPEG file, the data is stored in multiple scans of increasing quality.  If the

-file is being transmitted over a slow communications link, the decoder can use

-the first scan to display a low-quality image very quickly, and can then

-improve the display with each subsequent scan.  The final image is exactly

-equivalent to a standard JPEG file of the same quality setting, and the total

-file size is about the same --- often a little smaller.

-

-Switches for advanced users:

-

-	-arithmetic	Use arithmetic coding.

-			CAUTION: arithmetic coded JPEG is not yet widely

-			implemented, so many decoders will be unable to

-			view an arithmetic coded JPEG file at all.

-

-	-block N	Set DCT block size.  All N from 1 to 16 are possible.

-			Default is 8 (baseline format).

-			Larger values produce higher compression,

-			smaller values produce higher quality

-			(exact DCT stage possible with 1 or 2; with the

-			default quality of 75 and default Luminance qtable

-			the DCT+Quantization stage is lossless for N=1).

-			CAUTION: An implementation of the JPEG SmartScale

-			extension is required for this feature.  SmartScale

-			enabled JPEG is not yet widely implemented, so many

-			decoders will be unable to view a SmartScale extended

-			JPEG file at all.

-

-	-rgb1		Create RGB JPEG file with reversible color transform.

-			Works like the -rgb switch (see above) and inserts a

-			simple reversible color transform into the processing

-			which significantly improves the compression.

-			Use this switch in combination with the -block N

-			switch (see above) for lossless JPEG coding.

-			CAUTION: A decoder with inverse color transform

-			support is required for this feature.  Reversible

-			color transform support is not yet widely implemented,

-			so many decoders will be unable to view a reversible

-			color transformed JPEG file at all.

-

-	-bgycc		Create big gamut YCC JPEG file.

-			In this type of encoding the color difference

-			components are quantized further by a factor of 2

-			compared to the normal Cb/Cr values, thus creating

-			space to allow larger color values with higher

-			saturation than the normal gamut limits to be encoded.

-			In order to compensate for the loss of color fidelity

-			compared to a normal YCC encoded file, the color

-			quantization tables can be adjusted accordingly.

-			For example, cjpeg -bgycc -quality 80,90 will give

-			similar results as cjpeg -quality 80.

-			CAUTION: For correct decompression a decoder with big

-			gamut YCC support (JFIF version 2) is required.

-			An old decoder may or may not display a big gamut YCC

-			encoded JPEG file, depending on JFIF version check

-			and corresponding warning/error configuration.

-			In case of a granted decompression the old decoder

-			will display the image with half saturated colors.

-

-	-dct int	Use integer DCT method (default).

-	-dct fast	Use fast integer DCT (less accurate).

-	-dct float	Use floating-point DCT method.

-			The float method is very slightly more accurate than

-			the int method, but is much slower unless your machine

-			has very fast floating-point hardware.  Also note that

-			results of the floating-point method may vary slightly

-			across machines, while the integer methods should give

-			the same results everywhere.  The fast integer method

-			is much less accurate than the other two.

-

-	-nosmooth	Don't use high-quality downsampling.

-

-	-restart N	Emit a JPEG restart marker every N MCU rows, or every

-			N MCU blocks if "B" is attached to the number.

-			-restart 0 (the default) means no restart markers.

-

-	-smooth N	Smooth the input image to eliminate dithering noise.

-			N, ranging from 1 to 100, indicates the strength of

-			smoothing.  0 (the default) means no smoothing.

-

-	-maxmemory N	Set limit for amount of memory to use in processing

-			large images.  Value is in thousands of bytes, or

-			millions of bytes if "M" is attached to the number.

-			For example, -max 4m selects 4000000 bytes.  If more

-			space is needed, temporary files will be used.

-

-	-verbose	Enable debug printout.  More -v's give more printout.

-	or  -debug	Also, version information is printed at startup.

-

-The -restart option inserts extra markers that allow a JPEG decoder to

-resynchronize after a transmission error.  Without restart markers, any damage

-to a compressed file will usually ruin the image from the point of the error

-to the end of the image; with restart markers, the damage is usually confined

-to the portion of the image up to the next restart marker.  Of course, the

-restart markers occupy extra space.  We recommend -restart 1 for images that

-will be transmitted across unreliable networks such as Usenet.

-

-The -smooth option filters the input to eliminate fine-scale noise.  This is

-often useful when converting dithered images to JPEG: a moderate smoothing

-factor of 10 to 50 gets rid of dithering patterns in the input file, resulting

-in a smaller JPEG file and a better-looking image.  Too large a smoothing

-factor will visibly blur the image, however.

-

-Switches for wizards:

-

-	-baseline	Force baseline-compatible quantization tables to be

-			generated.  This clamps quantization values to 8 bits

-			even at low quality settings.  (This switch is poorly

-			named, since it does not ensure that the output is

-			actually baseline JPEG.  For example, you can use

-			-baseline and -progressive together.)

-

-	-qtables file	Use the quantization tables given in the specified

-			text file.

-

-	-qslots N[,...] Select which quantization table to use for each color

-			component.

-

-	-sample HxV[,...]  Set JPEG sampling factors for each color component.

-

-	-scans file	Use the scan script given in the specified text file.

-

-The "wizard" switches are intended for experimentation with JPEG.  If you

-don't know what you are doing, DON'T USE THEM.  These switches are documented

-further in the file wizard.txt.

-

-

-DJPEG DETAILS

-

-The basic command line switches for djpeg are:

-

-	-colors N	Reduce image to at most N colors.  This reduces the

-	or -quantize N	number of colors used in the output image, so that it

-			can be displayed on a colormapped display or stored in

-			a colormapped file format.  For example, if you have

-			an 8-bit display, you'd need to reduce to 256 or fewer

-			colors.  (-colors is the recommended name, -quantize

-			is provided only for backwards compatibility.)

-

-	-fast		Select recommended processing options for fast, low

-			quality output.  (The default options are chosen for

-			highest quality output.)  Currently, this is equivalent

-			to "-dct fast -nosmooth -onepass -dither ordered".

-

-	-grayscale	Force grayscale output even if JPEG file is color.

-			Useful for viewing on monochrome displays; also,

-			djpeg runs noticeably faster in this mode.

-

-	-rgb		Force RGB output even if JPEG file is grayscale.

-			This is provided to support applications that don't

-			want to cope with grayscale as a separate case.

-

-	-scale M/N	Scale the output image by a factor M/N.  Currently

-			supported scale factors are M/N with all M from 1 to

-			16, where N is the source DCT size, which is 8 for

-			baseline JPEG.  If the /N part is omitted, then M

-			specifies the DCT scaled size to be applied on the

-			given input.  For baseline JPEG this is equivalent to

-			M/8 scaling, since the source DCT size for baseline

-			JPEG is 8.  Scaling is handy if the image is larger

-			than your screen; also, djpeg runs much faster when

-			scaling down the output.

-

-	-bmp		Select BMP output format (Windows flavor).  8-bit

-			colormapped format is emitted if -colors or -grayscale

-			is specified, or if the JPEG file is grayscale;

-			otherwise, 24-bit full-color format is emitted.

-

-	-gif		Select GIF output format.  Since GIF does not support

-			more than 256 colors, -colors 256 is assumed (unless

-			you specify a smaller number of colors).  If you

-			specify -fast, the default number of colors is 216.

-

-	-os2		Select BMP output format (OS/2 1.x flavor).  8-bit

-			colormapped format is emitted if -colors or -grayscale

-			is specified, or if the JPEG file is grayscale;

-			otherwise, 24-bit full-color format is emitted.

-

-	-pnm		Select PBMPLUS (PPM/PGM) output format (this is the

-			default format).  PGM is emitted if the JPEG file is

-			grayscale or if -grayscale is specified; otherwise

-			PPM is emitted.

-

-	-rle		Select RLE output format.  (Requires URT library.)

-

-	-targa		Select Targa output format.  Grayscale format is

-			emitted if the JPEG file is grayscale or if

-			-grayscale is specified; otherwise, colormapped format

-			is emitted if -colors is specified; otherwise, 24-bit

-			full-color format is emitted.

-

-Switches for advanced users:

-

-	-dct int	Use integer DCT method (default).

-	-dct fast	Use fast integer DCT (less accurate).

-	-dct float	Use floating-point DCT method.

-			The float method is very slightly more accurate than

-			the int method, but is much slower unless your machine

-			has very fast floating-point hardware.  Also note that

-			results of the floating-point method may vary slightly

-			across machines, while the integer methods should give

-			the same results everywhere.  The fast integer method

-			is much less accurate than the other two.

-

-	-dither fs	Use Floyd-Steinberg dithering in color quantization.

-	-dither ordered	Use ordered dithering in color quantization.

-	-dither none	Do not use dithering in color quantization.

-			By default, Floyd-Steinberg dithering is applied when

-			quantizing colors; this is slow but usually produces

-			the best results.  Ordered dither is a compromise

-			between speed and quality; no dithering is fast but

-			usually looks awful.  Note that these switches have

-			no effect unless color quantization is being done.

-			Ordered dither is only available in -onepass mode.

-

-	-map FILE	Quantize to the colors used in the specified image

-			file.  This is useful for producing multiple files

-			with identical color maps, or for forcing a predefined

-			set of colors to be used.  The FILE must be a GIF

-			or PPM file.  This option overrides -colors and

-			-onepass.

-

-	-nosmooth	Don't use high-quality upsampling.

-

-	-onepass	Use one-pass instead of two-pass color quantization.

-			The one-pass method is faster and needs less memory,

-			but it produces a lower-quality image.  -onepass is

-			ignored unless you also say -colors N.  Also,

-			the one-pass method is always used for grayscale

-			output (the two-pass method is no improvement then).

-

-	-maxmemory N	Set limit for amount of memory to use in processing

-			large images.  Value is in thousands of bytes, or

-			millions of bytes if "M" is attached to the number.

-			For example, -max 4m selects 4000000 bytes.  If more

-			space is needed, temporary files will be used.

-

-	-verbose	Enable debug printout.  More -v's give more printout.

-	or  -debug	Also, version information is printed at startup.

-

-

-HINTS FOR CJPEG

-

-Color GIF files are not the ideal input for JPEG; JPEG is really intended for

-compressing full-color (24-bit) images.  In particular, don't try to convert

-cartoons, line drawings, and other images that have only a few distinct

-colors.  GIF works great on these, JPEG does not.  If you want to convert a

-GIF to JPEG, you should experiment with cjpeg's -quality and -smooth options

-to get a satisfactory conversion.  -smooth 10 or so is often helpful.

-

-Avoid running an image through a series of JPEG compression/decompression

-cycles.  Image quality loss will accumulate; after ten or so cycles the image

-may be noticeably worse than it was after one cycle.  It's best to use a

-lossless format while manipulating an image, then convert to JPEG format when

-you are ready to file the image away.

-

-The -optimize option to cjpeg is worth using when you are making a "final"

-version for posting or archiving.  It's also a win when you are using low

-quality settings to make very small JPEG files; the percentage improvement

-is often a lot more than it is on larger files.  (At present, -optimize

-mode is always selected when generating progressive JPEG files.)

-

-GIF input files are no longer supported, to avoid the Unisys LZW patent

-(now expired).

-(Conversion of GIF files to JPEG is usually a bad idea anyway.)

-

-

-HINTS FOR DJPEG

-

-To get a quick preview of an image, use the -grayscale and/or -scale switches.

-"-grayscale -scale 1/8" is the fastest case.

-

-Several options are available that trade off image quality to gain speed.

-"-fast" turns on the recommended settings.

-

-"-dct fast" and/or "-nosmooth" gain speed at a small sacrifice in quality.

-When producing a color-quantized image, "-onepass -dither ordered" is fast but

-much lower quality than the default behavior.  "-dither none" may give

-acceptable results in two-pass mode, but is seldom tolerable in one-pass mode.

-

-If you are fortunate enough to have very fast floating point hardware,

-"-dct float" may be even faster than "-dct fast".  But on most machines

-"-dct float" is slower than "-dct int"; in this case it is not worth using,

-because its theoretical accuracy advantage is too small to be significant

-in practice.

-

-Two-pass color quantization requires a good deal of memory; on MS-DOS machines

-it may run out of memory even with -maxmemory 0.  In that case you can still

-decompress, with some loss of image quality, by specifying -onepass for

-one-pass quantization.

-

-To avoid the Unisys LZW patent (now expired), djpeg produces uncompressed GIF

-files.  These are larger than they should be, but are readable by standard GIF

-decoders.

-

-

-HINTS FOR BOTH PROGRAMS

-

-If more space is needed than will fit in the available main memory (as

-determined by -maxmemory), temporary files will be used.  (MS-DOS versions

-will try to get extended or expanded memory first.)  The temporary files are

-often rather large: in typical cases they occupy three bytes per pixel, for

-example 3*800*600 = 1.44Mb for an 800x600 image.  If you don't have enough

-free disk space, leave out -progressive and -optimize (for cjpeg) or specify

--onepass (for djpeg).

-

-On MS-DOS, the temporary files are created in the directory named by the TMP

-or TEMP environment variable, or in the current directory if neither of those

-exist.  Amiga implementations put the temp files in the directory named by

-JPEGTMP:, so be sure to assign JPEGTMP: to a disk partition with adequate free

-space.

-

-The default memory usage limit (-maxmemory) is set when the software is

-compiled.  If you get an "insufficient memory" error, try specifying a smaller

--maxmemory value, even -maxmemory 0 to use the absolute minimum space.  You

-may want to recompile with a smaller default value if this happens often.

-

-On machines that have "environment" variables, you can define the environment

-variable JPEGMEM to set the default memory limit.  The value is specified as

-described for the -maxmemory switch.  JPEGMEM overrides the default value

-specified when the program was compiled, and itself is overridden by an

-explicit -maxmemory switch.

-

-On MS-DOS machines, -maxmemory is the amount of main (conventional) memory to

-use.  (Extended or expanded memory is also used if available.)  Most

-DOS-specific versions of this software do their own memory space estimation

-and do not need you to specify -maxmemory.

-

-

-JPEGTRAN

-

-jpegtran performs various useful transformations of JPEG files.

-It can translate the coded representation from one variant of JPEG to another,

-for example from baseline JPEG to progressive JPEG or vice versa.  It can also

-perform some rearrangements of the image data, for example turning an image

-from landscape to portrait format by rotation.  For EXIF files and JPEG files

-containing Exif data, you may prefer to use exiftran instead.

-

-jpegtran works by rearranging the compressed data (DCT coefficients), without

-ever fully decoding the image.  Therefore, its transformations are lossless:

-there is no image degradation at all, which would not be true if you used

-djpeg followed by cjpeg to accomplish the same conversion.  But by the same

-token, jpegtran cannot perform lossy operations such as changing the image

-quality.  However, while the image data is losslessly transformed, metadata

-can be removed.  See the -copy option for specifics.

-

-jpegtran uses a command line syntax similar to cjpeg or djpeg.

-On Unix-like systems, you say:

-	jpegtran [switches] [inputfile] >outputfile

-On most non-Unix systems, you say:

-	jpegtran [switches] inputfile outputfile

-where both the input and output files are JPEG files.

-

-To specify the coded JPEG representation used in the output file,

-jpegtran accepts a subset of the switches recognized by cjpeg:

-	-optimize	Perform optimization of entropy encoding parameters.

-	-progressive	Create progressive JPEG file.

-	-arithmetic	Use arithmetic coding.

-	-restart N	Emit a JPEG restart marker every N MCU rows, or every

-			N MCU blocks if "B" is attached to the number.

-	-scans file	Use the scan script given in the specified text file.

-See the previous discussion of cjpeg for more details about these switches.

-If you specify none of these switches, you get a plain baseline-JPEG output

-file.  The quality setting and so forth are determined by the input file.

-

-The image can be losslessly transformed by giving one of these switches:

-	-flip horizontal	Mirror image horizontally (left-right).

-	-flip vertical		Mirror image vertically (top-bottom).

-	-rotate 90		Rotate image 90 degrees clockwise.

-	-rotate 180		Rotate image 180 degrees.

-	-rotate 270		Rotate image 270 degrees clockwise (or 90 ccw).

-	-transpose		Transpose image (across UL-to-LR axis).

-	-transverse		Transverse transpose (across UR-to-LL axis).

-

-The transpose transformation has no restrictions regarding image dimensions.

-The other transformations operate rather oddly if the image dimensions are not

-a multiple of the iMCU size (usually 8 or 16 pixels), because they can only

-transform complete blocks of DCT coefficient data in the desired way.

-

-jpegtran's default behavior when transforming an odd-size image is designed

-to preserve exact reversibility and mathematical consistency of the

-transformation set.  As stated, transpose is able to flip the entire image

-area.  Horizontal mirroring leaves any partial iMCU column at the right edge

-untouched, but is able to flip all rows of the image.  Similarly, vertical

-mirroring leaves any partial iMCU row at the bottom edge untouched, but is

-able to flip all columns.  The other transforms can be built up as sequences

-of transpose and flip operations; for consistency, their actions on edge

-pixels are defined to be the same as the end result of the corresponding

-transpose-and-flip sequence.

-

-For practical use, you may prefer to discard any untransformable edge pixels

-rather than having a strange-looking strip along the right and/or bottom edges

-of a transformed image.  To do this, add the -trim switch:

-	-trim		Drop non-transformable edge blocks.

-Obviously, a transformation with -trim is not reversible, so strictly speaking

-jpegtran with this switch is not lossless.  Also, the expected mathematical

-equivalences between the transformations no longer hold.  For example,

-"-rot 270 -trim" trims only the bottom edge, but "-rot 90 -trim" followed by

-"-rot 180 -trim" trims both edges.

-

-If you are only interested in perfect transformation, add the -perfect switch:

-	-perfect	Fails with an error if the transformation is not

-			perfect.

-For example you may want to do

-  jpegtran -rot 90 -perfect foo.jpg || djpeg foo.jpg | pnmflip -r90 | cjpeg

-to do a perfect rotation if available or an approximated one if not.

-

-We also offer a lossless-crop option, which discards data outside a given

-image region but losslessly preserves what is inside.  Like the rotate and

-flip transforms, lossless crop is restricted by the current JPEG format: the

-upper left corner of the selected region must fall on an iMCU boundary.  If

-this does not hold for the given crop parameters, we silently move the upper

-left corner up and/or left to make it so, simultaneously increasing the

-region dimensions to keep the lower right crop corner unchanged.  (Thus, the

-output image covers at least the requested region, but may cover more.)

-The adjustment of the region dimensions may be optionally disabled by

-attaching an 'f' character ("force") to the width or height number.

-

-The image can be losslessly cropped by giving the switch:

-	-crop WxH+X+Y	Crop to a rectangular subarea of width W, height H

-			starting at point X,Y.

-

-A complementary lossless-wipe option is provided to discard (gray out) data

-inside a given image region while losslessly preserving what is outside:

-	-wipe WxH+X+Y	Wipe (gray out) a rectangular subarea of

-			width W, height H starting at point X,Y.

-

-Other not-strictly-lossless transformation switches are:

-

-	-grayscale	Force grayscale output.

-This option discards the chrominance channels if the input image is YCbCr

-(ie, a standard color JPEG), resulting in a grayscale JPEG file.  The

-luminance channel is preserved exactly, so this is a better method of reducing

-to grayscale than decompression, conversion, and recompression.  This switch

-is particularly handy for fixing a monochrome picture that was mistakenly

-encoded as a color JPEG.  (In such a case, the space savings from getting rid

-of the near-empty chroma channels won't be large; but the decoding time for

-a grayscale JPEG is substantially less than that for a color JPEG.)

-

-	-scale M/N	Scale the output image by a factor M/N.

-Currently supported scale factors are M/N with all M from 1 to 16, where N is

-the source DCT size, which is 8 for baseline JPEG.  If the /N part is omitted,

-then M specifies the DCT scaled size to be applied on the given input.  For

-baseline JPEG this is equivalent to M/8 scaling, since the source DCT size

-for baseline JPEG is 8.  CAUTION: An implementation of the JPEG SmartScale

-extension is required for this feature.  SmartScale enabled JPEG is not yet

-widely implemented, so many decoders will be unable to view a SmartScale

-extended JPEG file at all.

-

-jpegtran also recognizes these switches that control what to do with "extra"

-markers, such as comment blocks:

-	-copy none	Copy no extra markers from source file.

-			This setting suppresses all comments

-			and other metadata in the source file.

-	-copy comments	Copy only comment markers.

-			This setting copies comments from the source file,

-			but discards any other metadata.

-	-copy all	Copy all extra markers.  This setting preserves

-			metadata found in the source file, such as JFIF

-			thumbnails, Exif data, and Photoshop settings.

-			In some files these extra markers can be sizable.

-			Note that this option will copy thumbnails as-is;

-			they will not be transformed.

-The default behavior is -copy comments.  (Note: in IJG releases v6 and v6a,

-jpegtran always did the equivalent of -copy none.)

-

-Additional switches recognized by jpegtran are:

-	-outfile filename

-	-maxmemory N

-	-verbose

-	-debug

-These work the same as in cjpeg or djpeg.

-

-

-THE COMMENT UTILITIES

-

-The JPEG standard allows "comment" (COM) blocks to occur within a JPEG file.

-Although the standard doesn't actually define what COM blocks are for, they

-are widely used to hold user-supplied text strings.  This lets you add

-annotations, titles, index terms, etc to your JPEG files, and later retrieve

-them as text.  COM blocks do not interfere with the image stored in the JPEG

-file.  The maximum size of a COM block is 64K, but you can have as many of

-them as you like in one JPEG file.

-

-We provide two utility programs to display COM block contents and add COM

-blocks to a JPEG file.

-

-rdjpgcom searches a JPEG file and prints the contents of any COM blocks on

-standard output.  The command line syntax is

-	rdjpgcom [-raw] [-verbose] [inputfilename]

-The switch "-raw" (or just "-r") causes rdjpgcom to also output non-printable

-characters in comments, which are normally escaped for security reasons.

-The switch "-verbose" (or just "-v") causes rdjpgcom to also display the JPEG

-image dimensions.  If you omit the input file name from the command line,

-the JPEG file is read from standard input.  (This may not work on some

-operating systems, if binary data can't be read from stdin.)

-

-wrjpgcom adds a COM block, containing text you provide, to a JPEG file.

-Ordinarily, the COM block is added after any existing COM blocks, but you

-can delete the old COM blocks if you wish.  wrjpgcom produces a new JPEG

-file; it does not modify the input file.  DO NOT try to overwrite the input

-file by directing wrjpgcom's output back into it; on most systems this will

-just destroy your file.

-

-The command line syntax for wrjpgcom is similar to cjpeg's.  On Unix-like

-systems, it is

-	wrjpgcom [switches] [inputfilename]

-The output file is written to standard output.  The input file comes from

-the named file, or from standard input if no input file is named.

-

-On most non-Unix systems, the syntax is

-	wrjpgcom [switches] inputfilename outputfilename

-where both input and output file names must be given explicitly.

-

-wrjpgcom understands three switches:

-	-replace		 Delete any existing COM blocks from the file.

-	-comment "Comment text"	 Supply new COM text on command line.

-	-cfile name		 Read text for new COM block from named file.

-(Switch names can be abbreviated.)  If you have only one line of comment text

-to add, you can provide it on the command line with -comment.  The comment

-text must be surrounded with quotes so that it is treated as a single

-argument.  Longer comments can be read from a text file.

-

-If you give neither -comment nor -cfile, then wrjpgcom will read the comment

-text from standard input.  (In this case an input image file name MUST be

-supplied, so that the source JPEG file comes from somewhere else.)  You can

-enter multiple lines, up to 64KB worth.  Type an end-of-file indicator

-(usually control-D or control-Z) to terminate the comment text entry.

-

-wrjpgcom will not add a COM block if the provided comment string is empty.

-Therefore -replace -comment "" can be used to delete all COM blocks from a

-file.

-

-These utility programs do not depend on the IJG JPEG library.  In

-particular, the source code for rdjpgcom is intended as an illustration of

-the minimum amount of code required to parse a JPEG file header correctly.

diff --git a/plugins/AdvaImg/src/LibJPEG/wizard.txt b/plugins/AdvaImg/src/LibJPEG/wizard.txt
deleted file mode 100644
index 02418ba2b2..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wizard.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-Advanced usage instructions for the Independent JPEG Group's JPEG software

-==========================================================================

-

-This file describes cjpeg's "switches for wizards".

-

-The "wizard" switches are intended for experimentation with JPEG by persons

-who are reasonably knowledgeable about the JPEG standard.  If you don't know

-what you are doing, DON'T USE THESE SWITCHES.  You'll likely produce files

-with worse image quality and/or poorer compression than you'd get from the

-default settings.  Furthermore, these switches must be used with caution

-when making files intended for general use, because not all JPEG decoders

-will support unusual JPEG parameter settings.

-

-

-Quantization Table Adjustment

------------------------------

-

-Ordinarily, cjpeg starts with a default set of tables (the same ones given

-as examples in the JPEG standard) and scales them up or down according to

-the -quality setting.  The details of the scaling algorithm can be found in

-jcparam.c.  At very low quality settings, some quantization table entries

-can get scaled up to values exceeding 255.  Although 2-byte quantization

-values are supported by the IJG software, this feature is not in baseline

-JPEG and is not supported by all implementations.  If you need to ensure

-wide compatibility of low-quality files, you can constrain the scaled

-quantization values to no more than 255 by giving the -baseline switch.

-Note that use of -baseline will result in poorer quality for the same file

-size, since more bits than necessary are expended on higher AC coefficients.

-

-You can substitute a different set of quantization values by using the

--qtables switch:

-

-	-qtables file	Use the quantization tables given in the named file.

-

-The specified file should be a text file containing decimal quantization

-values.  The file should contain one to four tables, each of 64 elements.

-The tables are implicitly numbered 0,1,etc. in order of appearance.  Table

-entries appear in normal array order (NOT in the zigzag order in which they

-will be stored in the JPEG file).

-

-Quantization table files are free format, in that arbitrary whitespace can

-appear between numbers.  Also, comments can be included: a comment starts

-with '#' and extends to the end of the line.  Here is an example file that

-duplicates the default quantization tables:

-

-	# Quantization tables given in JPEG spec, section K.1

-

-	# This is table 0 (the luminance table):

-	  16  11  10  16  24  40  51  61

-	  12  12  14  19  26  58  60  55

-	  14  13  16  24  40  57  69  56

-	  14  17  22  29  51  87  80  62

-	  18  22  37  56  68 109 103  77

-	  24  35  55  64  81 104 113  92

-	  49  64  78  87 103 121 120 101

-	  72  92  95  98 112 100 103  99

-

-	# This is table 1 (the chrominance table):

-	  17  18  24  47  99  99  99  99

-	  18  21  26  66  99  99  99  99

-	  24  26  56  99  99  99  99  99

-	  47  66  99  99  99  99  99  99

-	  99  99  99  99  99  99  99  99

-	  99  99  99  99  99  99  99  99

-	  99  99  99  99  99  99  99  99

-	  99  99  99  99  99  99  99  99

-

-If the -qtables switch is used without -quality, then the specified tables

-are used exactly as-is.  If both -qtables and -quality are used, then the

-tables taken from the file are scaled in the same fashion that the default

-tables would be scaled for that quality setting.  If -baseline appears, then

-the quantization values are constrained to the range 1-255.

-

-By default, cjpeg will use quantization table 0 for luminance components and

-table 1 for chrominance components.  To override this choice, use the -qslots

-switch:

-

-	-qslots N[,...]		Select which quantization table to use for

-				each color component.

-

-The -qslots switch specifies a quantization table number for each color

-component, in the order in which the components appear in the JPEG SOF marker.

-For example, to create a separate table for each of Y,Cb,Cr, you could

-provide a -qtables file that defines three quantization tables and say

-"-qslots 0,1,2".  If -qslots gives fewer table numbers than there are color

-components, then the last table number is repeated as necessary.

-

-

-Sampling Factor Adjustment

---------------------------

-

-By default, cjpeg uses 2:1 horizontal and vertical downsampling when

-compressing YCbCr data, and no downsampling for all other color spaces.

-You can override this default with the -sample switch:

-

-	-sample HxV[,...]	Set JPEG sampling factors for each color

-				component.

-

-The -sample switch specifies the JPEG sampling factors for each color

-component, in the order in which they appear in the JPEG SOF marker.

-If you specify fewer HxV pairs than there are components, the remaining

-components are set to 1x1 sampling.  For example, the default YCbCr setting

-is equivalent to "-sample 2x2,1x1,1x1", which can be abbreviated to

-"-sample 2x2".

-

-There are still some JPEG decoders in existence that support only 2x1

-sampling (also called 4:2:2 sampling).  Compatibility with such decoders can

-be achieved by specifying "-sample 2x1".  This is not recommended unless

-really necessary, since it increases file size and encoding/decoding time

-with very little quality gain.

-

-

-Multiple Scan / Progression Control

------------------------------------

-

-By default, cjpeg emits a single-scan sequential JPEG file.  The

--progressive switch generates a progressive JPEG file using a default series

-of progression parameters.  You can create multiple-scan sequential JPEG

-files or progressive JPEG files with custom progression parameters by using

-the -scans switch:

-

-	-scans file	Use the scan sequence given in the named file.

-

-The specified file should be a text file containing a "scan script".

-The script specifies the contents and ordering of the scans to be emitted.

-Each entry in the script defines one scan.  A scan definition specifies

-the components to be included in the scan, and for progressive JPEG it also

-specifies the progression parameters Ss,Se,Ah,Al for the scan.  Scan

-definitions are separated by semicolons (';').  A semicolon after the last

-scan definition is optional.

-

-Each scan definition contains one to four component indexes, optionally

-followed by a colon (':') and the four progressive-JPEG parameters.  The

-component indexes denote which color component(s) are to be transmitted in

-the scan.  Components are numbered in the order in which they appear in the

-JPEG SOF marker, with the first component being numbered 0.  (Note that these

-indexes are not the "component ID" codes assigned to the components, just

-positional indexes.)

-

-The progression parameters for each scan are:

-	Ss	Zigzag index of first coefficient included in scan

-	Se	Zigzag index of last coefficient included in scan

-	Ah	Zero for first scan of a coefficient, else Al of prior scan

-	Al	Successive approximation low bit position for scan

-If the progression parameters are omitted, the values 0,63,0,0 are used,

-producing a sequential JPEG file.  cjpeg automatically determines whether

-the script represents a progressive or sequential file, by observing whether

-Ss and Se values other than 0 and 63 appear.  (The -progressive switch is

-not needed to specify this; in fact, it is ignored when -scans appears.)

-The scan script must meet the JPEG restrictions on progression sequences.

-(cjpeg checks that the spec's requirements are obeyed.)

-

-Scan script files are free format, in that arbitrary whitespace can appear

-between numbers and around punctuation.  Also, comments can be included: a

-comment starts with '#' and extends to the end of the line.  For additional

-legibility, commas or dashes can be placed between values.  (Actually, any

-single punctuation character other than ':' or ';' can be inserted.)  For

-example, the following two scan definitions are equivalent:

-	0 1 2: 0 63 0 0;

-	0,1,2 : 0-63, 0,0 ;

-

-Here is an example of a scan script that generates a partially interleaved

-sequential JPEG file:

-

-	0;			# Y only in first scan

-	1 2;			# Cb and Cr in second scan

-

-Here is an example of a progressive scan script using only spectral selection

-(no successive approximation):

-

-	# Interleaved DC scan for Y,Cb,Cr:

-	0,1,2: 0-0,   0, 0 ;

-	# AC scans:

-	0:     1-2,   0, 0 ;	# First two Y AC coefficients

-	0:     3-5,   0, 0 ;	# Three more

-	1:     1-63,  0, 0 ;	# All AC coefficients for Cb

-	2:     1-63,  0, 0 ;	# All AC coefficients for Cr

-	0:     6-9,   0, 0 ;	# More Y coefficients

-	0:     10-63, 0, 0 ;	# Remaining Y coefficients

-

-Here is an example of a successive-approximation script.  This is equivalent

-to the default script used by "cjpeg -progressive" for YCbCr images:

-

-	# Initial DC scan for Y,Cb,Cr (lowest bit not sent)

-	0,1,2: 0-0,   0, 1 ;

-	# First AC scan: send first 5 Y AC coefficients, minus 2 lowest bits:

-	0:     1-5,   0, 2 ;

-	# Send all Cr,Cb AC coefficients, minus lowest bit:

-	# (chroma data is usually too small to be worth subdividing further;

-	#  but note we send Cr first since eye is least sensitive to Cb)

-	2:     1-63,  0, 1 ;

-	1:     1-63,  0, 1 ;

-	# Send remaining Y AC coefficients, minus 2 lowest bits:

-	0:     6-63,  0, 2 ;

-	# Send next-to-lowest bit of all Y AC coefficients:

-	0:     1-63,  2, 1 ;

-	# At this point we've sent all but the lowest bit of all coefficients.

-	# Send lowest bit of DC coefficients

-	0,1,2: 0-0,   1, 0 ;

-	# Send lowest bit of AC coefficients

-	2:     1-63,  1, 0 ;

-	1:     1-63,  1, 0 ;

-	# Y AC lowest bit scan is last; it's usually the largest scan

-	0:     1-63,  1, 0 ;

-

-It may be worth pointing out that this script is tuned for quality settings

-of around 50 to 75.  For lower quality settings, you'd probably want to use

-a script with fewer stages of successive approximation (otherwise the

-initial scans will be really bad).  For higher quality settings, you might

-want to use more stages of successive approximation (so that the initial

-scans are not too large).

diff --git a/plugins/AdvaImg/src/LibJPEG/wrbmp.c b/plugins/AdvaImg/src/LibJPEG/wrbmp.c
deleted file mode 100644
index 2b8146e2c0..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrbmp.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*

- * wrbmp.c

- *

- * Copyright (C) 1994-1996, 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 routines to write output images in Microsoft "BMP"

- * format (MS Windows 3.x and OS/2 1.x flavors).

- * Either 8-bit colormapped or 24-bit full-color format can be written.

- * No compression is supported.

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume output to

- * an ordinary stdio stream.

- *

- * This code contributed by James Arthur Boucher.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef BMP_SUPPORTED

-

-

-/*

- * To support 12-bit JPEG data, we'd have to scale output down to 8 bits.

- * This is not yet implemented.

- */

-

-#if BITS_IN_JSAMPLE != 8

-  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */

-#endif

-

-/*

- * Since BMP stores scanlines bottom-to-top, we have to invert the image

- * from JPEG's top-to-bottom order.  To do this, we save the outgoing data

- * in a virtual array during put_pixel_row calls, then actually emit the

- * BMP file during finish_output.  The virtual array contains one JSAMPLE per

- * pixel if the output is grayscale or colormapped, three if it is full color.

- */

-

-/* Private version of data destination object */

-

-typedef struct {

-  struct djpeg_dest_struct pub;	/* public fields */

-

-  boolean is_os2;		/* saves the OS2 format request flag */

-

-  jvirt_sarray_ptr whole_image;	/* needed to reverse row order */

-  JDIMENSION data_width;	/* JSAMPLEs per row */

-  JDIMENSION row_width;		/* physical width of one row in the BMP file */

-  int pad_bytes;		/* number of padding bytes needed per row */

-  JDIMENSION cur_output_row;	/* next row# to write to virtual array */

-} bmp_dest_struct;

-

-typedef bmp_dest_struct * bmp_dest_ptr;

-

-

-/* Forward declarations */

-LOCAL(void) write_colormap

-	JPP((j_decompress_ptr cinfo, bmp_dest_ptr dest,

-	     int map_colors, int map_entry_size));

-

-

-/*

- * Write some pixel data.

- * In this module rows_supplied will always be 1.

- */

-

-METHODDEF(void)

-put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		JDIMENSION rows_supplied)

-/* This version is for writing 24-bit pixels */

-{

-  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;

-  JSAMPARRAY image_ptr;

-  register JSAMPROW inptr, outptr;

-  register JDIMENSION col;

-  int pad;

-

-  /* Access next row in virtual array */

-  image_ptr = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, dest->whole_image,

-     dest->cur_output_row, (JDIMENSION) 1, TRUE);

-  dest->cur_output_row++;

-

-  /* Transfer data.  Note destination values must be in BGR order

-   * (even though Microsoft's own documents say the opposite).

-   */

-  inptr = dest->pub.buffer[0];

-  outptr = image_ptr[0];

-  for (col = cinfo->output_width; col > 0; col--) {

-    outptr[2] = *inptr++;	/* can omit GETJSAMPLE() safely */

-    outptr[1] = *inptr++;

-    outptr[0] = *inptr++;

-    outptr += 3;

-  }

-

-  /* Zero out the pad bytes. */

-  pad = dest->pad_bytes;

-  while (--pad >= 0)

-    *outptr++ = 0;

-}

-

-METHODDEF(void)

-put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-	       JDIMENSION rows_supplied)

-/* This version is for grayscale OR quantized color output */

-{

-  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;

-  JSAMPARRAY image_ptr;

-  register JSAMPROW inptr, outptr;

-  register JDIMENSION col;

-  int pad;

-

-  /* Access next row in virtual array */

-  image_ptr = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, dest->whole_image,

-     dest->cur_output_row, (JDIMENSION) 1, TRUE);

-  dest->cur_output_row++;

-

-  /* Transfer data. */

-  inptr = dest->pub.buffer[0];

-  outptr = image_ptr[0];

-  for (col = cinfo->output_width; col > 0; col--) {

-    *outptr++ = *inptr++;	/* can omit GETJSAMPLE() safely */

-  }

-

-  /* Zero out the pad bytes. */

-  pad = dest->pad_bytes;

-  while (--pad >= 0)

-    *outptr++ = 0;

-}

-

-

-/*

- * Startup: normally writes the file header.

- * In this module we may as well postpone everything until finish_output.

- */

-

-METHODDEF(void)

-start_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  /* no work here */

-}

-

-

-/*

- * Finish up at the end of the file.

- *

- * Here is where we really output the BMP file.

- *

- * First, routines to write the Windows and OS/2 variants of the file header.

- */

-

-LOCAL(void)

-write_bmp_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)

-/* Write a Windows-style BMP file header, including colormap if needed */

-{

-  char bmpfileheader[14];

-  char bmpinfoheader[40];

-#define PUT_2B(array,offset,value)  \

-	(array[offset] = (char) ((value) & 0xFF), \

-	 array[offset+1] = (char) (((value) >> 8) & 0xFF))

-#define PUT_4B(array,offset,value)  \

-	(array[offset] = (char) ((value) & 0xFF), \

-	 array[offset+1] = (char) (((value) >> 8) & 0xFF), \

-	 array[offset+2] = (char) (((value) >> 16) & 0xFF), \

-	 array[offset+3] = (char) (((value) >> 24) & 0xFF))

-  INT32 headersize, bfSize;

-  int bits_per_pixel, cmap_entries;

-

-  /* Compute colormap size and total file size */

-  if (cinfo->out_color_space == JCS_RGB) {

-    if (cinfo->quantize_colors) {

-      /* Colormapped RGB */

-      bits_per_pixel = 8;

-      cmap_entries = 256;

-    } else {

-      /* Unquantized, full color RGB */

-      bits_per_pixel = 24;

-      cmap_entries = 0;

-    }

-  } else {

-    /* Grayscale output.  We need to fake a 256-entry colormap. */

-    bits_per_pixel = 8;

-    cmap_entries = 256;

-  }

-  /* File size */

-  headersize = 14 + 40 + cmap_entries * 4; /* Header and colormap */

-  bfSize = headersize + (INT32) dest->row_width * (INT32) cinfo->output_height;

-  

-  /* Set unused fields of header to 0 */

-  MEMZERO(bmpfileheader, SIZEOF(bmpfileheader));

-  MEMZERO(bmpinfoheader, SIZEOF(bmpinfoheader));

-

-  /* Fill the file header */

-  bmpfileheader[0] = 0x42;	/* first 2 bytes are ASCII 'B', 'M' */

-  bmpfileheader[1] = 0x4D;

-  PUT_4B(bmpfileheader, 2, bfSize); /* bfSize */

-  /* we leave bfReserved1 & bfReserved2 = 0 */

-  PUT_4B(bmpfileheader, 10, headersize); /* bfOffBits */

-

-  /* Fill the info header (Microsoft calls this a BITMAPINFOHEADER) */

-  PUT_2B(bmpinfoheader, 0, 40);	/* biSize */

-  PUT_4B(bmpinfoheader, 4, cinfo->output_width); /* biWidth */

-  PUT_4B(bmpinfoheader, 8, cinfo->output_height); /* biHeight */

-  PUT_2B(bmpinfoheader, 12, 1);	/* biPlanes - must be 1 */

-  PUT_2B(bmpinfoheader, 14, bits_per_pixel); /* biBitCount */

-  /* we leave biCompression = 0, for none */

-  /* we leave biSizeImage = 0; this is correct for uncompressed data */

-  if (cinfo->density_unit == 2) { /* if have density in dots/cm, then */

-    PUT_4B(bmpinfoheader, 24, (INT32) (cinfo->X_density*100)); /* XPels/M */

-    PUT_4B(bmpinfoheader, 28, (INT32) (cinfo->Y_density*100)); /* XPels/M */

-  }

-  PUT_2B(bmpinfoheader, 32, cmap_entries); /* biClrUsed */

-  /* we leave biClrImportant = 0 */

-

-  if (JFWRITE(dest->pub.output_file, bmpfileheader, 14) != (size_t) 14)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-  if (JFWRITE(dest->pub.output_file, bmpinfoheader, 40) != (size_t) 40)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-

-  if (cmap_entries > 0)

-    write_colormap(cinfo, dest, cmap_entries, 4);

-}

-

-

-LOCAL(void)

-write_os2_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)

-/* Write an OS2-style BMP file header, including colormap if needed */

-{

-  char bmpfileheader[14];

-  char bmpcoreheader[12];

-  INT32 headersize, bfSize;

-  int bits_per_pixel, cmap_entries;

-

-  /* Compute colormap size and total file size */

-  if (cinfo->out_color_space == JCS_RGB) {

-    if (cinfo->quantize_colors) {

-      /* Colormapped RGB */

-      bits_per_pixel = 8;

-      cmap_entries = 256;

-    } else {

-      /* Unquantized, full color RGB */

-      bits_per_pixel = 24;

-      cmap_entries = 0;

-    }

-  } else {

-    /* Grayscale output.  We need to fake a 256-entry colormap. */

-    bits_per_pixel = 8;

-    cmap_entries = 256;

-  }

-  /* File size */

-  headersize = 14 + 12 + cmap_entries * 3; /* Header and colormap */

-  bfSize = headersize + (INT32) dest->row_width * (INT32) cinfo->output_height;

-  

-  /* Set unused fields of header to 0 */

-  MEMZERO(bmpfileheader, SIZEOF(bmpfileheader));

-  MEMZERO(bmpcoreheader, SIZEOF(bmpcoreheader));

-

-  /* Fill the file header */

-  bmpfileheader[0] = 0x42;	/* first 2 bytes are ASCII 'B', 'M' */

-  bmpfileheader[1] = 0x4D;

-  PUT_4B(bmpfileheader, 2, bfSize); /* bfSize */

-  /* we leave bfReserved1 & bfReserved2 = 0 */

-  PUT_4B(bmpfileheader, 10, headersize); /* bfOffBits */

-

-  /* Fill the info header (Microsoft calls this a BITMAPCOREHEADER) */

-  PUT_2B(bmpcoreheader, 0, 12);	/* bcSize */

-  PUT_2B(bmpcoreheader, 4, cinfo->output_width); /* bcWidth */

-  PUT_2B(bmpcoreheader, 6, cinfo->output_height); /* bcHeight */

-  PUT_2B(bmpcoreheader, 8, 1);	/* bcPlanes - must be 1 */

-  PUT_2B(bmpcoreheader, 10, bits_per_pixel); /* bcBitCount */

-

-  if (JFWRITE(dest->pub.output_file, bmpfileheader, 14) != (size_t) 14)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-  if (JFWRITE(dest->pub.output_file, bmpcoreheader, 12) != (size_t) 12)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-

-  if (cmap_entries > 0)

-    write_colormap(cinfo, dest, cmap_entries, 3);

-}

-

-

-/*

- * Write the colormap.

- * Windows uses BGR0 map entries; OS/2 uses BGR entries.

- */

-

-LOCAL(void)

-write_colormap (j_decompress_ptr cinfo, bmp_dest_ptr dest,

-		int map_colors, int map_entry_size)

-{

-  JSAMPARRAY colormap = cinfo->colormap;

-  int num_colors = cinfo->actual_number_of_colors;

-  FILE * outfile = dest->pub.output_file;

-  int i;

-

-  if (colormap != NULL) {

-    if (cinfo->out_color_components == 3) {

-      /* Normal case with RGB colormap */

-      for (i = 0; i < num_colors; i++) {

-	putc(GETJSAMPLE(colormap[2][i]), outfile);

-	putc(GETJSAMPLE(colormap[1][i]), outfile);

-	putc(GETJSAMPLE(colormap[0][i]), outfile);

-	if (map_entry_size == 4)

-	  putc(0, outfile);

-      }

-    } else {

-      /* Grayscale colormap (only happens with grayscale quantization) */

-      for (i = 0; i < num_colors; i++) {

-	putc(GETJSAMPLE(colormap[0][i]), outfile);

-	putc(GETJSAMPLE(colormap[0][i]), outfile);

-	putc(GETJSAMPLE(colormap[0][i]), outfile);

-	if (map_entry_size == 4)

-	  putc(0, outfile);

-      }

-    }

-  } else {

-    /* If no colormap, must be grayscale data.  Generate a linear "map". */

-    for (i = 0; i < 256; i++) {

-      putc(i, outfile);

-      putc(i, outfile);

-      putc(i, outfile);

-      if (map_entry_size == 4)

-	putc(0, outfile);

-    }

-  }

-  /* Pad colormap with zeros to ensure specified number of colormap entries */ 

-  if (i > map_colors)

-    ERREXIT1(cinfo, JERR_TOO_MANY_COLORS, i);

-  for (; i < map_colors; i++) {

-    putc(0, outfile);

-    putc(0, outfile);

-    putc(0, outfile);

-    if (map_entry_size == 4)

-      putc(0, outfile);

-  }

-}

-

-

-METHODDEF(void)

-finish_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;

-  register FILE * outfile = dest->pub.output_file;

-  JSAMPARRAY image_ptr;

-  register JSAMPROW data_ptr;

-  JDIMENSION row;

-  register JDIMENSION col;

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-

-  /* Write the header and colormap */

-  if (dest->is_os2)

-    write_os2_header(cinfo, dest);

-  else

-    write_bmp_header(cinfo, dest);

-

-  /* Write the file body from our virtual array */

-  for (row = cinfo->output_height; row > 0; row--) {

-    if (progress != NULL) {

-      progress->pub.pass_counter = (long) (cinfo->output_height - row);

-      progress->pub.pass_limit = (long) cinfo->output_height;

-      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-    }

-    image_ptr = (*cinfo->mem->access_virt_sarray)

-      ((j_common_ptr) cinfo, dest->whole_image, row-1, (JDIMENSION) 1, FALSE);

-    data_ptr = image_ptr[0];

-    for (col = dest->row_width; col > 0; col--) {

-      putc(GETJSAMPLE(*data_ptr), outfile);

-      data_ptr++;

-    }

-  }

-  if (progress != NULL)

-    progress->completed_extra_passes++;

-

-  /* Make sure we wrote the output file OK */

-  fflush(outfile);

-  if (ferror(outfile))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * The module selection routine for BMP format output.

- */

-

-GLOBAL(djpeg_dest_ptr)

-jinit_write_bmp (j_decompress_ptr cinfo, boolean is_os2)

-{

-  bmp_dest_ptr dest;

-  JDIMENSION row_width;

-

-  /* Create module interface object, fill in method pointers */

-  dest = (bmp_dest_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(bmp_dest_struct));

-  dest->pub.start_output = start_output_bmp;

-  dest->pub.finish_output = finish_output_bmp;

-  dest->is_os2 = is_os2;

-

-  if (cinfo->out_color_space == JCS_GRAYSCALE) {

-    dest->pub.put_pixel_rows = put_gray_rows;

-  } else if (cinfo->out_color_space == JCS_RGB) {

-    if (cinfo->quantize_colors)

-      dest->pub.put_pixel_rows = put_gray_rows;

-    else

-      dest->pub.put_pixel_rows = put_pixel_rows;

-  } else {

-    ERREXIT(cinfo, JERR_BMP_COLORSPACE);

-  }

-

-  /* Calculate output image dimensions so we can allocate space */

-  jpeg_calc_output_dimensions(cinfo);

-

-  /* Determine width of rows in the BMP file (padded to 4-byte boundary). */

-  row_width = cinfo->output_width * cinfo->output_components;

-  dest->data_width = row_width;

-  while ((row_width & 3) != 0) row_width++;

-  dest->row_width = row_width;

-  dest->pad_bytes = (int) (row_width - dest->data_width);

-

-  /* Allocate space for inversion array, prepare for write pass */

-  dest->whole_image = (*cinfo->mem->request_virt_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-     row_width, cinfo->output_height, (JDIMENSION) 1);

-  dest->cur_output_row = 0;

-  if (cinfo->progress != NULL) {

-    cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-    progress->total_extra_passes++; /* count file input as separate pass */

-  }

-

-  /* Create decompressor output buffer. */

-  dest->pub.buffer = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, row_width, (JDIMENSION) 1);

-  dest->pub.buffer_height = 1;

-

-  return (djpeg_dest_ptr) dest;

-}

-

-#endif /* BMP_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/wrgif.c b/plugins/AdvaImg/src/LibJPEG/wrgif.c
deleted file mode 100644
index d38a42bf40..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrgif.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*

- * wrgif.c

- *

- * Copyright (C) 1991-1997, Thomas G. Lane.

- * Modified 2015 by Guido Vollbeding.

- * 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 routines to write output images in GIF format.

- *

- **************************************************************************

- * NOTE: to avoid entanglements with Unisys' patent on LZW compression,   *

- * this code has been modified to output "uncompressed GIF" files.        *

- * There is no trace of the LZW algorithm in this file.                   *

- **************************************************************************

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume output to

- * an ordinary stdio stream.

- */

-

-/*

- * This code is loosely based on ppmtogif from the PBMPLUS distribution

- * of Feb. 1991.  That file contains the following copyright notice:

- *    Based on GIFENCODE by David Rowley <mgardi@watdscu.waterloo.edu>.

- *    Lempel-Ziv compression based on "compress" by Spencer W. Thomas et al.

- *    Copyright (C) 1989 by Jef Poskanzer.

- *    Permission to use, copy, modify, and distribute this software and its

- *    documentation for any purpose and without fee is hereby granted, provided

- *    that the above copyright notice appear in all copies and that both that

- *    copyright notice and this permission notice appear in supporting

- *    documentation.  This software is provided "as is" without express or

- *    implied warranty.

- *

- * We are also 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."

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef GIF_SUPPORTED

-

-

-/* Private version of data destination object */

-

-typedef struct {

-  struct djpeg_dest_struct pub;	/* public fields */

-

-  j_decompress_ptr cinfo;	/* back link saves passing separate parm */

-

-  /* State for packing variable-width codes into a bitstream */

-  int n_bits;			/* current number of bits/code */

-  int maxcode;			/* maximum code, given n_bits */

-  INT32 cur_accum;		/* holds bits not yet output */

-  int cur_bits;			/* # of bits in cur_accum */

-

-  /* State for GIF code assignment */

-  int ClearCode;		/* clear code (doesn't change) */

-  int EOFCode;			/* EOF code (ditto) */

-  int code_counter;		/* counts output symbols */

-

-  /* GIF data packet construction buffer */

-  int bytesinpkt;		/* # of bytes in current packet */

-  char packetbuf[256];		/* workspace for accumulating packet */

-

-} gif_dest_struct;

-

-typedef gif_dest_struct * gif_dest_ptr;

-

-/* Largest value that will fit in N bits */

-#define MAXCODE(n_bits)	((1 << (n_bits)) - 1)

-

-

-/*

- * Routines to package finished data bytes into GIF data blocks.

- * A data block consists of a count byte (1..255) and that many data bytes.

- */

-

-LOCAL(void)

-flush_packet (gif_dest_ptr dinfo)

-/* flush any accumulated data */

-{

-  if (dinfo->bytesinpkt > 0) {	/* never write zero-length packet */

-    dinfo->packetbuf[0] = (char) dinfo->bytesinpkt++;

-    if (JFWRITE(dinfo->pub.output_file, dinfo->packetbuf, dinfo->bytesinpkt)

-	!= (size_t) dinfo->bytesinpkt)

-      ERREXIT(dinfo->cinfo, JERR_FILE_WRITE);

-    dinfo->bytesinpkt = 0;

-  }

-}

-

-

-/* Add a character to current packet; flush to disk if necessary */

-#define CHAR_OUT(dinfo,c)  \

-	{ (dinfo)->packetbuf[++(dinfo)->bytesinpkt] = (char) (c);  \

-	    if ((dinfo)->bytesinpkt >= 255)  \

-	      flush_packet(dinfo);  \

-	}

-

-

-/* Routine to convert variable-width codes into a byte stream */

-

-LOCAL(void)

-output (gif_dest_ptr dinfo, int code)

-/* Emit a code of n_bits bits */

-/* Uses cur_accum and cur_bits to reblock into 8-bit bytes */

-{

-  dinfo->cur_accum |= ((INT32) code) << dinfo->cur_bits;

-  dinfo->cur_bits += dinfo->n_bits;

-

-  while (dinfo->cur_bits >= 8) {

-    CHAR_OUT(dinfo, dinfo->cur_accum & 0xFF);

-    dinfo->cur_accum >>= 8;

-    dinfo->cur_bits -= 8;

-  }

-}

-

-

-/* The pseudo-compression algorithm.

- *

- * In this module we simply output each pixel value as a separate symbol;

- * thus, no compression occurs.  In fact, there is expansion of one bit per

- * pixel, because we use a symbol width one bit wider than the pixel width.

- *

- * GIF ordinarily uses variable-width symbols, and the decoder will expect

- * to ratchet up the symbol width after a fixed number of symbols.

- * To simplify the logic and keep the expansion penalty down, we emit a

- * GIF Clear code to reset the decoder just before the width would ratchet up.

- * Thus, all the symbols in the output file will have the same bit width.

- * Note that emitting the Clear codes at the right times is a mere matter of

- * counting output symbols and is in no way dependent on the LZW patent.

- *

- * With a small basic pixel width (low color count), Clear codes will be

- * needed very frequently, causing the file to expand even more.  So this

- * simplistic approach wouldn't work too well on bilevel images, for example.

- * But for output of JPEG conversions the pixel width will usually be 8 bits

- * (129 to 256 colors), so the overhead added by Clear symbols is only about

- * one symbol in every 256.

- */

-

-LOCAL(void)

-compress_init (gif_dest_ptr dinfo, int i_bits)

-/* Initialize pseudo-compressor */

-{

-  /* init all the state variables */

-  dinfo->n_bits = i_bits;

-  dinfo->maxcode = MAXCODE(dinfo->n_bits);

-  dinfo->ClearCode = (1 << (i_bits - 1));

-  dinfo->EOFCode = dinfo->ClearCode + 1;

-  dinfo->code_counter = dinfo->ClearCode + 2;

-  /* init output buffering vars */

-  dinfo->bytesinpkt = 0;

-  dinfo->cur_accum = 0;

-  dinfo->cur_bits = 0;

-  /* GIF specifies an initial Clear code */

-  output(dinfo, dinfo->ClearCode);

-}

-

-

-LOCAL(void)

-compress_pixel (gif_dest_ptr dinfo, int c)

-/* Accept and "compress" one pixel value.

- * The given value must be less than n_bits wide.

- */

-{

-  /* Output the given pixel value as a symbol. */

-  output(dinfo, c);

-  /* Issue Clear codes often enough to keep the reader from ratcheting up

-   * its symbol size.

-   */

-  if (dinfo->code_counter < dinfo->maxcode) {

-    dinfo->code_counter++;

-  } else {

-    output(dinfo, dinfo->ClearCode);

-    dinfo->code_counter = dinfo->ClearCode + 2;	/* reset the counter */

-  }

-}

-

-

-LOCAL(void)

-compress_term (gif_dest_ptr dinfo)

-/* Clean up at end */

-{

-  /* Send an EOF code */

-  output(dinfo, dinfo->EOFCode);

-  /* Flush the bit-packing buffer */

-  if (dinfo->cur_bits > 0) {

-    CHAR_OUT(dinfo, dinfo->cur_accum & 0xFF);

-  }

-  /* Flush the packet buffer */

-  flush_packet(dinfo);

-}

-

-

-/* GIF header construction */

-

-

-LOCAL(void)

-put_word (gif_dest_ptr dinfo, unsigned int w)

-/* Emit a 16-bit word, LSB first */

-{

-  putc(w & 0xFF, dinfo->pub.output_file);

-  putc((w >> 8) & 0xFF, dinfo->pub.output_file);

-}

-

-

-LOCAL(void)

-put_3bytes (gif_dest_ptr dinfo, int val)

-/* Emit 3 copies of same byte value --- handy subr for colormap construction */

-{

-  putc(val, dinfo->pub.output_file);

-  putc(val, dinfo->pub.output_file);

-  putc(val, dinfo->pub.output_file);

-}

-

-

-LOCAL(void)

-emit_header (gif_dest_ptr dinfo, int num_colors, JSAMPARRAY colormap)

-/* Output the GIF file header, including color map */

-/* If colormap==NULL, synthesize a grayscale colormap */

-{

-  int BitsPerPixel, ColorMapSize, InitCodeSize, FlagByte;

-  int cshift = dinfo->cinfo->data_precision - 8;

-  int i;

-

-  if (num_colors > 256)

-    ERREXIT1(dinfo->cinfo, JERR_TOO_MANY_COLORS, num_colors);

-  /* Compute bits/pixel and related values */

-  BitsPerPixel = 1;

-  while (num_colors > (1 << BitsPerPixel))

-    BitsPerPixel++;

-  ColorMapSize = 1 << BitsPerPixel;

-  if (BitsPerPixel <= 1)

-    InitCodeSize = 2;

-  else

-    InitCodeSize = BitsPerPixel;

-  /*

-   * Write the GIF header.

-   * Note that we generate a plain GIF87 header for maximum compatibility.

-   */

-  putc('G', dinfo->pub.output_file);

-  putc('I', dinfo->pub.output_file);

-  putc('F', dinfo->pub.output_file);

-  putc('8', dinfo->pub.output_file);

-  putc('7', dinfo->pub.output_file);

-  putc('a', dinfo->pub.output_file);

-  /* Write the Logical Screen Descriptor */

-  put_word(dinfo, (unsigned int) dinfo->cinfo->output_width);

-  put_word(dinfo, (unsigned int) dinfo->cinfo->output_height);

-  FlagByte = 0x80;		/* Yes, there is a global color table */

-  FlagByte |= (BitsPerPixel-1) << 4; /* color resolution */

-  FlagByte |= (BitsPerPixel-1);	/* size of global color table */

-  putc(FlagByte, dinfo->pub.output_file);

-  putc(0, dinfo->pub.output_file); /* Background color index */

-  putc(0, dinfo->pub.output_file); /* Reserved (aspect ratio in GIF89) */

-  /* Write the Global Color Map */

-  /* If the color map is more than 8 bits precision, */

-  /* we reduce it to 8 bits by shifting */

-  for (i=0; i < ColorMapSize; i++) {

-    if (i < num_colors) {

-      if (colormap != NULL) {

-	if (dinfo->cinfo->out_color_space == JCS_RGB) {

-	  /* Normal case: RGB color map */

-	  putc(GETJSAMPLE(colormap[0][i]) >> cshift, dinfo->pub.output_file);

-	  putc(GETJSAMPLE(colormap[1][i]) >> cshift, dinfo->pub.output_file);

-	  putc(GETJSAMPLE(colormap[2][i]) >> cshift, dinfo->pub.output_file);

-	} else {

-	  /* Grayscale "color map": possible if quantizing grayscale image */

-	  put_3bytes(dinfo, GETJSAMPLE(colormap[0][i]) >> cshift);

-	}

-      } else {

-	/* Create a grayscale map of num_colors values, range 0..255 */

-	put_3bytes(dinfo, (i * 255 + (num_colors-1)/2) / (num_colors-1));

-      }

-    } else {

-      /* fill out the map to a power of 2 */

-      put_3bytes(dinfo, 0);

-    }

-  }

-  /* Write image separator and Image Descriptor */

-  putc(',', dinfo->pub.output_file); /* separator */

-  put_word(dinfo, 0);		/* left/top offset */

-  put_word(dinfo, 0);

-  put_word(dinfo, (unsigned int) dinfo->cinfo->output_width); /* image size */

-  put_word(dinfo, (unsigned int) dinfo->cinfo->output_height);

-  /* flag byte: not interlaced, no local color map */

-  putc(0x00, dinfo->pub.output_file);

-  /* Write Initial Code Size byte */

-  putc(InitCodeSize, dinfo->pub.output_file);

-

-  /* Initialize for "compression" of image data */

-  compress_init(dinfo, InitCodeSize+1);

-}

-

-

-/*

- * Startup: write the file header.

- */

-

-METHODDEF(void)

-start_output_gif (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  gif_dest_ptr dest = (gif_dest_ptr) dinfo;

-

-  if (cinfo->quantize_colors)

-    emit_header(dest, cinfo->actual_number_of_colors, cinfo->colormap);

-  else

-    emit_header(dest, 256, (JSAMPARRAY) NULL);

-}

-

-

-/*

- * Write some pixel data.

- * In this module rows_supplied will always be 1.

- */

-

-METHODDEF(void)

-put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		JDIMENSION rows_supplied)

-{

-  gif_dest_ptr dest = (gif_dest_ptr) dinfo;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-

-  ptr = dest->pub.buffer[0];

-  for (col = cinfo->output_width; col > 0; col--) {

-    compress_pixel(dest, GETJSAMPLE(*ptr++));

-  }

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_output_gif (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  gif_dest_ptr dest = (gif_dest_ptr) dinfo;

-

-  /* Flush "compression" mechanism */

-  compress_term(dest);

-  /* Write a zero-length data block to end the series */

-  putc(0, dest->pub.output_file);

-  /* Write the GIF terminator mark */

-  putc(';', dest->pub.output_file);

-  /* Make sure we wrote the output file OK */

-  fflush(dest->pub.output_file);

-  if (ferror(dest->pub.output_file))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * The module selection routine for GIF format output.

- */

-

-GLOBAL(djpeg_dest_ptr)

-jinit_write_gif (j_decompress_ptr cinfo)

-{

-  gif_dest_ptr dest;

-

-  /* Create module interface object, fill in method pointers */

-  dest = (gif_dest_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(gif_dest_struct));

-  dest->cinfo = cinfo;		/* make back link for subroutines */

-  dest->pub.start_output = start_output_gif;

-  dest->pub.put_pixel_rows = put_pixel_rows;

-  dest->pub.finish_output = finish_output_gif;

-

-  if (cinfo->out_color_space != JCS_GRAYSCALE &&

-      cinfo->out_color_space != JCS_RGB)

-    ERREXIT(cinfo, JERR_GIF_COLORSPACE);

-

-  /* Force quantization if color or if > 8 bits input */

-  if (cinfo->out_color_space != JCS_GRAYSCALE || cinfo->data_precision > 8) {

-    /* Force quantization to at most 256 colors */

-    cinfo->quantize_colors = TRUE;

-    if (cinfo->desired_number_of_colors > 256)

-      cinfo->desired_number_of_colors = 256;

-  }

-

-  /* Calculate output image dimensions so we can allocate space */

-  jpeg_calc_output_dimensions(cinfo);

-

-  if (cinfo->output_components != 1) /* safety check: just one component? */

-    ERREXIT(cinfo, JERR_GIF_BUG);

-

-  /* Create decompressor output buffer. */

-  dest->pub.buffer = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, cinfo->output_width, (JDIMENSION) 1);

-  dest->pub.buffer_height = 1;

-

-  return &dest->pub;

-}

-

-#endif /* GIF_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/wrjpgcom.c b/plugins/AdvaImg/src/LibJPEG/wrjpgcom.c
deleted file mode 100644
index 66dccee636..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrjpgcom.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/*

- * wrjpgcom.c

- *

- * Copyright (C) 1994-1997, Thomas G. Lane.

- * Modified 2015 by Guido Vollbeding.

- * 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 a very simple stand-alone application that inserts

- * user-supplied text as a COM (comment) marker in a JFIF file.

- * This may be useful as an example of the minimum logic needed to parse

- * JPEG markers.

- */

-

-#define JPEG_CJPEG_DJPEG	/* to get the command-line config symbols */

-#include "jinclude.h"		/* get auto-config symbols, <stdio.h> */

-

-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc() */

-extern void * malloc ();

-#endif

-#include <ctype.h>		/* to declare isupper(), tolower() */

-#ifdef USE_SETMODE

-#include <fcntl.h>		/* to declare setmode()'s parameter macros */

-/* If you have setmode() but not <io.h>, just delete this line: */

-#include <io.h>			/* to declare setmode() */

-#endif

-

-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */

-#ifdef __MWERKS__

-#include <SIOUX.h>              /* Metrowerks needs this */

-#include <console.h>		/* ... and this */

-#endif

-#ifdef THINK_C

-#include <console.h>		/* Think declares it here */

-#endif

-#endif

-

-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */

-#define READ_BINARY	"r"

-#define WRITE_BINARY	"w"

-#else

-#ifdef VMS			/* VMS is very nonstandard */

-#define READ_BINARY	"rb", "ctx=stm"

-#define WRITE_BINARY	"wb", "ctx=stm"

-#else				/* standard ANSI-compliant case */

-#define READ_BINARY	"rb"

-#define WRITE_BINARY	"wb"

-#endif

-#endif

-

-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */

-#define EXIT_FAILURE  1

-#endif

-#ifndef EXIT_SUCCESS

-#ifdef VMS

-#define EXIT_SUCCESS  1		/* VMS is very nonstandard */

-#else

-#define EXIT_SUCCESS  0

-#endif

-#endif

-

-/* Reduce this value if your malloc() can't allocate blocks up to 64K.

- * On DOS, compiling in large model is usually a better solution.

- */

-

-#ifndef MAX_COM_LENGTH

-#define MAX_COM_LENGTH 65000L	/* must be <= 65533 in any case */

-#endif

-

-

-/*

- * These macros are used to read the input file and write the output file.

- * To reuse this code in another application, you might need to change these.

- */

-

-static FILE * infile;		/* input JPEG file */

-

-/* Return next input byte, or EOF if no more */

-#define NEXTBYTE()  getc(infile)

-

-static FILE * outfile;		/* output JPEG file */

-

-/* Emit an output byte */

-#define PUTBYTE(x)  putc((x), outfile)

-

-

-/* Error exit handler */

-#define ERREXIT(msg)  (fprintf(stderr, "%s\n", msg), exit(EXIT_FAILURE))

-

-

-/* Read one byte, testing for EOF */

-static int

-read_1_byte (void)

-{

-  int c;

-

-  c = NEXTBYTE();

-  if (c == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  return c;

-}

-

-/* Read 2 bytes, convert to unsigned int */

-/* All 2-byte quantities in JPEG markers are MSB first */

-static unsigned int

-read_2_bytes (void)

-{

-  int c1, c2;

-

-  c1 = NEXTBYTE();

-  if (c1 == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  c2 = NEXTBYTE();

-  if (c2 == EOF)

-    ERREXIT("Premature EOF in JPEG file");

-  return (((unsigned int) c1) << 8) + ((unsigned int) c2);

-}

-

-

-/* Routines to write data to output file */

-

-static void

-write_1_byte (int c)

-{

-  PUTBYTE(c);

-}

-

-static void

-write_2_bytes (unsigned int val)

-{

-  PUTBYTE((val >> 8) & 0xFF);

-  PUTBYTE(val & 0xFF);

-}

-

-static void

-write_marker (int marker)

-{

-  PUTBYTE(0xFF);

-  PUTBYTE(marker);

-}

-

-static void

-copy_rest_of_file (void)

-{

-  int c;

-

-  while ((c = NEXTBYTE()) != EOF)

-    PUTBYTE(c);

-}

-

-

-/*

- * JPEG markers consist of one or more 0xFF bytes, followed by a marker

- * code byte (which is not an FF).  Here are the marker codes of interest

- * in this program.  (See jdmarker.c for a more complete list.)

- */

-

-#define M_SOF0  0xC0		/* Start Of Frame N */

-#define M_SOF1  0xC1		/* N indicates which compression process */

-#define M_SOF2  0xC2		/* Only SOF0-SOF2 are now in common use */

-#define M_SOF3  0xC3

-#define M_SOF5  0xC5		/* NB: codes C4 and CC are NOT SOF markers */

-#define M_SOF6  0xC6

-#define M_SOF7  0xC7

-#define M_SOF9  0xC9

-#define M_SOF10 0xCA

-#define M_SOF11 0xCB

-#define M_SOF13 0xCD

-#define M_SOF14 0xCE

-#define M_SOF15 0xCF

-#define M_SOI   0xD8		/* Start Of Image (beginning of datastream) */

-#define M_EOI   0xD9		/* End Of Image (end of datastream) */

-#define M_SOS   0xDA		/* Start Of Scan (begins compressed data) */

-#define M_COM   0xFE		/* COMment */

-

-

-/*

- * Find the next JPEG marker and return its marker code.

- * We expect at least one FF byte, possibly more if the compressor used FFs

- * to pad the file.  (Padding FFs will NOT be replicated in the output file.)

- * There could also be non-FF garbage between markers.  The treatment of such

- * garbage is unspecified; we choose to skip over it but emit a warning msg.

- * NB: this routine must not be used after seeing SOS marker, since it will

- * not deal correctly with FF/00 sequences in the compressed image data...

- */

-

-static int

-next_marker (void)

-{

-  int c;

-  int discarded_bytes = 0;

-

-  /* Find 0xFF byte; count and skip any non-FFs. */

-  c = read_1_byte();

-  while (c != 0xFF) {

-    discarded_bytes++;

-    c = read_1_byte();

-  }

-  /* Get marker code byte, swallowing any duplicate FF bytes.  Extra FFs

-   * are legal as pad bytes, so don't count them in discarded_bytes.

-   */

-  do {

-    c = read_1_byte();

-  } while (c == 0xFF);

-

-  if (discarded_bytes != 0) {

-    fprintf(stderr, "Warning: garbage data found in JPEG file\n");

-  }

-

-  return c;

-}

-

-

-/*

- * Read the initial marker, which should be SOI.

- * For a JFIF file, the first two bytes of the file should be literally

- * 0xFF M_SOI.  To be more general, we could use next_marker, but if the

- * input file weren't actually JPEG at all, next_marker might read the whole

- * file and then return a misleading error message...

- */

-

-static int

-first_marker (void)

-{

-  int c1, c2;

-

-  c1 = NEXTBYTE();

-  c2 = NEXTBYTE();

-  if (c1 != 0xFF || c2 != M_SOI)

-    ERREXIT("Not a JPEG file");

-  return c2;

-}

-

-

-/*

- * Most types of marker are followed by a variable-length parameter segment.

- * This routine skips over the parameters for any marker we don't otherwise

- * want to process.

- * Note that we MUST skip the parameter segment explicitly in order not to

- * be fooled by 0xFF bytes that might appear within the parameter segment;

- * such bytes do NOT introduce new markers.

- */

-

-static void

-copy_variable (void)

-/* Copy an unknown or uninteresting variable-length marker */

-{

-  unsigned int length;

-

-  /* Get the marker parameter length count */

-  length = read_2_bytes();

-  write_2_bytes(length);

-  /* Length includes itself, so must be at least 2 */

-  if (length < 2)

-    ERREXIT("Erroneous JPEG marker length");

-  length -= 2;

-  /* Skip over the remaining bytes */

-  while (length > 0) {

-    write_1_byte(read_1_byte());

-    length--;

-  }

-}

-

-static void

-skip_variable (void)

-/* Skip over an unknown or uninteresting variable-length marker */

-{

-  unsigned int length;

-

-  /* Get the marker parameter length count */

-  length = read_2_bytes();

-  /* Length includes itself, so must be at least 2 */

-  if (length < 2)

-    ERREXIT("Erroneous JPEG marker length");

-  length -= 2;

-  /* Skip over the remaining bytes */

-  while (length > 0) {

-    (void) read_1_byte();

-    length--;

-  }

-}

-

-

-/*

- * Parse the marker stream until SOFn or EOI is seen;

- * copy data to output, but discard COM markers unless keep_COM is true.

- */

-

-static int

-scan_JPEG_header (int keep_COM)

-{

-  int marker;

-

-  /* Expect SOI at start of file */

-  if (first_marker() != M_SOI)

-    ERREXIT("Expected SOI marker first");

-  write_marker(M_SOI);

-

-  /* Scan miscellaneous markers until we reach SOFn. */

-  for (;;) {

-    marker = next_marker();

-    switch (marker) {

-      /* Note that marker codes 0xC4, 0xC8, 0xCC are not, and must not be,

-       * treated as SOFn.  C4 in particular is actually DHT.

-       */

-    case M_SOF0:		/* Baseline */

-    case M_SOF1:		/* Extended sequential, Huffman */

-    case M_SOF2:		/* Progressive, Huffman */

-    case M_SOF3:		/* Lossless, Huffman */

-    case M_SOF5:		/* Differential sequential, Huffman */

-    case M_SOF6:		/* Differential progressive, Huffman */

-    case M_SOF7:		/* Differential lossless, Huffman */

-    case M_SOF9:		/* Extended sequential, arithmetic */

-    case M_SOF10:		/* Progressive, arithmetic */

-    case M_SOF11:		/* Lossless, arithmetic */

-    case M_SOF13:		/* Differential sequential, arithmetic */

-    case M_SOF14:		/* Differential progressive, arithmetic */

-    case M_SOF15:		/* Differential lossless, arithmetic */

-      return marker;

-

-    case M_SOS:			/* should not see compressed data before SOF */

-      ERREXIT("SOS without prior SOFn");

-      break;

-

-    case M_EOI:			/* in case it's a tables-only JPEG stream */

-      return marker;

-

-    case M_COM:			/* Existing COM: conditionally discard */

-      if (keep_COM) {

-	write_marker(marker);

-	copy_variable();

-      } else {

-	skip_variable();

-      }

-      break;

-

-    default:			/* Anything else just gets copied */

-      write_marker(marker);

-      copy_variable();		/* we assume it has a parameter count... */

-      break;

-    }

-  } /* end loop */

-}

-

-

-/* Command line parsing code */

-

-static const char * progname;	/* program name for error messages */

-

-

-static void

-usage (void)

-/* complain about bad command line */

-{

-  fprintf(stderr, "wrjpgcom inserts a textual comment in a JPEG file.\n");

-  fprintf(stderr, "You can add to or replace any existing comment(s).\n");

-

-  fprintf(stderr, "Usage: %s [switches] ", progname);

-#ifdef TWO_FILE_COMMANDLINE

-  fprintf(stderr, "inputfile outputfile\n");

-#else

-  fprintf(stderr, "[inputfile]\n");

-#endif

-

-  fprintf(stderr, "Switches (names may be abbreviated):\n");

-  fprintf(stderr, "  -replace         Delete any existing comments\n");

-  fprintf(stderr, "  -comment \"text\"  Insert comment with given text\n");

-  fprintf(stderr, "  -cfile name      Read comment from named file\n");

-  fprintf(stderr, "Notice that you must put quotes around the comment text\n");

-  fprintf(stderr, "when you use -comment.\n");

-  fprintf(stderr, "If you do not give either -comment or -cfile on the command line,\n");

-  fprintf(stderr, "then the comment text is read from standard input.\n");

-  fprintf(stderr, "It can be multiple lines, up to %u characters total.\n",

-	  (unsigned int) MAX_COM_LENGTH);

-#ifndef TWO_FILE_COMMANDLINE

-  fprintf(stderr, "You must specify an input JPEG file name when supplying\n");

-  fprintf(stderr, "comment text from standard input.\n");

-#endif

-

-  exit(EXIT_FAILURE);

-}

-

-

-static int

-keymatch (char * arg, const char * keyword, int minchars)

-/* Case-insensitive matching of (possibly abbreviated) keyword switches. */

-/* keyword is the constant keyword (must be lower case already), */

-/* minchars is length of minimum legal abbreviation. */

-{

-  register int ca, ck;

-  register int nmatched = 0;

-

-  while ((ca = *arg++) != '\0') {

-    if ((ck = *keyword++) == '\0')

-      return 0;			/* arg longer than keyword, no good */

-    if (isupper(ca))		/* force arg to lcase (assume ck is already) */

-      ca = tolower(ca);

-    if (ca != ck)

-      return 0;			/* no good */

-    nmatched++;			/* count matched characters */

-  }

-  /* reached end of argument; fail if it's too short for unique abbrev */

-  if (nmatched < minchars)

-    return 0;

-  return 1;			/* A-OK */

-}

-

-

-/*

- * The main program.

- */

-

-int

-main (int argc, char **argv)

-{

-  int argn;

-  char * arg;

-  int keep_COM = 1;

-  char * comment_arg = NULL;

-  FILE * comment_file = NULL;

-  unsigned int comment_length = 0;

-  int marker;

-

-  /* On Mac, fetch a command line. */

-#ifdef USE_CCOMMAND

-  argc = ccommand(&argv);

-#endif

-

-  progname = argv[0];

-  if (progname == NULL || progname[0] == 0)

-    progname = "wrjpgcom";	/* in case C library doesn't provide it */

-

-  /* Parse switches, if any */

-  for (argn = 1; argn < argc; argn++) {

-    arg = argv[argn];

-    if (arg[0] != '-')

-      break;			/* not switch, must be file name */

-    arg++;			/* advance over '-' */

-    if (keymatch(arg, "replace", 1)) {

-      keep_COM = 0;

-    } else if (keymatch(arg, "cfile", 2)) {

-      if (++argn >= argc) usage();

-      if ((comment_file = fopen(argv[argn], "r")) == NULL) {

-	fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);

-	exit(EXIT_FAILURE);

-      }

-    } else if (keymatch(arg, "comment", 1)) {

-      if (++argn >= argc) usage();

-      comment_arg = argv[argn];

-      /* If the comment text starts with '"', then we are probably running

-       * under MS-DOG and must parse out the quoted string ourselves.  Sigh.

-       */

-      if (comment_arg[0] == '"') {

-	comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH);

-	if (comment_arg == NULL)

-	  ERREXIT("Insufficient memory");

-	if (strlen(argv[argn]+1) >= (size_t) MAX_COM_LENGTH) {

-	  fprintf(stderr, "Comment text may not exceed %u bytes\n",

-		  (unsigned int) MAX_COM_LENGTH);

-	  exit(EXIT_FAILURE);

-	}

-	strcpy(comment_arg, argv[argn]+1);

-	for (;;) {

-	  comment_length = (unsigned int) strlen(comment_arg);

-	  if (comment_length > 0 && comment_arg[comment_length-1] == '"') {

-	    comment_arg[comment_length-1] = '\0'; /* zap terminating quote */

-	    break;

-	  }

-	  if (++argn >= argc)

-	    ERREXIT("Missing ending quote mark");

-	  if (strlen(comment_arg) + 1 + strlen(argv[argn]) >=

-	      (size_t) MAX_COM_LENGTH) {

-	    fprintf(stderr, "Comment text may not exceed %u bytes\n",

-		    (unsigned int) MAX_COM_LENGTH);

-	    exit(EXIT_FAILURE);

-	  }

-	  strcat(comment_arg, " ");

-	  strcat(comment_arg, argv[argn]);

-	}

-      } else if (strlen(comment_arg) >= (size_t) MAX_COM_LENGTH) {

-	fprintf(stderr, "Comment text may not exceed %u bytes\n",

-		(unsigned int) MAX_COM_LENGTH);

-	exit(EXIT_FAILURE);

-      }

-      comment_length = (unsigned int) strlen(comment_arg);

-    } else

-      usage();

-  }

-

-  /* Cannot use both -comment and -cfile. */

-  if (comment_arg != NULL && comment_file != NULL)

-    usage();

-  /* If there is neither -comment nor -cfile, we will read the comment text

-   * from stdin; in this case there MUST be an input JPEG file name.

-   */

-  if (comment_arg == NULL && comment_file == NULL && argn >= argc)

-    usage();

-

-  /* Open the input file. */

-  if (argn < argc) {

-    if ((infile = fopen(argv[argn], READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);

-      exit(EXIT_FAILURE);

-    }

-  } else {

-    /* default input file is stdin */

-#ifdef USE_SETMODE		/* need to hack file mode? */

-    setmode(fileno(stdin), O_BINARY);

-#endif

-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */

-    if ((infile = fdopen(fileno(stdin), READ_BINARY)) == NULL) {

-      fprintf(stderr, "%s: can't open stdin\n", progname);

-      exit(EXIT_FAILURE);

-    }

-#else

-    infile = stdin;

-#endif

-  }

-

-  /* Open the output file. */

-#ifdef TWO_FILE_COMMANDLINE

-  /* Must have explicit output file name */

-  if (argn != argc-2) {

-    fprintf(stderr, "%s: must name one input and one output file\n",

-	    progname);

-    usage();

-  }

-  if ((outfile = fopen(argv[argn+1], WRITE_BINARY)) == NULL) {

-    fprintf(stderr, "%s: can't open %s\n", progname, argv[argn+1]);

-    exit(EXIT_FAILURE);

-  }

-#else

-  /* Unix style: expect zero or one file name */

-  if (argn < argc-1) {

-    fprintf(stderr, "%s: only one input file\n", progname);

-    usage();

-  }

-  /* default output file is stdout */

-#ifdef USE_SETMODE		/* need to hack file mode? */

-  setmode(fileno(stdout), O_BINARY);

-#endif

-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */

-  if ((outfile = fdopen(fileno(stdout), WRITE_BINARY)) == NULL) {

-    fprintf(stderr, "%s: can't open stdout\n", progname);

-    exit(EXIT_FAILURE);

-  }

-#else

-  outfile = stdout;

-#endif

-#endif /* TWO_FILE_COMMANDLINE */

-

-  /* Collect comment text from comment_file or stdin, if necessary */

-  if (comment_arg == NULL) {

-    FILE * src_file;

-    int c;

-

-    comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH);

-    if (comment_arg == NULL)

-      ERREXIT("Insufficient memory");

-    comment_length = 0;

-    src_file = (comment_file != NULL ? comment_file : stdin);

-    while ((c = getc(src_file)) != EOF) {

-      if (comment_length >= (unsigned int) MAX_COM_LENGTH) {

-	fprintf(stderr, "Comment text may not exceed %u bytes\n",

-		(unsigned int) MAX_COM_LENGTH);

-	exit(EXIT_FAILURE);

-      }

-      comment_arg[comment_length++] = (char) c;

-    }

-    if (comment_file != NULL)

-      fclose(comment_file);

-  }

-

-  /* Copy JPEG headers until SOFn marker;

-   * we will insert the new comment marker just before SOFn.

-   * This (a) causes the new comment to appear after, rather than before,

-   * existing comments; and (b) ensures that comments come after any JFIF

-   * or JFXX markers, as required by the JFIF specification.

-   */

-  marker = scan_JPEG_header(keep_COM);

-  /* Insert the new COM marker, but only if nonempty text has been supplied */

-  if (comment_length > 0) {

-    write_marker(M_COM);

-    write_2_bytes(comment_length + 2);

-    while (comment_length > 0) {

-      write_1_byte(*comment_arg++);

-      comment_length--;

-    }

-  }

-  /* Duplicate the remainder of the source file.

-   * Note that any COM markers occuring after SOF will not be touched.

-   */

-  write_marker(marker);

-  copy_rest_of_file();

-

-  /* All done. */

-  exit(EXIT_SUCCESS);

-  return 0;			/* suppress no-return-value warnings */

-}

diff --git a/plugins/AdvaImg/src/LibJPEG/wrppm.c b/plugins/AdvaImg/src/LibJPEG/wrppm.c
deleted file mode 100644
index 1e56d9c50e..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrppm.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*

- * wrppm.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2009 by Guido Vollbeding.

- * 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 routines to write output images in PPM/PGM format.

- * The extended 2-byte-per-sample raw PPM/PGM formats are supported.

- * The PBMPLUS library is NOT required to compile this software

- * (but it is highly useful as a set of PPM image manipulation programs).

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume output to

- * an ordinary stdio stream.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef PPM_SUPPORTED

-

-

-/*

- * For 12-bit JPEG data, we either downscale the values to 8 bits

- * (to write standard byte-per-sample PPM/PGM files), or output

- * nonstandard word-per-sample PPM/PGM files.  Downscaling is done

- * if PPM_NORAWWORD is defined (this can be done in the Makefile

- * or in jconfig.h).

- * (When the core library supports data precision reduction, a cleaner

- * implementation will be to ask for that instead.)

- */

-

-#if BITS_IN_JSAMPLE == 8

-#define PUTPPMSAMPLE(ptr,v)  *ptr++ = (char) (v)

-#define BYTESPERSAMPLE 1

-#define PPM_MAXVAL 255

-#else

-#ifdef PPM_NORAWWORD

-#define PUTPPMSAMPLE(ptr,v)  *ptr++ = (char) ((v) >> (BITS_IN_JSAMPLE-8))

-#define BYTESPERSAMPLE 1

-#define PPM_MAXVAL 255

-#else

-/* The word-per-sample format always puts the MSB first. */

-#define PUTPPMSAMPLE(ptr,v)			\

-	{ register int val_ = v;		\

-	  *ptr++ = (char) ((val_ >> 8) & 0xFF);	\

-	  *ptr++ = (char) (val_ & 0xFF);	\

-	}

-#define BYTESPERSAMPLE 2

-#define PPM_MAXVAL ((1<<BITS_IN_JSAMPLE)-1)

-#endif

-#endif

-

-

-/*

- * When JSAMPLE is the same size as char, we can just fwrite() the

- * decompressed data to the PPM or PGM file.  On PCs, in order to make this

- * work the output buffer must be allocated in near data space, because we are

- * assuming small-data memory model wherein fwrite() can't reach far memory.

- * If you need to process very wide images on a PC, you might have to compile

- * in large-memory model, or else replace fwrite() with a putc() loop ---

- * which will be much slower.

- */

-

-

-/* Private version of data destination object */

-

-typedef struct {

-  struct djpeg_dest_struct pub;	/* public fields */

-

-  /* Usually these two pointers point to the same place: */

-  char *iobuffer;		/* fwrite's I/O buffer */

-  JSAMPROW pixrow;		/* decompressor output buffer */

-  size_t buffer_width;		/* width of I/O buffer */

-  JDIMENSION samples_per_row;	/* JSAMPLEs per output row */

-} ppm_dest_struct;

-

-typedef ppm_dest_struct * ppm_dest_ptr;

-

-

-/*

- * Write some pixel data.

- * In this module rows_supplied will always be 1.

- *

- * put_pixel_rows handles the "normal" 8-bit case where the decompressor

- * output buffer is physically the same as the fwrite buffer.

- */

-

-METHODDEF(void)

-put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		JDIMENSION rows_supplied)

-{

-  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;

-

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-/*

- * This code is used when we have to copy the data and apply a pixel

- * format translation.  Typically this only happens in 12-bit mode.

- */

-

-METHODDEF(void)

-copy_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		 JDIMENSION rows_supplied)

-{

-  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;

-  register char * bufferptr;

-  register JSAMPROW ptr;

-  register JDIMENSION col;

-

-  ptr = dest->pub.buffer[0];

-  bufferptr = dest->iobuffer;

-  for (col = dest->samples_per_row; col > 0; col--) {

-    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(*ptr++));

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-/*

- * Write some pixel data when color quantization is in effect.

- * We have to demap the color index values to straight data.

- */

-

-METHODDEF(void)

-put_demapped_rgb (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		  JDIMENSION rows_supplied)

-{

-  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;

-  register char * bufferptr;

-  register int pixval;

-  register JSAMPROW ptr;

-  register JSAMPROW color_map0 = cinfo->colormap[0];

-  register JSAMPROW color_map1 = cinfo->colormap[1];

-  register JSAMPROW color_map2 = cinfo->colormap[2];

-  register JDIMENSION col;

-

-  ptr = dest->pub.buffer[0];

-  bufferptr = dest->iobuffer;

-  for (col = cinfo->output_width; col > 0; col--) {

-    pixval = GETJSAMPLE(*ptr++);

-    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map0[pixval]));

-    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map1[pixval]));

-    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map2[pixval]));

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-METHODDEF(void)

-put_demapped_gray (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		   JDIMENSION rows_supplied)

-{

-  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;

-  register char * bufferptr;

-  register JSAMPROW ptr;

-  register JSAMPROW color_map = cinfo->colormap[0];

-  register JDIMENSION col;

-

-  ptr = dest->pub.buffer[0];

-  bufferptr = dest->iobuffer;

-  for (col = cinfo->output_width; col > 0; col--) {

-    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map[GETJSAMPLE(*ptr++)]));

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-/*

- * Startup: write the file header.

- */

-

-METHODDEF(void)

-start_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;

-

-  /* Emit file header */

-  switch (cinfo->out_color_space) {

-  case JCS_GRAYSCALE:

-    /* emit header for raw PGM format */

-    fprintf(dest->pub.output_file, "P5\n%ld %ld\n%d\n",

-	    (long) cinfo->output_width, (long) cinfo->output_height,

-	    PPM_MAXVAL);

-    break;

-  case JCS_RGB:

-    /* emit header for raw PPM format */

-    fprintf(dest->pub.output_file, "P6\n%ld %ld\n%d\n",

-	    (long) cinfo->output_width, (long) cinfo->output_height,

-	    PPM_MAXVAL);

-    break;

-  default:

-    ERREXIT(cinfo, JERR_PPM_COLORSPACE);

-  }

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  /* Make sure we wrote the output file OK */

-  fflush(dinfo->output_file);

-  if (ferror(dinfo->output_file))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * The module selection routine for PPM format output.

- */

-

-GLOBAL(djpeg_dest_ptr)

-jinit_write_ppm (j_decompress_ptr cinfo)

-{

-  ppm_dest_ptr dest;

-

-  /* Create module interface object, fill in method pointers */

-  dest = (ppm_dest_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(ppm_dest_struct));

-  dest->pub.start_output = start_output_ppm;

-  dest->pub.finish_output = finish_output_ppm;

-

-  /* Calculate output image dimensions so we can allocate space */

-  jpeg_calc_output_dimensions(cinfo);

-

-  /* Create physical I/O buffer.  Note we make this near on a PC. */

-  dest->samples_per_row = cinfo->output_width * cinfo->out_color_components;

-  dest->buffer_width = dest->samples_per_row * (BYTESPERSAMPLE * SIZEOF(char));

-  dest->iobuffer = (char *) (*cinfo->mem->alloc_small)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, dest->buffer_width);

-

-  if (cinfo->quantize_colors || BITS_IN_JSAMPLE != 8 ||

-      SIZEOF(JSAMPLE) != SIZEOF(char)) {

-    /* When quantizing, we need an output buffer for colormap indexes

-     * that's separate from the physical I/O buffer.  We also need a

-     * separate buffer if pixel format translation must take place.

-     */

-    dest->pub.buffer = (*cinfo->mem->alloc_sarray)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE,

-       cinfo->output_width * cinfo->output_components, (JDIMENSION) 1);

-    dest->pub.buffer_height = 1;

-    if (! cinfo->quantize_colors)

-      dest->pub.put_pixel_rows = copy_pixel_rows;

-    else if (cinfo->out_color_space == JCS_GRAYSCALE)

-      dest->pub.put_pixel_rows = put_demapped_gray;

-    else

-      dest->pub.put_pixel_rows = put_demapped_rgb;

-  } else {

-    /* We will fwrite() directly from decompressor output buffer. */

-    /* Synthesize a JSAMPARRAY pointer structure */

-    /* Cast here implies near->far pointer conversion on PCs */

-    dest->pixrow = (JSAMPROW) dest->iobuffer;

-    dest->pub.buffer = & dest->pixrow;

-    dest->pub.buffer_height = 1;

-    dest->pub.put_pixel_rows = put_pixel_rows;

-  }

-

-  return (djpeg_dest_ptr) dest;

-}

-

-#endif /* PPM_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/wrrle.c b/plugins/AdvaImg/src/LibJPEG/wrrle.c
deleted file mode 100644
index 7a00c0dd11..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrrle.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/*

- * wrrle.c

- *

- * Copyright (C) 1991-1996, 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 routines to write output images in RLE format.

- * The Utah Raster Toolkit library is required (version 3.1 or later).

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume output to

- * an ordinary stdio stream.

- *

- * Based on code contributed by Mike Lijewski,

- * with updates from Robert Hutchinson.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef RLE_SUPPORTED

-

-/* rle.h is provided by the Utah Raster Toolkit. */

-

-#include <rle.h>

-

-/*

- * We assume that JSAMPLE has the same representation as rle_pixel,

- * to wit, "unsigned char".  Hence we can't cope with 12- or 16-bit samples.

- */

-

-#if BITS_IN_JSAMPLE != 8

-  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */

-#endif

-

-

-/*

- * Since RLE stores scanlines bottom-to-top, we have to invert the image

- * from JPEG's top-to-bottom order.  To do this, we save the outgoing data

- * in a virtual array during put_pixel_row calls, then actually emit the

- * RLE file during finish_output.

- */

-

-

-/*

- * For now, if we emit an RLE color map then it is always 256 entries long,

- * though not all of the entries need be used.

- */

-

-#define CMAPBITS	8

-#define CMAPLENGTH	(1<<(CMAPBITS))

-

-typedef struct {

-  struct djpeg_dest_struct pub; /* public fields */

-

-  jvirt_sarray_ptr image;	/* virtual array to store the output image */

-  rle_map *colormap;	 	/* RLE-style color map, or NULL if none */

-  rle_pixel **rle_row;		/* To pass rows to rle_putrow() */

-

-} rle_dest_struct;

-

-typedef rle_dest_struct * rle_dest_ptr;

-

-/* Forward declarations */

-METHODDEF(void) rle_put_pixel_rows

-    JPP((j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-	 JDIMENSION rows_supplied));

-

-

-/*

- * Write the file header.

- *

- * In this module it's easier to wait till finish_output to write anything.

- */

-

-METHODDEF(void)

-start_output_rle (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  rle_dest_ptr dest = (rle_dest_ptr) dinfo;

-  size_t cmapsize;

-  int i, ci;

-#ifdef PROGRESS_REPORT

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-#endif

-

-  /*

-   * Make sure the image can be stored in RLE format.

-   *

-   * - RLE stores image dimensions as *signed* 16 bit integers.  JPEG

-   *   uses unsigned, so we have to check the width.

-   *

-   * - Colorspace is expected to be grayscale or RGB.

-   *

-   * - The number of channels (components) is expected to be 1 (grayscale/

-   *   pseudocolor) or 3 (truecolor/directcolor).

-   *   (could be 2 or 4 if using an alpha channel, but we aren't)

-   */

-

-  if (cinfo->output_width > 32767 || cinfo->output_height > 32767)

-    ERREXIT2(cinfo, JERR_RLE_DIMENSIONS, cinfo->output_width, 

-	     cinfo->output_height);

-

-  if (cinfo->out_color_space != JCS_GRAYSCALE &&

-      cinfo->out_color_space != JCS_RGB)

-    ERREXIT(cinfo, JERR_RLE_COLORSPACE);

-

-  if (cinfo->output_components != 1 && cinfo->output_components != 3)

-    ERREXIT1(cinfo, JERR_RLE_TOOMANYCHANNELS, cinfo->num_components);

-

-  /* Convert colormap, if any, to RLE format. */

-

-  dest->colormap = NULL;

-

-  if (cinfo->quantize_colors) {

-    /* Allocate storage for RLE-style cmap, zero any extra entries */

-    cmapsize = cinfo->out_color_components * CMAPLENGTH * SIZEOF(rle_map);

-    dest->colormap = (rle_map *) (*cinfo->mem->alloc_small)

-      ((j_common_ptr) cinfo, JPOOL_IMAGE, cmapsize);

-    MEMZERO(dest->colormap, cmapsize);

-

-    /* Save away data in RLE format --- note 8-bit left shift! */

-    /* Shifting would need adjustment for JSAMPLEs wider than 8 bits. */

-    for (ci = 0; ci < cinfo->out_color_components; ci++) {

-      for (i = 0; i < cinfo->actual_number_of_colors; i++) {

-        dest->colormap[ci * CMAPLENGTH + i] =

-          GETJSAMPLE(cinfo->colormap[ci][i]) << 8;

-      }

-    }

-  }

-

-  /* Set the output buffer to the first row */

-  dest->pub.buffer = (*cinfo->mem->access_virt_sarray)

-    ((j_common_ptr) cinfo, dest->image, (JDIMENSION) 0, (JDIMENSION) 1, TRUE);

-  dest->pub.buffer_height = 1;

-

-  dest->pub.put_pixel_rows = rle_put_pixel_rows;

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL) {

-    progress->total_extra_passes++;  /* count file writing as separate pass */

-  }

-#endif

-}

-

-

-/*

- * Write some pixel data.

- *

- * This routine just saves the data away in a virtual array.

- */

-

-METHODDEF(void)

-rle_put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		    JDIMENSION rows_supplied)

-{

-  rle_dest_ptr dest = (rle_dest_ptr) dinfo;

-

-  if (cinfo->output_scanline < cinfo->output_height) {

-    dest->pub.buffer = (*cinfo->mem->access_virt_sarray)

-      ((j_common_ptr) cinfo, dest->image,

-       cinfo->output_scanline, (JDIMENSION) 1, TRUE);

-  }

-}

-

-/*

- * Finish up at the end of the file.

- *

- * Here is where we really output the RLE file.

- */

-

-METHODDEF(void)

-finish_output_rle (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  rle_dest_ptr dest = (rle_dest_ptr) dinfo;

-  rle_hdr header;		/* Output file information */

-  rle_pixel **rle_row, *red, *green, *blue;

-  JSAMPROW output_row;

-  char cmapcomment[80];

-  int row, col;

-  int ci;

-#ifdef PROGRESS_REPORT

-  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;

-#endif

-

-  /* Initialize the header info */

-  header = *rle_hdr_init(NULL);

-  header.rle_file = dest->pub.output_file;

-  header.xmin     = 0;

-  header.xmax     = cinfo->output_width  - 1;

-  header.ymin     = 0;

-  header.ymax     = cinfo->output_height - 1;

-  header.alpha    = 0;

-  header.ncolors  = cinfo->output_components;

-  for (ci = 0; ci < cinfo->output_components; ci++) {

-    RLE_SET_BIT(header, ci);

-  }

-  if (cinfo->quantize_colors) {

-    header.ncmap   = cinfo->out_color_components;

-    header.cmaplen = CMAPBITS;

-    header.cmap    = dest->colormap;

-    /* Add a comment to the output image with the true colormap length. */

-    sprintf(cmapcomment, "color_map_length=%d", cinfo->actual_number_of_colors);

-    rle_putcom(cmapcomment, &header);

-  }

-

-  /* Emit the RLE header and color map (if any) */

-  rle_put_setup(&header);

-

-  /* Now output the RLE data from our virtual array.

-   * We assume here that (a) rle_pixel is represented the same as JSAMPLE,

-   * and (b) we are not on a machine where FAR pointers differ from regular.

-   */

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL) {

-    progress->pub.pass_limit = cinfo->output_height;

-    progress->pub.pass_counter = 0;

-    (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-  }

-#endif

-

-  if (cinfo->output_components == 1) {

-    for (row = cinfo->output_height-1; row >= 0; row--) {

-      rle_row = (rle_pixel **) (*cinfo->mem->access_virt_sarray)

-        ((j_common_ptr) cinfo, dest->image,

-	 (JDIMENSION) row, (JDIMENSION) 1, FALSE);

-      rle_putrow(rle_row, (int) cinfo->output_width, &header);

-#ifdef PROGRESS_REPORT

-      if (progress != NULL) {

-        progress->pub.pass_counter++;

-        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-      }

-#endif

-    }

-  } else {

-    for (row = cinfo->output_height-1; row >= 0; row--) {

-      rle_row = (rle_pixel **) dest->rle_row;

-      output_row = * (*cinfo->mem->access_virt_sarray)

-        ((j_common_ptr) cinfo, dest->image,

-	 (JDIMENSION) row, (JDIMENSION) 1, FALSE);

-      red = rle_row[0];

-      green = rle_row[1];

-      blue = rle_row[2];

-      for (col = cinfo->output_width; col > 0; col--) {

-        *red++ = GETJSAMPLE(*output_row++);

-        *green++ = GETJSAMPLE(*output_row++);

-        *blue++ = GETJSAMPLE(*output_row++);

-      }

-      rle_putrow(rle_row, (int) cinfo->output_width, &header);

-#ifdef PROGRESS_REPORT

-      if (progress != NULL) {

-        progress->pub.pass_counter++;

-        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);

-      }

-#endif

-    }

-  }

-

-#ifdef PROGRESS_REPORT

-  if (progress != NULL)

-    progress->completed_extra_passes++;

-#endif

-

-  /* Emit file trailer */

-  rle_puteof(&header);

-  fflush(dest->pub.output_file);

-  if (ferror(dest->pub.output_file))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * The module selection routine for RLE format output.

- */

-

-GLOBAL(djpeg_dest_ptr)

-jinit_write_rle (j_decompress_ptr cinfo)

-{

-  rle_dest_ptr dest;

-

-  /* Create module interface object, fill in method pointers */

-  dest = (rle_dest_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-                                  SIZEOF(rle_dest_struct));

-  dest->pub.start_output = start_output_rle;

-  dest->pub.finish_output = finish_output_rle;

-

-  /* Calculate output image dimensions so we can allocate space */

-  jpeg_calc_output_dimensions(cinfo);

-

-  /* Allocate a work array for output to the RLE library. */

-  dest->rle_row = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE,

-     cinfo->output_width, (JDIMENSION) cinfo->output_components);

-

-  /* Allocate a virtual array to hold the image. */

-  dest->image = (*cinfo->mem->request_virt_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,

-     (JDIMENSION) (cinfo->output_width * cinfo->output_components),

-     cinfo->output_height, (JDIMENSION) 1);

-

-  return (djpeg_dest_ptr) dest;

-}

-

-#endif /* RLE_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibJPEG/wrtarga.c b/plugins/AdvaImg/src/LibJPEG/wrtarga.c
deleted file mode 100644
index a3b7475cf8..0000000000
--- a/plugins/AdvaImg/src/LibJPEG/wrtarga.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*

- * wrtarga.c

- *

- * Copyright (C) 1991-1996, Thomas G. Lane.

- * Modified 2015 by Guido Vollbeding.

- * 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 routines to write output images in Targa format.

- *

- * These routines may need modification for non-Unix environments or

- * specialized applications.  As they stand, they assume output to

- * an ordinary stdio stream.

- *

- * Based on code contributed by Lee Daniel Crocker.

- */

-

-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */

-

-#ifdef TARGA_SUPPORTED

-

-

-/*

- * To support 12-bit JPEG data, we'd have to scale output down to 8 bits.

- * This is not yet implemented.

- */

-

-#if BITS_IN_JSAMPLE != 8

-  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */

-#endif

-

-/*

- * The output buffer needs to be writable by fwrite().  On PCs, we must

- * allocate the buffer in near data space, because we are assuming small-data

- * memory model, wherein fwrite() can't reach far memory.  If you need to

- * process very wide images on a PC, you might have to compile in large-memory

- * model, or else replace fwrite() with a putc() loop --- which will be much

- * slower.

- */

-

-

-/* Private version of data destination object */

-

-typedef struct {

-  struct djpeg_dest_struct pub;	/* public fields */

-

-  char *iobuffer;		/* physical I/O buffer */

-  JDIMENSION buffer_width;	/* width of one row */

-} tga_dest_struct;

-

-typedef tga_dest_struct * tga_dest_ptr;

-

-

-LOCAL(void)

-write_header (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo, int num_colors)

-/* Create and write a Targa header */

-{

-  char targaheader[18];

-

-  /* Set unused fields of header to 0 */

-  MEMZERO(targaheader, SIZEOF(targaheader));

-

-  if (num_colors > 0) {

-    targaheader[1] = 1;		/* color map type 1 */

-    targaheader[5] = (char) (num_colors & 0xFF);

-    targaheader[6] = (char) (num_colors >> 8);

-    targaheader[7] = 24;	/* 24 bits per cmap entry */

-  }

-

-  targaheader[12] = (char) (cinfo->output_width & 0xFF);

-  targaheader[13] = (char) (cinfo->output_width >> 8);

-  targaheader[14] = (char) (cinfo->output_height & 0xFF);

-  targaheader[15] = (char) (cinfo->output_height >> 8);

-  targaheader[17] = 0x20;	/* Top-down, non-interlaced */

-

-  if (cinfo->out_color_space == JCS_GRAYSCALE) {

-    targaheader[2] = 3;		/* image type = uncompressed grayscale */

-    targaheader[16] = 8;	/* bits per pixel */

-  } else {			/* must be RGB */

-    if (num_colors > 0) {

-      targaheader[2] = 1;	/* image type = colormapped RGB */

-      targaheader[16] = 8;

-    } else {

-      targaheader[2] = 2;	/* image type = uncompressed RGB */

-      targaheader[16] = 24;

-    }

-  }

-

-  if (JFWRITE(dinfo->output_file, targaheader, 18) != (size_t) 18)

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * Write some pixel data.

- * In this module rows_supplied will always be 1.

- */

-

-METHODDEF(void)

-put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		JDIMENSION rows_supplied)

-/* used for unquantized full-color output */

-{

-  tga_dest_ptr dest = (tga_dest_ptr) dinfo;

-  register JSAMPROW inptr;

-  register char * outptr;

-  register JDIMENSION col;

-

-  inptr = dest->pub.buffer[0];

-  outptr = dest->iobuffer;

-  for (col = cinfo->output_width; col > 0; col--) {

-    outptr[0] = (char) GETJSAMPLE(inptr[2]); /* RGB to BGR order */

-    outptr[1] = (char) GETJSAMPLE(inptr[1]);

-    outptr[2] = (char) GETJSAMPLE(inptr[0]);

-    inptr += 3, outptr += 3;

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-METHODDEF(void)

-put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-	       JDIMENSION rows_supplied)

-/* used for grayscale OR quantized color output */

-{

-  tga_dest_ptr dest = (tga_dest_ptr) dinfo;

-  register JSAMPROW inptr;

-  register char * outptr;

-  register JDIMENSION col;

-

-  inptr = dest->pub.buffer[0];

-  outptr = dest->iobuffer;

-  for (col = cinfo->output_width; col > 0; col--) {

-    *outptr++ = (char) GETJSAMPLE(*inptr++);

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-/*

- * Write some demapped pixel data when color quantization is in effect.

- * For Targa, this is only applied to grayscale data.

- */

-

-METHODDEF(void)

-put_demapped_gray (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,

-		   JDIMENSION rows_supplied)

-{

-  tga_dest_ptr dest = (tga_dest_ptr) dinfo;

-  register JSAMPROW inptr;

-  register char * outptr;

-  register JSAMPROW color_map0 = cinfo->colormap[0];

-  register JDIMENSION col;

-

-  inptr = dest->pub.buffer[0];

-  outptr = dest->iobuffer;

-  for (col = cinfo->output_width; col > 0; col--) {

-    *outptr++ = (char) GETJSAMPLE(color_map0[GETJSAMPLE(*inptr++)]);

-  }

-  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);

-}

-

-

-/*

- * Startup: write the file header.

- */

-

-METHODDEF(void)

-start_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  tga_dest_ptr dest = (tga_dest_ptr) dinfo;

-  int num_colors, i;

-  FILE *outfile;

-

-  if (cinfo->out_color_space == JCS_GRAYSCALE) {

-    /* Targa doesn't have a mapped grayscale format, so we will */

-    /* demap quantized gray output.  Never emit a colormap. */

-    write_header(cinfo, dinfo, 0);

-    if (cinfo->quantize_colors)

-      dest->pub.put_pixel_rows = put_demapped_gray;

-    else

-      dest->pub.put_pixel_rows = put_gray_rows;

-  } else if (cinfo->out_color_space == JCS_RGB) {

-    if (cinfo->quantize_colors) {

-      /* We only support 8-bit colormap indexes, so only 256 colors */

-      num_colors = cinfo->actual_number_of_colors;

-      if (num_colors > 256)

-	ERREXIT1(cinfo, JERR_TOO_MANY_COLORS, num_colors);

-      write_header(cinfo, dinfo, num_colors);

-      /* Write the colormap.  Note Targa uses BGR byte order */

-      outfile = dest->pub.output_file;

-      for (i = 0; i < num_colors; i++) {

-	putc(GETJSAMPLE(cinfo->colormap[2][i]), outfile);

-	putc(GETJSAMPLE(cinfo->colormap[1][i]), outfile);

-	putc(GETJSAMPLE(cinfo->colormap[0][i]), outfile);

-      }

-      dest->pub.put_pixel_rows = put_gray_rows;

-    } else {

-      write_header(cinfo, dinfo, 0);

-      dest->pub.put_pixel_rows = put_pixel_rows;

-    }

-  } else {

-    ERREXIT(cinfo, JERR_TGA_COLORSPACE);

-  }

-}

-

-

-/*

- * Finish up at the end of the file.

- */

-

-METHODDEF(void)

-finish_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)

-{

-  /* Make sure we wrote the output file OK */

-  fflush(dinfo->output_file);

-  if (ferror(dinfo->output_file))

-    ERREXIT(cinfo, JERR_FILE_WRITE);

-}

-

-

-/*

- * The module selection routine for Targa format output.

- */

-

-GLOBAL(djpeg_dest_ptr)

-jinit_write_targa (j_decompress_ptr cinfo)

-{

-  tga_dest_ptr dest;

-

-  /* Create module interface object, fill in method pointers */

-  dest = (tga_dest_ptr)

-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				  SIZEOF(tga_dest_struct));

-  dest->pub.start_output = start_output_tga;

-  dest->pub.finish_output = finish_output_tga;

-

-  /* Calculate output image dimensions so we can allocate space */

-  jpeg_calc_output_dimensions(cinfo);

-

-  /* Create I/O buffer.  Note we make this near on a PC. */

-  dest->buffer_width = cinfo->output_width * cinfo->output_components;

-  dest->iobuffer = (char *)

-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-				(size_t) (dest->buffer_width * SIZEOF(char)));

-

-  /* Create decompressor output buffer. */

-  dest->pub.buffer = (*cinfo->mem->alloc_sarray)

-    ((j_common_ptr) cinfo, JPOOL_IMAGE, dest->buffer_width, (JDIMENSION) 1);

-  dest->pub.buffer_height = 1;

-

-  return &dest->pub;

-}

-

-#endif /* TARGA_SUPPORTED */

diff --git a/plugins/AdvaImg/src/LibPNG/ANNOUNCE b/plugins/AdvaImg/src/LibPNG/ANNOUNCE
deleted file mode 100644
index c25ca741dc..0000000000
--- a/plugins/AdvaImg/src/LibPNG/ANNOUNCE
+++ /dev/null
@@ -1,35 +0,0 @@
-Libpng 1.6.34 - September 29, 2017

-

-This is a public release of libpng, intended for use in production codes.

-

-Files available for download:

-

-Source files with LF line endings (for Unix/Linux) and with a

-"configure" script

-

-   libpng-1.6.34.tar.xz (LZMA-compressed, recommended)

-   libpng-1.6.34.tar.gz

-

-Source files with CRLF line endings (for Windows), without the

-"configure" script

-

-   lpng1634.7z  (LZMA-compressed, recommended)

-   lpng1634.zip

-

-Other information:

-

-   libpng-1.6.34-README.txt

-   libpng-1.6.34-LICENSE.txt

-   libpng-1.6.34-*.asc (armored detached GPG signatures)

-

-Changes since the last public release (1.6.33):

-  Removed contrib/pngsuite/i*.png; some of these were incorrect and caused

-    test failures.

-

-Send comments/corrections/commendations to png-mng-implement at lists.sf.net

-(subscription required; visit

-https://lists.sourceforge.net/lists/listinfo/png-mng-implement

-to subscribe)

-or to glennrp at users.sourceforge.net

-

-Glenn R-P

diff --git a/plugins/AdvaImg/src/LibPNG/CHANGES b/plugins/AdvaImg/src/LibPNG/CHANGES
deleted file mode 100644
index 80f4c771b5..0000000000
--- a/plugins/AdvaImg/src/LibPNG/CHANGES
+++ /dev/null
@@ -1,6051 +0,0 @@
-#if 0

-CHANGES - changes for libpng

-

-version 0.1 [March 29, 1995]

-  initial work-in-progress release

-

-version 0.2 [April 1, 1995]

-  added reader into png.h

-  fixed small problems in stub file

-

-version 0.3 [April 8, 1995]

-  added pull reader

-  split up pngwrite.c to several files

-  added pnglib.txt

-  added example.c

-  cleaned up writer, adding a few new transformations

-  fixed some bugs in writer

-  interfaced with zlib 0.5

-  added K&R support

-  added check for 64 KB blocks for 16 bit machines

-

-version 0.4 [April 26, 1995]

-  cleaned up code and commented code

-  simplified time handling into png_time

-  created png_color_16 and png_color_8 to handle color needs

-  cleaned up color type defines

-  fixed various bugs

-  made various names more consistent

-  interfaced with zlib 0.71

-  cleaned up zTXt reader and writer (using zlib's Reset functions)

-  split transformations into pngrtran.c and pngwtran.c

-

-version 0.5 [April 30, 1995]

-  interfaced with zlib 0.8

-  fixed many reading and writing bugs

-  saved using 3 spaces instead of tabs

-

-version 0.6 [May 1, 1995]

-  first beta release

-  added png_large_malloc() and png_large_free()

-  added png_size_t

-  cleaned up some compiler warnings

-  added png_start_read_image()

-

-version 0.7 [June 24, 1995]

-  cleaned up lots of bugs

-  finished dithering and other stuff

-  added test program

-  changed name from pnglib to libpng

-

-version 0.71 [June 26, 1995]

-  changed pngtest.png for zlib 0.93

-  fixed error in libpng.txt and example.c

-

-version 0.8 [August 20, 1995]

-  cleaned up some bugs

-  added png_set_filler()

-  split up pngstub.c into pngmem.c, pngio.c, and pngerror.c

-  added #define's to remove unwanted code

-  moved png_info_init() to png.c

-  added old_size into png_realloc()

-  added functions to manually set filtering and compression info

-  changed compression parameters based on image type

-  optimized filter selection code

-  added version info

-  changed external functions passing floats to doubles (k&r problems?)

-  put all the configurable stuff in pngconf.h

-  enabled png_set_shift to work with paletted images on read

-  added png_read_update_info() - updates info structure with transformations

-

-Version 0.81 [August, 1995]

-  incorporated Tim Wegner's medium model code (thanks, Tim)

-

-Version 0.82 [September, 1995]

-  [unspecified changes]

-

-Version 0.85 [December, 1995]

-  added more medium model code (almost everything's a far)

-  added i/o, error, and memory callback functions

-  fixed some bugs (16-bit, 4-bit interlaced, etc.)

-  added first run progressive reader (barely tested)

-

-Version 0.86 [January, 1996]

-  fixed bugs

-  improved documentation

-

-Version 0.87 [January, 1996]

-  fixed medium model bugs

-  fixed other bugs introduced in 0.85 and 0.86

-  added some minor documentation

-

-Version 0.88 [January, 1996]

-  fixed progressive bugs

-  replaced tabs with spaces

-  cleaned up documentation

-  added callbacks for read/write and warning/error functions

-

-Version 0.89 [June 5, 1996]

-  Added new initialization API to make libpng work better with shared libs

-    we now have png_create_read_struct(), png_create_write_struct(),

-    png_create_info_struct(), png_destroy_read_struct(), and

-    png_destroy_write_struct() instead of the separate calls to

-    malloc and png_read_init(), png_info_init(), and png_write_init()

-  Changed warning/error callback functions to fix bug - this means you

-    should use the new initialization API if you were using the old

-    png_set_message_fn() calls, and that the old API no longer exists

-    so that people are aware that they need to change their code

-  Changed filter selection API to allow selection of multiple filters

-    since it didn't work in previous versions of libpng anyways

-  Optimized filter selection code

-  Fixed png_set_background() to allow using an arbitrary RGB color for

-    paletted images

-  Fixed gamma and background correction for paletted images, so

-    png_correct_palette is not needed unless you are correcting an

-    external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED

-    in pngconf.h) - if nobody uses this, it may disappear in the future.

-  Fixed bug with Borland 64K memory allocation (Alexander Lehmann)

-  Fixed bug in interlace handling (Smarasderagd, I think)

-  Added more error checking for writing and image to reduce invalid files

-  Separated read and write functions so that they won't both be linked

-    into a binary when only reading or writing functionality is used

-  New pngtest image also has interlacing and zTXt

-  Updated documentation to reflect new API

-

-Version 0.89c [June 17, 1996]

-  Bug fixes.

-

-Version 0.90 [January, 1997]

-  Made CRC errors/warnings on critical and ancillary chunks configurable

-  libpng will use the zlib CRC routines by (compile-time) default

-  Changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)

-  Added external C++ wrapper statements to png.h (Gilles Dauphin)

-  Allow PNG file to be read when some or all of file signature has already

-    been read from the beginning of the stream.  ****This affects the size

-    of info_struct and invalidates all programs that use a shared libpng****

-  Fixed png_filler() declarations

-  Fixed? background color conversions

-  Fixed order of error function pointers to match documentation

-  Current chunk name is now available in png_struct to reduce the number

-    of nearly identical error messages (will simplify multi-lingual

-    support when available)

-  Try to get ready for unknown-chunk callback functions:

-    - previously read critical chunks are flagged, so the chunk handling

-      routines can determine if the chunk is in the right place

-    - all chunk handling routines have the same prototypes, so we will

-      be able to handle all chunks via a callback mechanism

-  Try to fix Linux "setjmp" buffer size problems

-  Removed png_large_malloc, png_large_free, and png_realloc functions.

-

-Version 0.95 [March, 1997]

-  Fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never

-  Fixed bug in PNG file signature compares when start != 0

-  Changed parameter type of png_set_filler(...filler...) from png_byte

-    to png_uint_32

-  Added test for MACOS to ensure that both math.h and fp.h are not #included

-  Added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)

-  Added "packswap" transformation, which changes the endianness of

-    packed-pixel bytes (Kevin Bracey)

-  Added "strip_alpha" transformation, which removes the alpha channel of

-    input images without using it (not necessarily a good idea)

-  Added "swap_alpha" transformation, which puts the alpha channel in front

-    of the color bytes instead of after

-  Removed all implicit variable tests which assume NULL == 0 (I think)

-  Changed several variables to "png_size_t" to show 16/32-bit limitations

-  Added new pCAL chunk read/write support

-  Added experimental filter selection weighting (Greg Roelofs)

-  Removed old png_set_rgbx() and png_set_xrgb() functions that have been

-    obsolete for about 2 years now (use png_set_filler() instead)

-  Added macros to read 16- and 32-bit ints directly from buffer, to be

-    used only on those systems that support it (namely PowerPC and 680x0)

-    With some testing, this may become the default for MACOS/PPC systems.

-  Only calculate CRC on data if we are going to use it

-  Added macros for zTXt compression type PNG_zTXt_COMPRESSION_???

-  Added macros for simple libpng debugging output selectable at compile time

-  Removed PNG_READ_END_MODE in progressive reader (Smarasderagd)

-  More description of info_struct in libpng.txt and png.h

-  More instructions in example.c

-  More chunk types tested in pngtest.c

-  Renamed pngrcb.c to pngset.c, and all png_read_<chunk> functions to be

-    png_set_<chunk>.  We now have corresponding png_get_<chunk>

-    functions in pngget.c to get information in info_ptr.  This isolates

-    the application from the internal organization of png_info_struct

-    (good for shared library implementations).

-

-Version 0.96 [May, 1997]

-  Fixed serious bug with < 8bpp images introduced in 0.95

-  Fixed 256-color transparency bug (Greg Roelofs)

-  Fixed up documentation (Greg Roelofs, Laszlo Nyul)

-  Fixed "error" in pngconf.h for Linux setjmp() behavior

-  Fixed DOS medium model support (Tim Wegner)

-  Fixed png_check_keyword() for case with error in static string text

-  Added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)

-  Added typecasts to quiet compiler errors

-  Added more debugging info

-

-Version 0.97 [January, 1998]

-  Removed PNG_USE_OWN_CRC capability

-  Relocated png_set_crc_action from pngrutil.c to pngrtran.c

-  Fixed typecasts of "new_key", etc. (Andreas Dilger)

-  Added RFC 1152 [sic] date support

-  Fixed bug in gamma handling of 4-bit grayscale

-  Added 2-bit grayscale gamma handling (Glenn R-P)

-  Added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)

-  Minor corrections in libpng.txt

-  Added simple sRGB support (Glenn R-P)

-  Easier conditional compiling, e.g.,

-    define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;

-    all configurable options can be selected from command-line instead

-    of having to edit pngconf.h (Glenn R-P)

-  Fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)

-  Added more conditions for png_do_background, to avoid changing

-    black pixels to background when a background is supplied and

-    no pixels are transparent

-  Repaired PNG_NO_STDIO behavior

-  Tested NODIV support and made it default behavior (Greg Roelofs)

-  Added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)

-  Regularized version numbering scheme and bumped shared-library major

-    version number to 2 to avoid problems with libpng 0.89 apps

-    (Greg Roelofs)

-

-Version 0.98 [January, 1998]

-  Cleaned up some typos in libpng.txt and in code documentation

-  Fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)

-  Cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c

-  Changed recommendation about file_gamma for PC images to .51 from .45,

-    in example.c and libpng.txt, added comments to distinguish between

-    screen_gamma, viewing_gamma, and display_gamma.

-  Changed all references to RFC1152 to read RFC1123 and changed the

-    PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED

-  Added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)

-  Changed srgb_intent from png_byte to int to avoid compiler bugs

-

-Version 0.99 [January 30, 1998]

-  Free info_ptr->text instead of end_info_ptr->text in pngread.c (John Bowler)

-  Fixed a longstanding "packswap" bug in pngtrans.c

-  Fixed some inconsistencies in pngconf.h that prevented compiling with

-    PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined

-  Fixed some typos and made other minor rearrangement of libpng.txt (Andreas)

-  Changed recommendation about file_gamma for PC images to .50 from .51 in

-    example.c and libpng.txt, and changed file_gamma for sRGB images to .45

-  Added a number of functions to access information from the png structure

-    png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)

-  Added TARGET_MACOS similar to zlib-1.0.8

-  Define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined

-  Added type casting to all png_malloc() function calls

-

-Version 0.99a [January 31, 1998]

-  Added type casts and parentheses to all returns that return a value.(Tim W.)

-

-Version 0.99b [February 4, 1998]

-  Added type cast png_uint_32 on malloc function calls where needed.

-  Changed type of num_hist from png_uint_32 to int (same as num_palette).

-  Added checks for rowbytes overflow, in case png_size_t is less than 32 bits.

-  Renamed makefile.elf to makefile.lnx.

-

-Version 0.99c [February 7, 1998]

-  More type casting.  Removed erroneous overflow test in pngmem.c.

-  Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes.

-  Added UNIX manual pages libpng.3 (incorporating libpng.txt) and  png.5.

-

-Version 0.99d [February 11, 1998]

-  Renamed "far_to_near()" "png_far_to_near()"

-  Revised libpng.3

-  Version 99c "buffered" operations didn't work as intended.  Replaced them

-    with png_memcpy_check() and png_memset_check().

-  Added many "if (png_ptr == NULL) return" to quell compiler warnings about

-    unused png_ptr, mostly in pngget.c and pngset.c.

-  Check for overlength tRNS chunk present when indexed-color PLTE is read.

-  Cleaned up spelling errors in libpng.3/libpng.txt

-  Corrected a problem with png_get_tRNS() which returned undefined trans array

-

-Version 0.99e [February 28, 1998]

-  Corrected png_get_tRNS() again.

-  Add parentheses for easier reading of pngget.c, fixed "||" should be "&&".

-  Touched up example.c to make more of it compileable, although the entire

-    file still can't be compiled (Willem van Schaik)

-  Fixed a bug in png_do_shift() (Bryan Tsai)

-  Added a space in png.h prototype for png_write_chunk_start()

-  Replaced pngtest.png with one created with zlib 1.1.1

-  Changed pngtest to report PASS even when file size is different (Jean-loup G.)

-  Corrected some logic errors in png_do_invert_alpha() (Chris Patterson)

-

-Version 0.99f [March 5, 1998]

-  Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey)

-  Moved makefiles into a "scripts" directory, and added INSTALL instruction file

-  Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok)

-  Added pointers to "note on libpng versions" in makefile.lnx and README

-  Added row callback feature when reading and writing nonprogressive rows

-    and added a test of this feature in pngtest.c

-  Added user transform callbacks, with test of the feature in pngtest.c

-

-Version 0.99g [March 6, 1998, morning]

-  Minor changes to pngtest.c to suppress compiler warnings.

-  Removed "beta" language from documentation.

-

-Version 0.99h [March 6, 1998, evening]

-  Minor changes to previous minor changes to pngtest.c

-  Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED

-    and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro

-  Added user transform capability

-

-Version 1.00 [March 7, 1998]

-  Changed several typedefs in pngrutil.c

-  Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)

-  Replaced "while(1)" with "for(;;)"

-  Added PNGARG() to prototypes in pngtest.c and removed some prototypes

-  Updated some of the makefiles (Tom Lane)

-  Changed some typedefs (s_start, etc.) in pngrutil.c

-  Fixed dimensions of "short_months" array in pngwrite.c

-  Replaced ansi2knr.c with the one from jpeg-v6

-

-Version 1.0.0 [March 8, 1998]

-  Changed name from 1.00 to 1.0.0 (Adam Costello)

-  Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert)

-

-Version 1.0.0a [March 9, 1998]

-  Fixed three bugs in pngrtran.c to make gamma+background handling consistent

-    (Greg Roelofs)

-  Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz

-    for major, minor, and bugfix releases.  This is 10001. (Adam Costello,

-    Tom Lane)

-  Make months range from 1-12 in png_convert_to_rfc1123

-

-Version 1.0.0b [March 13, 1998]

-  Quieted compiler complaints about two empty "for" loops in pngrutil.c

-  Minor changes to makefile.s2x

-  Removed #ifdef/#endif around a png_free() in pngread.c

-

-Version 1.0.1 [March 14, 1998]

-  Changed makefile.s2x to reduce security risk of using a relative pathname

-  Fixed some typos in the documentation (Greg).

-  Fixed a problem with value of "channels" returned by png_read_update_info()

-

-Version 1.0.1a [April 21, 1998]

-  Optimized Paeth calculations by replacing abs() function calls with intrinsics

-  plus other loop optimizations. Improves avg decoding speed by about 20%.

-  Commented out i386istic "align" compiler flags in makefile.lnx.

-  Reduced the default warning level in some makefiles, to make them consistent.

-  Removed references to IJG and JPEG in the ansi2knr.c copyright statement.

-  Fixed a bug in png_do_strip_filler with XXRRGGBB => RRGGBB transformation.

-  Added grayscale and 16-bit capability to png_do_read_filler().

-  Fixed a bug in pngset.c, introduced in version 0.99c, that sets rowbytes

-    too large when writing an image with bit_depth < 8 (Bob Dellaca).

-  Corrected some bugs in the experimental weighted filtering heuristics.

-  Moved a misplaced pngrutil code block that truncates tRNS if it has more

-    than num_palette entries -- test was done before num_palette was defined.

-  Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins).

-  Changed compiler flags in makefile.wat for better optimization

-    (Pawel Mrochen).

-

-Version 1.0.1b [May 2, 1998]

-  Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg).

-  Relocated the png_composite macros from pngrtran.c to png.h (Greg).

-  Added makefile.sco (contributed by Mike Hopkirk).

-  Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a.

-  Fixed a bug in pngrtran.c that would set channels=5 under some circumstances.

-  More work on the Paeth-filtering, achieving imperceptible speedup

-    (A Kleinert).

-  More work on loop optimization which may help when compiled with C++

-    compilers.

-  Added warnings when people try to use transforms they've defined out.

-  Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran.

-  Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg)

-

-Version 1.0.1c [May 11, 1998]

-  Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for

-    filler bytes should have been 0xff instead of 0xf.

-  Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images.

-  Moved PNG_WRITE_WEIGHTED_FILTER_SUPPORTED and PNG_WRITE_FLUSH_SUPPORTED

-    out of the PNG_WRITE_TRANSFORMS_NOT_SUPPORTED block of pngconf.h

-  Added "PNG_NO_WRITE_TRANSFORMS" etc., as alternatives for *_NOT_SUPPORTED,

-    for consistency, in pngconf.h

-  Added individual "ifndef PNG_NO_[CAPABILITY]" in pngconf.h to make it easier

-    to remove unwanted capabilities via the compile line

-  Made some corrections to grammar (which, it's) in documentation (Greg).

-  Corrected example.c, use of row_pointers in png_write_image().

-

-Version 1.0.1d [May 24, 1998]

-  Corrected several statements that used side effects illegally in pngrutil.c

-    and pngtrans.c, that were introduced in version 1.0.1b

-  Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert)

-  More corrections to example.c, use of row_pointers in png_write_image()

-    and png_read_rows().

-  Added pngdll.mak and pngdef.pas to scripts directory, contributed by

-    Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5

-  Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.)

-  Changed several loops from count-down to count-up, for consistency.

-

-Version 1.0.1e [June 6, 1998]

-  Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and

-    added warnings when people try to set png_read_fn and png_write_fn in

-    the same structure.

-  Added a test such that png_do_gamma will be done when num_trans==0

-    for truecolor images that have defined a background.  This corrects an

-    error that was introduced in libpng-0.90 that can cause gamma processing

-    to be skipped.

-  Added tests in png.h to include "trans" and "trans_values" in structures

-    when PNG_READ_BACKGROUND_SUPPORTED or PNG_READ_EXPAND_SUPPORTED is defined.

-  Add png_free(png_ptr->time_buffer) in png_destroy_read_struct()

-  Moved png_convert_to_rfc_1123() from pngwrite.c to png.c

-  Added capability for user-provided malloc_fn() and free_fn() functions,

-    and revised pngtest.c to demonstrate their use, replacing the

-    PNGTEST_DEBUG_MEM feature.

-  Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner).

-

-Version 1.0.2 [June 14, 1998]

-  Fixed two bugs in makefile.bor .

-

-Version 1.0.2a [December 30, 1998]

-  Replaced and extended code that was removed from png_set_filler() in 1.0.1a.

-  Fixed a bug in png_do_filler() that made it fail to write filler bytes in

-    the left-most pixel of each row (Kevin Bracey).

-  Changed "static pngcharp tIME_string" to "static char tIME_string[30]"

-    in pngtest.c (Duncan Simpson).

-  Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk

-    even when no tIME chunk was present in the source file.

-  Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit.

-  Fixed a problem in png_read_push_finish_row(), which would not skip some

-    passes that it should skip, for images that are less than 3 pixels high.

-  Interchanged the order of calls to png_do_swap() and png_do_shift()

-    in pngwtran.c (John Cromer).

-  Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h .

-  Changed "bad adaptive filter type" from error to warning in pngrutil.c .

-  Fixed a documentation error about default filtering with 8-bit indexed-color.

-  Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO

-    (L. Peter Deutsch).

-  Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions.

-  Added png_get_copyright() and png_get_header_version() functions.

-  Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c

-  Added information about debugging in libpng.txt and libpng.3 .

-  Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and

-    makefile.sco.

-  Removed lines after Dynamic Dependencies" in makefile.aco .

-  Revised makefile.dec to make a shared library (Jeremie Petit).

-  Removed trailing blanks from all files.

-

-Version 1.0.2a [January 6, 1999]

-  Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h

-  Added "if" tests to silence complaints about unused png_ptr in png.h and png.c

-  Changed "check_if_png" function in example.c to return true (nonzero) if PNG.

-  Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()

-    which is obsolete.

-

-Version 1.0.3 [January 14, 1999]

-  Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)

-  Added a statement of Y2K compliance in png.h, libpng.3, and Y2KINFO.

-

-Version 1.0.3a [August 12, 1999]

-  Added check for PNG_READ_INTERLACE_SUPPORTED in pngread.c; issue a warning

-    if an attempt is made to read an interlaced image when it's not supported.

-  Added check if png_ptr->trans is defined before freeing it in pngread.c

-  Modified the Y2K statement to include versions back to version 0.71

-  Fixed a bug in the check for valid IHDR bit_depth/color_types in pngrutil.c

-  Modified makefile.wat (added -zp8 flag, ".symbolic", changed some comments)

-  Replaced leading blanks with tab characters in makefile.hux

-  Changed "dworkin.wustl.edu" to "ccrc.wustl.edu" in various documents.

-  Changed (float)red and (float)green to (double)red, (double)green

-    in png_set_rgb_to_gray() to avoid "promotion" problems in AIX.

-  Fixed a bug in pngconf.h that omitted <stdio.h> when PNG_DEBUG==0 (K Bracey).

-  Reformatted libpng.3 and libpngpf.3 with proper fonts (script by J. vanZandt).

-  Updated documentation to refer to the PNG-1.2 specification.

-  Removed ansi2knr.c and left pointers to the latest source for ansi2knr.c

-    in makefile.knr, INSTALL, and README (L. Peter Deutsch)

-  Fixed bugs in calculation of the length of rowbytes when adding alpha

-    channels to 16-bit images, in pngrtran.c (Chris Nokleberg)

-  Added function png_set_user_transform_info() to store user_transform_ptr,

-    user_depth, and user_channels into the png_struct, and a function

-    png_get_user_transform_ptr() to retrieve the pointer (Chris Nokleberg)

-  Added function png_set_empty_plte_permitted() to make libpng useable

-    in MNG applications.

-  Corrected the typedef for png_free_ptr in png.h (Jesse Jones).

-  Correct gamma with srgb is 45455 instead of 45000 in pngrutil.c, to be

-    consistent with PNG-1.2, and allow variance of 500 before complaining.

-  Added assembler code contributed by Intel in file pngvcrd.c and modified

-    makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation,

-    Gilles Vollant)

-  Changed "ln -s -f" to "ln -f -s" in the makefiles to make Solaris happy.

-  Added some aliases for png_set_expand() in pngrtran.c, namely

-    png_set_expand_PLTE(), png_set_expand_depth(), and png_set_expand_tRNS()

-    (Greg Roelofs, in "PNG: The Definitive Guide").

-  Added makefile.beo for BEOS on X86, contributed by Sander Stok.

-

-Version 1.0.3b [August 26, 1999]

-  Replaced 2147483647L several places with PNG_MAX_UINT macro, defined in png.h

-  Changed leading blanks to tabs in all makefiles.

-  Define PNG_USE_PNGVCRD in makefile.w32, to get MMX assembler code.

-  Made alternate versions of  png_set_expand() in pngrtran.c, namely

-    png_set_gray_1_2_4_to_8, png_set_palette_to_rgb, and png_set_tRNS_to_alpha

-    (Greg Roelofs, in "PNG: The Definitive Guide").  Deleted the 1.0.3a aliases.

-  Relocated start of 'extern "C"' block in png.h so it doesn't include pngconf.h

-  Revised calculation of num_blocks in pngmem.c to avoid a potentially

-    negative shift distance, whose results are undefined in the C language.

-  Added a check in pngset.c to prevent writing multiple tIME chunks.

-  Added a check in pngwrite.c to detect invalid small window_bits sizes.

-

-Version 1.0.3d [September 4, 1999]

-  Fixed type casting of igamma in pngrutil.c

-  Added new png_expand functions to scripts/pngdef.pas and pngos2.def

-  Added a demo read_user_transform_fn that examines the row filters in pngtest.c

-

-Version 1.0.4 [September 24, 1999, not distributed publicly]

-  Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined

-  Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h

-  Made several minor corrections to pngtest.c

-  Renamed the makefiles with longer but more user friendly extensions.

-  Copied the PNG copyright and license to a separate LICENSE file.

-  Revised documentation, png.h, and example.c to remove reference to

-    "viewing_gamma" which no longer appears in the PNG specification.

-  Revised pngvcrd.c to use MMX code for interlacing only on the final pass.

-  Updated pngvcrd.c to use the faster C filter algorithms from libpng-1.0.1a

-  Split makefile.win32vc into two versions, makefile.vcawin32 (uses MMX

-    assembler code) and makefile.vcwin32 (doesn't).

-  Added a CPU timing report to pngtest.c (enabled by defining PNGTEST_TIMING)

-  Added a copy of pngnow.png to the distribution.

-

-Version 1.0.4a [September 25, 1999]

-  Increase max_pixel_depth in pngrutil.c if a user transform needs it.

-  Changed several division operations to right-shifts in pngvcrd.c

-

-Version 1.0.4b [September 30, 1999]

-  Added parentheses in line 3732 of pngvcrd.c

-  Added a comment in makefile.linux warning about buggy -O3 in pgcc 2.95.1

-

-Version 1.0.4c [October 1, 1999]

-  Added a "png_check_version" function in png.c and pngtest.c that will generate

-    a helpful compiler error if an old png.h is found in the search path.

-  Changed type of png_user_transform_depth|channels from int to png_byte.

-  Added "Libpng is OSI Certified Open Source Software" statement to png.h

-

-Version 1.0.4d [October 6, 1999]

-  Changed 0.45 to 0.45455 in png_set_sRGB()

-  Removed unused PLTE entries from pngnow.png

-  Re-enabled some parts of pngvcrd.c (png_combine_row) that work properly.

-

-Version 1.0.4e [October 10, 1999]

-  Fixed sign error in pngvcrd.c (Greg Roelofs)

-  Replaced some instances of memcpy with simple assignments in pngvcrd (GR-P)

-

-Version 1.0.4f [October 15, 1999]

-  Surrounded example.c code with #if 0 .. #endif to prevent people from

-    inadvertently trying to compile it.

-  Changed png_get_header_version() from a function to a macro in png.h

-  Added type casting mostly in pngrtran.c and pngwtran.c

-  Removed some pointless "ptr = NULL" in pngmem.c

-  Added a "contrib" directory containing the source code from Greg's book.

-

-Version 1.0.5 [October 15, 1999]

-  Minor editing of the INSTALL and README files.

-

-Version 1.0.5a [October 23, 1999]

-  Added contrib/pngsuite and contrib/pngminus (Willem van Schaik)

-  Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans)

-  Further optimization and bugfix of pngvcrd.c

-  Revised pngset.c so that it does not allocate or free memory in the user's

-    text_ptr structure.  Instead, it makes its own copy.

-  Created separate write_end_info_struct in pngtest.c for a more severe test.

-  Added code in pngwrite.c to free info_ptr->text[i].key to stop a memory leak.

-

-Version 1.0.5b [November 23, 1999]

-  Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and

-    PNG_FLAG_WROTE_tIME from flags to mode.

-  Added png_write_info_before_PLTE() function.

-  Fixed some typecasting in contrib/gregbook/*.c

-  Updated scripts/makevms.com and added makevms.com to contrib/gregbook

-    and contrib/pngminus (Martin Zinser)

-

-Version 1.0.5c [November 26, 1999]

-  Moved png_get_header_version from png.h to png.c, to accommodate ansi2knr.

-  Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to

-    accommodate making DLL's: Moved usr_png_ver from global variable to function

-    png_get_header_ver() in png.c.  Moved png_sig to png_sig_bytes in png.c and

-    eliminated use of png_sig in pngwutil.c.  Moved the various png_CHNK arrays

-    into pngtypes.h.  Eliminated use of global png_pass arrays.  Declared the

-    png_CHNK and png_pass arrays to be "const".  Made the global arrays

-    available to applications (although none are used in libpng itself) when

-    PNG_NO_GLOBAL_ARRAYS is not defined or when PNG_GLOBAL_ARRAYS is defined.

-  Removed some extraneous "-I" from contrib/pngminus/makefile.std

-  Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2.

-  Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3

-

-Version 1.0.5d [November 29, 1999]

-  Add type cast (png_const_charp) two places in png.c

-  Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays.

-  Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available

-    to applications a macro "PNG_USE_LOCAL_ARRAYS".

-  comment out (with #ifdef) all the new declarations when

-    PNG_USE_GLOBAL_ARRAYS is defined.

-  Added PNG_EXPORT_VAR macro to accommodate making DLL's.

-

-Version 1.0.5e [November 30, 1999]

-  Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text

-    structure; refactored the inflate/deflate support to make adding new chunks

-    with trailing compressed parts easier in the future, and added new functions

-    png_free_iCCP, png_free_pCAL, png_free_sPLT, png_free_text, png_get_iCCP,

-    png_get_spalettes, png_set_iCCP, png_set_spalettes (Eric S. Raymond).

-    NOTE: Applications that write text chunks MUST define png_text->lang

-    before calling png_set_text(). It must be set to NULL if you want to

-    write tEXt or zTXt chunks.  If you want your application to be able to

-    run with older versions of libpng, use

-

-      #ifdef PNG_iTXt_SUPPORTED

-         png_text[i].lang = NULL;

-      #endif

-

-  Changed png_get_oFFs() and png_set_oFFs() to use signed rather than unsigned

-    offsets (Eric S. Raymond).

-  Combined PNG_READ_cHNK_SUPPORTED and PNG_WRITE_cHNK_SUPPORTED macros into

-    PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED

-    macros, leaving the separate macros also available.

-  Removed comments on #endifs at the end of many short, non-nested #if-blocks.

-

-Version 1.0.5f [December 6, 1999]

-  Changed makefile.solaris to issue a warning about potential problems when

-    the ucb "ld" is in the path ahead of the ccs "ld".

-  Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3.

-  Added sCAL chunk support (Eric S. Raymond).

-

-Version 1.0.5g [December 7, 1999]

-  Fixed "png_free_spallettes" typo in png.h

-  Added code to handle new chunks in pngpread.c

-  Moved PNG_CHNK string macro definitions outside of PNG_NO_EXTERN block

-  Added "translated_key" to png_text structure and png_write_iTXt().

-  Added code in pngwrite.c to work around a newly discovered zlib bug.

-

-Version 1.0.5h [December 10, 1999]

-  NOTE: regarding the note for version 1.0.5e, the following must also

-    be included in your code:

-        png_text[i].translated_key = NULL;

-  Unknown chunk handling is now supported.

-  Option to eliminate all floating point support was added.  Some new

-    fixed-point functions such as png_set_gAMA_fixed() were added.

-  Expanded tabs and removed trailing blanks in source files.

-

-Version 1.0.5i [December 13, 1999]

-  Added some type casts to silence compiler warnings.

-  Renamed "png_free_spalette" to "png_free_spalettes" for consistency.

-  Removed leading blanks from a #define in pngvcrd.c

-  Added some parameters to the new png_set_keep_unknown_chunks() function.

-  Added a test for up->location != 0 in the first instance of writing

-    unknown chunks in pngwrite.c

-  Changed "num" to "i" in png_free_spalettes() and png_free_unknowns() to

-    prevent recursion.

-  Added png_free_hIST() function.

-  Various patches to fix bugs in the sCAL and integer cHRM processing,

-    and to add some convenience macros for use with sCAL.

-

-Version 1.0.5j [December 21, 1999]

-  Changed "unit" parameter of png_write_sCAL from png_byte to int, to work

-    around buggy compilers.

-  Added new type "png_fixed_point" for integers that hold float*100000 values

-  Restored backward compatibility of tEXt/zTXt chunk processing:

-    Restored the first four members of png_text to the same order as v.1.0.5d.

-    Added members "lang_key" and "itxt_length" to png_text struct.  Set

-    text_length=0 when "text" contains iTXt data.  Use the "compression"

-    member to distinguish among tEXt/zTXt/iTXt types.  Added

-    PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros.

-    The "Note" above, about backward incompatibility of libpng-1.0.5e, no

-    longer applies.

-  Fixed png_read|write_iTXt() to read|write parameters in the right order,

-    and to write the iTXt chunk after IDAT if it appears in the end_ptr.

-  Added pnggccrd.c, version of pngvcrd.c Intel assembler for gcc (Greg Roelofs)

-  Reversed the order of trying to write floating-point and fixed-point gAMA.

-

-Version 1.0.5k [December 27, 1999]

-  Added many parentheses, e.g., "if (a && b & c)" becomes "if (a && (b & c))"

-  Added png_handle_as_unknown() function (Glenn)

-  Added png_free_chunk_list() function and chunk_list and num_chunk_list members

-    of png_ptr.

-  Eliminated erroneous warnings about multiple sPLT chunks and sPLT-after-PLTE.

-  Fixed a libpng-1.0.5h bug in pngrutil.c that was issuing erroneous warnings

-    about ignoring incorrect gAMA with sRGB (gAMA was in fact not ignored)

-  Added png_free_tRNS(); png_set_tRNS() now malloc's its own trans array (ESR).

-  Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is.

-  Changed type of proflen from png_int_32 to png_uint_32 in png_get_iCCP().

-

-Version 1.0.5l [January 1, 2000]

-  Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr()

-    for setting a callback function to handle unknown chunks and for

-    retrieving the associated user pointer (Glenn).

-

-Version 1.0.5m [January 7, 2000]

-  Added high-level functions png_read_png(), png_write_png(), png_free_pixels().

-

-Version 1.0.5n [January 9, 2000]

-  Added png_free_PLTE() function, and modified png_set_PLTE() to malloc its

-    own memory for info_ptr->palette.  This makes it safe for the calling

-    application to free its copy of the palette any time after it calls

-    png_set_PLTE().

-

-Version 1.0.5o [January 20, 2000]

-  Cosmetic changes only (removed some trailing blanks and TABs)

-

-Version 1.0.5p [January 31, 2000]

-  Renamed pngdll.mak to makefile.bd32

-  Cosmetic changes in pngtest.c

-

-Version 1.0.5q [February 5, 2000]

-  Relocated the makefile.solaris warning about PATH problems.

-  Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg)

-  Revised makefile.gcmmx

-  Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros

-

-Version 1.0.5r [February 7, 2000]

-  Removed superfluous prototype for png_get_itxt from png.h

-  Fixed a bug in pngrtran.c that improperly expanded the background color.

-  Return *num_text=0 from png_get_text() when appropriate, and fix documentation

-    of png_get_text() in libpng.txt/libpng.3.

-

-Version 1.0.5s [February 18, 2000]

-  Added "png_jmp_env()" macro to pngconf.h, to help people migrate to the

-    new error handler that's planned for the next libpng release, and changed

-    example.c, pngtest.c, and contrib programs to use this macro.

-  Revised some of the DLL-export macros in pngconf.h (Greg Roelofs)

-  Fixed a bug in png_read_png() that caused it to fail to expand some images

-    that it should have expanded.

-  Fixed some mistakes in the unused and undocumented INCH_CONVERSIONS functions

-    in pngget.c

-  Changed the allocation of palette, history, and trans arrays back to

-    the version 1.0.5 method (linking instead of copying) which restores

-    backward compatibility with version 1.0.5.  Added some remarks about

-    that in example.c.  Added "free_me" member to info_ptr and png_ptr

-    and added png_free_data() function.

-  Updated makefile.linux and makefile.gccmmx to make directories conditionally.

-  Made cosmetic changes to pngasmrd.h

-  Added png_set_rows() and png_get_rows(), for use with png_read|write_png().

-  Modified png_read_png() to allocate info_ptr->row_pointers only if it

-    hasn't already been allocated.

-

-Version 1.0.5t [March 4, 2000]

-  Changed png_jmp_env() migration aiding macro to png_jmpbuf().

-  Fixed "interlace" typo (should be "interlaced") in contrib/gregbook/read2-x.c

-  Fixed bug with use of PNG_BEFORE_IHDR bit in png_ptr->mode, introduced when

-    PNG_FLAG_HAVE_CHUNK_HEADER was moved into png_ptr->mode in version 1.0.5b

-  Files in contrib/gregbook were revised to use png_jmpbuf() and to select

-    a 24-bit visual if one is available, and to allow abbreviated options.

-  Files in contrib/pngminus were revised to use the png_jmpbuf() macro.

-  Removed spaces in makefile.linux and makefile.gcmmx, introduced in 1.0.5s

-

-Version 1.0.5u [March 5, 2000]

-  Simplified the code that detects old png.h in png.c and pngtest.c

-  Renamed png_spalette (_p, _pp) to png_sPLT_t (_tp, _tpp)

-  Increased precision of rgb_to_gray calculations from 8 to 15 bits and

-    added png_set_rgb_to_gray_fixed() function.

-  Added makefile.bc32 (32-bit Borland C++, C mode)

-

-Version 1.0.5v [March 11, 2000]

-  Added some parentheses to the png_jmpbuf macro definition.

-  Updated references to the zlib home page, which has moved to freesoftware.com.

-  Corrected bugs in documentation regarding png_read_row() and png_write_row().

-  Updated documentation of png_rgb_to_gray calculations in libpng.3/libpng.txt.

-  Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3,

-    revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin)

-

-Version 1.0.6 [March 20, 2000]

-  Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c

-  Added makefile.sggcc (SGI IRIX with gcc)

-

-Version 1.0.6d [April 7, 2000]

-  Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO

-  Added data_length parameter to png_decompress_chunk() function

-  Revised documentation to remove reference to abandoned png_free_chnk functions

-  Fixed an error in png_rgb_to_gray_fixed()

-  Revised example.c, usage of png_destroy_write_struct().

-  Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file

-  Added a check for info_ptr->free_me&PNG_FREE_TEXT when freeing text in png.c

-  Simplify png_sig_bytes() function to remove use of non-ISO-C strdup().

-

-Version 1.0.6e [April 9, 2000]

-  Added png_data_freer() function.

-  In the code that checks for over-length tRNS chunks, added check of

-    info_ptr->num_trans as well as png_ptr->num_trans (Matthias Benckmann)

-  Minor revisions of libpng.txt/libpng.3.

-  Check for existing data and free it if the free_me flag is set, in png_set_*()

-    and png_handle_*().

-  Only define PNG_WEIGHTED_FILTERS_SUPPORTED when PNG_FLOATING_POINT_SUPPORTED

-    is defined.

-  Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c

-    and mentioned the purposes of the two macros in libpng.txt/libpng.3.

-

-Version 1.0.6f [April 14, 2000]

-  Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data.

-  Add checks in png_set_text() for NULL members of the input text structure.

-  Revised libpng.txt/libpng.3.

-  Removed superfluous prototype for png_set_iTXt from png.h

-  Removed "else" from pngread.c, after png_error(), and changed "0" to "length".

-  Changed several png_errors about malformed ancillary chunks to png_warnings.

-

-Version 1.0.6g [April 24, 2000]

-  Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.

-  Relocated paragraph about png_set_background() in libpng.3/libpng.txt

-    and other revisions (Matthias Benckmann)

-  Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and

-    png_ptr members to restore binary compatibility with libpng-1.0.5

-    (breaks compatibility with libpng-1.0.6).

-

-Version 1.0.6h [April 24, 2000]

-  Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds

-    libpng.so.10 & libpng.so.10.6h instead of libpng.so.2 & libpng.so.2.1.0.6h)

-    This is a temporary change for test purposes.

-

-Version 1.0.6i [May 2, 2000]

-  Rearranged some members at the end of png_info and png_struct, to put

-    unknown_chunks_num and free_me within the original size of the png_structs

-    and free_me, png_read_user_fn, and png_free_fn within the original png_info,

-    because some old applications allocate the structs directly instead of

-    using png_create_*().

-  Added documentation of user memory functions in libpng.txt/libpng.3

-  Modified png_read_png so that it will use user_allocated row_pointers

-    if present, unless free_me directs that it be freed, and added description

-    of the use of png_set_rows() and png_get_rows() in libpng.txt/libpng.3.

-  Added PNG_LEGACY_SUPPORTED macro, and #ifdef out all new (since version

-    1.00) members of png_struct and png_info, to regain binary compatibility

-    when you define this macro.  Capabilities lost in this event

-    are user transforms (new in version 1.0.0),the user transform pointer

-    (new in version 1.0.2), rgb_to_gray (new in 1.0.5), iCCP, sCAL, sPLT,

-    the high-level interface, and unknown chunks support (all new in 1.0.6).

-    This was necessary because of old applications that allocate the structs

-    directly as authors were instructed to do in libpng-0.88 and earlier,

-    instead of using png_create_*().

-  Added modes PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT which

-    can be used to detect codes that directly allocate the structs, and

-    code to check these modes in png_read_init() and png_write_init() and

-    generate a libpng error if the modes aren't set and PNG_LEGACY_SUPPORTED

-    was not defined.

-  Added makefile.intel and updated makefile.watcom (Pawel Mrochen)

-

-Version 1.0.6j [May 3, 2000]

-  Overloaded png_read_init() and png_write_init() with macros that convert

-    calls to png_read_init_2() or png_write_init_2() that check the version

-    and structure sizes.

-

-Version 1.0.7beta11 [May 7, 2000]

-  Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes

-    which are no longer used.

-  Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is

-    defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXt_SUPPORTED

-    is defined.

-  Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory

-    overrun when old applications fill the info_ptr->text structure directly.

-  Added PNGAPI macro, and added it to the definitions of all exported functions.

-  Relocated version macro definitions ahead of the includes of zlib.h and

-    pngconf.h in png.h.

-

-Version 1.0.7beta12 [May 12, 2000]

-  Revised pngset.c to avoid a problem with expanding the png_debug macro.

-  Deleted some extraneous defines from pngconf.h

-  Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.

-  Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined.

-  Added png_access_version_number() function.

-  Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data().

-  Expanded libpng.3/libpng.txt information about png_data_freer().

-

-Version 1.0.7beta14 [May 17, 2000] (beta13 was not published)

-  Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as

-    warnings instead of errors, as pngrutil.c does.

-  Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png()

-    will actually write IDATs.

-  Made the default PNG_USE_LOCAL_ARRAYS depend on PNG_DLL instead of WIN32.

-  Make png_free_data() ignore its final parameter except when freeing data

-    that can have multiple instances (text, sPLT, unknowns).

-  Fixed a new bug in png_set_rows().

-  Removed info_ptr->valid tests from png_free_data(), as in version 1.0.5.

-  Added png_set_invalid() function.

-  Fixed incorrect illustrations of png_destroy_write_struct() in example.c.

-

-Version 1.0.7beta15 [May 30, 2000]

-  Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce

-    fewer error messages.

-  Rearranged checks for Z_OK to check the most likely path first in pngpread.c

-    and pngwutil.c.

-  Added checks in pngtest.c for png_create_*() returning NULL, and mentioned

-    in libpng.txt/libpng.3 the need for applications to check this.

-  Changed names of png_default_*() functions in pngtest to pngtest_*().

-  Changed return type of png_get_x|y_offset_*() from png_uint_32 to png_int_32.

-  Fixed some bugs in the unused PNG_INCH_CONVERSIONS functions in pngget.c

-  Set each pointer to NULL after freeing it in png_free_data().

-  Worked around a problem in pngconf.h; AIX's strings.h defines an "index"

-    macro that conflicts with libpng's png_color_16.index. (Dimitri

-    Papadapoulos)

-  Added "msvc" directory with MSVC++ project files (Simon-Pierre Cadieux).

-

-Version 1.0.7beta16 [June 4, 2000]

-  Revised the workaround of AIX string.h "index" bug.

-  Added a check for overlength PLTE chunk in pngrutil.c.

-  Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer

-    indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler.

-  Added a warning in png_decompress_chunk() when it runs out of data, e.g.

-    when it tries to read an erroneous PhotoShop iCCP chunk.

-  Added PNG_USE_DLL macro.

-  Revised the copyright/disclaimer/license notice.

-  Added contrib/msvctest directory

-

-Version 1.0.7rc1 [June 9, 2000]

-  Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA  (0x0400 not 0x0200)

-  Added contrib/visupng directory (Willem van Schaik)

-

-Version 1.0.7beta18 [June 23, 2000]

-  Revised PNGAPI definition, and pngvcrd.c to work with __GCC__

-    and do not redefine PNGAPI if it is passed in via a compiler directive.

-  Revised visupng/PngFile.c to remove returns from within the Try block.

-  Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.

-  Updated contrib/visupng/cexcept.h to version 1.0.0.

-  Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.

-

-Version 1.0.7rc2 [June 28, 2000]

-  Updated license to include disclaimers required by UCITA.

-  Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.

-

-Version 1.0.7 [July 1, 2000]

-  Revised the definition of "trans_values" in libpng.3/libpng.txt

-

-Version 1.0.8beta1 [July 8, 2000]

-  Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.

-  Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and

-    pngwutil.c.

-  Changed PNG_EXPORT_VAR to use PNG_IMPEXP, in pngconf.h.

-  Removed unused "#include <assert.h>" from png.c

-  Added WindowsCE support.

-  Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment.

-

-Version 1.0.8beta2 [July 10, 2000]

-  Added project files to the wince directory and made further revisions

-    of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE.

-

-Version 1.0.8beta3 [July 11, 2000]

-  Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()

-    for indexed-color input files to avoid potential double-freeing trans array

-    under some unusual conditions; problem was introduced in version 1.0.6f.

-  Further revisions to pngtest.c and files in the wince subdirectory.

-

-Version 1.0.8beta4 [July 14, 2000]

-  Added the files pngbar.png and pngbar.jpg to the distribution.

-  Added makefile.cygwin, and cygwin support in pngconf.h

-  Added PNG_NO_ZALLOC_ZERO macro (makes png_zalloc skip zeroing memory)

-

-Version 1.0.8rc1 [July 16, 2000]

-  Revised png_debug() macros and statements to eliminate compiler warnings.

-

-Version 1.0.8 [July 24, 2000]

-  Added png_flush() in pngwrite.c, after png_write_IEND().

-  Updated makefile.hpux to build a shared library.

-

-Version 1.0.9beta1 [November 10, 2000]

-  Fixed typo in scripts/makefile.hpux

-  Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser)

-  Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser)

-  Changed "cdrom.com" in documentation to "libpng.org"

-  Revised pnggccrd.c to get it all working, and updated makefile.gcmmx (Greg).

-  Changed type of "params" from voidp to png_voidp in png_read|write_png().

-  Make sure PNGAPI and PNG_IMPEXP are defined in pngconf.h.

-  Revised the 3 instances of WRITEFILE in pngtest.c.

-  Relocated "msvc" and "wince" project subdirectories into "dll" subdirectory.

-  Updated png.rc in dll/msvc project

-  Revised makefile.dec to define and use LIBPATH and INCPATH

-  Increased size of global png_libpng_ver[] array from 12 to 18 chars.

-  Made global png_libpng_ver[], png_sig[] and png_pass_*[] arrays const.

-  Removed duplicate png_crc_finish() from png_handle_bKGD() function.

-  Added a warning when application calls png_read_update_info() multiple times.

-  Revised makefile.cygwin

-  Fixed bugs in iCCP support in pngrutil.c and pngwutil.c.

-  Replaced png_set_empty_plte_permitted() with png_permit_mng_features().

-

-Version 1.0.9beta2 [November 19, 2000]

-  Renamed the "dll" subdirectory "projects".

-  Added borland project files to "projects" subdirectory.

-  Set VS_FF_PRERELEASE and VS_FF_PATCHED flags in msvc/png.rc when appropriate.

-  Add error message in png_set_compression_buffer_size() when malloc fails.

-

-Version 1.0.9beta3 [November 23, 2000]

-  Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project.

-  Removed the png_flush() in pngwrite.c that crashes some applications

-    that don't set png_output_flush_fn.

-  Added makefile.macosx and makefile.aix to scripts directory.

-

-Version 1.0.9beta4 [December 1, 2000]

-  Change png_chunk_warning to png_warning in png_check_keyword().

-  Increased the first part of msg buffer from 16 to 18 in png_chunk_error().

-

-Version 1.0.9beta5 [December 15, 2000]

-  Added support for filter method 64 (for PNG datastreams embedded in MNG).

-

-Version 1.0.9beta6 [December 18, 2000]

-  Revised png_set_filter() to accept filter method 64 when appropriate.

-  Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr->mode and use it to

-    help prevent applications from using MNG features in PNG datastreams.

-  Added png_permit_mng_features() function.

-  Revised libpng.3/libpng.txt.  Changed "filter type" to "filter method".

-

-Version 1.0.9rc1 [December 23, 2000]

-  Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c

-  Fixed error handling of unknown compression type in png_decompress_chunk().

-  In pngconf.h, define __cdecl when _MSC_VER is defined.

-

-Version 1.0.9beta7 [December 28, 2000]

-  Changed PNG_TEXT_COMPRESSION_zTXt to PNG_COMPRESSION_TYPE_BASE several places.

-  Revised memory management in png_set_hIST and png_handle_hIST in a backward

-    compatible manner.  PLTE and tRNS were revised similarly.

-  Revised the iCCP chunk reader to ignore trailing garbage.

-

-Version 1.0.9beta8 [January 12, 2001]

-  Moved pngasmrd.h into pngconf.h.

-  Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop.

-

-Version 1.0.9beta9 [January 15, 2001]

-  Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to

-    wince and msvc project module definition files.

-  Minor revision of makefile.cygwin.

-  Fixed bug with progressive reading of narrow interlaced images in pngpread.c

-

-Version 1.0.9beta10 [January 16, 2001]

-  Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined.

-  Fixed "png_mmx_supported" typo in project definition files.

-

-Version 1.0.9beta11 [January 19, 2001]

-  Updated makefile.sgi to make shared library.

-  Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED

-    by default, for the benefit of DLL forward compatibility.  These will

-    be re-enabled in version 1.2.0.

-

-Version 1.0.9rc2 [January 22, 2001]

-  Revised cygwin support.

-

-Version 1.0.9 [January 31, 2001]

-  Added check of cygwin's ALL_STATIC in pngconf.h

-  Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos.

-

-Version 1.0.10beta1 [March 14, 2001]

-  Revised makefile.dec, makefile.sgi, and makefile.sggcc; added makefile.hpgcc.

-  Reformatted libpng.3 to eliminate bad line breaks.

-  Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c

-  Added prototype for png_mmx_support() near the top of pnggccrd.c

-  Moved some error checking from png_handle_IHDR to png_set_IHDR.

-  Added PNG_NO_READ_SUPPORTED and PNG_NO_WRITE_SUPPORTED macros.

-  Revised png_mmx_support() function in pnggccrd.c

-  Restored version 1.0.8 PNG_WRITE_EMPTY_PLTE_SUPPORTED behavior in pngwutil.c

-  Fixed memory leak in contrib/visupng/PngFile.c

-  Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)

-  Added warnings when retrieving or setting gamma=0.

-  Increased the first part of msg buffer from 16 to 18 in png_chunk_warning().

-

-Version 1.0.10rc1 [March 23, 2001]

-  Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,

-    and png_strlen.

-  Revised png_mmx_supported() function in pnggccrd.c to return proper value.

-  Fixed bug in progressive reading (pngpread.c) with small images (height < 8).

-

-Version 1.0.10 [March 30, 2001]

-  Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin

-  Added beos project files (Chris Herborth)

-

-Version 1.0.11beta1 [April 3, 2001]

-  Added type casts on several png_malloc() calls (Dimitri Papadapoulos).

-  Removed a no-longer needed AIX work-around from pngconf.h

-  Changed several "//" single-line comments to C-style in pnggccrd.c

-

-Version 1.0.11beta2 [April 11, 2001]

-  Removed PNGAPI from several functions whose prototypes did not have PNGAPI.

-  Updated scripts/pngos2.def

-

-Version 1.0.11beta3 [April 14, 2001]

-  Added checking the results of many instances of png_malloc() for NULL

-

-Version 1.0.11beta4 [April 20, 2001]

-  Undid the changes from version 1.0.11beta3.  Added a check for NULL return

-    from user's malloc_fn().

-  Removed some useless type casts of the NULL pointer.

-  Added makefile.netbsd

-

-Version 1.0.11 [April 27, 2001]

-  Revised makefile.netbsd

-

-Version 1.0.12beta1 [May 14, 2001]

-  Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot)

-  Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h

-  Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings.

-  Eliminated the png_error about apps using png_read|write_init().  Instead,

-    libpng will reallocate the png_struct and info_struct if they are too small.

-    This retains future binary compatibility for old applications written for

-    libpng-0.88 and earlier.

-

-Version 1.2.0beta1 [May 6, 2001]

-  Bumped DLLNUM to 2.

-  Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED

-    by default.

-  Added runtime selection of MMX features.

-  Added png_set_strip_error_numbers function and related macros.

-

-Version 1.2.0beta2 [May 7, 2001]

-  Finished merging 1.2.0beta1 with version 1.0.11

-  Added a check for attempts to read or write PLTE in grayscale PNG datastreams.

-

-Version 1.2.0beta3 [May 17, 2001]

-  Enabled user memory function by default.

-  Modified png_create_struct so it passes user mem_ptr to user memory allocator.

-  Increased png_mng_features flag from png_byte to png_uint_32.

-  Bumped shared-library (so-number) and dll-number to 3.

-

-Version 1.2.0beta4 [June 23, 2001]

-  Check for missing profile length field in iCCP chunk and free chunk_data

-    in case of truncated iCCP chunk.

-  Bumped shared-library number to 3 in makefile.sgi and makefile.sggcc

-  Bumped dll-number from 2 to 3 in makefile.cygwin

-  Revised contrib/gregbook/rpng*-x.c to avoid a memory leak and to exit cleanly

-    if user attempts to run it on an 8-bit display.

-  Updated contrib/gregbook

-  Use png_malloc instead of png_zalloc to allocate palette in pngset.c

-  Updated makefile.ibmc

-  Added some typecasts to eliminate gcc 3.0 warnings.  Changed prototypes

-    of png_write_oFFS width and height from png_uint_32 to png_int_32.

-  Updated example.c

-  Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c

-

-Version 1.2.0beta5 [August 8, 2001]

-  Revised contrib/gregbook

-  Revised makefile.gcmmx

-  Revised pnggccrd.c to conditionally compile some thread-unsafe code only

-    when PNG_THREAD_UNSAFE_OK is defined.

-  Added tests to prevent pngwutil.c from writing a bKGD or tRNS chunk with

-    value exceeding 2^bit_depth-1

-  Revised makefile.sgi and makefile.sggcc

-  Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c

-  Removed restriction that do_invert_mono only operate on 1-bit opaque files

-

-Version 1.2.0 [September 1, 2001]

-  Changed a png_warning() to png_debug() in pnggccrd.c

-  Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC().

-

-Version 1.2.1beta1 [October 19, 2001]

-  Revised makefile.std in contrib/pngminus

-  Include background_1 in png_struct regardless of gamma support.

-  Revised makefile.netbsd and makefile.macosx, added makefile.darwin.

-  Revised example.c to provide more details about using row_callback().

-

-Version 1.2.1beta2 [October 25, 2001]

-  Added type cast to each NULL appearing in a function call, except for

-    WINCE functions.

-  Added makefile.so9.

-

-Version 1.2.1beta3 [October 27, 2001]

-  Removed type casts from all NULLs.

-  Simplified png_create_struct_2().

-

-Version 1.2.1beta4 [November 7, 2001]

-  Revised png_create_info_struct() and png_creat_struct_2().

-  Added error message if png_write_info() was omitted.

-  Type cast NULLs appearing in function calls when _NO_PROTO or

-    PNG_TYPECAST_NULL is defined.

-

-Version 1.2.1rc1 [November 24, 2001]

-  Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL

-    is defined.

-  Changed typecast of "size" argument to png_size_t in pngmem.c calls to

-    the user malloc_fn, to agree with the prototype in png.h

-  Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev)

-  Updated makefile.sgi to recognize LIBPATH and INCPATH.

-  Updated various makefiles so "make clean" does not remove previous major

-    version of the shared library.

-

-Version 1.2.1rc2 [December 4, 2001]

-  Always allocate 256-entry internal palette, hist, and trans arrays, to

-    avoid out-of-bounds memory reference caused by invalid PNG datastreams.

-  Added a check for prefix_length > data_length in iCCP chunk handler.

-

-Version 1.2.1 [December 7, 2001]

-  None.

-

-Version 1.2.2beta1 [February 22, 2002]

-  Fixed a bug with reading the length of iCCP profiles (Larry Reeves).

-  Revised makefile.linux, makefile.gcmmx, and makefile.sgi to generate

-    libpng.a, libpng12.so (not libpng.so.3), and libpng12/png.h

-  Revised makefile.darwin to remove "-undefined suppress" option.

-  Added checks for gamma and chromaticity values over 21474.83, which exceed

-    the limit for PNG unsigned 32-bit integers when encoded.

-  Revised calls to png_create_read_struct() and png_create_write_struct()

-    for simpler debugging.

-  Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK)

-

-Version 1.2.2beta2 [February 23, 2002]

-  Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths.

-  Check for invalid image dimensions in png_get_IHDR.

-  Added missing "fi;" in the install target of the SGI makefiles.

-  Added install-static to all makefiles that make shared libraries.

-  Always do gamma compensation when image is partially transparent.

-

-Version 1.2.2beta3 [March 7, 2002]

-  Compute background.gray and background_1.gray even when color_type is RGB

-    in case image gets reduced to gray later.

-  Modified shared-library makefiles to install pkgconfig/libpngNN.pc.

-  Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown

-  Removed unused png_write_destroy_info prototype from png.h

-  Eliminated incorrect use of width_mmx from pnggccrd.c in pixel_bytes == 8 case

-  Added install-shared target to all makefiles that make shared libraries.

-  Stopped a double free of palette, hist, and trans when not using free_me.

-  Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64.

-

-Version 1.2.2beta4 [March 8, 2002]

-  Compute background.gray and background_1.gray even when color_type is RGB

-    in case image gets reduced to gray later (Jason Summers).

-  Relocated a misplaced /bin/rm in the "install-shared" makefile targets

-  Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library.

-

-Version 1.2.2beta5 [March 26, 2002]

-  Added missing PNGAPI to several function definitions.

-  Check for invalid bit_depth or color_type in png_get_IHDR(), and

-    check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen).

-  Revised iTXt support to accept NULL for lang and lang_key.

-  Compute gamma for color components of background even when color_type is gray.

-  Changed "()" to "{}" in scripts/libpng.pc.in.

-  Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN

-  Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so

-

-Version 1.2.2beta6 [March 31, 2002]

-

-Version 1.0.13beta1 [March 31, 2002]

-  Prevent png_zalloc() from trying to memset memory that it failed to acquire.

-  Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).

-  Ensure that the right function (user or default) is used to free the

-    png_struct after an error in png_create_read_struct_2().

-

-Version 1.2.2rc1 [April 7, 2002]

-

-Version 1.0.13rc1 [April 7, 2002]

-  Save the ebx register in pnggccrd.c (Sami Farin)

-  Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner).

-  Updated makefiles to put headers in include/libpng and remove old include/*.h.

-

-Version 1.2.2 [April 15, 2002]

-

-Version 1.0.13 [April 15, 2002]

-  Revised description of png_set_filter() in libpng.3/libpng.txt.

-  Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd

-

-Version 1.0.13patch01 [April 17, 2002]

-

-Version 1.2.2patch01 [April 17, 2002]

-  Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and

-    makefile.sggcc

-  Fixed VER -> PNGVER typo in makefile.macosx and added install-static to

-    install

-  Added install: target to makefile.32sunu and makefile.64sunu

-

-Version 1.0.13patch03 [April 18, 2002]

-

-Version 1.2.2patch03 [April 18, 2002]

-  Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng

-  subdirectory to libpngNN subdirectory without the full pathname.

-  Moved generation of libpng.pc from "install" to "all" in 15 makefiles.

-

-Version 1.2.3rc1 [April 28, 2002]

-  Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).

-  Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)

-  Fixed bug with $prefix, should be $(prefix) in makefile.hpux.

-  Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin

-  Added a link from libpngNN.pc to libpng.pc in 15 makefiles.

-  Added links from include/libpngNN/*.h to include/*.h in 24 makefiles.

-  Revised makefile.darwin to make relative links without full pathname.

-  Added setjmp() at the end of png_create_*_struct_2() in case user forgets

-    to put one in their application.

-  Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and

-    removed them from module definition files.

-

-Version 1.2.3rc2 [May 1, 2002]

-  Fixed bug in reporting number of channels in pngget.c and pngset.c,

-    that was introduced in version 1.2.2beta5.

-  Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(),

-    png_default_flush(), and png_push_fill_buffer() and included them in

-    module definition files.

-  Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles.

-

-Version 1.2.3rc3 [May 1, 2002]

-  Revised prototype for png_default_flush()

-  Remove old libpng.pc and libpngNN.pc before installing new ones.

-

-Version 1.2.3rc4 [May 2, 2002]

-  Typos in *.def files (png_default_read|write -> png_default_read|write_data)

-  In makefiles, changed rm libpng.NN.pc to rm libpngNN.pc

-  Added libpng-config and libpngNN-config and modified makefiles to install

-    them.

-  Changed $(MANPATH) to $(DESTDIR)$(MANPATH) in makefiles

-  Added "Win32 DLL VB" configuration to projects/msvc/libpng.dsp

-

-Version 1.2.3rc5 [May 11, 2002]

-  Changed "error" and "message" in prototypes to "error_message" and

-    "warning_message" to avoid namespace conflict.

-  Revised 15 makefiles to build libpng-config from libpng-config-*.in

-  Once more restored png_zalloc and png_zfree to regular nonexported form.

-  Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer

-    to nonexported form, but with PNGAPI, and removed them from module def

-    files.

-

-Version 1.2.3rc6 [May 14, 2002]

-  Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c

-  Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.

-  Removed leftover libpng-config "sed" script from four makefiles.

-  Revised libpng-config creating script in 16 makefiles.

-

-Version 1.2.3 [May 22, 2002]

-  Revised libpng-config target in makefile.cygwin.

-  Removed description of png_set_mem_fn() from documentation.

-  Revised makefile.freebsd.

-  Minor cosmetic changes to 15 makefiles, e.g., $(DI) = $(DESTDIR)/$(INCDIR).

-  Revised projects/msvc/README.txt

-  Changed -lpng to -lpngNN in LDFLAGS in several makefiles.

-

-Version 1.2.4beta1 [May 24, 2002]

-  Added libpng.pc and libpng-config to "all:" target in 16 makefiles.

-  Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH)

-  Added missing "\" before closing double quote in makefile.gcmmx.

-  Plugged various memory leaks; added png_malloc_warn() and png_set_text_2()

-    functions.

-

-Version 1.2.4beta2 [June 25, 2002]

-  Plugged memory leak of png_ptr->current_text (Matt Holgate).

-  Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison)

-  Added -soname to the loader flags in makefile.dec, makefile.sgi, and

-    makefile.sggcc.

-  Added "test-installed" target to makefile.linux, makefile.gcmmx,

-    makefile.sgi, and makefile.sggcc.

-

-Version 1.2.4beta3 [June 28, 2002]

-  Plugged memory leak of row_buf in pngtest.c when there is a png_error().

-  Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.

-  Added "test-installed" target to makefile.32sunu, makefile.64sunu,

-    makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,

-    makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.

-

-Version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]

-  Added "test-installed" target to makefile.cygwin and makefile.sco.

-  Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.

-

-Version 1.2.4 and 1.0.14 [July 8, 2002]

-  Changed png_warning() to png_error() when width is too large to process.

-

-Version 1.2.4patch01 [July 20, 2002]

-  Revised makefile.cygwin to use DLL number 12 instead of 13.

-

-Version 1.2.5beta1 [August 6, 2002]

-  Added code to contrib/gregbook/readpng2.c to ignore unused chunks.

-  Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11)

-  Removed some stray *.o files from contrib/gregbook.

-  Changed png_error() to png_warning() about "Too much data" in pngpread.c

-    and about "Extra compressed data" in pngrutil.c.

-  Prevent png_ptr->pass from exceeding 7 in png_push_finish_row().

-  Updated makefile.hpgcc

-  Updated png.c and pnggccrd.c handling of return from png_mmx_support()

-

-Version 1.2.5beta2 [August 15, 2002]

-  Only issue png_warning() about "Too much data" in pngpread.c when avail_in

-    is nonzero.

-  Updated makefiles to install a separate libpng.so.3 with its own rpath.

-

-Version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002]

-  Revised makefiles to not remove previous minor versions of shared libraries.

-

-Version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002]

-  Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared

-    library loader directive.

-  Added missing "$OBJSDLL" line to makefile.gcmmx.

-  Added missing "; fi" to makefile.32sunu.

-

-Version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]

-  Revised libpng-config script.

-

-Version 1.2.5 and 1.0.15 [October 3, 2002]

-  Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux,

-    and makefile.aix.

-  Relocated two misplaced PNGAPI lines in pngtest.c

-

-Version 1.2.6beta1 [October 22, 2002]

-  Commented out warning about uninitialized mmx_support in pnggccrd.c.

-  Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h.

-  Relocated two more misplaced PNGAPI lines in pngtest.c

-  Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams,

-    introduced in version 1.0.2.

-  Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu.

-

-Version 1.2.6beta2 [November 1, 2002]

-  Added libpng-config "--ldopts" output.

-  Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"

-    in makefiles.

-

-Version 1.2.6beta3 [July 18, 2004]

-  Reverted makefile changes from version 1.2.6beta2 and some of the changes

-    from version 1.2.6beta1; these will be postponed until version 1.2.7.

-    Version 1.2.6 is going to be a simple bugfix release.

-  Changed the one instance of "ln -sf" to "ln -f -s" in each Sun makefile.

-  Fixed potential overrun in pngerror.c by using strncpy instead of memcpy.

-  Added "#!/bin/sh" at the top of configure, for recognition of the

-    'x' flag under Cygwin (Cosmin).

-  Optimized vacuous tests that silence compiler warnings, in png.c (Cosmin).

-  Added support for PNG_USER_CONFIG, in pngconf.h (Cosmin).

-  Fixed the special memory handler for Borland C under DOS, in pngmem.c

-    (Cosmin).

-  Removed some spurious assignments in pngrutil.c (Cosmin).

-  Replaced 65536 with 65536L, and 0xffff with 0xffffL, to silence warnings

-    on 16-bit platforms (Cosmin).

-  Enclosed shift op expressions in parentheses, to silence warnings (Cosmin).

-  Used proper type png_fixed_point, to avoid problems on 16-bit platforms,

-    in png_handle_sRGB() (Cosmin).

-  Added compression_type to png_struct, and optimized the window size

-    inside the deflate stream (Cosmin).

-  Fixed definition of isnonalpha(), in pngerror.c and pngrutil.c (Cosmin).

-  Fixed handling of unknown chunks that come after IDAT (Cosmin).

-  Allowed png_error() and png_warning() to work even if png_ptr == NULL

-    (Cosmin).

-  Replaced row_info->rowbytes with row_bytes in png_write_find_filter()

-    (Cosmin).

-  Fixed definition of PNG_LIBPNG_VER_DLLNUM (Simon-Pierre).

-  Used PNG_LIBPNG_VER and PNG_LIBPNG_VER_STRING instead of the hardcoded

-    values in png.c (Simon-Pierre, Cosmin).

-  Initialized png_libpng_ver[] with PNG_LIBPNG_VER_STRING (Simon-Pierre).

-  Replaced PNG_LIBPNG_VER_MAJOR with PNG_LIBPNG_VER_DLLNUM in png.rc

-    (Simon-Pierre).

-  Moved the definition of PNG_HEADER_VERSION_STRING near the definitions

-    of the other PNG_LIBPNG_VER_... symbols in png.h (Cosmin).

-  Relocated #ifndef PNGAPI guards in pngconf.h (Simon-Pierre, Cosmin).

-  Updated scripts/makefile.vc(a)win32 (Cosmin).

-  Updated the MSVC project (Simon-Pierre, Cosmin).

-  Updated the Borland C++ Builder project (Cosmin).

-  Avoided access to asm_flags in pngvcrd.c, if PNG_1_0_X is defined (Cosmin).

-  Commented out warning about uninitialized mmx_support in pngvcrd.c (Cosmin).

-  Removed scripts/makefile.bd32 and scripts/pngdef.pas (Cosmin).

-  Added extra guard around inclusion of Turbo C memory headers, in pngconf.h

-    (Cosmin).

-  Renamed projects/msvc/ to projects/visualc6/, and projects/borland/ to

-    projects/cbuilder5/ (Cosmin).

-  Moved projects/visualc6/png32ms.def to scripts/pngw32.def,

-    and projects/visualc6/png.rc to scripts/pngw32.rc (Cosmin).

-  Added projects/visualc6/pngtest.dsp; removed contrib/msvctest/ (Cosmin).

-  Changed line endings to DOS style in cbuilder5 and visualc6 files, even

-    in the tar.* distributions (Cosmin).

-  Updated contrib/visupng/VisualPng.dsp (Cosmin).

-  Updated contrib/visupng/cexcept.h to version 2.0.0 (Cosmin).

-  Added a separate distribution with "configure" and supporting files (Junichi).

-

-Version 1.2.6beta4 [July 28, 2004]

-  Added user ability to change png_size_t via a PNG_SIZE_T macro.

-  Added png_sizeof() and png_convert_size() functions.

-  Added PNG_SIZE_MAX (maximum value of a png_size_t variable.

-  Added check in png_malloc_default() for (size_t)size != (png_uint_32)size

-    which would indicate an overflow.

-  Changed sPLT failure action from png_error to png_warning and abandon chunk.

-  Changed sCAL and iCCP failures from png_error to png_warning and abandon.

-  Added png_get_uint_31(png_ptr, buf) function.

-  Added PNG_UINT_32_MAX macro.

-  Renamed PNG_MAX_UINT to PNG_UINT_31_MAX.

-  Made png_zalloc() issue a png_warning and return NULL on potential

-    overflow.

-  Turn on PNG_NO_ZALLOC_ZERO by default in version 1.2.x

-  Revised "clobber list" in pnggccrd.c so it will compile under gcc-3.4.

-  Revised Borland portion of png_malloc() to return NULL or issue

-    png_error() according to setting of PNG_FLAG_MALLOC_NULL_MEM_OK.

-  Added PNG_NO_SEQUENTIAL_READ_SUPPORTED macro to conditionally remove

-    sequential read support.

-  Added some "#if PNG_WRITE_SUPPORTED" blocks.

-  Added #ifdef to remove some redundancy in png_malloc_default().

-  Use png_malloc instead of png_zalloc to allocate the pallete.

-

-Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]

-  Fixed buffer overflow vulnerability (CVE-2004-0597) in png_handle_tRNS().

-  Fixed NULL dereference vulnerability (CVE-2004-0598) in png_handle_iCCP().

-  Fixed integer overflow vulnerability (CVE-2004-0599) in png_read_png().

-  Fixed some harmless bugs in png_handle_sBIT, etc, that would cause

-    duplicate chunk types to go undetected.

-  Fixed some timestamps in the -config version

-  Rearranged order of processing of color types in png_handle_tRNS().

-  Added ROWBYTES macro to calculate rowbytes without integer overflow.

-  Updated makefile.darwin and removed makefile.macosx from scripts directory.

-  Imposed default one million column, one-million row limits on the image

-    dimensions, and added png_set_user_limits() function to override them.

-  Revised use of PNG_SET_USER_LIMITS_SUPPORTED macro.

-  Fixed wrong cast of returns from png_get_user_width|height_max().

-  Changed some "keep the compiler happy" from empty statements to returns,

-  Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution

-

-Version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]

-  Revised makefile.darwin and makefile.solaris.  Removed makefile.macosx.

-  Revised pngtest's png_debug_malloc() to use png_malloc() instead of

-    png_malloc_default() which is not supposed to be exported.

-  Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in

-    pngpread.c.  Bug was introduced in 1.2.6rc1.

-  Fixed bug in RGB to RGBX transformation introduced in 1.2.6rc1.

-  Fixed old bug in RGB to Gray transformation.

-  Fixed problem with 64-bit compilers by casting arguments to abs()

-    to png_int_32.

-  Changed "ln -sf" to "ln -f -s" in three makefiles (solaris, sco, so9).

-  Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin)

-  Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles.

-  Added code to update the row_info->colortype in png_do_read_filler() (MSB).

-

-Version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004]

-  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid

-    trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.

-  Revised documentation of png_set_keep_unknown_chunks().

-  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.

-  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h

-  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c

-

-Version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004]

-  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of

-    "pinfo" was out of place).

-

-Version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004]

-  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED

-    section of png.h where they were inadvertently placed in version rc3.

-

-Version 1.2.6 and 1.0.16 [August 15, 2004]

-  Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.

-

-Version 1.2.7beta1 [August 26, 2004]

-  Removed unused pngasmrd.h file.

-  Removed references to uu.net for archived files.  Added references to

-    PNG Spec (second edition) and the PNG ISO/IEC Standard.

-  Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR.

-  Fixed bug with "optimized window size" in the IDAT datastream, that

-    causes libpng to write PNG files with incorrect zlib header bytes.

-

-Version 1.2.7beta2 [August 28, 2004]

-  Fixed bug with sCAL chunk and big-endian machines (David Munro).

-  Undid new code added in 1.2.6rc2 to update the color_type in

-    png_set_filler().

-  Added png_set_add_alpha() that updates color type.

-

-Version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004]

-  Revised png_set_strip_filler() to not remove alpha if color_type has alpha.

-

-Version 1.2.7 and 1.0.17 [September 12, 2004]

-  Added makefile.hp64

-  Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin

-

-Version 1.2.8beta1 [November 1, 2004]

-  Fixed bug in png_text_compress() that would fail to complete a large block.

-  Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during

-    strip alpha operation in png_do_strip_filler().

-  Added PNG_1_2_X definition in pngconf.h

-  Use #ifdef to comment out png_info_init in png.c and png_read_init in

-    pngread.c (as of 1.3.0)

-

-Version 1.2.8beta2 [November 2, 2004]

-  Reduce color_type to a nonalpha type after strip alpha operation in

-    png_do_strip_filler().

-

-Version 1.2.8beta3 [November 3, 2004]

-  Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM

-

-Version 1.2.8beta4 [November 12, 2004]

-  Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin).

-  Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin).

-  Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection

-    of data type in deflate (Cosmin).

-  Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of

-    PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.

-

-Version 1.2.8beta5 [November 20, 2004]

-  Use png_ptr->flags instead of png_ptr->transformations to pass

-    PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI

-    compatibility.

-  Revised handling of SPECIALBUILD, PRIVATEBUILD,

-    PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.

-

-Version 1.2.8rc1 [November 24, 2004]

-  Moved handling of BUILD macros from pngconf.h to png.h

-  Added definition of PNG_LIBPNG_BASE_TYPE in png.h, inadvertently

-    omitted from beta5.

-  Revised scripts/pngw32.rc

-  Despammed mailing addresses by masking "@" with "at".

-  Inadvertently installed a supposedly faster test version of pngrutil.c

-

-Version 1.2.8rc2 [November 26, 2004]

-  Added two missing "\" in png.h

-  Change tests in pngread.c and pngpread.c to

-    if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))

-       png_do_read_transformations(png_ptr);

-

-Version 1.2.8rc3 [November 28, 2004]

-  Reverted pngrutil.c to version libpng-1.2.8beta5.

-  Added scripts/makefile.elf with supporting code in pngconf.h for symbol

-    versioning (John Bowler).

-

-Version 1.2.8rc4 [November 29, 2004]

-  Added projects/visualc7 (Simon-pierre).

-

-Version 1.2.8rc5 [November 29, 2004]

-  Fixed new typo in scripts/pngw32.rc

-

-Version 1.2.8 [December 3, 2004]

-  Removed projects/visualc7, added projects/visualc71.

-

-Version 1.2.9beta1 [February 21, 2006]

-  Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints

-  Revised man page and libpng.txt to make it clear that one should not call

-    png_read_end or png_write_end after png_read_png or png_write_png.

-  Updated references to png-mng-implement mailing list.

-  Fixed an incorrect typecast in pngrutil.c

-  Added PNG_NO_READ_SUPPORTED conditional for making a write-only library.

-  Added PNG_NO_WRITE_INTERLACING_SUPPORTED conditional.

-  Optimized alpha-inversion loops in pngwtran.c

-  Moved test for nonzero gamma outside of png_build_gamma_table() in pngrtran.c

-  Make sure num_trans is <= 256 before copying data in png_set_tRNS().

-  Make sure num_palette is <= 256 before copying data in png_set_PLTE().

-  Interchanged order of write_swap_alpha and write_invert_alpha transforms.

-  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).

-  Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin).

-  Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin).

-  Exported png_get_uint_32, png_save_uint_32, png_get_uint_16, png_save_uint_16,

-    png_get_int_32, png_save_int_32, png_get_uint_31 (Cosmin).

-  Added type cast (png_byte) in png_write_sCAL() (Cosmin).

-  Fixed scripts/makefile.cygwin (Christian Biesinger, Cosmin).

-  Default iTXt support was inadvertently enabled.

-

-Version 1.2.9beta2 [February 21, 2006]

-  Check for png_rgb_to_gray and png_gray_to_rgb read transformations before

-    checking for png_read_dither in pngrtran.c

-  Revised checking of chromaticity limits to accommodate extended RGB

-    colorspace (John Denker).

-  Changed line endings in some of the project files to CRLF, even in the

-    "Unix" tar distributions (Cosmin).

-  Made png_get_int_32 and png_save_int_32 always available (Cosmin).

-  Updated scripts/pngos2.def, scripts/pngw32.def and projects/wince/png32ce.def

-    with the newly exported functions.

-  Eliminated distributions without the "configure" script.

-  Updated INSTALL instructions.

-

-Version 1.2.9beta3 [February 24, 2006]

-  Fixed CRCRLF line endings in contrib/visupng/VisualPng.dsp

-  Made libpng.pc respect EXEC_PREFIX (D. P. Kreil, J. Bowler)

-  Removed reference to pngasmrd.h from Makefile.am

-  Renamed CHANGES to ChangeLog.

-  Renamed LICENSE to COPYING.

-  Renamed ANNOUNCE to NEWS.

-  Created AUTHORS file.

-

-Version 1.2.9beta4 [March 3, 2006]

-  Changed definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac

-  Reverted to filenames LICENSE and ANNOUNCE; removed AUTHORS and COPYING.

-  Removed newline from the end of some error and warning messages.

-  Removed test for sqrt() from configure.ac and configure.

-  Made swap tables in pngtrans.c PNG_CONST (Carlo Bramix).

-  Disabled default iTXt support that was inadvertently enabled in

-    libpng-1.2.9beta1.

-  Added "OS2" to list of systems that don't need underscores, in pnggccrd.c

-  Removed libpng version and date from *.c files.

-

-Version 1.2.9beta5 [March 4, 2006]

-  Removed trailing blanks from source files.

-  Put version and date of latest change in each source file, and changed

-    copyright year accordingly.

-  More cleanup of configure.ac, Makefile.am, and associated scripts.

-  Restored scripts/makefile.elf which was inadvertently deleted.

-

-Version 1.2.9beta6 [March 6, 2006]

-  Fixed typo (RELEASE) in configuration files.

-

-Version 1.2.9beta7 [March 7, 2006]

-  Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am

-  Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s()

-    in png.h.

-  Updated makefile.elf as suggested by debian.

-  Made cosmetic changes to some makefiles, adding LN_SF and other macros.

-  Made some makefiles accept "exec_prefix".

-

-Version 1.2.9beta8 [March 9, 2006]

-  Fixed some "#if defined (..." which should be "#if defined(..."

-    Bug introduced in libpng-1.2.8.

-  Fixed inconsistency in definition of png_default_read_data()

-  Restored blank that was lost from makefile.sggcc "clean" target in beta7.

-  Revised calculation of "current" and "major" for irix in ltmain.sh

-  Changed "mkdir" to "MKDIR_P" in some makefiles.

-  Separated PNG_EXPAND and PNG_EXPAND_tRNS.

-  Added png_set_expand_gray_1_2_4_to_8() and deprecated

-    png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.

-

-Version 1.2.9beta9 [March 10, 2006]

-  Include "config.h" in pngconf.h when available.

-  Added some checks for NULL png_ptr or NULL info_ptr (timeless)

-

-Version 1.2.9beta10 [March 20, 2006]

-  Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)

-  Made pnggccrd.c PIC-compliant (Christian Aichinger).

-  Added makefile.mingw (Wolfgang Glas).

-  Revised pngconf.h MMX checking.

-

-Version 1.2.9beta11 [March 22, 2006]

-  Fixed out-of-order declaration in pngwrite.c that was introduced in beta9

-  Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros.

-

-Version 1.2.9rc1 [March 31, 2006]

-  Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin).

-  Removed nonsensical assertion check from pngtest.c (Cosmin).

-

-Version 1.2.9 [April 14, 2006]

-  Revised makefile.beos and added "none" selector in ltmain.sh

-

-Version 1.2.10beta1 [April 15, 2006]

-  Renamed "config.h" to "png_conf.h" and revised Makefile.am to add

-    -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h

-    to include png_conf.h only when PNG_BUILDING_LIBPNG is defined.

-

-Version 1.2.10beta2 [April 15, 2006]

-  Manually updated Makefile.in and configure.  Changed png_conf.h.in

-    back to config.h.

-

-Version 1.2.10beta3 [April 15, 2006]

-  Change png_conf.h back to config.h in pngconf.h.

-

-Version 1.2.10beta4 [April 16, 2006]

-  Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*.

-

-Version 1.2.10beta5 [April 16, 2006]

-  Added a configure check for compiling assembler code in pnggccrd.c

-

-Version 1.2.10beta6 [April 17, 2006]

-  Revised the configure check for pnggccrd.c

-  Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@

-  Added @LIBPNG_DEFINES@ to arguments when building libpng.sym

-

-Version 1.2.10beta7 [April 18, 2006]

-  Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles.

-

-Version 1.2.10rc1 [April 19, 2006]

-  Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD

-  Fixed "LN_FS" typo in makefile.sco and makefile.solaris.

-

-Version 1.2.10rc2 [April 20, 2006]

-  Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE

-   in configure.ac and configure

-  Made the configure warning about versioned symbols less arrogant.

-

-Version 1.2.10rc3 [April 21, 2006]

-  Added a note in libpng.txt that png_set_sig_bytes(8) can be used when

-    writing an embedded PNG without the 8-byte signature.

-  Revised makefiles and configure to avoid making links to libpng.so.*

-

-Version 1.2.10 [April 23, 2006]

-  Reverted configure to "rc2" state.

-

-Version 1.2.11beta1 [May 31, 2006]

-  scripts/libpng.pc.in contained "configure" style version info and would

-    not work with makefiles.

-  The shared-library makefiles were linking to libpng.so.0 instead of

-    libpng.so.3 compatibility as the library.

-

-Version 1.2.11beta2 [June 2, 2006]

-  Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid

-    buffer overflow.

-  Fixed bug in example.c (png_set_palette_rgb -> png_set_palette_to_rgb)

-

-Version 1.2.11beta3 [June 5, 2006]

-  Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin).

-  Removed the accidental leftover Makefile.in~ (Cosmin).

-  Avoided potential buffer overflow and optimized buffer in

-    png_write_sCAL(), png_write_sCAL_s() (Cosmin).

-  Removed the include directories and libraries from CFLAGS and LDFLAGS

-    in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin).

-

-Version 1.2.11beta4 [June 6, 2006]

-  Allow zero-length IDAT chunks after the entire zlib datastream, but not

-    after another intervening chunk type.

-

-Version 1.0.19rc1, 1.2.11rc1 [June 13, 2006]

-  Deleted extraneous square brackets from [config.h] in configure.ac

-

-Version 1.0.19rc2, 1.2.11rc2 [June 14, 2006]

-  Added prototypes for PNG_INCH_CONVERSIONS functions to png.h

-  Revised INSTALL and autogen.sh

-  Fixed typo in several makefiles (-W1 should be -Wl)

-  Added typedef for png_int_32 and png_uint_32 on 64-bit systems.

-

-Version 1.0.19rc3, 1.2.11rc3 [June 15, 2006]

-  Removed the new typedefs for 64-bit systems (delay until version 1.4.0)

-  Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid

-    reading out of bounds.

-

-Version 1.0.19rc4, 1.2.11rc4 [June 15, 2006]

-  Really removed the new typedefs for 64-bit systems.

-

-Version 1.0.19rc5, 1.2.11rc5 [June 22, 2006]

-  Removed png_sig_bytes entry from scripts/pngw32.def

-

-Version 1.0.19, 1.2.11 [June 26, 2006]

-  None.

-

-Version 1.0.20, 1.2.12 [June 27, 2006]

-  Really increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid

-    buffer overflow.

-

-Version 1.2.13beta1 [October 2, 2006]

-  Removed AC_FUNC_MALLOC from configure.ac

-  Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h

-  Change "logical" to "bitwise" throughout documentation.

-  Detect and fix attempt to write wrong iCCP profile length (CVE-2006-7244)

-

-Version 1.0.21, 1.2.13 [November 14, 2006]

-  Fix potential buffer overflow in sPLT chunk handler.

-  Fix Makefile.am to not try to link to noexistent files.

-  Check all exported functions for NULL png_ptr.

-

-Version 1.2.14beta1 [November 17, 2006]

-  Relocated three misplaced tests for NULL png_ptr.

-  Built Makefile.in with automake-1.9.6 instead of 1.9.2.

-  Build configure with autoconf-2.60 instead of 2.59

-

-Version 1.2.14beta2 [November 17, 2006]

-  Added some typecasts in png_zalloc().

-

-Version 1.2.14rc1 [November 20, 2006]

-  Changed "strtod" to "png_strtod" in pngrutil.c

-

-Version 1.0.22, 1.2.14    [November 27, 2006]

-  Added missing "$(srcdir)" in Makefile.am and Makefile.in

-

-Version 1.2.15beta1 [December 3, 2006]

-  Generated configure with autoconf-2.61 instead of 2.60

-  Revised configure.ac to update libpng.pc and libpng-config.

-

-Version 1.2.15beta2 [December 3, 2006]

-  Always export MMX asm functions, just stubs if not building pnggccrd.c

-

-Version 1.2.15beta3 [December 4, 2006]

-  Add "png_bytep" typecast to profile while calculating length in pngwutil.c

-

-Version 1.2.15beta4 [December 7, 2006]

-  Added scripts/CMakeLists.txt

-  Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta

-

-Version 1.2.15beta5 [December 7, 2006]

-  Changed some instances of PNG_ASSEMBLER_* to PNG_MMX_* in pnggccrd.c

-  Revised scripts/CMakeLists.txt

-

-Version 1.2.15beta6 [December 13, 2006]

-  Revised scripts/CMakeLists.txt and configure.ac

-

-Version 1.2.15rc1 [December 18, 2006]

-  Revised scripts/CMakeLists.txt

-

-Version 1.2.15rc2 [December 21, 2006]

-  Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.

-  Added scripts/makefile.nommx

-

-Version 1.2.15rc3 [December 25, 2006]

-  Fixed shared library numbering error that was introduced in 1.2.15beta6.

-

-Version 1.2.15rc4 [December 27, 2006]

-  Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set.

-

-Version 1.2.15rc5 [December 31, 2006]

-  Revised handling of rgb_to_gray.

-

-Version 1.2.15 [January 5, 2007]

-  Added some (unsigned long) typecasts in pngtest.c to avoid printing errors.

-

-Version 1.2.16beta1 [January 6, 2007]

-  Fix bugs in makefile.nommx

-

-Version 1.2.16beta2 [January 16, 2007]

-  Revised scripts/CMakeLists.txt

-

-Version 1.2.16 [January 31, 2007]

-  No changes.

-

-Version 1.2.17beta1 [March 6, 2007]

-  Revised scripts/CMakeLists.txt to install both shared and static libraries.

-  Deleted a redundant line from pngset.c.

-

-Version 1.2.17beta2 [April 26, 2007]

-  Relocated misplaced test for png_ptr == NULL in pngpread.c

-  Change "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN

-    flags.

-  Changed remaining instances of PNG_ASSEMBLER_* to PNG_MMX_*

-  Added pngerror() when write_IHDR fails in deflateInit2().

-  Added "const" to some array declarations.

-  Mention examples of libpng usage in the libpng*.txt and libpng.3 documents.

-

-Version 1.2.17rc1 [May 4, 2007]

-  No changes.

-

-Version 1.2.17rc2 [May 8, 2007]

-  Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications

-    calling set_unknown_chunk_location() need them.

-  Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in

-    png_set_expand_gray_1_2_4_to_8().

-  Added png_ptr->unknown_chunk to hold working unknown chunk data, so it

-    can be free'ed in case of error.  Revised unknown chunk handling in

-    pngrutil.c and pngpread.c to use this structure.

-

-Version 1.2.17rc3 [May 8, 2007]

-  Revised symbol-handling in configure script.

-

-Version 1.2.17rc4 [May 10, 2007]

-  Revised unknown chunk handling to avoid storing unknown critical chunks.

-

-Version 1.0.25 [May 15, 2007]

-Version 1.2.17 [May 15, 2007]

-  Added "png_ptr->num_trans=0" before error return in png_handle_tRNS,

-    to eliminate a vulnerability (CVE-2007-2445, CERT VU#684664)

-

-Version 1.0.26 [May 15, 2007]

-Version 1.2.18 [May 15, 2007]

-  Reverted the libpng-1.2.17rc3 change to symbol-handling in configure script

-

-Version 1.2.19beta1 [May 18, 2007]

-  Changed "const static" to "static PNG_CONST" everywhere, mostly undoing

-    change of libpng-1.2.17beta2.  Changed other "const" to "PNG_CONST"

-  Changed some handling of unused parameters, to avoid compiler warnings.

-    "if (unused == NULL) return;" becomes "unused = unused".

-

-Version 1.2.19beta2 [May 18, 2007]

-  Only use the valid bits of tRNS value in png_do_expand() (Brian Cartier)

-

-Version 1.2.19beta3 [May 19, 2007]

-  Add some "png_byte" typecasts in png_check_keyword() and write new_key

-  instead of key in zTXt chunk (Kevin Ryde).

-

-Version 1.2.19beta4 [May 21, 2007]

-  Add png_snprintf() function and use it in place of sprint() for improved

-    defense against buffer overflows.

-

-Version 1.2.19beta5 [May 21, 2007]

-  Fixed png_handle_tRNS() to only use the valid bits of tRNS value.

-  Changed handling of more unused parameters, to avoid compiler warnings.

-  Removed some PNG_CONST in pngwutil.c to avoid compiler warnings.

-

-Version 1.2.19beta6 [May 22, 2007]

-  Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c

-  Added a special "_MSC_VER" case that defines png_snprintf to _snprintf

-

-Version 1.2.19beta7 [May 22, 2007]

-  Squelched png_squelch_warnings() in pnggccrd.c and added

-    an #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused

-    the warnings that png_squelch_warnings was squelching.

-

-Version 1.2.19beta8 [May 22, 2007]

-  Removed __MMX__ from test in pngconf.h.

-

-Version 1.2.19beta9 [May 23, 2007]

-  Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro.

-  Revised png_squelch_warnings() so it might work.

-  Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86.

-

-Version 1.2.19beta10 [May 24, 2007]

-  Resquelched png_squelch_warnings(), use "__attribute__((used))" instead.

-

-Version 1.4.0beta1 [April 20, 2006]

-  Enabled iTXt support (changes png_struct, thus requires so-number change).

-  Cleaned up PNG_ASSEMBLER_CODE_SUPPORTED vs PNG_MMX_CODE_SUPPORTED

-  Eliminated PNG_1_0_X and PNG_1_2_X macros.

-  Removed deprecated functions png_read_init, png_write_init, png_info_init,

-    png_permit_empty_plte, png_set_gray_1_2_4_to_8, png_check_sig, and

-    removed the deprecated macro PNG_MAX_UINT.

-  Moved "PNG_INTERNAL" parts of png.h and pngconf.h into pngintrn.h

-  Removed many WIN32_WCE #ifdefs (Cosmin).

-  Reduced dependency on C-runtime library when on Windows (Simon-Pierre)

-  Replaced sprintf() with png_sprintf() (Simon-Pierre)

-

-Version 1.4.0beta2 [April 20, 2006]

-  Revised makefiles and configure to avoid making links to libpng.so.*

-  Moved some leftover MMX-related defines from pngconf.h to pngintrn.h

-  Updated scripts/pngos2.def, pngw32.def, and projects/wince/png32ce.def

-

-Version 1.4.0beta3 [May 10, 2006]

-  Updated scripts/pngw32.def to comment out MMX functions.

-  Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros.

-  Scripts/libpng.pc.in contained "configure" style version info and would

-    not work with makefiles.

-  Revised pngconf.h and added pngconf.h.in, so makefiles and configure can

-    pass defines to libpng and applications.

-

-Version 1.4.0beta4 [May 11, 2006]

-  Revised configure.ac, Makefile.am, and many of the makefiles to write

-    their defines in pngconf.h.

-

-Version 1.4.0beta5 [May 15, 2006]

-  Added a missing semicolon in Makefile.am and Makefile.in

-  Deleted extraneous square brackets from configure.ac

-

-Version 1.4.0beta6 [June 2, 2006]

-  Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid

-    buffer overflow.

-  Changed sonum from 0 to 1.

-  Removed unused prototype for png_check_sig() from png.h

-

-Version 1.4.0beta7 [June 16, 2006]

-  Exported png_write_sig (Cosmin).

-  Optimized buffer in png_handle_cHRM() (Cosmin).

-  Set pHYs = 2835 x 2835 pixels per meter, and added

-    sCAL = 0.352778e-3 x 0.352778e-3 meters, in pngtest.png (Cosmin).

-  Added png_set_benign_errors(), png_benign_error(), png_chunk_benign_error().

-  Added typedef for png_int_32 and png_uint_32 on 64-bit systems.

-  Added "(unsigned long)" typecast on png_uint_32 variables in printf lists.

-

-Version 1.4.0beta8 [June 22, 2006]

-  Added demonstration of user chunk support in pngtest.c, to support the

-    public sTER chunk and a private vpAg chunk.

-

-Version 1.4.0beta9 [July 3, 2006]

-  Removed ordinals from scripts/pngw32.def and removed png_info_int and

-    png_set_gray_1_2_4_to_8 entries.

-  Inline call of png_get_uint_32() in png_get_uint_31().

-  Use png_get_uint_31() to get vpAg width and height in pngtest.c

-  Removed WINCE and Netware projects.

-  Removed standalone Y2KINFO file.

-

-Version 1.4.0beta10 [July 12, 2006]

-  Eliminated automatic copy of pngconf.h to pngconf.h.in from configure and

-    some makefiles, because it was not working reliably.  Instead, distribute

-    pngconf.h.in along with pngconf.h and cause configure and some of the

-    makefiles to update pngconf.h from pngconf.h.in.

-  Added pngconf.h to DEPENDENCIES in Makefile.am

-

-Version 1.4.0beta11 [August 19, 2006]

-  Removed AC_FUNC_MALLOC from configure.ac.

-  Added a warning when writing iCCP profile with mismatched profile length.

-  Patched pnggccrd.c to assemble on x86_64 platforms.

-  Moved chunk header reading into a separate function png_read_chunk_header()

-    in pngrutil.c.  The chunk header (len+sig) is now serialized in a single

-    operation (Cosmin).

-  Implemented support for I/O states. Added png_ptr member io_state, and

-    functions png_get_io_chunk_name() and png_get_io_state() in pngget.c

-    (Cosmin).

-  Added png_get_io_chunk_name and png_get_io_state to scripts/*.def (Cosmin).

-  Renamed scripts/pngw32.* to scripts/pngwin.* (Cosmin).

-  Removed the include directories and libraries from CFLAGS and LDFLAGS

-    in scripts/makefile.gcc (Cosmin).

-  Used png_save_uint_32() to set vpAg width and height in pngtest.c (Cosmin).

-  Cast to proper type when getting/setting vpAg units in pngtest.c (Cosmin).

-  Added pngintrn.h to the Visual C++ projects (Cosmin).

-  Removed scripts/list (Cosmin).

-  Updated copyright year in scripts/pngwin.def (Cosmin).

-  Removed PNG_TYPECAST_NULL and used standard NULL consistently (Cosmin).

-  Disallowed the user to redefine png_size_t, and enforced a consistent use

-    of png_size_t across libpng (Cosmin).

-  Changed the type of png_ptr->rowbytes, PNG_ROWBYTES() and friends

-    to png_size_t (Cosmin).

-  Removed png_convert_size() and replaced png_sizeof with sizeof (Cosmin).

-  Removed some unnecessary type casts (Cosmin).

-  Changed prototype of png_get_compression_buffer_size() and

-    png_set_compression_buffer_size() to work with png_size_t instead of

-    png_uint_32 (Cosmin).

-  Removed png_memcpy_check() and png_memset_check() (Cosmin).

-  Fixed a typo (png_byte --> png_bytep) in libpng.3 and libpng.txt (Cosmin).

-  Clarified that png_zalloc() does not clear the allocated memory,

-    and png_zalloc() and png_zfree() cannot be PNGAPI (Cosmin).

-  Renamed png_mem_size_t to png_alloc_size_t, fixed its definition in

-    pngconf.h, and used it in all memory allocation functions (Cosmin).

-  Renamed pngintrn.h to pngpriv.h, added a comment at the top of the file

-    mentioning that the symbols declared in that file are private, and

-    updated the scripts and the Visual C++ projects accordingly (Cosmin).

-  Removed circular references between pngconf.h and pngconf.h.in in

-    scripts/makefile.vc*win32 (Cosmin).

-  Removing trailing '.' from the warning and error messages (Cosmin).

-  Added pngdefs.h that is built by makefile or configure, instead of

-    pngconf.h.in (Glenn).

-  Detect and fix attempt to write wrong iCCP profile length.

-

-Version 1.4.0beta12 [October 19, 2006]

-  Changed "logical" to "bitwise" in the documentation.

-  Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h

-  Add a typecast to stifle compiler warning in pngrutil.c

-

-Version 1.4.0beta13 [November 10, 2006]

-  Fix potential buffer overflow in sPLT chunk handler.

-  Fix Makefile.am to not try to link to noexistent files.

-

-Version 1.4.0beta14 [November 15, 2006]

-  Check all exported functions for NULL png_ptr.

-

-Version 1.4.0beta15 [November 17, 2006]

-  Relocated two misplaced tests for NULL png_ptr.

-  Built Makefile.in with automake-1.9.6 instead of 1.9.2.

-  Build configure with autoconf-2.60 instead of 2.59

-  Add "install: all" in Makefile.am so "configure; make install" will work.

-

-Version 1.4.0beta16 [November 17, 2006]

-  Added a typecast in png_zalloc().

-

-Version 1.4.0beta17 [December 4, 2006]

-  Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c

-  Add "png_bytep" typecast to profile while calculating length in pngwutil.c

-

-Version 1.4.0beta18 [December 7, 2006]

-  Added scripts/CMakeLists.txt

-

-Version 1.4.0beta19 [May 16, 2007]

-  Revised scripts/CMakeLists.txt

-  Rebuilt configure and Makefile.in with newer tools.

-  Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.

-  Added scripts/makefile.nommx

-

-Version 1.4.0beta20 [July 9, 2008]

-  Moved several PNG_HAVE_* macros from pngpriv.h to png.h because applications

-    calling set_unknown_chunk_location() need them.

-  Moved several macro definitions from pngpriv.h to pngconf.h

-  Merge with changes to the 1.2.X branch, as of 1.2.30beta04.

-  Deleted all use of the MMX assembler code and Intel-licensed optimizations.

-  Revised makefile.mingw

-

-Version 1.4.0beta21 [July 21, 2008]

-  Moved local array "chunkdata" from pngrutil.c to the png_struct, so

-    it will be freed by png_read_destroy() in case of a read error (Kurt

-    Christensen).

-

-Version 1.4.0beta22 [July 21, 2008]

-  Change "purpose" and "buffer" to png_ptr->chunkdata to avoid memory leaking.

-

-Version 1.4.0beta23 [July 22, 2008]

-  Change "chunkdata = NULL" to "png_ptr->chunkdata = NULL" several places in

-    png_decompress_chunk().

-

-Version 1.4.0beta24 [July 25, 2008]

-  Change all remaining "chunkdata" to "png_ptr->chunkdata" in

-    png_decompress_chunk(), and remove "chunkdata" from parameter list.

-  Put a call to png_check_chunk_name() in png_read_chunk_header().

-  Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte.

-  Removed two calls to png_check_chunk_name() occurring later in the process.

-  Define PNG_NO_ERROR_NUMBERS by default in pngconf.h

-

-Version 1.4.0beta25 [July 30, 2008]

-  Added a call to png_check_chunk_name() in pngpread.c

-  Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte.

-  Added png_push_have_buffer() function to pngpread.c

-  Eliminated PNG_BIG_ENDIAN_SUPPORTED and associated png_get_* macros.

-  Made inline expansion of png_get_*() optional with PNG_USE_READ_MACROS.

-  Eliminated all PNG_USELESS_TESTS and PNG_CORRECT_PALETTE_SUPPORTED code.

-  Synced contrib directory and configure files with libpng-1.2.30beta06.

-  Eliminated no-longer-used pngdefs.h (but it's still built in the makefiles)

-  Relocated a misplaced "#endif /* PNG_NO_WRITE_FILTER */" in pngwutil.c

-

-Version 1.4.0beta26 [August 4, 2008]

-  Removed png_push_have_buffer() function in pngpread.c.  It increased the

-    compiled library size slightly.

-  Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta)

-  Declared png_ptr "volatile" in pngread.c and pngwrite.c to avoid warnings.

-  Updated contrib/visupng/cexcept.h to version 2.0.1

-  Added PNG_LITERAL_CHARACTER macros for #, [, and ].

-

-Version 1.4.0beta27 [August 5, 2008]

-  Revised usage of PNG_LITERAL_SHARP in pngerror.c.

-  Moved newline character from individual png_debug messages into the

-    png_debug macros.

-  Allow user to #define their own png_debug, png_debug1, and png_debug2.

-

-Version 1.4.0beta28 [August 5, 2008]

-  Revised usage of PNG_LITERAL_SHARP in pngerror.c.

-  Added PNG_STRING_NEWLINE macro

-

-Version 1.4.0beta29 [August 9, 2008]

-  Revised usage of PNG_STRING_NEWLINE to work on non-ISO compilers.

-  Added PNG_STRING_COPYRIGHT macro.

-  Added non-ISO versions of png_debug macros.

-

-Version 1.4.0beta30 [August 14, 2008]

-  Added premultiplied alpha feature (Volker Wiendl).

-

-Version 1.4.0beta31 [August 18, 2008]

-  Moved png_set_premultiply_alpha from pngtrans.c to pngrtran.c

-  Removed extra crc check at the end of png_handle_cHRM().  Bug introduced

-    in libpng-1.4.0beta20.

-

-Version 1.4.0beta32 [August 19, 2008]

-  Added PNG_WRITE_FLUSH_SUPPORTED block around new png_flush() call.

-  Revised PNG_NO_STDIO version of png_write_flush()

-

-Version 1.4.0beta33 [August 20, 2008]

-  Added png_get|set_chunk_cache_max() to limit the total number of sPLT,

-    text, and unknown chunks that can be stored.

-

-Version 1.4.0beta34 [September 6, 2008]

-  Shortened tIME_string to 29 bytes in pngtest.c

-  Fixed off-by-one error introduced in png_push_read_zTXt() function in

-    libpng-1.2.30beta04/pngpread.c (Harald van Dijk)

-

-Version 1.4.0beta35 [October 6, 2008]

-  Changed "trans_values" to "trans_color".

-  Changed so-number from 0 to 14.  Some OS do not like 0.

-  Revised makefile.darwin to fix shared library numbering.

-  Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()

-    in example.c (debian bug report)

-

-Version 1.4.0beta36 [October 25, 2008]

-  Sync with tEXt vulnerability fix in libpng-1.2.33rc02.

-

-Version 1.4.0beta37 [November 13, 2008]

-  Added png_check_cHRM in png.c and moved checking from pngget.c, pngrutil.c,

-    and pngwrite.c

-

-Version 1.4.0beta38 [November 22, 2008]

-  Added check for zero-area RGB cHRM triangle in png_check_cHRM() and

-    png_check_cHRM_fixed().

-

-Version 1.4.0beta39 [November 23, 2008]

-  Revised png_warning() to write its message on standard output by default

-    when warning_fn is NULL.

-

-Version 1.4.0beta40 [November 24, 2008]

-  Eliminated png_check_cHRM().  Instead, always use png_check_cHRM_fixed().

-  In png_check_cHRM_fixed(), ensure white_y is > 0, and removed redundant

-    check for all-zero coordinates that is detected by the triangle check.

-

-Version 1.4.0beta41 [November 26, 2008]

-  Fixed string vs pointer-to-string error in png_check_keyword().

-  Rearranged test expressions in png_check_cHRM_fixed() to avoid internal

-    overflows.

-  Added PNG_NO_CHECK_cHRM conditional.

-

-Version 1.4.0beta42, 43 [December 1, 2008]

-  Merge png_debug with version 1.2.34beta04.

-

-Version 1.4.0beta44 [December 6, 2008]

-  Removed redundant check for key==NULL before calling png_check_keyword()

-    to ensure that new_key gets initialized and removed extra warning

-    (Merge with version 1.2.34beta05 -- Arvan Pritchard).

-

-Version 1.4.0beta45 [December 9, 2008]

-  In png_write_png(), respect the placement of the filler bytes in an earlier

-    call to png_set_filler() (Jim Barry).

-

-Version 1.4.0beta46 [December 10, 2008]

-  Undid previous change and added PNG_TRANSFORM_STRIP_FILLER_BEFORE and

-    PNG_TRANSFORM_STRIP_FILLER_AFTER conditionals and deprecated

-    PNG_TRANSFORM_STRIP_FILLER (Jim Barry).

-

-Version 1.4.0beta47 [December 15, 2008]

-  Support for dithering was disabled by default, because it has never

-    been well tested and doesn't work very well.  The code has not

-    been removed, however, and can be enabled by building libpng with

-    PNG_READ_DITHER_SUPPORTED defined.

-

-Version 1.4.0beta48 [February 14, 2009]

-  Added new exported function png_calloc().

-  Combined several instances of png_malloc(); png_memset() into png_calloc().

-  Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24

-    but was never defined.

-

-Version 1.4.0beta49 [February 28, 2009]

-  Added png_fileno() macro to pngconf.h, used in pngwio.c

-  Corrected order of #ifdef's in png_debug definition in png.h

-  Fixed bug introduced in libpng-1.4.0beta48 with the memset arguments

-    for pcal_params.

-  Fixed order of #ifdef directives in the png_debug defines in png.h

-    (bug introduced in libpng-1.2.34/1.4.0beta29).

-  Revised comments in png_set_read_fn() and png_set_write_fn().

-

-Version 1.4.0beta50 [March 18, 2009]

-  Use png_calloc() instead of png_malloc() to allocate big_row_buf when

-    reading an interlaced file, to avoid a possible UMR.

-  Undid revision of PNG_NO_STDIO version of png_write_flush().  Users

-    having trouble with fflush() can build with PNG_NO_WRITE_FLUSH defined

-    or supply their own flush_fn() replacement.

-  Revised libpng*.txt and png.h documentation about use of png_write_flush()

-    and png_set_write_fn().

-  Removed fflush() from pngtest.c.

-  Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h

-

-Version 1.4.0beta51 [March 21, 2009]

-  Removed new png_fileno() macro from pngconf.h .

-

-Version 1.4.0beta52 [March 27, 2009]

-  Relocated png_do_chop() ahead of building gamma tables in pngrtran.c

-    This avoids building 16-bit gamma tables unnecessarily.

-  Removed fflush() from pngtest.c.

-  Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h

-  Added a section on differences between 1.0.x and 1.2.x to libpng.3/libpng.txt

-

-Version 1.4.0beta53 [April 1, 2009]

-  Removed some remaining MMX macros from pngpriv.h

-  Fixed potential memory leak of "new_name" in png_write_iCCP() (Ralph Giles)

-

-Version 1.4.0beta54 [April 13, 2009]

-  Added "ifndef PNG_SKIP_SETJMP_CHECK" block in pngconf.h to allow

-    application code writers to bypass the check for multiple inclusion

-    of setjmp.h when they know that it is safe to ignore the situation.

-  Eliminated internal use of setjmp() in pngread.c and pngwrite.c

-  Reordered ancillary chunks in pngtest.png to be the same as what

-    pngtest now produces, and made some cosmetic changes to pngtest output.

-  Eliminated deprecated png_read_init_3() and png_write_init_3() functions.

-

-Version 1.4.0beta55 [April 15, 2009]

-  Simplified error handling in pngread.c and pngwrite.c by putting

-    the new png_read_cleanup() and png_write_cleanup() functions inline.

-

-Version 1.4.0beta56 [April 25, 2009]

-  Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress

-    "shadowed declaration" warning from gcc-4.3.3.

-  Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"

-    warning about a global "gamma" variable in math.h on some platforms.

-

-Version 1.4.0beta57 [May 2, 2009]

-  Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24

-    but was never defined (again).

-  Rebuilt configure scripts with autoconf-2.63 instead of 2.62

-  Removed pngprefs.h and MMX from makefiles

-

-Version 1.4.0beta58 [May 14, 2009]

-  Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced

-    in beta57).

-  Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)

-

-Version 1.4.0beta59 [May 15, 2009]

-  Reformated sources in libpng style (3-space intentation, comment format)

-  Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG)

-  Added sections about the git repository and our coding style to the

-    documentation

-  Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.

-

-Version 1.4.0beta60 [May 19, 2009]

-  Conditionally compile png_read_finish_row() which is not used by

-    progressive readers.

-  Added contrib/pngminim/preader to demonstrate building minimal progressive

-    decoder, based on contrib/gregbook with embedded libpng and zlib.

-

-Version 1.4.0beta61 [May 20, 2009]

-  In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there

-    is only one makefile in those directories, and revised the README files

-    accordingly.

-  More reformatting of comments, mostly to capitalize sentences.

-

-Version 1.4.0beta62 [June 2, 2009]

-  Added "#define PNG_NO_WRITE_SWAP" to contrib/pngminim/encoder/pngusr.h

-    and "define PNG_NO_READ_SWAP" to decoder/pngusr.h and preader/pngusr.h

-  Reformatted several remaining "else statement" into two lines.

-  Added a section to the libpng documentation about using png_get_io_ptr()

-    in configure scripts to detect the presence of libpng.

-

-Version 1.4.0beta63 [June 15, 2009]

-  Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR()

-    multiple times and to specify the sample order in the tRNS chunk,

-    because the ISO PNG specification has a typo in the tRNS table.

-  Changed several PNG_UNKNOWN_CHUNK_SUPPORTED to

-    PNG_HANDLE_AS_UNKNOWN_SUPPORTED, to make the png_set_keep mechanism

-    available for ignoring known chunks even when not saving unknown chunks.

-  Adopted preference for consistent use of "#ifdef" and "#ifndef" versus

-    "#if defined()" and "if !defined()" where possible.

-

-Version 1.4.0beta64 [June 24, 2009]

-  Eliminated PNG_LEGACY_SUPPORTED code.

-  Moved the various unknown chunk macro definitions outside of the

-    PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.

-

-Version 1.4.0beta65 [June 26, 2009]

-  Added a reference to the libpng license in each file.

-

-Version 1.4.0beta66 [June 27, 2009]

-  Refer to the libpng license instead of the libpng license in each file.

-

-Version 1.4.0beta67 [July 6, 2009]

-  Relocated INVERT_ALPHA within png_read_png() and png_write_png().

-  Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.

-  Added an "xcode" project to the projects directory (Alam Arias).

-

-Version 1.4.0beta68 [July 19, 2009]

-  Avoid some tests in filter selection in pngwutil.c

-

-Version 1.4.0beta69 [July 25, 2009]

-  Simplified the new filter-selection test.  This runs faster in the

-    common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.

-  Removed extraneous declaration from the new call to png_read_gray_to_rgb()

-    (bug introduced in libpng-1.4.0beta67).

-  Fixed up xcode project (Alam Arias)

-  Added a prototype for png_64bit_product() in png.c

-

-Version 1.4.0beta70 [July 27, 2009]

-  Avoid a possible NULL dereference in debug build, in png_set_text_2().

-    (bug introduced in libpng-0.95, discovered by Evan Rouault)

-

-Version 1.4.0beta71 [July 29, 2009]

-  Rebuilt configure scripts with autoconf-2.64.

-

-Version 1.4.0beta72 [August 1, 2009]

-  Replaced *.tar.lzma with *.tar.xz in distribution.  Get the xz codec

-    from <http://tukaani.org/xz>.

-

-Version 1.4.0beta73 [August 1, 2009]

-  Reject attempt to write iCCP chunk with negative embedded profile length

-    (JD Chen) (CVE-2009-5063).

-

-Version 1.4.0beta74 [August 8, 2009]

-  Changed png_ptr and info_ptr member "trans" to "trans_alpha".

-

-Version 1.4.0beta75 [August 21, 2009]

-  Removed an extra png_debug() recently added to png_write_find_filter().

-  Fixed incorrect #ifdef in pngset.c regarding unknown chunk support.

-

-Version 1.4.0beta76 [August 22, 2009]

-  Moved an incorrectly located test in png_read_row() in pngread.c

-

-Version 1.4.0beta77 [August 27, 2009]

-  Removed lpXYZ.tar.bz2 (with CRLF), KNOWNBUG, libpng-x.y.z-KNOWNBUG.txt,

-    and the "noconfig" files from the distribution.

-  Moved CMakeLists.txt from scripts into the main libpng directory.

-  Various bugfixes and improvements to CMakeLists.txt (Philip Lowman)

-

-Version 1.4.0beta78 [August 31, 2009]

-  Converted all PNG_NO_* tests to PNG_*_SUPPORTED everywhere except pngconf.h

-  Eliminated PNG_NO_FREE_ME and PNG_FREE_ME_SUPPORTED macros.

-  Use png_malloc plus a loop instead of png_calloc() to initialize

-    row_pointers in png_read_png().

-

-Version 1.4.0beta79 [September 1, 2009]

-  Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays.

-  Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc().

-

-Version 1.4.0beta80 [September 17, 2009]

-  Removed scripts/libpng.icc

-  Changed typecast of filler from png_byte to png_uint_16 in png_set_filler().

-    (Dennis Gustafsson)

-  Fixed typo introduced in beta78 in pngtest.c ("#if def " should be "#ifdef ")

-

-Version 1.4.0beta81 [September 23, 2009]

-  Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h

-  Expanded TAB characters in pngrtran.c

-  Removed PNG_CONST from all "PNG_CONST PNG_CHNK" declarations to avoid

-    compiler complaints about doubly declaring things "const".

-  Changed all "#if [!]defined(X)" to "if[n]def X" where possible.

-  Eliminated unused png_ptr->row_buf_size

-

-Version 1.4.0beta82 [September 25, 2009]

-  Moved redundant IHDR checking into new png_check_IHDR() in png.c

-    and report all errors found in the IHDR data.

-  Eliminated useless call to png_check_cHRM() from pngset.c

-

-Version 1.4.0beta83 [September 25, 2009]

-  Revised png_check_IHDR() to eliminate bogus complaint about filter_type.

-

-Version 1.4.0beta84 [September 30, 2009]

-  Fixed some inconsistent indentation in pngconf.h

-  Revised png_check_IHDR() to add a test for width variable less than 32-bit.

-

-Version 1.4.0beta85 [October 1, 2009]

-  Revised png_check_IHDR() again, to check info_ptr members instead of

-    the contents of the returned parameters.

-

-Version 1.4.0beta86 [October 9, 2009]

-  Updated the "xcode" project (Alam Arias).

-  Eliminated a shadowed declaration of "pp" in png_handle_sPLT().

-

-Version 1.4.0rc01 [October 19, 2009]

-  Trivial cosmetic changes.

-

-Version 1.4.0beta87 [October 30, 2009]

-  Moved version 1.4.0 back into beta.

-

-Version 1.4.0beta88 [October 30, 2009]

-  Revised libpng*.txt section about differences between 1.2.x and 1.4.0

-    because most of the new features have now been ported back to 1.2.41

-

-Version 1.4.0beta89 [November 1, 2009]

-  More bugfixes and improvements to CMakeLists.txt (Philip Lowman)

-  Removed a harmless extra png_set_invert_alpha() from pngwrite.c

-  Apply png_user_chunk_cache_max within png_decompress_chunk().

-  Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate.

-

-Version 1.4.0beta90 [November 2, 2009]

-  Removed all remaining WIN32_WCE #ifdefs except those involving the

-    time.h "tm" structure

-

-Version 1.4.0beta91 [November 3, 2009]

-  Updated scripts/pngw32.def and projects/wince/png32ce.def

-  Copied projects/wince/png32ce.def to the scripts directory.

-  Added scripts/makefile.wce

-  Patched ltmain.sh for wince support.

-  Added PNG_CONVERT_tIME_SUPPORTED macro.

-

-Version 1.4.0beta92 [November 4, 2009]

-  Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED

-  Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_WRITE_tIME_SUPPORTED

-  Revised libpng*.txt to describe differences from 1.2.40 to 1.4.0 (instead

-    of differences from 1.2.41 to 1.4.0)

-

-Version 1.4.0beta93 [November 7, 2009]

-  Added PNG_DEPSTRUCT, PNG_DEPRECATED, PNG_USE_RESULT, PNG_NORETURN, and

-    PNG_ALLOCATED macros to detect deprecated direct access to the

-    png_struct or info_struct members and other deprecated usage in

-    applications (John Bowler).

-  Updated scripts/makefile* to add "-DPNG_CONFIGURE_LIBPNG" to CFLAGS,

-    to prevent warnings about direct access to png structs by libpng

-    functions while building libpng.  They need to be tested, especially

-    those using compilers other than gcc.

-  Updated projects/visualc6 and visualc71 with "/d PNG_CONFIGURE_LIBPNG".

-    They should work but still need to be updated to remove

-    references to pnggccrd.c or pngvcrd.c and ASM building.

-  Added README.txt to the beos, cbuilder5, netware, and xcode projects warning

-    that they need to be updated, to remove references to pnggccrd.c and

-    pngvcrd.c and to depend on pngpriv.h

-  Removed three direct references to read_info_ptr members in pngtest.c

-    that were detected by the new PNG_DEPSTRUCT macro.

-  Moved the png_debug macro definitions and the png_read_destroy(),

-    png_write_destroy() and png_far_to_near() prototypes from png.h

-    to pngpriv.h (John Bowler)

-  Moved the synopsis lines for png_read_destroy(), png_write_destroy()

-    png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.

-

-Version 1.4.0beta94 [November 9, 2009]

-  Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.

-  Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.

-  Removed dependency of pngtest.o on pngpriv.h in the makefiles.

-  Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.

-

-Version 1.4.0beta95 [November 10, 2009]

-  Changed png_check_sig() to !png_sig_cmp() in contrib programs.

-  Added -DPNG_CONFIGURE_LIBPNG to contrib/pngminm/*/makefile

-  Changed png_check_sig() to !png_sig_cmp() in contrib programs.

-  Corrected the png_get_IHDR() call in contrib/gregbook/readpng2.c

-  Changed pngminim/*/gather.sh to stop trying to remove pnggccrd.c and pngvcrd.c

-  Added dependency on pngpriv.h in contrib/pngminim/*/makefile

-

-Version 1.4.0beta96 [November 12, 2009]

-  Renamed scripts/makefile.wce to scripts/makefile.cegcc

-  Revised Makefile.am to use libpng.sys while building libpng.so

-    so that only PNG_EXPORT functions are exported.

-  Removed the deprecated png_check_sig() function/macro.

-  Removed recently removed function names from scripts/*.def

-  Revised pngtest.png to put chunks in the same order written by pngtest

-    (evidently the same change made in libpng-1.0beta54 was lost).

-  Added PNG_PRIVATE macro definition in pngconf.h for possible future use.

-

-Version 1.4.0beta97 [November 13, 2009]

-  Restored pngtest.png to the libpng-1.4.0beta7 version.

-  Removed projects/beos and netware.txt; no one seems to be supporting them.

-  Revised Makefile.in

-

-Version 1.4.0beta98 [November 13, 2009]

-  Added the "xcode" project to zip distributions,

-  Fixed a typo in scripts/pngwin.def introduced in beta97.

-

-Version 1.4.0beta99 [November 14, 2009]

-  Moved libpng-config.in and libpng.pc-configure.in out of the scripts

-    directory, to libpng-config.in and libpng-pc.in, respectively, and

-    modified Makefile.am and configure.ac accordingly.  Now "configure"

-    needs nothing from the "scripts" directory.

-  Avoid redefining PNG_CONST in pngconf.h

-

-Version 1.4.0beta100 [November 14, 2009]

-  Removed ASM builds from projects/visualc6 and projects/visualc71

-  Removed scripts/makefile.nommx and makefile.vcawin32

-  Revised CMakeLists.txt to account for new location of libpng-config.in

-    and libpng-pc.in

-  Updated INSTALL to reflect removal and relocation of files.

-

-Version 1.4.0beta101 [November 14, 2009]

-  Restored the binary files (*.jpg, *.png, some project files) that were

-    accidentally deleted from the zip and 7z distributions when the xcode

-    project was added.

-

-Version 1.4.0beta102 [November 18, 2009]

-  Added libpng-config.in and libpng-pc.in to the zip and 7z distributions.

-  Fixed a typo in projects/visualc6/pngtest.dsp, introduced in beta100.

-  Moved descriptions of makefiles and other scripts out of INSTALL into

-    scripts/README.txt

-  Updated the copyright year in scripts/pngwin.rc from 2006 to 2009.

-

-Version 1.4.0beta103 [November 21, 2009]

-  Removed obsolete comments about ASM from projects/visualc71/README_zlib.txt

-  Align row_buf on 16-byte boundary in memory.

-  Restored the PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED guard around the call

-    to png_flush() after png_write_IEND().  See 1.4.0beta32, 1.4.0beta50

-    changes above and 1.2.30, 1.2.30rc01 and rc03 in 1.2.41 CHANGES.  Someone

-    needs this feature.

-  Make the 'png_jmpbuf' macro expand to a call that records the correct

-    longjmp function as well as returning a pointer to the setjmp

-    jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'.

-    (John Bowler)

-

-Version 1.4.0beta104 [November 22, 2009]

-  Removed png_longjmp_ptr from scripts/*.def and libpng.3

-  Rebuilt configure scripts with autoconf-2.65

-

-Version 1.4.0beta105 [November 25, 2009]

-  Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535()

-    to accomplish alpha premultiplication when

-    PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined.

-  Changed "/255" to "/255.0" in background calculations to make it clear

-    that the 255 is used as a double.

-

-Version 1.4.0beta106 [November 27, 2009]

-  Removed premultiplied alpha feature.

-

-Version 1.4.0beta107 [December 4, 2009]

-  Updated README

-  Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.

-  Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.

-  Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco

-    to put png.h and pngconf.h in $prefix/include, like the other scripts,

-    instead of in $prefix/include/libpng.  Also revised makefile.sco

-    to put them in $prefix/include/libpng15 instead of in

-    $prefix/include/libpng/libpng15.

-

-Version 1.4.0beta108 [December 11, 2009]

-  Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile

-  Relocated png_do_chop() to its original position in pngrtran.c; the

-    change in version 1.2.41beta08 caused transparency to be handled wrong

-    in some 16-bit datastreams (Yusaku Sugai).

-

-Version 1.4.0beta109 [December 13, 2009]

-  Added "bit_depth" parameter to the private png_build_gamma_table() function.

-  Pass bit_depth=8 to png_build_gamma_table() when bit_depth is 16 but the

-    PNG_16_TO_8 transform has been set, to avoid unnecessary build of 16-bit

-    tables.

-

-Version 1.4.0rc02 [December 20, 2009]

-  Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c

-

-Version 1.4.0rc03 [December 22, 2009]

-  Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt

-    (revising the change in 1.4.0beta99)

-

-Version 1.4.0rc04 [December 25, 2009]

-  Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-    in pngset.c to be consistent with other changes in version 1.2.38.

-

-Version 1.4.0rc05 [December 25, 2009]

-  Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and

-    Makefile.in to be consistent with changes in libpng-1.4.0rc03

-

-Version 1.4.0rc06 [December 29, 2009]

-  Reverted the gamma_table changes from libpng-1.4.0beta109.

-  Fixed some indentation errors.

-

-Version 1.4.0rc07 [January 1, 2010]

-  Revised libpng*.txt and libpng.3 about 1.2.x->1.4.x differences.

-  Use png_calloc() instead of png_malloc(); png_memset() in pngrutil.c

-  Update copyright year to 2010.

-

-Version 1.4.0rc08 [January 2, 2010]

-  Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr

-    in pngtest.c

-

-Version 1.4.0 [January 3, 2010]

-  No changes.

-

-Version 1.4.1beta01 [January 8, 2010]

-  Updated CMakeLists.txt for consistent indentation and to avoid an

-    unclosed if-statement warning (Philip Lowman).

-  Revised Makefile.am and Makefile.in to remove references to Y2KINFO,

-    KNOWNBUG, and libpng.la (Robert Schwebel).

-  Revised the makefiles to install the same files and symbolic

-    links as configure, except for libpng.la and libpng14.la.

-  Make png_set|get_compression_buffer_size() available even when

-    PNG_WRITE_SUPPORTED is not enabled.

-  Revised Makefile.am and Makefile.in to simplify their maintenance.

-  Revised scripts/makefile.linux to install a link to libpng14.so.14.1

-

-Version 1.4.1beta02 [January 9, 2010]

-  Revised the rest of the makefiles to install a link to libpng14.so.14.1

-

-Version 1.4.1beta03 [January 10, 2010]

-  Removed png_set_premultiply_alpha() from scripts/*.def

-

-Version 1.4.1rc01 [January 16, 2010]

-  No changes.

-

-Version 1.4.1beta04 [January 23, 2010]

-  Revised png_decompress_chunk() to improve speed and memory usage when

-    decoding large chunks.

-  Added png_set|get_chunk_malloc_max() functions.

-

-Version 1.4.1beta05 [January 26, 2010]

-  Relocated "int k" declaration in pngtest.c to minimize its scope.

-

-Version 1.4.1beta06 [January 28, 2010]

-  Revised png_decompress_chunk() to use a two-pass method suggested by

-    John Bowler.

-

-Version 1.4.1beta07 [February 6, 2010]

-  Folded some long lines in the source files.

-  Added defineable PNG_USER_CHUNK_CACHE_MAX, PNG_USER_CHUNK_MALLOC_MAX,

-    and a PNG_USER_LIMITS_SUPPORTED flag.

-  Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as

-    png_ptr->png_user_chunk_malloc_max.

-  Revised png_push_save_buffer() to do fewer but larger png_malloc() calls.

-

-Version 1.4.1beta08 [February 6, 2010]

-  Minor cleanup and updating of dates and copyright year.

-

-Version 1.5.0beta01 [February 7, 2010]

-  Moved declaration of png_struct into private pngstruct.h and png_info

-    into pnginfo.h

-

-Version 1.4.1beta09 and 1.5.0beta02 [February 7, 2010]

-  Reverted to original png_push_save_buffer() code.

-

-Version 1.4.1beta10 and 1.5.0beta03 [February 8, 2010]

-  Return allocated "old_buffer" in png_push_save_buffer() before

-    calling png_error(), to avoid a potential memory leak.

-  Updated configure script to use SO number 15.

-

-Version 1.5.0beta04 [February 9, 2010]

-  Removed malformed "incomplete struct declaration" of png_info from png.h

-

-Version 1.5.0beta05 [February 12, 2010]

-  Removed PNG_DEPSTRUCT markup in pngstruct.h and pnginfo.h, and undid the

-    linewrapping that it entailed.

-  Revised comments in pngstruct.h and pnginfo.h and added pointers to

-    the libpng license.

-  Changed PNG_INTERNAL to PNG_EXPOSE_INTERNAL_STRUCTURES

-  Removed the cbuilder5 project, which has not been updated to 1.4.0.

-

-Version 1.4.1beta12 and 1.5.0beta06 [February 14, 2010]

-  Fixed type declaration of png_get_chunk_malloc_max() in pngget.c (Daisuke

-    Nishikawa)

-

-Version 1.5.0beta07 [omitted]

-

-Version 1.5.0beta08 [February 19, 2010]

-  Changed #ifdef PNG_NO_STDIO_SUPPORTED to #ifdef PNG_NO_CONSOLE_IO_SUPPORTED

-    wherever png_snprintf() is used to construct error and warning messages.

-  Noted in scripts/makefile.mingw that it expects to be run under MSYS.

-  Removed obsolete unused MMX-querying support from contrib/gregbook

-  Added exported png_longjmp() function.

-  Removed the AIX redefinition of jmpbuf in png.h

-  Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt

-    when building on AIX.

-

-Version 1.5.0beta09 [February 19, 2010]

-  Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt.

-  Changed the name of png_ptr->jmpbuf to png_ptr->png_jmpbuf in pngstruct.h

-

-Version 1.5.0beta10 [February 25, 2010]

-  Removed unused gzio.c from contrib/pngminim gather and makefile scripts

-  Removed replacement error handlers from contrib/gregbook.  Because of

-    the new png_longjmp() function they are no longer needed.

-

-Version 1.5.0beta11 [March 6, 2010]

-  Removed checking for already-included setjmp.h from pngconf.h

-  Fixed inconsistent indentations and made numerous cosmetic changes.

-  Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5

-

-Version 1.5.0beta12 [March 9, 2010]

-  Moved "#include png.h" inside pngpriv.h and removed "#include png.h" from

-    the source files, along with "#define PNG_EXPOSE_INTERNAL_STRUCTURES"

-    and "#define PNG_NO_PEDANTIC_WARNINGS" (John Bowler).

-  Created new pngdebug.h and moved debug definitions there.

-

-Version 1.5.0beta13 [March 10, 2010]

-  Protect pngstruct.h, pnginfo.h, and pngdebug.h from being included twice.

-  Revise the "#ifdef" blocks in png_inflate() so it will compile when neither

-    PNG_USER_CHUNK_MALLOC_MAX nor PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED

-    is defined.

-  Removed unused png_measure_compressed_chunk() from pngpriv.h and libpngpf.3

-  Moved the 'config.h' support from pngconf.h to pngpriv.h

-  Removed PNGAPI from the png_longjmp_ptr typedef.

-  Eliminated dependence of pngtest.c on the private pngdebug.h file.

-  Make all png_debug macros into *unterminated* statements or

-    expressions (i.e. a trailing ';' must always be added) and correct

-    the format statements in various png_debug messages.

-

-Version 1.5.0beta14 [March 14, 2010]

-  Removed direct access to png_ptr->io_ptr from the Windows code in pngtest.c

-  Revised Makefile.am to account for recent additions and replacements.

-  Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and

-    added ordinal numbers to the Windows DEF file and corrected the duplicated

-    ordinal numbers on CE symbols that are commented out.

-  Added back in export symbols that can be present in the Windows build but

-    are disabled by default.

-  PNG_EXPORT changed to include an 'ordinal' field for DEF file generation.

-    PNG_CALLBACK added to make callback definitions uniform.  PNGAPI split

-    into PNGCAPI (base C form), PNGAPI (exports) and PNGCBAPI (callbacks),

-    and appropriate changes made to all files.  Cygwin builds re-hinged to

-    allow procedure call standard changes and to remove the need for the DEF

-    file (fixes build on Cygwin).

-  Enabled 'attribute' warnings that are relevant to library APIs and callbacks.

-  Changed rules for generation of the various symbol files and added a new

-    rule for a DEF file (which is also added to the distribution).

-  Updated the symbol file generation to stop it adding spurious spaces

-    to EOL (coming from preprocessor macro expansion).  Added a facility

-    to join tokens in the output and rewrite *.dfn to use this.

-  Eliminated scripts/*.def in favor of libpng.def; updated projects/visualc71

-    and removed scripts/makefile.cygwin.

-  Made PNG_BUILD_DLL safe: it can be set whenever a DLL is being built.

-  Removed the include of sys/types.h - apparently unnecessary now on the

-    platforms on which it happened (all but Mac OS and RISC OS).

-  Moved the Mac OS test into pngpriv.h (the only place it is used.)

-

-Version 1.5.0beta15 [March 17, 2010]

-  Added symbols.chk target to Makefile.am to validate the symbols in png.h

-    against the new DEF file scripts/symbols.def.

-  Changed the default DEF file back to pngwin.def.

-  Removed makefile.mingw.

-  Eliminated PNG_NO_EXTERN and PNG_ALL_EXTERN

-

-Version 1.5.0beta16 [April 1, 2010]

-  Make png_text_struct independent of PNG_iTXt_SUPPORTED, so that

-    fields are initialized in all configurations.  The READ/WRITE

-    macros (PNG_(READ|WRITE)_iTXt_SUPPORTED) still function as

-    before to disable code to actually read or write iTXt chunks

-    and iTXt_SUPPORTED can be used to detect presence of either

-    read or write support (but it is probably better to check for

-    the one actually required - read or write.)

-  Combined multiple png_warning() calls for a single error.

-  Restored the macro definition of png_check_sig().

-

-Version 1.5.0beta17 [April 17, 2010]

-  Added some "(long)" typecasts to printf calls in png_handle_cHRM().

-  Documented the fact that png_set_dither() was disabled since libpng-1.4.0.

-  Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect

-    more accurately what it actually does.  At the same time, renamed

-    the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to

-    PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS.

-  Added some "(long)" typecasts to printf calls in png_handle_cHRM().

-  Freeze build-time only configuration in the build.

-    In all prior versions of libpng most configuration options

-    controlled by compiler #defines had to be repeated by the

-    application code that used libpng.  This patch changes this

-    so that compilation options that can only be changed at build

-    time are frozen in the build.  Options that are compiler

-    dependent (and those that are system dependent) are evaluated

-    each time - pngconf.h holds these.  Options that can be changed

-    per-file in the application are in png.h.  Frozen options are

-    in the new installed header file pnglibconf.h (John Bowler)

-  Removed the xcode project because it has not been updated to work

-    with libpng-1.5.0.

-  Removed the ability to include optional pngusr.h

-

-Version 1.5.0beta18 [April 17, 2010]

-  Restored the ability to include optional pngusr.h

-  Moved replacements for png_error() and png_warning() from the

-    contrib/pngminim project to pngerror.c, for use when warnings or

-    errors are disabled via PNG_NO_WARN or PNG_NO_ERROR_TEXT, to avoid

-    storing unneeded error/warning text.

-  Updated contrib/pngminim project to work with the new pnglibconf.h

-  Added some PNG_NO_* defines to contrib/pngminim/*/pngusr.h to save space.

-

-Version 1.5.0beta19 [April 24, 2010]

-  Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the functions

-    to read and write ints to be disabled independently of PNG_USE_READ_MACROS,

-    which allows libpng to be built with the functions even though the default

-    is to use the macros - this allows applications to choose at app build

-    time whether or not to use macros (previously impossible because the

-    functions weren't in the default build.)

-  Changed Windows calling convention back to __cdecl for API functions.

-    For Windows/x86 platforms only:

-      __stdcall is no longer needed for Visual Basic, so libpng-1.5.0 uses

-      __cdecl throughout (both API functions and callbacks) on Windows/x86

-      platforms.

-  Replaced visualc6 and visualc71 projects with new vstudio project

-  Relaxed the overly-restrictive permissions of some files.

-

-Version 1.5.0beta20 [April 24, 2010]

-  Relaxed more overly-restrictive permissions of some files.

-

-Version 1.5.0beta21 [April 27, 2010]

-  Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new

-    vstudio project files, and some trivial editing of some files in the

-    scripts directory.

-  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in

-    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.

-

-Version 1.5.0beta22 [April 28, 2010]

-  Fixed dependencies of GET_INT_32 - it does not require READ_INT_FUNCTIONS

-    because it has a macro equivalent.

-  Improved the options.awk script; added an "everything off" option.

-  Revised contrib/pngminim to use the "everything off" option in pngusr.dfa.

-

-Version 1.5.0beta23 [April 29, 2010]

-  Corrected PNG_REMOVED macro to take five arguments.

-    The macro was documented with two arguments (name,ordinal), however

-    the symbol checking .dfn files assumed five arguments.  The five

-    argument form seems more useful so it is changed to that.

-  Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-    in gregbook/readpng2.c

-  Corrected protection of png_get_user_transform_ptr. The API declaration in

-    png.h is removed if both READ and WRITE USER_TRANSFORM are turned off

-    but was left defined in pngtrans.c

-  Added logunsupported=1 to cause pnglibconf.h to document disabled options.

-    This makes the installed pnglibconf.h more readable but causes no

-    other change.  The intention is that users of libpng will find it

-    easier to understand if an API they need is missing.

-  Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined.

-  Removed dummy_inflate.c from contrib/pngminim/encoder

-  Removed contrib/pngminim/*/gather.sh; gathering is now done in the makefile.

-

-Version 1.5.0beta24 [May 7, 2010]

-  Use bitwise "&" instead of arithmetic mod in pngrutil.c calculation of the

-    offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.

-  Added more blank lines for readability.

-

-Version 1.5.0beta25 [June 18, 2010]

-  In pngpread.c: png_push_have_row() add check for new_row > height

-  Removed the now-redundant check for out-of-bounds new_row from example.c

-

-Version 1.5.0beta26 [June 18, 2010]

-  In pngpread.c: png_push_process_row() add check for too many rows.

-

-Version 1.5.0beta27 [June 18, 2010]

-  Removed the check added in beta25 as it is now redundant.

-

-Version 1.5.0beta28 [June 20, 2010]

-  Rewrote png_process_IDAT_data to consistently treat extra data as warnings

-    and handle end conditions more cleanly.

-  Removed the new (beta26) check in png_push_process_row().

-

-Version 1.5.0beta29 [June 21, 2010]

-  Revised scripts/options.awk to work on Sunos (but still doesn't work)

-  Added comment to options.awk and contrib/pngminim/*/makefile to try nawk.

-

-Version 1.5.0beta30 [June 22, 2010]

-  Stop memory leak when reading a malformed sCAL chunk.

-

-Version 1.5.0beta31 [June 26, 2010]

-  Revised pngpread.c patch of beta28 to avoid an endless loop.

-  Removed some trailing blanks.

-

-Version 1.5.0beta32 [June 26, 2010]

-  Removed leftover scripts/options.patch and scripts/options.rej

-

-Version 1.5.0beta33 [July 6, 3010]

-  Made FIXED and FLOATING options consistent in the APIs they enable and

-    disable.  Corrected scripts/options.awk to handle both command line

-    options and options specified in the .dfa files.

-  Changed char *msg to PNG_CONST char *msg in pngrutil.c

-  Make png_set_sRGB_gAMA_and_cHRM set values using either the fixed or

-    floating point APIs, but not both.

-  Reversed patch to remove error handler when the jmp_buf is stored in the

-    main program structure, not the png_struct.

-    The error handler is needed because the default handler in libpng will

-    always use the jmp_buf in the library control structure; this is never

-    set.  The gregbook code is a useful example because, even though it

-    uses setjmp/longjmp, it shows how error handling can be implemented

-    using control mechanisms not directly supported by libpng.  The

-    technique will work correctly with mechanisms such as Microsoft

-    Structure Exceptions or C++ exceptions (compiler willing - note that gcc

-    does not by default support interworking of C and C++ error handling.)

-  Reverted changes to call png_longjmp in contrib/gregbook where it is not

-    appropriate.  If mainprog->jmpbuf is used by setjmp, then png_longjmp

-    cannot be used.

-  Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans)

-  Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {')

-

-Version 1.5.0beta34 [July 12, 2010]

-  Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h

-

-Version 1.5.0beta35 [July 24, 2010]

-  Removed some newly-added TAB characters.

-  Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2

-  Moved the definition of png_snprintf() outside of the enclosing

-    #ifdef blocks in pngconf.h

-

-Version 1.5.0beta36 [July 29, 2010]

-  Patches by John Bowler:

-  Fixed point APIs are now supported throughout (no missing APIs).

-  Internal fixed point arithmetic support exists for all internal floating

-    point operations.

-  sCAL validates the floating point strings it is passed.

-  Safe, albeit rudimentary, Watcom support is provided by PNG_API_RULE==2

-  Two new APIs exist to get the number of passes without turning on the

-    PNG_INTERLACE transform and to get the number of rows in the current

-    pass.

-  A new test program, pngvalid.c, validates the gamma code.

-  Errors in the 16-bit gamma correction (overflows) have been corrected.

-  cHRM chunk testing is done consistently (previously the floating point

-    API bypassed it, because the test really didn't work on FP, now the test

-    is performed on the actual values to be stored in the PNG file so it

-    works in the FP case too.)

-  Most floating point APIs now simply call the fixed point APIs after

-    converting the values to the fixed point form used in the PNG file.

-  The standard headers no longer include zlib.h, which is currently only

-    required for pngstruct.h and can therefore be internal.

-  Revised png_get_int_32 to undo the PNG two's complement representation of

-    negative numbers.

-

-Version 1.5.0beta37 [July 30, 2010]

-  Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid

-    a compiler warning.

-  Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png

-

-Version 1.5.0beta38 [July 31, 2010]

-  Implemented remaining "_fixed" functions.

-  Corrected a number of recently introduced warnings mostly resulting from

-    safe but uncast assignments to shorter integers.  Also added a zlib

-    VStudio release library project because the latest zlib Official Windows

-    build does not include such a thing.

-  Revised png_get_int_16() to be similar to png_get_int_32().

-  Restored projects/visualc71.

-

-Version 1.5.0beta39 [August 2, 2010]

-  VisualC/GCC warning fixes, VisualC build fixes

-  The changes include support for function attributes in VC in addition to

-    those already present in GCC - necessary because without these some

-    warnings are unavoidable.  Fixes include signed/unsigned fixes in

-    pngvalid and checks with gcc -Wall -Wextra -Wunused.

-  VC requires function attributes on function definitions as well as

-    declarations, PNG_FUNCTION has been added to enable this and the

-    relevant function definitions changed.

-

-Version 1.5.0beta40 [August 6, 2010]

-  Correct use of _WINDOWS_ in pngconf.h

-  Removed png_mem_ #defines; they are no longer used.

-  Added the sRGB chunk to pngtest.png

-

-Version 1.5.0beta41 [August 11, 2010]

-  Added the cHRM chunk to pngtest.png

-  Don't try to use version-script with cygwin/mingw.

-  Revised contrib/gregbook to work under cygwin/mingw.

-

-Version 1.5.0beta42 [August 18, 2010]

-  Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov)

-  Made all API functions that have const arguments and constant string

-    literal pointers declare them (John Bowler).

-

-Version 1.5.0beta43 [August 20, 2010]

-  Removed spurious tabs, shorten long lines (no source change)

-    Also added scripts/chkfmt to validate the format of all the files that can

-    reasonably be validated (it is suggested to run "make distclean" before

-    checking, because some machine generated files have long lines.)

-  Reformatted the CHANGES file to be more consistent throughout.

-  Made changes to address various issues identified by GCC, mostly

-    signed/unsigned and shortening problems on assignment but also a few

-    difficult to optimize (for GCC) loops.

-  Fixed non-GCC fixed point builds.  In png.c a declaration was misplaced

-    in an earlier update.  Fixed to declare the auto variables at the head.

-  Use cexcept.h in pngvalid.c.

-

-Version 1.5.0beta44 [August 24, 2010]

-  Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for

-    installing libpng in /usr/lib64 (Funda Wang).

-  Revised CMakeLists.txt to put the man pages in share/man/man* not man/man*

-  Revised CMakeLists.txt to make symlinks instead of copies when installing.

-  Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)

-  Implemented memory checks within pngvalid

-  Reformatted/rearranged pngvalid.c to assist use of progressive reader.

-  Check interlaced images in pngvalid

-  Clarified pngusr.h comments in pnglibconf.dfa

-  Simplified the pngvalid error-handling code now that cexcept.h is in place.

-  Implemented progressive reader in pngvalid.c for standard tests

-  Implemented progressive read in pngvalid.c gamma tests

-  Turn on progressive reader in pngvalid.c by default and tidy code.

-

-Version 1.5.0beta45 [August 26, 2010]

-  Added an explicit make step to projects/vstudio for pnglibconf.h

-    Also corrected zlib.vcxproj into which Visual Studio had introduced

-    what it calls an "authoring error".  The change to make pnglibconf.h

-    simply copies the file; in the future it may actually generate the

-    file from scripts/pnglibconf.dfa as the other build systems do.

-  Changed pngvalid to work when floating point APIs are disabled

-  Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt

-  Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX

-    in pngpriv.h in case the user neglected to define them in their pngusr.h

-

-Version 1.5.0beta46 [August 28, 2010]

-  Added new private header files to libpng_sources in CMakeLists.txt

-  Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options.

-  Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project.

-

-Version 1.5.0beta47 [September 11, 2010]

-  Fixed a number of problems with 64-bit compilation reported by Visual

-    Studio 2010 (John Bowler).

-

-Version 1.5.0beta48 [October 4, 2010]

-  Updated CMakeLists.txt (Philip Lowman).

-  Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER,

-    $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE

-  Fixed problem with symbols creation in Makefile.am which was assuming that

-    all versions of ccp write to standard output by default (Martin Banky). The

-    bug was introduced in libpng-1.2.9beta5.

-  Removed unused mkinstalldirs.

-

-Version 1.5.0beta49 [October 8, 2010]

-  Undid Makefile.am revision of 1.5.0beta48.

-

-Version 1.5.0beta50 [October 14, 2010]

-  Revised Makefile.in to account for mkinstalldirs being removed.

-  Added some "(unsigned long)" typecasts in printf statements in pngvalid.c.

-  Suppressed a compiler warning in png_handle_sPLT().

-  Check for out-of-range text compression mode in png_set_text().

-

-Version 1.5.0beta51 [October 15, 2010]

-  Changed embedded dates to "(PENDING RELEASE) in beta releases (and future

-    rc releases) to minimize the difference between releases.

-

-Version 1.5.0beta52 [October 16, 2010]

-  Restored some of the embedded dates (in png.h, png.c, documentation, etc.)

-

-Version 1.5.0beta53 [October 18, 2010]

-  Updated INSTALL to mention using "make maintainer-clean" and to remove

-    obsolete statement about a custom ltmain.sh

-  Disabled "color-tests" by default in Makefile.am so it will work with

-    automake versions earlier than 1.11.1

-  Use document name "libpng-manual.txt" instead of "libpng-<version>.txt"

-    to simplify version differences.

-  Removed obsolete remarks about setjmp handling from INSTALL.

-  Revised and renamed the typedef in png.h and png.c that was designed

-    to catch library and header mismatch.

-

-Version 1.5.0beta54 [November 10, 2010]

-  Require 48 bytes, not 64 bytes, for big_row_buf in overflow checks.

-  Used a consistent structure for the pngget.c functions.

-

-Version 1.5.0beta55 [November 21, 2010]

-  Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)

-  Moved reading of file signature into png_read_sig (Cosmin)

-  Fixed atomicity of chunk header serialization (Cosmin)

-  Added test for io_state in pngtest.c (Cosmin)

-  Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts.

-  Changes to remove gcc warnings (John Bowler)

-    Certain optional gcc warning flags resulted in warnings in libpng code.

-    With these changes only -Wconversion and -Wcast-qual cannot be turned on.

-    Changes are trivial rearrangements of code.  -Wconversion is not possible

-    for pngrutil.c (because of the widespread use of += et al on variables

-    smaller than (int) or (unsigned int)) and -Wcast-qual is not possible

-    with pngwio.c and pngwutil.c because the 'write' callback and zlib

-    compression both fail to declare their input buffers with 'const'.

-

-Version 1.5.0beta56 [December 7, 2010]

-  Added the private PNG_UNUSED() macro definition in pngpriv.h.

-  Added some commentary about PNG_EXPORT in png.h and pngconf.h

-  Revised PNG_EXPORT() macro and added PNG_EXPORTA() macro, with the

-    objective of simplifying and improving the cosmetic appearance of png.h.

-  Fixed some incorrect "=" macro names in pnglibconf.dfa

-  Included documentation of changes in 1.5.0 from 1.4.x in libpng-manual.txt

-

-Version 1.5.0beta57 [December 9, 2010]

-  Documented the pngvalid gamma error summary with additional comments and

-    print statements.

-  Improved missing symbol handling in checksym.awk; symbols missing in both

-    the old and new files can now be optionally ignored, treated as errors

-    or warnings.

-  Removed references to pngvcrd.c and pnggccrd.c from the vstudio project.

-  Updated "libpng14" to "libpng15" in the visualc71 project.

-  Enabled the strip16 tests in pngvalid.`

-  Don't display test results (except PASS/FAIL) when running "make test".

-    Instead put them in pngtest-log.txt

-  Added "--with-zprefix=<string>" to configure.ac

-  Updated the prebuilt configuration files to autoconf version 2.68

-

-Version 1.5.0beta58 [December 19, 2010]

-  Fixed interlace image handling and add test cases (John Bowler)

-  Fixed the clean rule in Makefile.am to remove pngtest-log.txt

-  Made minor changes to work around warnings in gcc 3.4

-

-Version 1.5.0rc01 [December 27, 2010]

-  No changes.

-

-Version 1.5.0rc02 [December 27, 2010]

-  Eliminated references to the scripts/*.def files in project/visualc71.

-

-Version 1.5.0rc03 [December 28, 2010]

-  Eliminated scripts/*.def and revised Makefile.am accordingly

-

-Version 1.5.0rc04 [December 29, 2010]

-  Fixed bug in background transformation handling in pngrtran.c (it was

-    looking for the flag in png_ptr->transformations instead of in

-    png_ptr->flags) (David Raymond).

-

-Version 1.5.0rc05 [December 31, 2010]

-  Fixed typo in a comment in CMakeLists.txt (libpng14 => libpng15) (Cosmin)

-

-Version 1.5.0rc06 [January 4, 2011]

-  Changed the new configure option "zprefix=string" to "zlib-prefix=string"

-

-Version 1.5.0rc07 [January 4, 2011]

-  Updated copyright year.

-

-Version 1.5.0 [January 6, 2011]

-  No changes.

-

-version 1.5.1beta01 [January 8, 2011]

-  Added description of png_set_crc_action() to the manual.

-  Added a note in the manual that the type of the iCCP profile was changed

-    from png_charpp to png_bytepp in png_get_iCCP().  This change happened

-    in version 1.5.0beta36 but is not noted in the CHANGES.  Similarly,

-    it was changed from png_charpp to png_const_bytepp in png_set_iCCP().

-  Ensure that png_rgb_to_gray ignores palette mapped images, if libpng

-    internally happens to call it with one, and fixed a failure to handle

-    palette mapped images correctly.  This fixes CVE-2690.

-

-Version 1.5.1beta02 [January 14, 2011]

-  Fixed a bug in handling of interlaced images (bero at arklinux.org).

-  Updated CMakeLists.txt (Clifford Yapp)

-

-Version 1.5.1beta03 [January 14, 2011]

-  Fixed typecasting of some png_debug() statements (Cosmin)

-

-Version 1.5.1beta04 [January 16, 2011]

-  Updated documentation of png_set|get_tRNS() (Thomas Klausner).

-  Mentioned in the documentation that applications must #include "zlib.h"

-    if they need access to anything in zlib.h, and that a number of

-    macros such as png_memset() are no longer accessible by applications.

-  Corrected pngvalid gamma test "sample" function to access all of the color

-    samples of each pixel, instead of sampling the red channel three times.

-  Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"

-    warnings, and (mistakenly) changed png_exp() to exp().

-

-Version 1.5.1beta05 [January 16, 2011]

-  Changed variable names png_index, png_div, png_exp, and png_gamma to

-    char_index, divisor, exp_b10, and gamma_val, respectively, and

-    changed exp() back to png_exp().

-

-Version 1.5.1beta06 [January 20, 2011]

-  Prevent png_push_crc_skip() from hanging while reading an unknown chunk

-    or an over-large compressed zTXt chunk with the progressive reader.

-  Eliminated more GCC "shadow" warnings.

-  Revised png_fixed() in png.c to avoid compiler warning about reaching the

-    end without returning anything.

-

-Version 1.5.1beta07 [January 22, 2011]

-  In the manual, describe the png_get_IHDR() arguments in the correct order.

-  Added const_png_structp and const_png_infop types, and used them in

-    prototypes for most png_get_*() functions.

-

-Version 1.5.1beta08 [January 23, 2011]

-  Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()

-  Added synopses for the IO_STATE functions and other missing synopses

-    to the manual. Removed the synopses from libpngpf.3 because they

-    were out of date and no longer useful.  Better information can be

-    obtained by reading the prototypes and comments in pngpriv.h

-  Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build

-    Added a make macro DFNCPP that is a CPP that will accept the tokens in

-    a .dfn file and adds configure stuff to test for such a CPP.  ./configure

-    should fail if one is not available.

-  Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.

-  Added png_get_current_row_number and png_get_current_pass_number for the

-    benefit of the user transform callback.

-  Added png_process_data_pause and png_process_data_skip for the benefit of

-    progressive readers that need to stop data processing or want to optimize

-    skipping of unread data (e.g., if the reader marks a chunk to be skipped.)

-

-Version 1.5.1beta09 [January 24, 2011]

-  Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.

-    pngvalid contains tests of transforms, which tests are currently disabled

-    because they are incompletely tested.  gray_to_rgb was failing to expand

-    the bit depth for smaller bit depth images; this seems to be a long

-    standing error and resulted, apparently, in invalid output

-    (CVE-2011-0408, CERT VU#643140).  The documentation did not accurately

-    describe what libpng really does when converting RGB to gray.

-

-Version 1.5.1beta10 [January 27, 2010]

-  Fixed incorrect examples of callback prototypes in the manual, that were

-    introduced in libpng-1.0.0.

-  In addition the order of the png_get_uint macros with respect to the

-    relevant function definitions has been reversed.  This helps the

-    preprocessing of the symbol files be more robust.  Furthermore, the

-    symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when

-    the library may actually be built with PNG_USE_READ_MACROS; this stops

-    the read macros interfering with the symbol file format.

-  Made the manual, synopses, and function prototypes use the function

-    argument names file_gamma, int_file_gamma, and srgb_intent consistently.

-

-Version 1.5.1beta11 [January 28, 2011]

-  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".

-  Corrected local variable type in new API png_process_data_skip()

-    The type was self-evidently incorrect but only causes problems on 64-bit

-    architectures.

-  Added transform tests to pngvalid and simplified the arguments.

-

-Version 1.5.1rc01 [January 29, 2011]

-  No changes.

-

-Version 1.5.1rc02 [January 31, 2011]

-  Added a request in the manual that applications do not use "png_" or

-    "PNG_" to begin any of their own symbols.

-  Changed PNG_UNUSED to "(void)param;" and updated the commentary in pngpriv.h

-

-Version 1.5.1 [February 3, 2011]

-  No changes.

-

-Version 1.5.2beta01 [February 13, 2011]

-  More -Wshadow fixes for older gcc compilers.  Older gcc versions apparently

-    check formal parameters names in function declarations (as well as

-    definitions) to see if they match a name in the global namespace.

-  Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the

-    old VisualC++ preprocessor.

-  Turned on interlace handling in png_read_png().

-  Fixed gcc pendantic warnings.

-  Handle longjmp in Cygwin.

-  Fixed png_get_current_row_number() in the interlaced case.

-  Cleaned up ALPHA flags and transformations.

-  Implemented expansion to 16 bits.

-

-Version 1.5.2beta02 [February 19, 2011]

-  Fixed mistake in the descriptions of user read_transform and write_transform

-    function prototypes in the manual.  The row_info struct is png_row_infop.

-  Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior.

-  Corrected png_get_current_row_number documentation

-  Fixed the read/write row callback documentation.

-    This documents the current behavior, where the callback is called after

-    every row with information pertaining to the next row.

-

-Version 1.5.2beta03 [March 3, 2011]

-  Fixed scripts/makefile.vcwin32

-  Updated contrib/pngsuite/README to add the word "modify".

-  Define PNG_ALLOCATED to blank when _MSC_VER<1300.

-

-Version 1.5.2rc01 [March 19, 2011]

-  Define remaining attributes to blank when MSC_VER<1300.

-  ifdef out mask arrays in pngread.c when interlacing is not supported.

-

-Version 1.5.2rc02 [March 22, 2011]

-  Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak

-    and in contrib/pngminim/*/makefile, eg., on SunOS 5.10, and removed "strip"

-    from the makefiles.

-  Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail

-    to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill)

-

-Version 1.5.2rc03 [March 24, 2011]

-  Don't include standard header files in png.h while building the symbol table,

-    to avoid cpp failure on SunOS (introduced PNG_BUILDING_SYMBOL_TABLE macro).

-

-Version 1.5.2 [March 31, 2011]

-  No changes.

-

-Version 1.5.3beta01 [April 1, 2011]

-  Re-initialize the zlib compressor before compressing non-IDAT chunks.

-  Added API functions (png_set_text_compression_level() and four others) to

-    set parameters for zlib compression of non-IDAT chunks.

-

-Version 1.5.3beta02 [April 3, 2011]

-  Updated scripts/symbols.def with new API functions.

-  Only compile the new zlib re-initializing code when text or iCCP is

-    supported, using PNG_WRITE_COMPRESSED_TEXT_SUPPORTED macro.

-  Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).

-  Optimize the zlib CMF byte in non-IDAT compressed chunks

-

-Version 1.5.3beta03 [April 16, 2011]

-  Fixed gcc -ansi -pedantic compile. A strict ANSI system does not have

-    snprintf, and the "__STRICT_ANSI__" detects that condition more reliably

-    than __STDC__ (John Bowler).

-  Removed the PNG_PTR_NORETURN attribute because it too dangerous. It tells

-    the compiler that a user supplied callback (the error handler) does not

-    return, yet there is no guarantee in practice that the application code

-    will correctly implement the error handler because the compiler only

-    issues a warning if there is a mistake (John Bowler).

-  Removed the no-longer-used PNG_DEPSTRUCT macro.

-  Updated the zlib version to 1.2.5 in the VStudio project.

-  Fixed 64-bit builds where png_uint_32 is smaller than png_size_t in

-    pngwutil.c (John Bowler).

-  Fixed bug with stripping the filler or alpha channel when writing, that

-    was introduced in libpng-1.5.2beta01 (bug report by Andrew Church).

-

-Version 1.5.3beta04 [April 27, 2011]

-  Updated pngtest.png with the new zlib CMF optimization.

-  Cleaned up conditional compilation code and of background/gamma handling

-    Internal changes only except a new option to avoid compiling the

-    png_build_grayscale_palette API (which is not used at all internally.)

-    The main change is to move the transform tests (READ_TRANSFORMS,

-    WRITE_TRANSFORMS) up one level to the caller of the APIs.  This avoids

-    calls to spurious functions if all transforms are disabled and slightly

-    simplifies those functions.  Pngvalid modified to handle this.

-    A minor change is to stop the strip_16 and expand_16 interfaces from

-    disabling each other; this allows the future alpha premultiplication

-    code to use 16-bit intermediate values while still producing 8-bit output.

-    png_do_background and png_do_gamma have been simplified to take a single

-    pointer to the png_struct rather than pointers to every item required

-    from the png_struct. This makes no practical difference to the internal

-    code.

-  A serious bug in the pngvalid internal routine 'standard_display_init' has

-    been fixed - this failed to initialize the red channel and accidentally

-    initialized the alpha channel twice.

-  Changed png_struct jmp_buf member name from png_jmpbuf to tmp_jmpbuf to

-    avoid a possible clash with the png_jmpbuf macro on some platforms.

-

-Version 1.5.3beta05 [May 6, 2011]

-  Added the "_POSIX_SOURCE" feature test macro to ensure libpng sees the

-    correct API. _POSIX_SOURCE is defined in pngpriv.h, pngtest.c and

-    pngvalid.c to ensure that POSIX conformant systems disable non-POSIX APIs.

-  Removed png_snprintf and added formatted warning messages.  This change adds

-    internal APIs to allow png_warning messages to have parameters without

-    requiring the host OS to implement snprintf.  As a side effect the

-    dependency of the tIME-supporting RFC1132 code on stdio is removed and

-    PNG_NO_WARNINGS does actually work now.

-  Pass "" instead of '\0' to png_default_error() in png_err().  This mistake

-    was introduced in libpng-1.2.20beta01.  This fixes CVE-2011-2691.

-  Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte

-    optimization configureable.

-  IDAT compression failed if preceded by a compressed text chunk (bug

-    introduced in libpng-1.5.3beta01-02).  This was because the attempt to

-    reset the zlib stream in png_write_IDAT happened after the first IDAT

-    chunk had been deflated - much too late.  In this change internal

-    functions were added to claim/release the z_stream and, hopefully, make

-    the code more robust.  Also deflateEnd checking is added - previously

-    libpng would ignore an error at the end of the stream.

-

-Version 1.5.3beta06 [May 8, 2011]

-  Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt

-  Implemented premultiplied alpha support: png_set_alpha_mode API

-

-Version 1.5.3beta07 [May 11, 2011]

-  Added expand_16 support to the high level interface.

-  Added named value and 'flag' gamma support to png_set_gamma.  Made a minor

-    change from the previous (unreleased) ABI/API to hide the exact value used

-    for Macs - it's not a good idea to embed this in the ABI!

-  Moved macro definitions for PNG_HAVE_IHDR, PNG_HAVE_PLTE, and PNG_AFTER_IDAT

-    from pngpriv.h to png.h because they must be visible to applications

-    that call png_set_unknown_chunks().

-  Check for up->location !PNG_AFTER_IDAT when writing unknown chunks

-    before IDAT.

-

-Version 1.5.3beta08 [May 16, 2011]

-  Improved "pngvalid --speed" to exclude more of pngvalid from the time.

-  Documented png_set_alpha_mode(), other changes in libpng.3/libpng-manual.txt

-  The cHRM chunk now sets the defaults for png_set_rgb_to_gray() (when negative

-    parameters are supplied by the caller), while in the absence of cHRM

-    sRGB/Rec 709 values are still used.  This introduced a divide-by-zero

-    bug in png_handle_cHRM().

-  The bKGD chunk no longer overwrites the background value set by

-    png_set_background(), allowing the latter to be used before the file

-    header is read. It never performed any useful function to override

-    the default anyway.

-  Added memory overwrite and palette image checks to pngvalid.c

-    Previously palette image code was poorly checked. Since the transformation

-    code has a special palette path in most cases this was a severe weakness.

-  Minor cleanup and some extra checking in pngrutil.c and pngrtran.c. When

-    expanding an indexed image, always expand to RGBA if transparency is

-    present.

-

-Version 1.5.3beta09 [May 17, 2011]

-  Reversed earlier 1.5.3 change of transformation order; move png_expand_16

-    back where it was.  The change doesn't work because it requires 16-bit

-    gamma tables when the code only generates 8-bit ones.  This fails

-    silently; the libpng code just doesn't do any gamma correction.  Moving

-    the tests back leaves the old, inaccurate, 8-bit gamma calculations, but

-    these are clearly better than none!

-

-Version 1.5.3beta10 [May 20, 2011]

-

-  png_set_background() and png_expand_16() did not work together correctly.

-    This problem is present in 1.5.2; if png_set_background is called with

-    need_expand false and the matching 16 bit color libpng erroneously just

-    treats it as an 8-bit color because of where png_do_expand_16 is in the

-    transform list.  This simple fix reduces the supplied colour to 8-bits,

-    so it gets smashed, but this is better than the current behavior.

-  Added tests for expand16, more fixes for palette image tests to pngvalid.

-    Corrects the code for palette image tests and disables attempts to

-    validate palette colors.

-

-Version 1.5.3rc01 [June 3, 2011]

-  No changes.

-

-Version 1.5.3rc02 [June 8, 2011]

-  Fixed uninitialized memory read in png_format_buffer() (Bug report by

-    Frank Busse, CVE-2011-2501, related to CVE-2004-0421).

-

-Version 1.5.3beta11 [June 11, 2011]

-  Fixed png_handle_sCAL which is broken in 1.5. This fixes CVE 2011-2692.

-  Added sCAL to pngtest.png

-  Revised documentation about png_set_user_limits() to say that it also affects

-    png writing.

-  Revised handling of png_set_user_limits() so that it can increase the

-    limit beyond the PNG_USER_WIDTH|HEIGHT_MAX; previously it could only

-    reduce it.

-  Make the 16-to-8 scaling accurate. Dividing by 256 with no rounding is

-    wrong (high by one) 25% of the time. Dividing by 257 with rounding is

-    wrong in 128 out of 65536 cases. Getting the right answer all the time

-    without division is easy.

-  Added "_SUPPORTED" to the PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION macro.

-  Added projects/owatcom, an IDE project for OpenWatcom to replace

-    scripts/makefile.watcom.  This project works with OpenWatcom 1.9. The

-    IDE autogenerates appropriate makefiles (libpng.mk) for batch processing.

-    The project is configurable, unlike the Visual Studio project, so long

-    as the developer has an awk.

-  Changed png_set_gAMA to limit the gamma value range so that the inverse

-    of the stored value cannot overflow the fixed point representation,

-    and changed other things OpenWatcom warns about.

-  Revised pngvalid.c to test PNG_ALPHA_MODE_SUPPORTED correctly. This allows

-    pngvalid to build when ALPHA_MODE is not supported, which is required if

-    it is to build on libpng 1.4.

-  Removed string/memory macros that are no longer used and are not

-    necessarily fully supportable, particularly png_strncpy and png_snprintf.

-  Added log option to pngvalid.c and attempted to improve gamma messages.

-

-Version 1.5.3 [omitted]

-  People found the presence of a beta release following an rc release

-    to be confusing; therefore we bump the version to libpng-1.5.4beta01

-    and there will be no libpng-1.5.3 release.

-

-Version 1.5.4beta01 [June 14, 2011]

-  Made it possible to undefine PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED

-    to get the same (inaccurate) output as libpng-1.5.2 and earlier.

-  Moved definitions of PNG_HAVE_IHDR, PNG_AFTER_IDAT, and PNG_HAVE_PLTE

-    outside of an unknown-chunk block in png.h because they are also

-    needed for other uses.

-

-Version 1.5.4beta02 [June 14, 2011]

-  Fixed and clarified LEGACY 16-to-8 scaling code.

-  Added png_set_chop_16() API, to match inaccurate results from previous

-    libpng versions.

-  Removed the ACCURATE and LEGACY options (they are no longer useable)

-  Use the old scaling method for background if png_set_chop_16() was

-    called.

-  Made png_set_chop_16() API removeable by disabling PNG_CHOP_16_TO_8_SUPPORTED

-

-Version 1.5.4beta03 [June 15, 2011]

-  Fixed a problem in png_do_expand_palette() exposed by optimization in

-    1.5.3beta06

-  Also removed a spurious and confusing "trans" member ("trans") from png_info.

-  The palette expand optimization prevented expansion to an intermediate RGBA

-    form if tRNS was present but alpha was marked to be stripped; this exposed

-    a check for tRNS in png_do_expand_palette() which is inconsistent with the

-    code elsewhere in libpng.

-  Correction to the expand_16 code; removed extra instance of

-    png_set_scale_16_to_8 from pngpriv.h

-

-Version 1.5.4beta04 [June 16, 2011]

-  Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c

-  Added PNG_TRANSFORM_CHOP_16 to the high-level read transforms.

-  Made PNG_READ_16_TO_8_ACCURATE_SCALE configurable again.  If this is

-    not enabled, png_set_strip_16() and png_do_scale_16_to_8() aren't built.

-  Revised contrib/visupng, gregbook, and pngminim to demonstrate chop_16_to_8

-

-Version 1.5.4beta05 [June 16, 2011]

-  Renamed png_set_strip_16() to png_set_scale_16() and renamed

-    png_set_chop_16() to png_set_strip(16) in an attempt to minimize the

-    behavior changes between libpng14 and libpng15.

-

-Version 1.5.4beta06 [June 18, 2011]

-  Fixed new bug that was causing both strip_16 and scale_16 to be applied.

-

-Version 1.5.4beta07 [June 19, 2011]

-  Fixed pngvalid, simplified macros, added checking for 0 in sCAL.

-    The ACCURATE scale macro is no longer defined in 1.5 - call the

-    png_scale_16_to_8 API.  Made sure that PNG_READ_16_TO_8 is still defined

-    if the png_strip_16_to_8 API is present.  png_check_fp_number now

-    maintains some state so that positive, negative and zero values are

-    identified.  sCAL uses these to be strictly spec conformant.

-

-Version 1.5.4beta08 [June 23, 2011]

-  Fixed pngvalid if ACCURATE_SCALE is defined.

-  Updated scripts/pnglibconf.h.prebuilt.

-

-Version 1.5.4rc01 [June 30, 2011]

-  Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400.

-

-Version 1.5.4 [July 7, 2011]

-  No changes.

-

-Version 1.5.5beta01 [July 13, 2011]

-  Fixed some typos and made other minor changes in the manual.

-  Updated contrib/pngminus/makefile.std (Samuli Souminen)

-

-Version 1.5.5beta02 [July 14, 2011]

-  Revised Makefile.am and Makefile.in to look in the right directory for

-    pnglibconf.h.prebuilt

-

-Version 1.5.5beta03 [July 27, 2011]

-  Enabled compilation with g++ compiler.  This compiler does not recognize

-    the file extension, so it always compiles with C++ rules.  Made minor

-    changes to pngrutil.c to cast results where C++ expects it but C does not.

-  Minor editing of libpng.3 and libpng-manual.txt.

-

-Version 1.5.5beta04 [July 29, 2011]

-  Revised CMakeLists.txt (Clifford Yapp)

-  Updated commentary about the png_rgb_to_gray() default coefficients

-    in the manual and in pngrtran.c

-

-Version 1.5.5beta05 [August 17, 2011]

-  Prevent unexpected API exports from non-libpng DLLs on Windows.  The "_DLL"

-    is removed from the test of whether a DLL is being built (this erroneously

-    caused the libpng APIs to be marked as DLL exports in static builds under

-    Microsoft Visual Studio).  Almost all of the libpng building configuration

-    is moved from pngconf.h to pngpriv.h, but PNG_DLL_EXPORT remains in

-    pngconf.h, though, so that it is colocated with the import definition (it

-    is no longer used anywhere in the installed headers).  The VStudio project

-    definitions have been cleaned up: "_USRDLL" has been removed from the

-    static library builds (this was incorrect), and PNG_USE_DLL has been added

-    to pngvalid to test the functionality (pngtest does not supply it,

-    deliberately).  The spurious "_EXPORTS" has been removed from the

-    libpng build (all these errors were a result of copy/paste between project

-    configurations.)

-  Added new types and internal functions for CIE RGB end point handling to

-    pngpriv.h (functions yet to be implemented).

-

-Version 1.5.5beta06 [August 26, 2011]

-  Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set in CMakeLists.txt

-    (Clifford Yap)

-  Fixes to rgb_to_gray and cHRM XYZ APIs (John Bowler):

-    The rgb_to_gray code had errors when combined with gamma correction.

-    Some pixels were treated as true grey when they weren't and such pixels

-    and true grey ones were not gamma corrected (the original value of the

-    red component was used instead).  APIs to get and set cHRM using color

-    space end points have been added and the rgb_to_gray code that defaults

-    based on cHRM, and the divide-by-zero bug in png_handle_cHRM (CERT

-    VU#477046, CVE-2011-3328, introduced in 1.5.4) have been corrected.

-  A considerable number of tests has been added to pngvalid for the

-    rgb_to_gray transform.

-  Arithmetic errors in rgb_to_gray whereby the calculated gray value was

-    truncated to the bit depth rather than rounded have been fixed except in

-    the 8-bit non-gamma-corrected case (where consistency seems more important

-    than correctness.)  The code still has considerable inaccuracies in the

-    8-bit case because 8-bit linear arithmetic is used.

-

-Version 1.5.5beta07 [September 7, 2011]

-  Added "$(ARCH)" option to makefile.darwin

-  Added SunOS support to configure.ac and Makefile.am

-  Changed png_chunk_benign_error() to png_warning() in png.c, in

-    png_XYZ_from_xy_checked().

-

-Version 1.5.5beta08 [September 10, 2011]

-  Fixed 64-bit compilation errors (gcc). The errors fixed relate

-    to conditions where types that are 32 bits in the GCC 32-bit

-    world (uLong and png_size_t) become 64 bits in the 64-bit

-    world.  This produces potential truncation errors which the

-    compiler correctly flags.

-  Relocated new HAVE_SOLARIS_LD definition in configure.ac

-  Constant changes for 64-bit compatibility (removal of L suffixes). The

-    16-bit cases still use "L" as we don't have a 16-bit test system.

-

-Version 1.5.5rc01 [September 15, 2011]

-  Removed "L" suffixes in pngpriv.h

-

-Version 1.5.5 [September 22, 2011]

-  No changes.

-

-Version 1.5.6beta01 [September 22, 2011]

-  Fixed some 64-bit type conversion warnings in pngrtran.c

-  Moved row_info from png_struct to a local variable.

-  The various interlace mask arrays have been made into arrays of

-    bytes and made PNG_CONST and static (previously some arrays were

-    marked PNG_CONST and some weren't).

-  Additional checks have been added to the transform code to validate the

-    pixel depths after the transforms on both read and write.

-  Removed some redundant code from pngwrite.c, in png_destroy_write_struct().

-  Changed chunk reading/writing code to use png_uint_32 instead of png_byte[4].

-    This removes the need to allocate temporary strings for chunk names on

-    the stack in the read/write code.  Unknown chunk handling still uses the

-    string form because this is exposed in the API.

-

-Version 1.5.6beta02 [September 26, 2011]

-  Added a note in the manual the png_read_update_info() must be called only

-    once with a particular info_ptr.

-  Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro.

-

-Version 1.5.6beta03 [September 28, 2011]

-  Revised test-pngtest.sh to report FAIL when pngtest fails.

-  Added "--strict" option to pngtest, to report FAIL when the failure is

-    only because the resulting valid files are different.

-  Revised CMakeLists.txt to work with mingw and removed some material from

-    CMakeLists.txt that is no longer useful in libpng-1.5.

-

-Version 1.5.6beta04 [October 5, 2011]

-  Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")."

-

-Version 1.5.6beta05 [October 12, 2011]

-  Speed up png_combine_row() for interlaced images. This reduces the generality

-    of the code, allowing it to be optimized for Adam7 interlace.  The masks

-    passed to png_combine_row() are now generated internally, avoiding

-    some code duplication and localizing the interlace handling somewhat.

-  Align png_struct::row_buf - previously it was always unaligned, caused by

-    a bug in the code that attempted to align it; the code needs to subtract

-    one from the pointer to take account of the filter byte prepended to

-    each row.

-  Optimized png_combine_row() when rows are aligned. This gains a small

-    percentage for 16-bit and 32-bit pixels in the typical case where the

-    output row buffers are appropriately aligned. The optimization was not

-    previously possible because the png_struct buffer was always misaligned.

-  Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.

-

-Version 1.5.6beta06 [October 17, 2011]

-  Removed two redundant tests for unitialized row.

-  Fixed a relatively harmless memory overwrite in compressed text writing

-    with a 1 byte zlib buffer.

-  Add ability to call png_read_update_info multiple times to pngvalid.c.

-  Fixes for multiple calls to png_read_update_info. These fixes attend to

-    most of the errors revealed in pngvalid, however doing the gamma work

-    twice results in inaccuracies that can't be easily fixed.  There is now

-    a warning in the code if this is going to happen.

-  Turned on multiple png_read_update_info in pngvalid transform tests.

-  Prevent libpng from overwriting unused bits at the end of the image when

-    it is not byte aligned, while reading. Prior to libpng-1.5.6 libpng would

-    overwrite the partial byte at the end of each row if the row width was not

-    an exact multiple of 8 bits and the image is not interlaced.

-

-Version 1.5.6beta07 [October 21, 2011]

-  Made png_ptr->prev_row an aligned pointer into png_ptr->big_prev_row

-    (Mans Rullgard).

-

-Version 1.5.6rc01 [October 26, 2011]

-  Changed misleading "Missing PLTE before cHRM" warning to "Out of place cHRM"

-

-Version 1.5.6rc02 [October 27, 2011]

-  Added LSR() macro to defend against buggy compilers that evaluate non-taken

-    code branches and complain about out-of-range shifts.

-

-Version 1.5.6rc03 [October 28, 2011]

-  Renamed the LSR() macro to PNG_LSR() and added PNG_LSL() macro.

-  Fixed compiler warnings with Intel and MSYS compilers. The logical shift

-    fix for Microsoft Visual C is required by other compilers, so this

-    enables that fix for all compilers when using compile-time constants.

-    Under MSYS 'byte' is a name declared in a system header file, so we

-    changed the name of a local variable to avoid the warnings that result.

-  Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h

-

-Version 1.5.6 [November 3, 2011]

-  No changes.

-

-Version 1.5.7beta01 [November 4, 2011]

-  Added support for ARM processor, when decoding all PNG up-filtered rows

-    and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard).

-  Fixed bug in pngvalid on early allocation failure; fixed type cast in

-    pngmem.c; pngvalid would attempt to call png_error() if the allocation

-    of a png_struct or png_info failed. This would probably have led to a

-    crash.  The pngmem.c implementation of png_malloc() included a cast

-    to png_size_t which would fail on large allocations on 16-bit systems.

-  Fix for the preprocessor of the Intel C compiler. The preprocessor

-    splits adjacent @ signs with a space; this changes the concatentation

-    token from @-@-@ to PNG_JOIN; that should work with all compiler

-    preprocessors.

-  Paeth filter speed improvements from work by Siarhei Siamashka. This

-    changes the 'Paeth' reconstruction function to improve the GCC code

-    generation on x86. The changes are only part of the suggested ones;

-    just the changes that definitely improve speed and remain simple.

-    The changes also slightly increase the clarity of the code.

-

-Version 1.5.7beta02 [November 11, 2011]

-  Check compression_type parameter in png_get_iCCP and remove spurious

-    casts. The compression_type parameter is always assigned to, so must

-    be non-NULL. The cast of the profile length potentially truncated the

-    value unnecessarily on a 16-bit int system, so the cast of the (byte)

-    compression type to (int) is specified by ANSI-C anyway.

-  Fixed FP division by zero in pngvalid.c; the 'test_pixel' code left

-    the sBIT fields in the test pixel as 0, which resulted in a floating

-    point division by zero which was irrelevant but causes systems where

-    FP exceptions cause a crash. Added code to pngvalid to turn on FP

-    exceptions if the appropriate glibc support is there to ensure this is

-    tested in the future.

-  Updated scripts/pnglibconf.mak and scripts/makefile.std to handle the

-    new PNG_JOIN macro.

-  Added versioning to pnglibconf.h comments.

-  Simplified read/write API initial version; basic read/write tested on

-    a variety of images, limited documentation (in the header file.)

-  Installed more accurate linear to sRGB conversion tables. The slightly

-    modified tables reduce the number of 16-bit values that

-    convert to an off-by-one 8-bit value.  The "makesRGB.c" code that was used

-    to generate the tables is now in a contrib/sRGBtables sub-directory.

-

-Version 1.5.7beta03 [November 17, 2011]

-  Removed PNG_CONST from the sRGB table declarations in pngpriv.h and png.c

-  Added run-time detection of NEON support.

-  Added contrib/libtests; includes simplified API test and timing test and

-    a color conversion utility for rapid checking of failed 'pngstest' results.

-  Multiple transform bug fixes plus a work-round for double gamma correction.

-    libpng does not support more than one transform that requires linear data

-    at once - if this is tried typically the results is double gamma

-    correction. Since the simplified APIs can need rgb to gray combined with

-    a compose operation it is necessary to do one of these outside the main

-    libpng transform code. This check-in also contains fixes to various bugs

-    in the simplified APIs themselves and to some bugs in compose and rgb to

-    gray (on palette) itself.

-  Fixes for C++ compilation using g++ When libpng source is compiled

-    using g++. The compiler imposes C++ rules on the C source; thus it

-    is desireable to make the source work with either C or C++ rules

-    without throwing away useful error information.  This change adds

-    png_voidcast to allow C semantic (void*) cases or the corresponding

-    C++ static_cast operation, as appropriate.

-  Added --noexecstack to assembler file compilation. GCC does not set

-    this on assembler compilation, even though it does on C compilation.

-    This creates security issues if assembler code is enabled; the

-    work-around is to set it by default in the flags for $(CCAS)

-  Work around compilers that don't support declaration of const data. Some

-    compilers fault 'extern const' data declarations (because the data is

-    not initialized); this turns on const-ness only for compilers where

-    this is known to work.

-

-Version 1.5.7beta04 [November 17, 2011]

-  Since the gcc driver does not recognize the --noexecstack flag, we must

-    use the -Wa prefix to have it passed through to the assembler.

-    Also removed a duplicate setting of this flag.

-  Added files that were omitted from the libpng-1.5.7beta03 zip distribution.

-

-Version 1.5.7beta05 [November 25, 2011]

-  Removed "zTXt" from warning in generic chunk decompression function.

-  Validate time settings passed to png_set_tIME() and png_convert_to_rfc1123()

-    (Frank Busse). Note: This prevented CVE-2015-7981 from affecting

-    libpng-1.5.7 and later.

-  Added MINGW support to CMakeLists.txt

-  Reject invalid compression flag or method when reading the iTXt chunk.

-  Backed out 'simplified' API changes. The API seems too complex and there

-    is a lack of consensus or enthusiasm for the proposals.  The API also

-    reveals significant bugs inside libpng (double gamma correction and the

-    known bug of being unable to retrieve a corrected palette). It seems

-    better to wait until the bugs, at least, are corrected.

-  Moved pngvalid.c into contrib/libtests

-  Rebuilt Makefile.in, configure, etc., with autoconf-2.68

-

-Version 1.5.7rc01 [December 1, 2011]

-  Replaced an "#if" with "#ifdef" in pngrtran.c

-  Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)

-

-Version 1.5.7rc02 [December 5, 2011]

-  Revised project files and contrib/pngvalid/pngvalid.c to account for

-    the relocation of pngvalid into contrib/libtests.

-  Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,

-    as in libpng-1.5.4.

-  Put CRLF line endings in the owatcom project files.

-

-Version 1.5.7rc03 [December 7, 2011]

-  Updated CMakeLists.txt to account for the relocation of pngvalid.c

-

-Version 1.5.7 [December 15, 2011]

-  Minor fixes to pngvalid.c for gcc 4.6.2 compatibility to remove warnings

-    reported by earlier versions.

-  Fixed minor memset/sizeof errors in pngvalid.c.

-

-Version 1.6.0beta01 [December 15, 2011]

-  Removed machine-generated configure files from the GIT repository (they will

-    continue to appear in the tarball distributions and in the libpng15 and

-    earlier GIT branches).

-  Restored the new 'simplified' API, which was started in libpng-1.5.7beta02

-    but later deleted from libpng-1.5.7beta05.

-  Added example programs for the new 'simplified' API.

-  Added ANSI-C (C90) headers and require them, and take advantage of the

-    change. Also fixed some of the projects/* and contrib/* files that needed

-    updates for libpng16 and the move of pngvalid.c.

-    With this change the required ANSI-C header files are assumed to exist: the

-    implementation must provide float.h, limits.h, stdarg.h and stddef.h and

-    libpng relies on limits.h and stddef.h existing and behaving as defined

-    (the other two required headers aren't used).  Non-ANSI systems that don't

-    have stddef.h or limits.h will have to provide an appropriate fake

-    containing the relevant types and #defines.

-  Dropped support for 16-bit platforms. The use of FAR/far has been eliminated

-    and the definition of png_alloc_size_t is now controlled by a flag so

-    that 'small size_t' systems can select it if necessary.  Libpng 1.6 may

-    not currently work on such systems -- it seems likely that it will

-    ask 'malloc' for more than 65535 bytes with any image that has a

-    sufficiently large row size (rather than simply failing to read such

-    images).

-  New tools directory containing tools used to generate libpng code.

-  Fixed race conditions in parallel make builds. With higher degrees of

-    parallelism during 'make' the use of the same temporary file names such

-    as 'dfn*' can result in a race where a temporary file from one arm of the

-    build is deleted or overwritten in another arm.  This changes the

-    temporary files for suffix rules to always use $* and ensures that the

-    non-suffix rules use unique file names.

-

-Version 1.6.0beta02 [December 21, 2011]

-  Correct configure builds where build and source directories are separate.

-    The include path of 'config.h' was erroneously made relative in pngvalid.c

-    in libpng 1.5.7.

-

-Version 1.6.0beta03 [December 22, 2011]

-  Start-up code size improvements, error handler flexibility. These changes

-    alter how the tricky allocation of the initial png_struct and png_info

-    structures are handled. png_info is now handled in pretty much the same

-    way as everything else, except that the allocations handle NULL return

-    silently.  png_struct is changed in a similar way on allocation and on

-    deallocation a 'safety' error handler is put in place (which should never

-    be required).  The error handler itself is changed to permit mismatches

-    in the application and libpng error buffer size; however, this means a

-    silent change to the API to return the jmp_buf if the size doesn't match

-    the size from the libpng compilation; libpng now allocates the memory and

-    this may fail.  Overall these changes result in slight code size

-    reductions; however, this is a reduction in code that is always executed

-    so is particularly valuable.  Overall on a 64-bit system the libpng DLL

-    decreases in code size by 1733 bytes.  pngerror.o increases in size by

-    about 465 bytes because of the new functionality.

-  Added png_convert_to_rfc1123_buffer() and deprecated png_convert_to_rfc1123()

-    to avoid including a spurious buffer in the png_struct.

-

-Version 1.6.0beta04 [December 30, 2011]

-  Regenerated configure scripts with automake-1.11.2

-  Eliminated png_info_destroy(). It is now used only in png.c and only calls

-    one other internal function and memset().

-  Enabled png_get_sCAL_fixed() if floating point APIs are enabled. Previously

-    it was disabled whenever internal fixed point arithmetic was selected,

-    which meant it didn't exist even on systems where FP was available but not

-    preferred.

-  Added pngvalid.c compile time checks for const APIs.

-  Implemented 'restrict' for png_info and png_struct. Because of the way

-    libpng works both png_info and png_struct are always accessed via a

-    single pointer.  This means adding C99 'restrict' to the pointer gives

-    the compiler some opportunity to optimize the code.  This change allows

-    that.

-  Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper

-    location in configure.ac (Gilles Espinasse).

-  Changed png_memcpy to C assignment where appropriate. Changed all those

-    uses of png_memcpy that were doing a simple assignment to assignments

-    (all those cases where the thing being copied is a non-array C L-value).

-  Added some error checking to png_set_*() routines.

-  Removed the reference to the non-exported function png_memcpy() from

-    example.c.

-  Fixed the Visual C 64-bit build - it requires jmp_buf to be aligned, but

-    it had become misaligned.

-  Revised contrib/pngminus/pnm2png.c to avoid warnings when png_uint_32

-    and unsigned long are of different sizes.

-

-Version 1.6.0beta05 [January 15, 2012]

-  Updated manual with description of the simplified API (copied from png.h)

-  Fix bug in pngerror.c: some long warnings were being improperly truncated

-    (CVE-2011-3464, bug introduced in libpng-1.5.3beta05).

-

-Version 1.6.0beta06 [January 24, 2012]

-  Added palette support to the simplified APIs. This commit

-    changes some of the macro definitions in png.h, app code

-    may need corresponding changes.

-  Increased the formatted warning buffer to 192 bytes.

-  Added color-map support to simplified API. This is an initial version for

-    review; the documentation has not yet been updated.

-  Fixed Min/GW uninstall to remove libpng.dll.a

-

-Version 1.6.0beta07 [January 28, 2012]

-  Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived)

-    compiler issues slightly different warnings from those issued by the

-    current vesions of GCC. This eliminates those warnings by

-    adding/removing casts and small code rewrites.

-  Updated configure.ac from autoupdate: added --enable-werror option.

-    Also some layout regularization and removal of introduced tab characters

-    (replaced with 3-character indentation).  Obsolete macros identified by

-    autoupdate have been removed; the replacements are all in 2.59 so

-    the pre-req hasn't been changed.  --enable-werror checks for support

-    for -Werror (or the given argument) in the compiler.  This mimics the

-    gcc configure option by allowing -Werror to be turned on safely; without

-    the option the tests written in configure itself fail compilation because

-    they cause compiler warnings.

-  Rewrote autogen.sh to run autoreconf instead of running tools one-by-one.

-  Conditionalize the install rules for MINGW and CYGWIN in CMakeLists.txt and

-    set CMAKE_LIBRARY_OUTPUT_DIRECTORY to "lib" on all platforms (C. Yapp).

-  Freeze libtool files in the 'scripts' directory. This version of autogen.sh

-    attempts to dissuade people from running it when it is not, or should not,

-    be necessary.  In fact, autogen.sh does not work when run in a libpng

-    directory extracted from a tar distribution anymore. You must run it in

-    a GIT clone instead.

-  Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale),

-    and renamed three whose names were inconsistent with those in

-    pngsuite/README.txt.

-

-Version 1.6.0beta08 [February 1, 2012]

-  Fixed Image::colormap misalignment in pngstest.c

-  Check libtool/libtoolize version number (2.4.2) in configure.ac

-  Divide test-pngstest.sh into separate pngstest runs for basic and

-    transparent images.

-  Moved automake options to AM_INIT_AUTOMAKE in configure.ac

-  Added color-tests, silent-rules (Not yet implemented in Makefile.am) and

-    version checking to configure.ac

-  Improved pngstest speed by not doing redundant tests and add const to

-    the background parameter of png_image_finish_read. The --background

-    option is now done automagically only when required, so that commandline

-    option no longer exists.

-  Cleaned up pngpriv.h to consistently declare all functions and data.

-    Also eliminated PNG_CONST_DATA, which is apparently not needed but we

-    can't be sure until it is gone.

-  Added symbol prefixing that allows all the libpng external symbols

-    to be prefixed (suggested by Reuben Hawkins).

-  Updated "ftbb*.png" list in the owatcom and vstudio projects.

-  Fixed 'prefix' builds on clean systems. The generation of pngprefix.h

-    should not require itself.

-  Updated INSTALL to explain that autogen.sh must be run in a GIT clone,

-    not in a libpng directory extracted from a tar distribution.

-

-Version 1.6.0beta09 [February 1, 2012]

-  Reverted the prebuilt configure files to libpng-1.6.0beta05 condition.

-

-Version 1.6.0beta10 [February 3, 2012]

-  Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests

-  Updated list of test images in CMakeLists.txt

-  Updated the prebuilt configure files to current condition.

-  Revised INSTALL information about autogen.sh; it works in tar distributions.

-

-Version 1.6.0beta11 [February 16, 2012]

-  Fix character count in pngstest command in projects/owatcom/pngstest.tgt

-  Revised test-pngstest.sh to report PASS/FAIL for each image.

-  Updated documentation about the simplified API.

-  Corrected estimate of error in libpng png_set_rgb_to_gray API.  The API is

-    extremely inaccurate for sRGB conversions because it uses an 8-bit

-    intermediate linear value and it does not use the sRGB transform, so it

-    suffers from the known instability in gamma transforms for values close

-    to 0 (see Poynton).  The net result is that the calculation has a maximum

-    error of 14.99/255; 0.5/255^(1/2.2).  pngstest now uses 15 for the

-    permitted 8-bit error. This may still not be enough because of arithmetic

-    error.

-  Removed some unused arrays (with #ifdef) from png_read_push_finish_row().

-  Fixed a memory overwrite bug in simplified read of RGB PNG with

-    non-linear gamma Also bugs in the error checking in pngread.c and changed

-    quite a lot of the checks in pngstest.c to be correct; either correctly

-    written or not over-optimistic.  The pngstest changes are insufficient to

-    allow all possible RGB transforms to be passed; pngstest cmppixel needs

-    to be rewritten to make it clearer which errors it allows and then changed

-    to permit known inaccuracies.

-  Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h

-  Fixed fixed/float API export conditionals. 1) If FIXED_POINT or

-    FLOATING_POINT options were switched off, png.h ended up with lone ';'

-    characters.  This is not valid ANSI-C outside a function.  The ';'

-    characters have been moved inside the definition of PNG_FP_EXPORT and

-    PNG_FIXED_EXPORT. 2) If either option was switched off, the declaration

-    of the corresponding functions were completely omitted, even though some

-    of them are still used internally.  The result is still valid, but

-    produces warnings from gcc with some warning options (including -Wall). The

-    fix is to cause png.h to declare the functions with PNG_INTERNAL_FUNCTION

-    when png.h is included from pngpriv.h.

-  Check for invalid palette index while reading paletted PNG.  When one is

-    found, issue a warning and increase png_ptr->num_palette accordingly.

-    Apps are responsible for checking to see if that happened.

-

-Version 1.6.0beta12 [February 18, 2012]

-  Do not increase num_palette on invalid_index.

-  Relocated check for invalid palette index to pngrtran.c, after unpacking

-    the sub-8-bit pixels.

-  Fixed CVE-2011-3026 buffer overrun bug.  This bug was introduced when

-    iCCP chunk support was added at libpng-1.0.6. Deal more correctly with the

-    test on iCCP chunk length. Also removed spurious casts that may hide

-    problems on 16-bit systems.

-

-Version 1.6.0beta13 [February 24, 2012]

-  Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from

-    pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;

-    now that png_ptr->buffer is inaccessible to applications, the special

-    handling is no longer useful.

-  Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new

-    pngusr.dfa to reset the user limits to safe ones if PNG_SAFE_LIMITS is

-    defined.  To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED=1" on the

-    configure command or put #define PNG_SAFE_LIMITS_SUPPORTED in

-    pnglibconf.h.prebuilt and pnglibconf.h.

-

-Version 1.6.0beta14 [February 27, 2012]

-  Added information about the new limits in the manual.

-  Updated Makefile.in

-

-Version 1.6.0beta15 [March 2, 2012]

-  Removed unused "current_text" members of png_struct and the png_free()

-    of png_ptr->current_text from pngread.c

-  Rewrote pngstest.c for substantial speed improvement.

-  Fixed transparent pixel and 16-bit rgb tests in pngstest and removed a

-    spurious check in pngwrite.c

-  Added PNG_IMAGE_FLAG_FAST for the benefit of applications that store

-    intermediate files, or intermediate in-memory data, while processing

-    image data with the simplified API.  The option makes the files larger

-    but faster to write and read.  pngstest now uses this by default; this

-    can be disabled with the --slow option.

-  Improved pngstest fine tuning of error numbers, new test file generator.

-    The generator generates images that test the full range of sample values,

-    allow the error numbers in pngstest to be tuned and checked.  makepng

-    also allows generation of images with extra chunks, although this is

-    still work-in-progress.

-  Added check for invalid palette index while reading.

-  Fixed some bugs in ICC profile writing. The code should now accept

-    all potentially valid ICC profiles and reject obviously invalid ones.

-    It now uses png_error() to do so rather than casually writing a PNG

-    without the necessary color data.

-  Removed whitespace from the end of lines in all source files and scripts.

-

-Version 1.6.0beta16 [March 6, 2012]

-  Relocated palette-index checking function from pngrutil.c to pngtrans.c

-  Added palette-index checking while writing.

-  Changed png_inflate() and calling routines to avoid overflow problems.

-    This is an intermediate check-in that solves the immediate problems and

-    introduces one performance improvement (avoiding a copy via png_ptr->zbuf.)

-    Further changes will be made to make ICC profile handling more secure.

-  Fixed build warnings (MSVC, GCC, GCC v3). Cygwin GCC with default options

-    declares 'index' as a global, causing a warning if it is used as a local

-    variable.  GCC 64-bit warns about assigning a (size_t) (unsigned 64-bit)

-    to an (int) (signed 32-bit).  MSVC, however, warns about using the

-    unary '-' operator on an unsigned value (even though it is well defined

-    by ANSI-C to be ~x+1).  The padding calculation was changed to use a

-    different method.  Removed the tests on png_ptr->pass.

-  Added contrib/libtests/tarith.c to test internal arithmetic functions from

-    png.c. This is a libpng maintainer program used to validate changes to the

-    internal arithmetic functions.

-  Made read 'inflate' handling like write 'deflate' handling. The read

-    code now claims and releases png_ptr->zstream, like the write code.

-    The bug whereby the progressive reader failed to release the zstream

-    is now fixed, all initialization is delayed, and the code checks for

-    changed parameters on deflate rather than always calling

-    deflatedEnd/deflateInit.

-  Validate the zTXt strings in pngvalid.

-  Added code to validate the windowBits value passed to deflateInit2().

-    If the call to deflateInit2() is wrong a png_warning will be issued

-    (in fact this is harmless, but the PNG data produced may be sub-optimal).

-

-Version 1.6.0beta17 [March 10, 2012]

-  Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. 

-  Reject all iCCP chunks after the first, even if the first one is invalid.

-  Deflate/inflate was reworked to move common zlib calls into single

-    functions [rw]util.c.  A new shared keyword check routine was also added

-    and the 'zbuf' is no longer allocated on progressive read.  It is now

-    possible to call png_inflate() incrementally.  A warning is no longer

-    issued if the language tag or translated keyword in the iTXt chunk

-    has zero length.

-  If benign errors are disabled use maximum window on ancilliary inflate.

-    This works round a bug introduced in 1.5.4 where compressed ancillary

-    chunks could end up with a too-small windowBits value in the deflate

-    header.

-

-Version 1.6.0beta18 [March 16, 2012]

-  Issue a png_benign_error() instead of png_warning() about bad palette index.

-  In pngtest, treat benign errors as errors if "-strict" is present.

-  Fixed an off-by-one error in the palette index checking function.

-  Fixed a compiler warning under Cygwin (Windows-7, 32-bit system)

-  Revised example.c to put text strings in a temporary character array

-    instead of directly assigning string constants to png_textp members.

-    This avoids compiler warnings when -Wwrite-strings is enabled.

-  Added output flushing to aid debugging under Visual Studio. Unfortunately

-    this is necessary because the VS2010 output window otherwise simply loses

-    the error messages on error (they weren't flushed to the window before

-    the process exited, apparently!)

-  Added configuration support for benign errors and changed the read

-    default. Also changed some warnings in the iCCP and sRGB handling

-    from to benign errors. Configuration now makes read benign

-    errors warnings and write benign errors to errors by default (thus

-    changing the behavior on read).  The simplified API always forces

-    read benign errors to warnings (regardless of the system default, unless

-    this is disabled in which case the simplified API can't be built.)

-

-Version 1.6.0beta19 [March 18, 2012]

-  Work around for duplicate row start calls; added warning messages.

-    This turns on PNG_FLAG_DETECT_UNINITIALIZED to detect app code that

-    fails to call one of the 'start' routines (not enabled in libpng-1.5

-    because it is technically an API change, since it did normally work

-    before.)  It also makes duplicate calls to png_read_start_row (an

-    internal function called at the start of the image read) benign, as

-    they were before changes to use png_inflate_claim. Somehow webkit is

-    causing this to happen; this is probably a mis-feature in the zlib

-    changes so this commit is only a work-round.

-  Removed erroneous setting of DETECT_UNINITIALIZED and added more

-    checks. The code now does a png_error if an attempt is made to do the

-    row initialization twice; this is an application error and it has

-    serious consequences because the transform data in png_struct is

-    changed by each call.

-  Added application error reporting and added chunk names to read

-    benign errors; also added --strict to pngstest - not enabled

-    yet because a warning is produced.

-  Avoid the double gamma correction warning in the simplified API.

-    This allows the --strict option to pass in the pngstest checks

-

-Version 1.6.0beta20 [March 29, 2012]

-  Changed chunk handler warnings into benign errors, incrementally load iCCP

-  Added checksum-icc.c to contrib/tools

-  Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.

-  Recognize known sRGB ICC profiles while reading; prefer writing the

-    iCCP profile over writing the sRGB chunk, controlled by the

-    PNG_sRGB_PROFILE_CHECKS option.

-  Revised png_set_text_2() to avoid potential memory corruption (fixes

-    CVE-2011-3048, also known as CVE-2012-3425).

-

-Version 1.6.0beta21 [April 27, 2012]

-  Revised scripts/makefile.darwin: use system zlib; remove quotes around

-    architecture list; add missing ppc architecture; add architecture options

-    to shared library link; don't try to create a shared lib based on missing

-    RELEASE variable.

-  Enable png_set_check_for_invalid_index() for both read and write.

-  Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around

-    declaration of png_handle_unknown().

-  Added -lssp_nonshared in a comment in scripts/makefile.freebsd

-    and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.

-

-Version 1.6.0beta22 [May 23, 2012]

-  Removed need for -Wno-cast-align with clang.  clang correctly warns on

-    alignment increasing pointer casts when -Wcast-align is passed. This

-    fixes the cases that clang warns about either by eliminating the

-    casts from png_bytep to png_uint_16p (pngread.c), or, for pngrutil.c

-    where the cast is previously verified or pngstest.c where it is OK, by

-    introducing new png_aligncast macros to do the cast in a way that clang

-    accepts.

-

-Version 1.6.0beta23 [June 6, 2012]

-  Revised CMakeLists.txt to not attempt to make a symlink under mingw.

-  Made fixes for new optimization warnings from gcc 4.7.0. The compiler

-    performs an optimization which is safe; however it then warns about it.

-    Changing the type of 'palette_number' in pngvalid.c removes the warning.

-  Do not depend upon a GCC feature macro being available for use in generating

-    the linker mapfile symbol prefix.

-  Improved performance of new do_check_palette_indexes() function (only

-    update the value when it actually increases, move test for whether

-    the check is wanted out of the function.

-

-Version 1.6.0beta24 [June 7, 2012]

-  Don't check palette indexes if num_palette is 0 (as it can be in MNG files).

-

-Version 1.6.0beta25 [June 16, 2012]

-  Revised png_set_keep_unknown_chunks() so num_chunks < 0 means ignore all

-    unknown chunks and all known chunks except for IHDR, PLTE, tRNS, IDAT,

-    and IEND.  Previously it only meant ignore all unknown chunks, the

-    same as num_chunks == 0. Revised png_image_skip_unused_chunks() to

-    provide a list of chunks to be processed instead of a list of chunks to

-    ignore.  Revised contrib/gregbook/readpng2.c accordingly.

-

-Version 1.6.0beta26 [July 10, 2012]

-  Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it

-    depends on configure, which is not included in those archives.

-  Moved scripts/chkfmt to contrib/tools.

-  Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386.

-

-Version 1.6.0beta27 [August 11, 2012]

-  Do not compile PNG_DEPRECATED, PNG_ALLOC and PNG_PRIVATE when __GNUC__ < 3.

-  Do not use __restrict when GNUC is <= 3.1

-  Removed references to png_zalloc() and png_zfree() from the manual.

-  Fixed configurations where floating point is completely disabled.  Because

-    of the changes to support symbol prefixing PNG_INTERNAL_FUNCTION declares

-    floating point APIs during libpng builds even if they are completely

-    disabled. This requires the png floating point types (png_double*) to be

-    declared even though the functions are never actually defined.  This

-    change provides a dummy definition so that the declarations work, yet any

-    implementation will fail to compile because of an incomplete type.

-  Re-eliminated the use of strcpy() in pngtest.c.  An unncessary use of

-    strcpy() was accidentally re-introduced in libpng16; this change replaces

-    it with strncpy().

-  Eliminated use of png_sizeof(); use sizeof() instead.

-  Use a consistent style for (sizeof type) and (sizeof (array))

-  Cleanup of png_set_filler().  This function does very different things on

-    read and write.  In libpng 1.6 the two cases can be distinguished and

-    considerable code cleanup, and extra error checking, is possible.  This

-    makes calls on the write side that have no effect be ignored with a

-    png_app_error(), which can be disabled in the app using

-    png_set_benign_errors(), and removes the spurious use of usr_channels

-    on the read side.

-  Insist on autotools 1.12.1 for git builds because there are security issues

-    with 1.12 and insisting on anything less would allow 1.12 to be used.

-  Removed info_ptr->signature[8] from WRITE-only builds.

-  Add some conditions for compiling png_fixed().  This is a small function

-    but it requires "-lm" on some platforms.

-  Cause pngtest --strict to fail on any warning from libpng (not just errors)

-    and cause it not to fail at the comparison step if libpng lacks support

-    for writing chunks that it reads from the input (currently only implemented

-    for compressed text chunks).

-  Make all three "make check" test programs work without READ or WRITE support.

-    Now "make check" will succeed even if libpng is compiled with -DPNG_NO_READ

-    or -DPNG_NO_WRITE.  The tests performed are reduced, but the basic reading

-    and writing of a PNG file is always tested by one or more of the tests.

-  Consistently use strlen(), memset(), memcpy(), and memcmp() instead of the

-    png_strlen(), png_memset(), png_memcpy(), and png_memcmp() macros.

-  Removed the png_sizeof(), png_strlen(), png_memset(), png_memcpy(), and

-    png_memcmp() macros.

-  Work around gcc 3.x and Microsoft Visual Studio 2010 complaints. Both object

-    to the split initialization of num_chunks.

-

-Version 1.6.0beta28 [August 29, 2012]

-  Unknown handling fixes and clean up. This adds more correct option

-    control of the unknown handling, corrects the pre-existing bug where

-    the per-chunk 'keep' setting is ignored and makes it possible to skip

-    IDAT chunks in the sequential reader (broken in earlier 1.6 versions).

-    There is a new test program, test-unknown.c, which is a work in progress

-    (not currently part of the test suite).  Comments in the header files now

-    explain how the unknown handling works.

-  Allow fine grain control of unknown chunk APIs. This change allows

-    png_set_keep_unknown_chunks() to be turned off if not required and causes

-    both read and write to behave appropriately (on read this is only possible

-    if the user callback is used to handle unknown chunks).  The change

-    also removes the support for storing unknown chunks in the info_struct

-    if the only unknown handling enabled is via the callback, allowing libpng

-    to be configured with callback reading and none of the unnecessary code.

-  Corrected fix for unknown handling in pngtest. This reinstates the

-    libpng handling of unknown chunks other than vpAg and sTER (including

-    unsafe-to-copy chunks which were dropped before) and eliminates the

-    repositioning of vpAg and sTER in pngtest.png by changing pngtest.png

-    (so the chunks are where libpng would put them).

-  Added "tunknown" test and corrected a logic error in png_handle_unknown()

-    when SAVE support is absent.  Moved the shell test scripts for

-    contrib/libtests from the libpng top directory to contrib/libtests.

-    png_handle_unknown() must always read or skip the chunk, if

-    SAVE_UNKNOWN_CHUNKS is turned off *and* the application does not set

-    a user callback an unknown chunk will not be read, leading to a read

-    error, which was revealed by the "tunknown" test.

-  Cleaned up and corrected ICC profile handling.

-    contrib/libtests/makepng: corrected 'rgb' and 'gray' cases.  profile_error

-    messages could be truncated; made a correct buffer size calculation and

-    adjusted pngerror.c appropriately. png_icc_check_* checking improved;

-    changed the functions to receive the correct color type of the PNG on read

-    or write and check that it matches the color space of the profile (despite

-    what the comments said before, there is danger in assuming the app will

-    cope correctly with an RGB profile on a grayscale image and, since it

-    violates the PNG spec, allowing it is certain to produce inconsistent

-    app behavior and might even cause app crashes.) Check that profiles

-    contain the tags needed to process the PNG (tags all required by the ICC

-    spec). Removed unused PNG_STATIC from pngpriv.h.

-

-Version 1.6.0beta29 [September 4, 2012]

-  Fixed the simplified API example programs to add the *colormap parameter

-    to several of he API and improved the error message if the version field

-    is not set.

-  Added contrib/examples/* to the *.zip and *.7z distributions.

-  Updated simplified API synopses and description of the png_image structure

-    in the manual.

-  Made makepng and pngtest produce identical PNGs, add "--relaxed" option

-    to pngtest. The "--relaxed" option turns off the benign errors that are

-    enabled by default in pre-RC builds. makepng can now write ICC profiles

-    where the length has not been extended to a multiple of 4, and pngtest

-    now intercepts all libpng errors, allowing the previously-introduced

-    "--strict test" on no warnings to actually work.

-  Improved ICC profile handling including cHRM chunk generation and fixed

-    Cygwin+MSVC build errors. The ICC profile handling now includes more

-    checking.  Several errors that caused rejection of the profile are now

-    handled with a warning in such a way that the invalid profiles will be

-    read by default in release (but not pre-RC) builds but will not be

-    written by default.  The easy part of handling the cHRM chunk is written,

-    where the ICC profile contains the required data.  The more difficult

-    part plus guessing a gAMA value requires code to pass selected RGB values

-    through the profile.

-

-Version 1.6.0beta30 [October 24, 2012]

-  Changed ICC profile matrix/vector types to not depend on array type rules.

-    By the ANSI-C standard the new types should be identical to the previous

-    versions, and all known versions of gcc tested with the previous versions

-    except for GCC-4.2.1 work with this version.  The change makes the ANSI-C

-    rule that const applied to an array of elements applies instead to the

-    elements in the array moot by explicitly applying const to the base

-    elements of the png_icc_matrix and png_icc_vector types. The accidental

-    (harmless) 'const' previously applied to the parameters of two of the

-    functions have also been removed.

-  Added a work around for GCC 4.2 optimization bug.

-  Marked the broken (bad white point) original HP sRGB profiles correctly and

-    correct comments.

-  Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7

-  Use /MDd for vstudio debug builds. Also added pngunkown to the vstudio

-    builds, fixed build errors and corrected a minor exit code error in

-    pngvalid if the 'touch' file name is invalid.

-  Add updated WARNING file to projects/vstudio from libpng 1.5/vstudio

-  Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in

-    pngrtran.c (Domani Hannes).

-

-Version 1.6.0beta31 [November 1, 2012]

-  Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.

-  Made pngvalid so that it will build outside the libpng source tree.

-  Made builds -DPNG_NO_READ_GAMMA compile (the unit tests still fail).

-  Made PNG_NO_READ_GAMMA switch off interfaces that depend on READ_GAMMA.

-    Prior to 1.6.0 switching off READ_GAMMA did unpredictable things to the

-    interfaces that use it (specifically, png_do_background in 1.4 would

-    simply display composite for grayscale images but do composition

-    with the incorrect arithmetic for color ones). In 1.6 the semantic

-    of -DPNG_NO_READ_GAMMA is changed to simply disable any interface that

-    depends on it; this obliges people who set it to consider whether they

-    really want it off if they happen to use any of the interfaces in

-    question (typically most users who disable it won't).

-  Fixed GUIDs in projects/vstudio. Some were duplicated or missing,

-    resulting in VS2010 having to update the files.

-  Removed non-working ICC profile support code that was mostly added to

-    libpng-1.6.0beta29 and beta30. There was too much code for too little

-    gain; implementing full ICC color correction may be desireable but is left

-    up to applications.

-

-Version 1.6.0beta32 [November 25, 2012]

-  Fixed an intermittent SEGV in pngstest due to an uninitialized array element.

-  Added the ability for contrib/libtests/makepng.c to make a PNG with just one

-    color. This is useful for debugging pngstest color inaccuracy reports.

-  Fixed error checking in the simplified write API (Olaf van der Spek)

-  Made png_user_version_check() ok to use with libpng version 1.10.x and later.

-

-Version 1.6.0beta33 [December 15, 2012]

-  Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX should be PNG_CHUNK_MALLOC_MAX)

-    that causes the MALLOC_MAX limit not to work (John Bowler)

-  Change png_warning() to png_app_error() in pngwrite.c and comment the

-    fall-through condition.

-  Change png_warning() to png_app_warning() in png_write_tRNS().

-  Rearranged the ARM-NEON optimizations: Isolated the machine specific code

-    to the hardware subdirectory and added comments to pngrutil.c so that

-    implementors of other optimizations know what to do.

-  Fixed cases of unquoted DESTDIR in Makefile.am

-  Rebuilt Makefile.in, etc., with autoconf-2.69 and automake-1.12.5.

-

-Version 1.6.0beta34 [December 19, 2012]

-  Cleaned up whitespace in the synopsis portion of the manpage "libpng.3"

-  Disassembled the version number in scripts/options.awk (necessary for

-    building on SunOs).

-

-Version 1.6.0beta35 [December 23, 2012]

-  Made default Zlib compression settings be configurable. This adds #defines to

-    pnglibconf.h to control the defaults.

-  Fixed Windows build issues, enabled ARM compilation. Various warnings issued

-    by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old

-    GCCs.) ARM support is enabled by default in zlib.props (unsupported by

-    Microsoft) and ARM compilation is made possible by deleting the check for

-    x86. The test programs cannot be run because they are not signed.

-

-Version 1.6.0beta36 [January 2, 2013]

-  Discontinued distributing libpng-1.x.x.tar.bz2.

-  Discontinued distributing libpng-1.7.0-1.6.0-diff.txt and similar.

-  Rebuilt configure with autoconf-2.69 (inadvertently not done in beta33)

-  Fixed 'make distcheck' on SUN OS - libpng.so was not being removed

-

-Version 1.6.0beta37 [January 10, 2013]

-  Fixed conceivable but difficult to repro overflow. Also added two test

-    programs to generate and test a PNG which should have the problem.

-

-Version 1.6.0beta39 [January 19, 2013]

-  Again corrected attempt at overflow detection in png_set_unknown_chunks()

-  (CVE-2013-7353).  Added overflow detection in png_set_sPLT() and

-  png_set_text_2() (CVE-2013-7354).

-

-Version 1.6.0beta40 [January 20, 2013]

-  Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs

-

-Version 1.6.0rc01 [January 26, 2013]

-  No changes.

-

-Version 1.6.0rc02 [February 4, 2013]

-  Added png_get_palette_max() function.

-

-Version 1.6.0rc03 [February 5, 2013]

-  Fixed the png_get_palette_max API.

-

-Version 1.6.0rc04 [February 7, 2013]

-  Turn serial tests back on (recently turned off by autotools upgrade).

-

-Version 1.6.0rc05 [February 8, 2013]

-  Update manual about png_get_palette_max().

-

-Version 1.6.0rc06 [February 9, 2013]

-  Fixed missing dependency in --prefix builds The intermediate

-    internal 'prefix.h' file can only be generated correctly after

-    pnglibconf.h, however the dependency was not in Makefile.am.  The

-    symptoms are unpredictable depending on the order make chooses to

-    build pngprefix.h and pnglibconf.h, often the error goes unnoticed

-    because there is a system pnglibconf.h to use instead.

-

-Version 1.6.0rc07 [February 10, 2013]

-  Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED

-    block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.

-

-Version 1.6.0rc08 [February 10, 2013]

-  Fix typo in png.h #ifdef

-

-Version 1.6.0 [February 14, 2013]

-  No changes.

-

-Version 1.6.1beta01 [February 16, 2013]

-  Made symbol prefixing work with the ARM neon optimizations. Also allow

-    pngpriv.h to be included for preprocessor definitions only, so it can

-    be used in non-C/C++ files. Back ported from libpng 1.7.

-  Made sRGB check numbers consistent.

-  Ported libpng 1.5 options.awk/dfn file handling to 1.6, fixed one bug.

-  Removed cc -E workround, corrected png_get_palette_max API Tested on

-    SUN OS cc 5.9, which demonstrates the tokenization problem previously

-    avoided by using /lib/cpp.  Since all .dfn output is now protected in

-    double quotes unless it is to be macro substituted the fix should

-    work everywhere.

-  Enabled parallel tests - back ported from libpng-1.7.

-  scripts/pnglibconf.dfa formatting improvements back ported from libpng17.

-  Fixed a race condition in the creation of the build 'scripts' directory

-    while building with a parallel make.

-  Use approved/supported Android method to check for NEON, use Linux/POSIX

-    1003.1 API to check /proc/self/auxv avoiding buffer allocation and other

-    library calls (ported from libpng15).

-

-Version 1.6.1beta02 [February 19, 2013]

-  Use parentheses more consistently in "#if defined(MACRO)" tests.

-  Folded long lines.

-  Reenabled code to allow zero length PLTE chunks for MNG.

-

-Version 1.6.1beta03 [February 22, 2013]

-  Fixed ALIGNED_MEMORY support.

-  Added a new configure option:

-    --enable-arm-neon=always will stop the run-time checks. New checks

-    within arm/arm_init.c will cause the code not to be compiled unless

-    __ARM_NEON__ is set. This should make it fail safe (if someone asks

-    for it on then the build will fail if it can't be done.)

-  Updated the INSTALL document.

-

-Version 1.6.1beta04 [February 27, 2013]

-  Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.

-  Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC.

-  Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble

-    with CRLF line endings.

-

-Version 1.6.1beta05 [March 1, 2013]

-  Avoid a possible memory leak in contrib/gregbook/readpng.c

-

-Version 1.6.1beta06 [March 4, 2013]

-  Better documentation of unknown handling API interactions.

-  Corrected Android builds and corrected libpng.vers with symbol

-    prefixing.  It also makes those tests compile and link on Android.

-  Added an API png_set_option() to set optimization options externally,

-    providing an alternative and general solution for the non-portable

-    run-time tests used by the ARM Neon code, using the PNG_ARM_NEON option.

-  The order of settings vs options in pnglibconf.h is reversed to allow

-    settings to depend on options and options can now set (or override) the

-    defaults for settings.

-

-Version 1.6.1beta07 [March 7, 2013]

-  Corrected simplified API default gamma for color-mapped output, added

-    a flag to change default. In 1.6.0 when the simplified API was used

-    to produce color-mapped output from an input image with no gamma

-    information the gamma assumed for the input could be different from

-    that assumed for non-color-mapped output.  In particular 16-bit depth

-    input files were assumed to be sRGB encoded, whereas in the 'direct'

-    case they were assumed to have linear data.  This was an error.  The

-    fix makes the simplified API treat all input files the same way and

-    adds a new flag to the png_image::flags member to allow the

-    application/user to specify that 16-bit files contain sRGB data

-    rather than the default linear.

-  Fixed bugs in the pngpixel and makepng test programs.

-

-Version 1.6.1beta08 [March 7, 2013]

-  Fixed CMakelists.txt to allow building a single variant of the library

-    (Claudio Bley):

-  Introduced a PNG_LIB_TARGETS variable that lists all activated library

-    targets.  It is an error if this variable ends up empty, ie. you have

-    to build at least one library variant.

-  Made the *_COPY targets only depend on library targets actually being build.

-  Use PNG_LIB_TARGETS to unify a code path.

-  Changed the CREATE_SYMLINK macro to expect the full path to a file as the

-    first argument. When symlinking the filename component of that path is

-    determined and used as the link target.

-  Use copy_if_different in the CREATE_SYMLINK macro.

-

-Version 1.6.1beta09 [March 13, 2013]

-  Eliminated two warnings from the Intel C compiler. The warnings are

-    technically valid, although a reasonable treatment of division would

-    show it to be incorrect.

-

-Version 1.6.1rc01 [March 21, 2013]

-  No changes.

-

-Version 1.6.1 [March 28, 2013]

-  No changes.

-

-Version 1.6.2beta01 [April 14, 2013]

-  Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling.

-  Fixed incorrect warning of excess deflate data. End condition - the

-    warning would be produced if the end of the deflate stream wasn't read

-    in the last row.  The warning is harmless.

-  Corrected the test on user transform changes on read. It was in the

-    png_set of the transform function, but that doesn't matter unless the

-    transform function changes the rowbuf size, and that is only valid if

-    transform_info is called.

-  Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c

-    (Flavio Medeiros).

-  Corrected length written to uncompressed iTXt chunks (Samuli Suominen).

-    Bug was introduced in libpng-1.6.0.

-

-Version 1.6.2rc01 [April 18, 2013]

-  Added contrib/tools/fixitxt.c, to repair the erroneous iTXt chunk length

-    written by libpng-1.6.0 and 1.6.1.

-  Disallow storing sRGB information when the sRGB is not supported.

-

-Version 1.6.2rc02 [April 18, 2013]

-  Merge pngtest.c with libpng-1.7.0

-

-Version 1.6.2rc03 [April 22, 2013]

-  Trivial spelling cleanup.

-

-Version 1.6.2rc04 and 1.6.2rc05 [omitted]

-

-Version 1.6.2rc06 [April 24, 2013]

-  Reverted to version 1.6.2rc03.  Recent changes to arm/neon support

-    have been ported to libpng-1.7.0beta09 and will reappear in version

-    1.6.3beta01.

-

-Version 1.6.2 [April 25, 2013]

-  No changes.

-

-Version 1.6.3beta01 [April 25, 2013]

-  Revised stack marking in arm/filter_neon.S and configure.ac.

-  Ensure that NEON filter stuff is completely disabled when switched 'off'.

-    Previously the ARM NEON specific files were still built if the option

-    was switched 'off' as opposed to being explicitly disabled.

-

-Version 1.6.3beta02 [April 26, 2013]

-  Test for 'arm*' not just 'arm' in the host_cpu configure variable.

-  Rebuilt the configure scripts.

-

-Version 1.6.3beta03 [April 30, 2013]

-  Expanded manual paragraph about writing private chunks, particularly

-    the need to call png_set_keep_unknown_chunks() when writing them.

-  Avoid dereferencing NULL pointer possibly returned from

-    png_create_write_struct() (Andrew Church).

-

-Version 1.6.3beta05 [May 9, 2013]

-  Calculate our own zlib windowBits when decoding rather than trusting the

-    CMF bytes in the PNG datastream.

-  Added an option to force maximum window size for inflating, which was

-    the behavior of libpng15 and earlier, via a new PNG_MAXIMUM_INFLATE_WINDOW

-    option for png_set_options().

-  Added png-fix-itxt and png-fix-too-far-back to the built programs and

-    removed warnings from the source code and timepng that are revealed as

-    a result.

-  Detect wrong libpng versions linked to png-fix-too-far-back, which currently

-    only works with libpng versions that can be made to reliably fail when

-    the deflate data contains an out-of-window reference.  This means only

-    1.6 and later.

-  Fixed gnu issues: g++ needs a static_cast, gcc 4.4.7 has a broken warning

-    message which it is easier to work round than ignore.

-  Updated contrib/pngminus/pnm2png.c (Paul Stewart):

-    Check for EOF

-    Ignore "#" delimited comments in input file to pnm2png.c.

-    Fixed whitespace handling

-    Added a call to png_set_packing()

-    Initialize dimension values so if sscanf fails at least we have known

-      invalid values.

-  Attempt to detect configuration issues with png-fix-too-far-back, which

-    requires both the correct libpng and the correct zlib to function

-    correctly.

-  Check ZLIB_VERNUM for mismatches, enclose #error in quotes

-  Added information in the documentation about problems with and fixes for

-    the bad CRC and bad iTXt chunk situations.

-

-Version 1.6.3beta06 [May 12, 2013]

-  Allow contrib/pngminus/pnm2png.c to compile without WRITE_INVERT and

-    WRITE_PACK supported (writes error message that it can't read P1 or

-    P4 PBM files).

-  Improved png-fix-too-far-back usage message, added --suffix option.

-  Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the

-    right zlib header files.

-  Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile

-

-Version 1.6.3beta07 [June 8, 2013]

-  Removed a redundant test in png_set_IHDR().

-  Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt)

-  Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt

-  Enclose the prototypes for the simplified write API in

-    #ifdef PNG_STDIO_SUPPORTED/#endif

-  Make ARM NEON support work at compile time (not just configure time).

-    This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when

-    using a compiler that compiles for multiple architectures at one time.

-  Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from

-    pnglibconf.h, allowing more of the decisions to be made internally

-    (pngpriv.h) during the compile.  Without this, symbol prefixing is broken

-    under certain circumstances on ARM platforms.  Now only the API parts of

-    the optimizations ('check' vs 'api') are exposed in the public header files

-    except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the

-    decision about whether or not to use the optimizations.

-  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.

-    Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test

-    on __ARM_NEON__ from configure time to compile time.  This breaks symbol

-    prefixing because the definition of the special png_init_filter_functions

-    call was hidden at configure time if the relevant compiler arguments are

-    passed in CFLAGS as opposed to CC.  This change attempts to avoid all

-    the confusion that would result by declaring the init function even when

-    it is not used, so that it will always get prefixed.

-

-Version 1.6.3beta08 [June 18, 2013]

-  Revised libpng.3 so that "doclifter" can process it.

-

-Version 1.6.3beta09 [June 27, 2013]

-  Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18

-    as parameters for png_set_gamma().  These have been available since

-    libpng-1.5.4.

-  Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it

-    to check all compressed chunks known to libpng.

-

-Version 1.6.3beta10 [July 5, 2013]

-  Updated documentation to show default behavior of benign errors correctly.

-  Only compile ARM code when PNG_READ_SUPPORTED is defined.

-  Fixed undefined behavior in contrib/tools/pngfix.c and added new strip

-    option. pngfix relied on undefined behavior and even a simple change from

-    gcc to g++ caused it to fail.  The new strip option 'unsafe' has been

-    implemented and is the default if --max is given.  Option names have

-    been clarified, with --strip=transform now stripping the bKGD chunk,

-    which was stripped previously with --strip=unused.

-  Added all documented chunk types to pngpriv.h

-  Unified pngfix.c source with libpng17.

-

-Version 1.6.3rc01 [July 11, 2013]

-  No changes.

-

-Version 1.6.3 [July 18, 2013]

-  Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.

-  Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings

-    may be erroneously issued by code-checking applications.

-

-Version 1.6.4beta01 [August 21, 2013]

-  Added information about png_set_options() to the manual.

-  Delay calling png_init_filter_functions() until a row with nonzero filter

-    is found.

-

-Version 1.6.4beta02 [August 30, 2013]

-  Fixed inconsistent conditional compilation of png_chunk_unknown_handling()

-    prototype, definition, and usage.  Made it depend on

-    PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere.

-

-Version 1.6.4rc01 [September 5, 2013]

-  No changes.

-

-Version 1.6.4 [September 12, 2013]

-  No changes.

-

-Version 1.6.5 [September 14, 2013]

-  Removed two stray lines of code from arm/arm_init.c.

-

-Version 1.6.6 [September 16, 2013]

-  Removed two stray lines of code from arm/arm_init.c, again.

-

-Version 1.6.7beta01 [September 30, 2013]

-  Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE

-    combination

-  Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also

-    fixed the pngminim makefiles to work when $(MAKEFLAGS) contains stuff

-    which terminates the make options (as by default in recent versions of

-    Gentoo).

-  Avoid up-cast warnings in pngvalid.c. On ARM the alignment requirements of

-    png_modifier are greater than that of png_store and as a consequence

-    compilation of pngvalid.c results in a warning about increased alignment

-    requirements because of the bare cast to (png_modifier*). The code is safe,

-    because the pointer is known to point to a stack allocated png_modifier,

-    but this change avoids the warning.

-  Fixed default behavior of ARM_NEON_API. If the ARM NEON API option was

-    compiled without the CHECK option it defaulted to on, not off.

-  Check user callback behavior in pngunknown.c. Previous versions compiled

-    if SAVE_UNKNOWN was not available but did nothing since the callback

-    was never implemented.

-  Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes

-

-Version 1.6.7beta02 [October 12, 2013]

-  Made changes for compatibility with automake 1.14:

-    1) Added the 'compile' program to the list of programs that must be cleaned

-       in autogen.sh

-    2) Added 'subdir-objects' which causes .c files in sub-directories to be

-       compiled such that the corresponding .o files are also in the

-       sub-directory.  This is because automake 1.14 warns that the

-       current behavior of compiling to the top level directory may be removed

-       in the future.

-    3) Updated dependencies on pnglibconf.h to match the new .o locations and

-       added all the files in contrib/libtests and contrib/tools that depend

-       on pnglibconf.h

-    4) Added 'BUILD_SOURCES = pnglibconf.h'; this is the automake recommended

-       way of handling the dependencies of sources that are machine generated;

-       unfortunately it only works if the user does 'make all' or 'make check',

-       so the dependencies (3) are still required.

-  Cleaned up (char*) casts of zlib messages. The latest version of the Intel C

-    compiler complains about casting a string literal as (char*), so copied the

-    treatment of z_const from the library code into pngfix.c

-  Simplified error message code in pngunknown. The simplification has the

-    useful side effect of avoiding a bogus warning generated by the latest

-    version of the Intel C compiler (it objects to

-    condition ? string-literal : string-literal).

-  Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always

-    removing the 1.14 'compile' script but never checking for it.

-

-Version 1.6.7beta03 [October 19, 2013]

-  Added ARMv8 support (James Yu <james.yu at linaro.org>).  Added file

-    arm/filter_neon_intrinsics.c; enable with -mfpu=neon.

-  Revised pngvalid to generate size images with as many filters as it can

-    manage, limited by the number of rows.

-  Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h

-    and detect the broken GCC compilers.

-

-Version 1.6.7beta04 [October 26, 2013]

-  Allow clang derived from older GCC versions to use ARM intrinsics. This

-    causes all clang builds that use -mfpu=neon to use the intrinsics code,

-    not the assembler code.  This has only been tested on iOS 7. It may be

-    necessary to exclude some earlier clang versions but this seems unlikely.

-  Changed NEON implementation selection mechanism. This allows assembler

-    or intrinsics to be turned on at compile time during the build by defining

-    PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1).  This macro

-    is undefined by default and the build type is selected in pngpriv.h.

-

-Version 1.6.7rc01 [November 2, 2013]

-  No changes.

-

-Version 1.6.7rc02 [November 7, 2013]

-  Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char

-    checking macros take an unsigned char argument, not a signed char.

-

-Version 1.6.7 [November 14, 2013]

-  No changes.

-

-Version 1.6.8beta01 [November 24, 2013]

-  Moved prototype for png_handle_unknown() in pngpriv.h outside of

-    the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block.

-  Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile

-  Conditionally compile some unused functions reported by -Wall in

-    pngminim.

-  Fixed 'minimal' builds. Various obviously useful minimal configurations

-    don't build because of missing contrib/libtests test programs and

-    overly complex dependencies in scripts/pnglibconf.dfa. This change

-    adds contrib/conftest/*.dfa files that can be used in automatic build

-    scripts to ensure that these configurations continue to build.

-  Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder.

-  Fixed pngvalid 'fail' function declaration on the Intel C Compiler.

-    This reverts to the previous 'static' implementation and works round

-    the 'unused static function' warning by using PNG_UNUSED().

-

-Version 1.6.8beta02 [November 30, 2013]

-  Removed or marked PNG_UNUSED some harmless "dead assignments" reported

-    by clang scan-build.

-  Changed tabs to 3 spaces in png_debug macros and changed '"%s"m'

-    to '"%s" m' to improve portability among compilers.

-  Changed png_free_default() to free() in pngtest.c

-

-Version 1.6.8rc01 [December 12, 2013]

-  Tidied up pngfix inits and fixed pngtest no-write builds.

-

-Version 1.6.8rc02 [December 14, 2013]

-  Handle zero-length PLTE chunk or NULL palette with png_error()

-    instead of png_chunk_report(), which by default issues a warning

-    rather than an error, leading to later reading from a NULL pointer

-    (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954

-    and VU#650142.  Libpng-1.6.1 through 1.6.7 are vulnerable.

-    Libpng-1.6.0 and earlier do not have this bug.

-

-Version 1.6.8 [December 19, 2013]

-  No changes.

-

-Version 1.6.9beta01 [December 26, 2013]

-  Bookkeeping: Moved functions around (no changes). Moved transform

-    function definitions before the place where they are called so that

-    they can be made static. Move the intrapixel functions and the

-    grayscale palette builder out of the png?tran.c files. The latter

-    isn't a transform function and is no longer used internally, and the

-    former MNG specific functions are better placed in pngread/pngwrite.c

-  Made transform implementation functions static. This makes the internal

-    functions called by png_do_{read|write}_transformations static. On an

-    x86-64 DLL build (Gentoo Linux) this reduces the size of the text

-    segment of the DLL by 1208 bytes, about 0.6%. It also simplifies

-    maintenance by removing the declarations from pngpriv.h and allowing

-    easier changes to the internal interfaces.

-  Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69

-    in the tar distributions.

-

-Version 1.6.9beta02 [January 1, 2014]

-  Added checks for libpng 1.5 to pngvalid.c.  This supports the use of

-    this version of pngvalid in libpng 1.5

-  Merged with pngvalid.c from libpng-1.7 changes to create a single

-    pngvalid.c

-  Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner).

-  Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0

-  Merged libpng-1.7.0 changes to make no-interlace configurations work

-    with test programs.

-  Revised pngvalid.c to support libpng 1.5, which does not support the

-    PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in

-    pngvalid.c

-  Allow unversioned links created on install to be disabled in configure.

-    In configure builds 'make install' changes/adds links like png.h

-    and libpng.a to point to the newly installed, versioned, files (e.g.

-    libpng17/png.h and libpng17.a). Three new configure options and some

-    rearrangement of Makefile.am allow creation of these links to be disabled.

-

-Version 1.6.9beta03 [January 10, 2014]

-  Removed potentially misleading warning from png_check_IHDR().

-

-Version 1.6.9beta04 [January 20, 2014]

-  Updated scripts/makefile.* to use CPPFLAGS (Cosmin).

-  Added clang attribute support (Cosmin).

-

-Version 1.6.9rc01 [January 28, 2014]

-  No changes.

-

-Version 1.6.9rc02 [January 30, 2014]

-  Quiet an uninitialized memory warning from VC2013 in png_get_png().

-

-Version 1.6.9 [February 6, 2014]

-

-Version 1.6.10beta01 [February 9, 2014]

-  Backported changes from libpng-1.7.0beta30 and beta31:

-  Fixed a large number of instances where PNGCBAPI was omitted from

-    function definitions.

-  Added pngimage test program for png_read_png() and png_write_png()

-    with two new test scripts.

-  Removed dependence on !PNG_READ_EXPAND_SUPPORTED for calling

-    png_set_packing() in png_read_png().

-  Fixed combination of ~alpha with shift. On read invert alpha, processing

-    occurred after shift processing, which causes the final values to be

-    outside the range that should be produced by the shift. Reversing the

-    order on read makes the two transforms work together correctly and mirrors

-    the order used on write.

-  Do not read invalid sBIT chunks. Previously libpng only checked sBIT

-    values on write, so a malicious PNG writer could therefore cause

-    the read code to return an invalid sBIT chunk, which might lead to

-    application errors or crashes.  Such chunks are now skipped (with

-    chunk_benign_error).

-  Make png_read_png() and png_write_png() prototypes in png.h depend

-    upon PNG_READ_SUPPORTED and PNG_WRITE_SUPPORTED.

-  Support builds with unsupported PNG_TRANSFORM_* values.  All of the

-    PNG_TRANSFORM_* values are always defined in png.h and, because they

-    are used for both read and write in some cases, it is not reliable

-    to #if out ones that are totally unsupported. This change adds error

-    detection in png_read_image() and png_write_image() to do a

-    png_app_error() if the app requests something that cannot be done

-    and it adds corresponding code to pngimage.c to handle such options

-    by not attempting to test them.

-

-Version 1.6.10beta02 [February 23, 2014]

-  Moved redefines of png_error(), png_warning(), png_chunk_error(),

-    and png_chunk_warning() from pngpriv.h to png.h to make them visible

-    to libpng-calling applications.

-  Moved OS dependent code from arm/arm_init.c, to allow the included

-    implementation of the ARM NEON discovery function to be set at

-    build-time and provide sample implementations from the current code in the

-    contrib/arm-neon subdirectory. The __linux__ code has also been changed to

-    compile and link on Android by using /proc/cpuinfo, and the old linux code

-    is in contrib/arm-neon/linux-auxv.c.  The new code avoids POSIX and Linux

-    dependencies apart from opening /proc/cpuinfo and is C90 compliant.

-  Check for info_ptr == NULL early in png_read_end() so we don't need to

-    run all the png_handle_*() and depend on them to return if info_ptr == NULL.

-    This improves the performance of png_read_end(png_ptr, NULL) and makes

-    it more robust against future programming errors.

-  Check for __has_extension before using it in pngconf.h, to

-    support older Clang versions (Jeremy Sequoia).

-  Treat CRC error handling with png_set_crc_action(), instead of with

-    png_set_benign_errors(), which has been the case since libpng-1.6.0beta18.

-  Use a user warning handler in contrib/gregbook/readpng2.c instead of default,

-    so warnings will be put on stderr even if libpng has CONSOLE_IO disabled.

-  Added png_ptr->process_mode = PNG_READ_IDAT_MODE in png_push_read_chunk

-    after recognizing the IDAT chunk, which avoids an infinite loop while

-    reading a datastream whose first IDAT chunk is of zero-length.

-    This fixes CERT VU#684412 and CVE-2014-0333.

-  Don't recognize known sRGB profiles as sRGB if they have been hacked,

-    but don't reject them and don't issue a copyright violation warning.

-

-Version 1.6.10beta03 [February 25, 2014]

-  Moved some documentation from png.h to libpng.3 and libpng-manual.txt

-  Minor editing of contrib/arm-neon/README and contrib/examples/*.c

-

-Version 1.6.10rc01 [February 27, 2014]

-  Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS

-    and PNG_USR_CONFIG -> PNG_USER_CONFIG).

-

-Version 1.6.10rc02 [February 28, 2014]

-  Removed unreachable return statement after png_chunk_error()

-    in pngrutil.c

-

-Version 1.6.10rc03 [March 4, 2014]

-  Un-deprecated png_data_freer().

-

-Version 1.6.10 [March 6, 2014]

-  No changes.

-

-Version 1.6.11beta01 [March 17, 2014]

-  Use "if (value != 0)" instead of "if (value)" consistently.

-  Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.

-  Moved configuration information from the manual to the INSTALL file.

-

-Version 1.6.11beta02 [April 6, 2014]

-  Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because

-    they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3

-    when using its "__builtin_pow()" function.

-  Silence 'unused parameter' build warnings (Cosmin Truta).

-  $(CP) is now used alongside $(RM_F).  Also, use 'copy' instead of 'cp'

-    where applicable, and applied other minor makefile changes (Cosmin).

-  Don't warn about invalid dimensions exceeding user limits (Cosmin).

-  Allow an easy replacement of the default pre-built configuration

-    header with a custom header, via the make PNGLIBCONF_H_PREBUILT

-    macro (Cosmin).

-

-Version 1.6.11beta03 [April 6, 2014]

-  Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes

-    with "blocky" expansion of sub-8-bit interlaced PNG files (Eric Huss).

-  Optionally use  __builtin_bswap16() in png_do_swap().

-

-Version 1.6.11beta04 [April 19, 2014]

-  Made progressive reading of interlaced images consistent with the

-    behavior of the sequential reader and consistent with the manual, by

-    moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. The

-    row_callback now receives the proper pass number and unexpanded rows, when

-    png_combine_row() isn't built or used, and png_set_interlace_handling()

-    is not called.

-  Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking.

-

-Version 1.6.11beta05 [April 26, 2014]

-  Do not reject ICC V2 profiles that lack padding (Kai-Uwe Behrmann).

-  Relocated closing bracket of the sRGB profile test loop to avoid getting

-    "Not recognizing known sRGB profile that has been edited" warning for

-    ICC V2 profiles that lack the MD5 signature in the profile header.

-

-Version 1.6.11beta06 [May 19, 2014]

-  Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option().

-

-Version 1.6.11rc01 [May 27, 2014]

-  No changes.

-

-Version 1.6.11rc02 [June 3, 2014]

-  Test ZLIB_VERNUM instead of PNG_ZLIB_VERNUM in contrib/tools/pngfix.c

-

-Version 1.6.11 [June 5, 2014]

-  No changes.

-

-Version 1.6.12rc01 [June 6, 2014]

-  Relocated new code from 1.6.11beta06 in png.c to a point after the

-    declarations (Max Stepin).

-

-Version 1.6.12rc02 [June 7, 2014]

-  Changed file permissions of contrib/tools/intgamma.sh,

-    test-driver, and compile from 0644 to 0755 (Cosmin).

-

-Version 1.6.12rc03 [June 8, 2014]

-  Ensure "__has_attribute()" macro exists before trying to use it with

-    old clang compilers (MacPorts Ticket #43939).

-

-Version 1.6.12 [June 12, 2014]

-  No changes.

-

-Version 1.6.13beta01 [July 4, 2014]

-  Quieted -Wsign-compare and -Wclobber compiler warnings in

-    contrib/pngminus/*.c

-  Added "(void) png_ptr;" where needed in contrib/gregbook to quiet

-    compiler complaints about unused pointers.

-  Split a long output string in contrib/gregbook/rpng2-x.c.

-  Added "PNG_SET_OPTION" requirement for sRGB chunk support to pnglibconf.dfa,

-    Needed for write-only support (John Bowler).

-  Changed "if defined(__ARM_NEON__)" to

-    "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu).

-  Fixed clang no-warning builds: png_digit was defined but never used.

-    

-Version 1.6.13beta02 [July 21, 2014]

-  Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32

-    (bug report from Wolfgang S. Kechel).  Bug was introduced in libpng-1.6.11.

-    Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and

-    makefile.tc3 similarly.

-

-Version 1.6.13beta03 [August 3, 2014]

-  Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14

-    due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT

-    definitions from pngconf.h.

-  Ensure that CMakeLists.txt makes the target "lib" directory before making

-    symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).

-

-Version 1.6.13beta04 [August 8, 2014]

-  Added opinion that the ECCN (Export Control Classification Number) for

-    libpng is EAR99 to the README file.

-  Eliminated use of "$<" in makefile explicit rules, when copying

-    $PNGLIBCONF_H_PREBUILT.  This does not work on some versions of make;

-    bug introduced in libpng version 1.6.11.

-

-Version 1.6.13rc01 [August 14, 2014]

-  Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu

-

-Version 1.6.13 [August 21, 2014]

-  No changes.

-

-Version 1.6.14beta01 [September 14, 2014]

-  Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.

-  Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED,

-    to allow "make" to complete without setjmp support (bug report by

-    Claudio Fontana)

-  Add "#include <setjmp.h>" to contrib/tools/pngfix.c (John Bowler)

-

-Version 1.6.14beta02 [September 18, 2014]

-  Use nanosleep() instead of usleep() in contrib/gregbook/rpng2-x.c

-    because usleep() is deprecated.

-  Define usleep() in contrib/gregbook/rpng2-x.c if not already defined

-    in unistd.h and nanosleep() is not available; fixes error introduced

-    in libpng-1.6.13.

-  Disable floating point exception handling in pngvalid.c when

-    PNG_FLOATING_ARITHMETIC is not supported (bug report by "zootus

-    at users.sourceforge.net").

-

-Version 1.6.14beta03 [September 19, 2014]

-  Define FE_DIVBYZERO, FE_INVALID, and FE_OVERFLOW in pngvalid.c if not

-    already defined.  Revert floating point exception handling in pngvalid.c

-    to version 1.6.14beta01 behavior.

-

-Version 1.6.14beta04 [September 27, 2014]

-  Fixed incorrect handling of the iTXt compression flag in pngrutil.c

-    (bug report by Shunsaku Hirata).  Bug was introduced in libpng-1.6.0.

-

-Version 1.6.14beta05 [October 1, 2014]

-  Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa

-

-Version 1.6.14beta06 [October 5, 2014]

-  Removed unused "text_len" parameter from private function png_write_zTXt().

-  Conditionally compile some code in png_deflate_claim(), when

-    PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled.

-  Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL.

-  Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT"

-    to pnglibconf.dfa.

-  Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa,

-    to make it possible to configure a libpng that supports iCCP but not TEXT.

-

-Version 1.6.14beta07 [October 7, 2014]

-  Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa

-  Only mark text chunks as written after successfully writing them.

-

-Version 1.6.14rc01 [October 15, 2014]

-  Fixed some typos in comments.

-

-Version 1.6.14rc02 [October 17, 2014]

-  Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer()

-    in the manual, to reflect the change made in libpng-1.6.0.

-  Updated README file to explain that direct access to the png_struct

-    and info_struct members has not been permitted since libpng-1.5.0.

-

-Version 1.6.14 [October 23, 2014]

-  No changes.

-

-Version 1.6.15beta01 [October 29, 2014]

-  Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"

-  Simplified png_free_data().

-  Added missing "ptr = NULL" after some instances of png_free().

-

-Version 1.6.15beta02 [November 1, 2014]

-  Changed remaining "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"

-

-Version 1.6.15beta03 [November 3, 2014]

-  Added PNG_USE_ARM_NEON configuration flag (Marcin Juszkiewicz).

-

-Version 1.6.15beta04 [November 4, 2014]

-  Removed new PNG_USE_ARM_NEON configuration flag and made a one-line

-    revision to configure.ac to support ARM on aarch64 instead (John Bowler).

-

-Version 1.6.15beta05 [November 5, 2014]

-  Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in

-    example.c, pngtest.c, and applications in the contrib directory.

-  Fixed an out-of-range read in png_user_version_check() (Bug report from

-    Qixue Xiao, CVE-2015-8540).

-  Simplified and future-proofed png_user_version_check().

-  Fixed GCC unsigned int->float warnings. Various versions of GCC

-    seem to generate warnings when an unsigned value is implicitly

-    converted to double. This is probably a GCC bug but this change

-    avoids the issue by explicitly converting to (int) where safe.

-  Free all allocated memory in pngimage. The file buffer cache was left

-    allocated at the end of the program, harmless but it causes memory

-    leak reports from clang.

-  Fixed array size calculations to avoid warnings. At various points

-    in the code the number of elements in an array is calculated using

-    sizeof.  This generates a compile time constant of type (size_t) which

-    is then typically assigned to an (unsigned int) or (int). Some versions

-    of GCC on 64-bit systems warn about the apparent narrowing, even though

-    the same compiler does apparently generate the correct, in-range,

-    numeric constant.  This adds appropriate, safe, casts to make the

-    warnings go away.

-

-Version 1.6.15beta06 [November 6, 2014]

-  Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING

-    in the manual, example.c, pngtest.c, and applications in the contrib

-    directory.  It was incorrect advice.

-

-Version 1.6.15beta07 [November 7, 2014]

-  Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is

-    needed by png_reciprocal2().

-  Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and

-    png_do_swap().

-  Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"

-

-Version 1.6.15beta08 [November 8, 2014]

-  More housecleaning in *.h

-

-Version 1.6.15rc01 [November 13, 2014]

-

-Version 1.6.15rc02 [November 14, 2014]

-  The macros passed in the command line to Borland make were ignored if

-    similarly-named macros were already defined in makefiles. This behavior

-    is different from POSIX make and other make programs.  Surround the

-    macro definitions with ifndef guards (Cosmin).

-

-Version 1.6.15rc03 [November 16, 2014]

-  Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.

-  Removed the obsolete $ARCH variable from scripts/makefile.darwin.

-

-Version 1.6.15 [November 20, 2014]

-  No changes.

-

-Version 1.6.16beta01 [December 14, 2014]

-  Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that

-    don't do alignment correctly.

-  Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS

-    (Bob Friesenhahn).

-

-Version 1.6.16beta02 [December 15, 2014]

-  Revised Makefile.am and scripts/*.dfn again to work with MinGW/MSYS;

-    renamed scripts/*.dfn to scripts/*.c (John Bowler).

-

-Version 1.6.16beta03 [December 21, 2014]

-  Quiet a "comparison always true" warning in pngstest.c (John Bowler).

-

-Version 1.6.16rc01 [December 21, 2014]

-  Restored a test on width that was removed from png.c at libpng-1.6.9

-    (Bug report by Alex Eubanks, CVE-2015-0973).

-

-Version 1.6.16rc02 [December 21, 2014]

-  Undid the update to pngrutil.c in 1.6.16rc01.

-

-Version 1.6.16rc03 [December 21, 2014]

-  Fixed an overflow in png_combine_row() with very wide interlaced images

-    (Bug report and fix by John Bowler, CVE-2014-9495).

-

-Version 1.6.16 [December 22, 2014]

-  No changes.

-

-Version 1.6.17beta01 [January 29, 2015]

-  Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h

-  Corrected the width limit calculation in png_check_IHDR().

-  Removed user limits from pngfix. Also pass NULL pointers to

-    png_read_row to skip the unnecessary row de-interlace stuff.

-  Added testing of png_set_packing() to pngvalid.c

-  Regenerated configure scripts in the *.tar distributions with libtool-2.4.4

-  Implement previously untested cases of libpng transforms in pngvalid.c

-  Fixed byte order in png_do_read_filler() with 16-bit input. Previously

-    the high and low bytes of the filler, from png_set_filler() or from

-    png_set_add_alpha(), were read in the wrong order.

-  Made the check for out-of-range values in png_set_tRNS() detect

-    values that are exactly 2^bit_depth, and work on 16-bit platforms.

-  Merged some parts of libpng-1.6.17beta01 and libpng-1.7.0beta47.

-  Added #ifndef __COVERITY__ where needed in png.c, pngrutil.c and

-    pngset.c to avoid warnings about dead code.

-  Added "& 0xff" to many instances of expressions that are typecast

-    to (png_byte), to avoid Coverity warnings.

-

-Version 1.6.17beta02 [February 7, 2015]

-  Work around one more Coverity-scan dead-code warning.

-  Do not build png_product2() when it is unused.

-

-Version 1.6.17beta03 [February 17, 2015]

-  Display user limits in the output from pngtest.

-  Eliminated the PNG_SAFE_LIMITS macro and restored the 1-million-column

-    and 1-million-row default limits in pnglibconf.dfa, that can be reset

-    by the user at build time or run time.  This provides a more robust

-    defense against DOS and as-yet undiscovered overflows.

-

-Version 1.6.17beta04 [February 21, 2015]

-  Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default.

-  Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins).

-  Rebuilt configure scripts with automake-1.15 and libtool-2.4.6

-

-Version 1.6.17beta05 [February 25, 2015]

-  Restored compiling of png_reciprocal2 with PNG_NO_16BIT.

-

-Version 1.6.17beta06 [February 27, 2015]

-  Moved png_set_filter() prototype into a PNG_WRITE_SUPPORTED block

-    of png.h.

-  Avoid runtime checks when converting integer to png_byte with

-    Visual Studio (Sergey Kosarevsky)

-

-Version 1.6.17rc01 [March 4, 2015]

-  No changes.

-

-Version 1.6.17rc02 [March 9, 2015]

-  Removed some comments that the configure script did not handle

-    properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt.

-  Free the unknown_chunks structure even when it contains no data.

-

-Version 1.6.17rc03 [March 12, 2015]

-  Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF

-    for consistency, and remove some useless tests (Alexey Petruchik).

-

-Version 1.6.17rc04 [March 16, 2015]

-  Remove pnglibconf.h, pnglibconf.c, and pnglibconf.out instead of

-    pnglibconf.* in "make clean" (Cosmin).

-  Fix bug in calculation of maxbits, in png_write_sBIT, introduced

-    in libpng-1.6.17beta01 (John Bowler).

-

-Version 1.6.17rc05 [March 21, 2015]

-  Define PNG_FILTER_* and PNG_FILTER_VALUE_* in png.h even when WRITE

-    is not supported (John Bowler).  This fixes an error introduced in

-    libpng-1.6.17beta06.

-  Reverted "& 0xff" additions of version 1.6.17beta01. Libpng passes

-    the Coverity scan without them.

-

-Version 1.6.17rc06 [March 23, 2015]

-  Remove pnglibconf.dfn and pnglibconf.pre with "make clean".

-  Reformatted some "&0xff" instances to "& 0xff".

-  Fixed simplified 8-bit-linear to sRGB alpha. The calculated alpha

-    value was wrong.  It's not clear if this affected the final stored

-    value; in the obvious code path the upper and lower 8-bits of the

-    alpha value were identical and the alpha was truncated to 8-bits

-    rather than dividing by 257 (John Bowler).

-

-Version 1.6.17 [March 26, 2015]

-  No changes.

-

-Version 1.6.18beta01 [April 1, 2015]

-  Removed PNG_SET_CHUNK_[CACHE|MALLOC]_LIMIT_SUPPORTED macros.  They

-    have been combined with PNG_SET_USER_LIMITS_SUPPORTED (resolves

-    bug report by Andrew Church).

-  Fixed rgb_to_gray checks and added tRNS checks to pngvalid.c.  This

-    fixes some arithmetic errors that caused some tests to fail on

-    some 32-bit platforms (Bug reports by Peter Breitenlohner [i686]

-    and Petr Gajdos [i586]).

-

-Version 1.6.18beta02 [April 26, 2015]

-  Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler

-    (Bug report by Viktor Szakats).

-

-Version 1.6.18beta03 [May 6, 2015]

-  Replaced "unexpected" with an integer (0xabadca11) in pngset.c

-    where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1.

-  Added contrib/examples/simpleover.c, to demonstrate how to handle

-    alpha compositing of multiple images, using the "simplified API"

-    and an example PNG generation tool, contrib/examples/genpng.c

-    (John Bowler).

-

-Version 1.6.18beta04 [May 20, 2015]

-  PNG_RELEASE_BUILD replaces tests where the code depended on the build base

-    type and can be defined on the command line, allowing testing in beta

-    builds (John Bowler).

-  Avoid Coverity issue 80858 (REVERSE NULL) in pngtest.c PNG_DEBUG builds.

-  Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug

-    report from Christopher Ferris).

-

-Version 1.6.18beta05 [May 31, 2015]

-  Backport filter selection code from libpng-1.7.0beta51, to combine

-    sub_row, up_row, avg_row, and paeth_row into try_row and tst_row.

-  Changed png_voidcast(), etc., to voidcast(), etc., in contrib/tools/pngfix.c

-    to avoid confusion with the libpng private macros.

-  Fixed old cut&paste bug in the weighted filter selection code in

-    pngwutil.c, introduced in libpng-0.95, March 1997.

-

-Version 1.6.18beta06 [June 1, 2015]

-  Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the

-    compiled library size. It never worked properly and as far as we can

-    tell, no one uses it. The png_set_filter_heuristics() and

-    png_set_filter_heuristics_fixed() APIs are retained but deprecated

-    and do nothing.

-

-Version 1.6.18beta07 [June 6, 2015]

-  Removed non-working progressive reader 'skip' function. This

-    function has apparently never been used. It was implemented

-    to support back-door modification of png_struct in libpng-1.4.x

-    but (because it does nothing and cannot do anything) was apparently

-    never tested (John Bowler).

-  Fixed cexcept.h in which GCC 5 now reports that one of the auto

-    variables in the Try macro needs to be volatile to prevent value

-    being lost over the setjmp (John Bowler).

-  Fixed NO_WRITE_FILTER and -Wconversion build breaks (John Bowler).

-  Fix g++ build breaks (John Bowler).

-  Quieted some Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c,

-    pngstest.c, and pngimage.c. Most seem harmless, but png-fix-itxt

-    would only work with iTXt chunks with length 255 or less.

-  Added #ifdef's to contrib/examples programs so people don't try

-    to compile them without the minimum required support enabled

-    (suggested by Flavio Medeiros).

-

-Version 1.6.18beta08 [June 30, 2015]

-  Eliminated the final two Coverity defects (insecure temporary file

-    handling in contrib/libtests/pngstest.c; possible overflow of

-    unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure"

-    file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will

-    be used.

-  Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h

-

-Version 1.6.18beta09 [July 5, 2015]

-  Removed some useless typecasts from contrib/tools/png-fix-itxt.c

-  Fixed a new signed-unsigned comparison in pngrtran.c (Max Stepin).

-  Replaced arbitrary use of 'extern' with #define PNG_LINKAGE_*.  To

-    preserve API compatibility, the new defines all default to "extern"

-    (requested by Jan Nijtmans).

-

-Version 1.6.18rc01 [July 9, 2015]

-  Belatedly added Mans Rullgard and James Yu to the list of Contributing

-    Authors.

-

-Version 1.6.18rc02 [July 12, 2015]

-  Restored unused FILTER_HEURISTIC macros removed at libpng-1.6.18beta08

-    to png.h to avoid compatibility warnings.

-

-Version 1.6.18rc03 [July 15, 2015]

-  Minor changes to the man page

-

-Version 1.6.18 [July 23, 2015]

-  No changes.

-

-Version 1.6.19beta01 [July 30, 2015]

-  Updated obsolete information about the simplified API macros in the

-    manual pages (Bug report by Arc Riley).

-  Avoid potentially dereferencing NULL info_ptr in png_info_init_3().

-  Rearranged png.h to put the major sections in the same order as

-    in libpng17.

-  Eliminated unused PNG_COST_SHIFT, PNG_WEIGHT_SHIFT, PNG_COST_FACTOR, and

-    PNG_WEIGHT_FACTOR macros.

-  Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler

-    (Bug report by Viktor Szakats).  Several warnings remain and are

-    unavoidable, where we test for overflow.

-  Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c

-  Fixed uninitialized variable in contrib/gregbook/rpng2-x.c

-

-Version 1.6.19beta02 [August 19, 2015]

-  Moved config.h.in~ from the "libpng_autotools_files" list to the

-    "libpng_autotools_extra" list in autogen.sh because it was causing a

-    false positive for missing files (bug report by Robert C. Seacord).

-  Removed unreachable "break" statements in png.c, pngread.c, and pngrtran.c

-    to suppress clang warnings (Bug report by Viktor Szakats).

-  Fixed some bad links in the man page.

-  Changed "n bit" to "n-bit" in comments.

-  Added signed/unsigned 16-bit safety net. This removes the dubious

-    0x8000 flag definitions on 16-bit systems. They aren't supported

-    yet the defs *probably* work, however it seems much safer to do this

-    and be advised if anyone, contrary to advice, is building libpng 1.6

-    on a 16-bit system. It also adds back various switch default clauses

-    for GCC; GCC errors out if they are not present (with an appropriately

-    high level of warnings).

-  Safely convert num_bytes to a png_byte in png_set_sig_bytes() (Robert

-    Seacord).

-  Fixed the recently reported 1's complement security issue by replacing

-    the value that is illegal in the PNG spec, in both signed and unsigned

-    values, with 0. Illegal unsigned values (anything greater than or equal

-    to  0x80000000) can still pass through, but since these are not illegal

-    in ANSI-C (unlike 0x80000000 in the signed case) the checking that

-    occurs later can catch them (John Bowler).

-

-Version 1.6.19beta03 [September 26, 2015]

-  Fixed png_save_int_32 when int is not 2's complement (John Bowler).

-  Updated libpng16 with all the recent test changes from libpng17,

-    including changes to pngvalid.c to ensure that the original,

-    distributed, version of contrib/visupng/cexcept.h can be used

-    (John Bowler).

-  pngvalid contains the correction to the use of SAVE/STORE_

-    UNKNOWN_CHUNKS; a bug revealed by changes in libpng 1.7. More

-    tests contain the --strict option to detect warnings and the

-    pngvalid-standard test has been corrected so that it does not

-    turn on progressive-read. There is a separate test which does

-    that. (John Bowler)

-  Also made some signed/unsigned fixes.

-  Make pngstest error limits version specific. Splitting the machine

-    generated error structs out to a file allows the values to be updated

-    without changing pngstest.c itself. Since libpng 1.6 and 1.7 have

-    slightly different error limits this simplifies maintenance. The

-    makepngs.sh script has also been updated to more accurately reflect

-    current problems in libpng 1.7 (John Bowler).

-  Incorporated new test PNG files into make check.  tests/pngstest-*

-    are changed so that the new test files are divided into 8 groups by

-    gamma and alpha channel.  These tests have considerably better code

-    and pixel-value coverage than contrib/pngsuite; however,coverage is

-    still incomplete (John Bowler).

-  Removed the '--strict' in 1.6 because of the double-gamma-correction

-    warning, updated pngstest-errors.h for the errors detected with the

-    new contrib/testspngs PNG test files (John Bowler).

-

-Version 1.6.19beta04 [October 15, 2015]

-  Worked around rgb-to-gray issues in libpng 1.6.  The previous

-    attempts to ignore the errors in the code aren't quite enough to

-    deal with the 'channel selection' encoding added to libpng 1.7; abort.

-    pngvalid.c is changed to drop this encoding in prior versions.

-  Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a

-    macro, therefore the argument list cannot contain preprocessing

-    directives.  Make sure pow is a function where this happens. This is

-    a minimal safe fix, the issue only arises in non-performance-critical

-    code (bug report by Curtis Leach, fix by John Bowler).

-  Added sPLT support to pngtest.c

-

-Version 1.6.19rc01 [October 23, 2015]

-  No changes.

-

-Version 1.6.19rc02 [October 31, 2015]

-  Prevent setting or writing over-length PLTE chunk (Cosmin Truta).

-  Silently truncate over-length PLTE chunk while reading.

-  Libpng incorrectly calculated the output rowbytes when the application

-    decreased either the number of channels or the bit depth (or both) in

-    a user transform.  This was safe; libpng overallocated buffer space

-   (potentially by quite a lot; up to 4 times the amount required) but,

-   from 1.5.4 on, resulted in a png_error (John Bowler).

-

-Version 1.6.19rc03 [November 3, 2015]

-  Fixed some inconsequential cut-and-paste typos in png_set_cHRM_XYZ_fixed().

-  Clarified COPYRIGHT information to state explicitly that versions

-    are derived from previous versions.

-  Removed much of the long list of previous versions from png.h and

-    libpng.3.

-

-Version 1.6.19rc04 [November 5, 2015]

-  Fixed new bug with CRC error after reading an over-length palette

-    (bug report by Cosmin Truta) (CVE-2015-8126).

-

-Version 1.6.19 [November 12, 2015]

-  Cleaned up coding style in png_handle_PLTE().

-

-Version 1.6.20beta01 [November 20, 2015]

-  Avoid potential pointer overflow/underflow in png_handle_sPLT() and

-    png_handle_pCAL() (Bug report by John Regehr).

-

-Version 1.6.20beta02 [November 23, 2015]

-  Fixed incorrect implementation of png_set_PLTE() that uses png_ptr

-    not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126

-    vulnerability.  Fixes CVE-2015-8472.

-

-Version 1.6.20beta03 [November 24, 2015]

-  Backported tests from libpng-1.7.0beta69.

-

-Version 1.6.20rc01 [November 26, 2015]

-  Fixed an error in handling of bad zlib CMINFO field in pngfix, found by

-    American Fuzzy Lop, reported by Brian Carpenter.  inflate() doesn't

-    immediately fault a bad CMINFO field; instead a 'too far back' error

-    happens later (at least some times).  pngfix failed to limit CMINFO to

-    the allowed values but then assumed that window_bits was in range,

-    triggering an assert. The bug is mostly harmless; the PNG file cannot

-    be fixed.

-

-Version 1.6.20rc02 [November 29, 2015]

-  In libpng 1.6 zlib initialization was changed to use the window size

-    in the zlib stream, not a fixed value. This causes some invalid images,

-    where CINFO is too large, to display 'correctly' if the rest of the

-    data is valid.  This provides a workaround for zlib versions where the

-    error arises (ones that support the API change to use the window size

-    in the stream).

-

-Version 1.6.20 [December 3, 2015]

-  No changes.

-

-Version 1.6.21beta01 [December 11, 2015]

-  Fixed syntax "$(command)" in tests/pngstest that some shells other than

-    bash could not parse (Bug report by Nelson Beebe). Use `command` instead.

-

-Version 1.6.21beta02 [December 14, 2015]

-  Moved png_check_keyword() from pngwutil.c to pngset.c

-  Removed LE/BE dependencies in pngvalid, to 'fix' the current problem

-    in the BigEndian tests by not testing it, making the BE code the same 

-    as the LE version.

-  Fixes to pngvalid for various reduced build configurations (eliminate unused

-    statics) and a fix for the case in rgb_to_gray when the digitize option

-    reduces graylo to 0, producing a large error.

-

-Version 1.6.21beta03 [December 18, 2015]

-  Widened the 'limit' check on the internally calculated error limits in

-    the 'DIGITIZE' case (the code used prior to 1.7 for rgb_to_gray error

-    checks) and changed the check to only operate in non-release builds

-    (base build type not RC or RELEASE.)

-  Fixed undefined behavior in pngvalid.c, undefined because

-    (png_byte) << shift is undefined if it changes the signed bit

-    (because png_byte is promoted to int). The libpng exported functions

-    png_get_uint_32 and png_get_uint_16 handle this. (Bug reported by

-    David Drysdale as a result of reports from UBSAN in clang 3.8).

-  This changes pngvalid to use BE random numbers; this used to produce

-    errors but these should not be fixed as a result of the previous changes.

-

-Version 1.6.21rc01 [January 4, 2016]

-  In projects/vstudio, combined readme.txt and WARNING into README.txt

-

-Version 1.6.21rc02 [January 7, 2016]

-  Relocated assert() in contrib/tools/pngfix.c, bug found by American

-    Fuzzy Lop, reported by Brian Carpenter.

-  Marked 'limit' UNUSED in transform_range_check().  This only affects

-    release builds.

-

-Version 1.6.21 [January 15, 2016]

-  Worked around a false-positive Coverity issue in pngvalid.c.

-

-Version 1.6.22beta01 [January 23, 2016]

-  Changed PNG_USE_MKSTEMP to __COVERITY__ to select alternate

-    "tmpfile()" implementation in contrib/libtests/pngstest.c

-  Fixed NO_STDIO build of pngunknown.c to skip calling png_init_io()

-    if there is no stdio.h support.

-  Added a png_image_write_to_memory() API and a number of assist macros

-    to allow an application that uses the simplified API write to bypass

-    stdio and write directly to memory.

-  Added some warnings (png.h) and some check code to detect *possible*

-    overflow in the ROW_STRIDE and simplified image SIZE macros.  This

-    disallows image width/height/format that *might* overflow.  This is

-    a quiet API change that limits in-memory image size (uncompressed) to

-    less than 4GByte and image row size (stride) to less than 2GByte.

-  Revised workaround for false-positive Coverity issue in pngvalid.c.

-

-Version 1.6.22beta02 [February 8, 2016]

-  Only use exit(77) in configure builds.

-  Corrected error in PNG_IMAGE_PNG_SIZE_MAX. This new macro underreported

-    the palette size because it failed to take into account that the memory

-    palette has to be expanded to full RGB when it is written to PNG.

-  Updated CMakeLists.txt, added supporting scripts/gen*.cmake.in

-    and test.cmake.in (Roger Leigh).

-  Relaxed limit checks on gamma values in pngrtran.c. As suggested in

-    the comments gamma values outside the range currently permitted

-    by png_set_alpha_mode are useful for HDR data encoding.  These values

-    are already permitted by png_set_gamma so it is reasonable caution to

-    extend the png_set_alpha_mode range as HDR imaging systems are starting

-    to emerge.

-

-Version 1.6.22beta03 [March 9, 2016]

-  Added a common-law trademark notice and export control information

-    to the LICENSE file, png.h, and the man page.

-  Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that

-    were accidentally removed from libpng-1.6.17. 

-  Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h

-    (Robert C. Seacord).

-  Removed dubious "#if INT_MAX" test from png.h that was added to

-    libpng-1.6.19beta02 (John Bowler).

-  Add ${INCLUDES} in scripts/genout.cmake.in (Bug report by Nixon Kwok).

-  Updated LICENSE to say files in the contrib directory are not

-    necessarily under the libpng license, and that some makefiles have

-    other copyright owners.

-  Added INTEL-SSE2 support (Mike Klein and Matt Sarett, Google, Inc.).

-  Made contrib/libtests/timepng more robust.  The code no longer gives

-    up/fails on invalid PNG data, it just skips it (with error messages).

-    The code no longer fails on PNG files with data beyond IEND.  Options

-    exist to use png_read_png (reading the whole image, not by row) and, in

-    that case, to apply any of the supported transforms.  This makes for

-    more realistic testing; the decoded data actually gets used in a

-    meaningful fashion (John Bowler).

-  Fixed some misleading indentation (Krishnaraj Bhat).

-

-Version 1.6.22beta04 [April 5, 2016]

-  Force GCC compilation to C89 if needed (Dagobert Michelsen).

-  SSE filter speed improvements for bpp=3:

-    memcpy-free implementations of load3() / store3().

-    call load3() only when needed at the end of a scanline.

-

-Version 1.6.22beta05 [April 27, 2016]

-  Added PNG_FAST_FILTERS macro (defined as

-    PNG_FILTER_NONE|PNG_FILTER_SUB|PNG_FILTER_UP).

-  Various fixes for contrib/libtests/timepng.c

-  Moved INTEL-SSE code from pngpriv.h into contrib/intel/intel_sse.patch.

-  Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED

-    (Bug report by Y.Ohashik).

-

-Version 1.6.22beta06 [May 5, 2016]

-  Rebased contrib/intel_sse.patch.

-  Quieted two Coverity issues in contrib/libtests/timepng.c.

-  Fixed issues with scripts/genout.cmake.in (David Capello, Nixon Kwok):

-    Added support to use multiple directories in ZLIBINCDIR variable,

-    Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC,

-    Fixed pnglibconf.c compilation on OS X including the sysroot path.

-

-Version 1.6.22rc01 [May 14, 2016]

-  No changes.

-

-Version 1.6.22rc02 [May 16, 2016]

-  Removed contrib/timepng from default build; it does not build on platforms

-    that don't supply clock_gettime().

-

-Version 1.6.22rc03 [May 17, 2016]

-  Restored contrib/timepng to default build but check for the presence

-    of clock_gettime() in configure.ac and Makefile.am.

-

-Version 1.6.22 [May 26, 2016]

-  No changes.

-

-Version 1.6.23beta01 [May 29, 2016]

-  Stop a potential memory leak in png_set_tRNS() (Bug report by Ted Ying).

-  Fixed the progressive reader to handle empty first IDAT chunk properly

-    (patch by Timothy Nikkel).  This bug was introduced in libpng-1.6.0 and

-    only affected the libpng16 branch.

-  Added tests in pngvalid.c to check zero-length IDAT chunks in various

-    positions.  Fixed the sequential reader to handle these more robustly

-    (John Bowler).

-

-Version 1.6.23rc01 [June 2, 2016]

-  Corrected progressive read input buffer in pngvalid.c. The previous version

-    the code invariably passed just one byte at a time to libpng.  The intent

-    was to pass a random number of bytes in the range 0..511.

-  Moved sse2 prototype from pngpriv.h to contrib/intel/intel_sse.patch.

-  Added missing ")" in pngerror.c (Matt Sarrett).

-

-Version 1.6.23rc02 [June 4, 2016]

-  Fixed undefined behavior in png_push_save_buffer(). Do not call

-    memcpy() with a null source, even if count is zero (Leon Scroggins III).

-

-Version 1.6.23 [June 9, 2016]

-  Fixed bad link to RFC2083 in png.5 (Nikola Forro).

-

-Version 1.6.24beta01 [June 11, 2016]

-  Avoid potential overflow of the PNG_IMAGE_SIZE macro.  This macro

-    is not used within libpng, but is used in some of the examples.

-

-Version 1.6.24beta02 [June 23, 2016]

-  Correct filter heuristic overflow handling. This was broken when the

-    write filter code was moved out-of-line; if there is a single filter and

-    the heuristic sum overflows the calculation of the filtered line is not

-    completed.  In versions prior to 1.6 the code was duplicated in-line

-    and the check not performed, so the filter operation completed; however,

-    in the multi-filter case where the sum is performed the 'none' filter would

-    be selected if all the sums overflowed, even if it wasn't in the filter

-    list.  The fix to the first problem is simply to provide PNG_SIZE_MAX as

-    the current lmins sum value; this means the sum can never exceed it and

-    overflows silently.  A reasonable compiler that does choose to inline

-    the code will simply eliminate the sum check.

-  The fix to the second problem is to use high precision arithmetic (this is

-    implemented in 1.7), however a simple safe fix here is to chose the lowest

-    numbered filter in the list from png_set_filter (this only works if the

-    first problem is also fixed) (John Bowler).

-  Use a more efficient absolute value calculation on SSE2 (Matthieu Darbois).

-  Fixed the case where PNG_IMAGE_BUFFER_SIZE can overflow in the application

-    as a result of the application using an increased 'row_stride'; previously

-    png_image_finish_read only checked for overflow on the base calculation of

-    components.  (I.e. it checked for overflow of a 32-bit number on the total

-    number of pixel components in the output format, not the possibly padded row

-    length and not the number of bytes, which for linear formats is twice the

-    number of components.)

-  MSVC does not like '-(unsigned)', so replaced it with 0U-(unsigned)

-  MSVC does not like (uInt) = -(unsigned) (i.e. as an initializer), unless

-    the conversion is explicitly invoked by a cast.

-  Put the SKIP definition in the correct place. It needs to come after the

-    png.h include (see all the other .c files in contrib/libtests) because it

-    depends on PNG_LIBPNG_VER.

-  Removed the three compile warning options from the individual project

-    files into the zlib.props globals.  It increases the warning level from 4

-    to All and adds a list of the warnings that need to be turned off.  This is

-    semi-documentary; the intent is to tell libpng users which warnings have

-    been examined and judged non-fixable at present.  The warning about

-    structure padding is fixable, but it would be a signficant change (moving

-    structure members around).

-

-Version 1.6.24beta03 [July 4, 2016]

-  Optimized absolute value calculation in filter selection, similar to

-    code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to

-    use this.

-  Added pngcp to the build together with a pngcp.dfa configuration test.

-  Added high resolution timing to pngcp.

-  Added "Common linking failures" section to INSTALL.

-  Relocated misplaced #endif in png.c sRGB profile checking.

-  Fixed two Coverity issues in pngcp.c.

-

-Version 1.6.24beta04 [July 8, 2016]

-  Avoid filter-selection heuristic sum calculations in cases where only one

-    filter is a candidate for selection. This trades off code size (added

-    private png_setup_*_row_only() functions) for speed.

-

-Version 1.6.24beta05 [July 13, 2016]

-  Fixed some indentation to comply with our coding style.

-  Added contrib/tools/reindent.

-

-Version 1.6.24beta06 [July 18, 2016]

-  Fixed more indentation to comply with our coding style.

-  Eliminated unnecessary tests of boolean png_isaligned() vs 0.

-

-Version 1.6.24rc01 [July 25, 2016]

-  No changes.

-

-Version 1.6.24rc02 [August 1, 2016]

-  Conditionally compile SSE2 headers in contrib/intel/intel_sse.patch

-  Conditionally compile png_decompress_chunk().

-

-Version 1.6.24rc03 [August 2, 2016]

-  Conditionally compile ARM_NEON headers in pngpriv.h

-  Updated contrib/intel/intel_sse.patch

-

-Version 1.6.24[August 4, 2016]

-  No changes.

-

-Version 1.6.25beta01 [August 12, 2016]

-  Reject oversized iCCP profile immediately.

-  Cleaned up PNG_DEBUG compile of pngtest.c.

-  Conditionally compile png_inflate().

-

-Version 1.6.25beta02 [August 18, 2016]

-  Don't install pngcp; it conflicts with pngcp in the pngtools package.

-  Minor editing of INSTALL, (whitespace, added copyright line)

-

-Version 1.6.25rc01 [August 24, 2016]

-  No changes.

-

-Version 1.6.25rc02 [August 29, 2016]

-  Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).

-  Only the UP filter is currently implemented.

-

-Version 1.6.25rc03 [August 29, 2016]

-  Rebased contrib/intel/intel_sse.patch after the MIPS implementation.

-

-Version 1.6.25rc04 [August 30, 2016]

-  Added MIPS support for SUB, AVG, and PAETH filters (Mandar Sahastrabuddhe).

-

-Version 1.6.25rc05 [August 30, 2016]

-  Rebased contrib/intel/intel_sse.patch after the MIPS implementation update..

-

-Version 1.6.25 [September 1, 2016]

-  No changes.

-

-Version 1.6.26beta01 [September 26, 2016]

-  Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,

-    bugfix by John Bowler).

-  Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL

-    has allocated memory that libpng needs to free.

-  Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c

-  Issue a png_benign_error instead of a png_error on ADLER32 mismatch

-    while decoding compressed data chunks.

-  Changed PNG_ZLIB_VERNUM to ZLIB_VERNUM in pngpriv.h, pngstruct.h, and

-    pngrutil.c.

-  If CRC handling of critical chunks has been set to PNG_CRC_QUIET_USE,

-    ignore the ADLER32 checksum in the IDAT chunk as well as the chunk CRCs.

-  Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().

-  Add tests/badcrc.png and tests/badadler.png to tests/pngtest.

-  Merged pngtest.c with libpng-1.7.0beta84/pngtest.c

-

-Version 1.6.26beta02 [October 1, 2016]

-  Updated the documentation about CRC and ADLER32 handling.

-  Quieted 117 warnings from clang-3.8 in pngtrans.c, pngread.c,

-     pngwrite.c, pngunknown.c, and pngvalid.c.

-  Quieted 58 (out of 144) -Wconversion compiler warnings by changing

-    flag definitions in pngpriv.h from 0xnnnn to 0xnnnnU and trivial changes

-    in png.c, pngread.c, and pngwutil.c.

-

-Version 1.6.26beta03 [October 2, 2016]

-  Removed contrib/libtests/*.orig and *.rej that slipped into the tarballs.

-  Quieted the 86 remaining -Wconversion compiler warnings by

-    revising the png_isaligned() macro and trivial changes in png.c,

-    pngerror.c, pngget.c, pngmem.c, pngset.c, pngrtran.c, pngrutil.c,

-    pngwtran.c, pngwrite.c, and pngwutil.c.

-

-Version 1.6.26beta04 [October 3, 2016]

-  Quieted (bogus?) clang warnings about "absolute value has no effect"

-    when PNG_USE_ABS is defined.

-  Fixed offsets in contrib/intel/intel_sse.patch

-

-Version 1.6.26beta05 [October 6, 2016]

-  Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h

-    to avoid a signed/unsigned compare in the preprocessor.

-

-Version 1.6.26beta06 [October 7, 2016]

-  Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to

-    optionally avoid ADLER32 evaluation.

-

-Version 1.6.26rc01 [October 12, 2016]

-  No changes.

-

-Version 1.6.26 [October 20, 2016]

-  Cosmetic change, "ptr != 0" to "ptr != NULL" in png.c and pngrutil.c

-  Despammed email addresses (replaced "@" with " at ").

-

-Version 1.6.27beta01 [November 2, 2016]

-  Restrict the new ADLER32-skipping to IDAT chunks.  It broke iCCP chunk

-    handling: an erroneous iCCP chunk would throw a png_error and reject the

-    entire PNG image instead of rejecting just the iCCP chunk with a warning,

-    if built with zlib-1.2.8.1.

-

-Version 1.6.27rc01 [December 27, 2016]

-  Control ADLER32 checking with new PNG_IGNORE_ADLER32 option. Fixes

-    an endless loop when handling erroneous ADLER32 checksums; bug

-    introduced in libpng-1.6.26.

-  Removed the use of a macro containing the pre-processor 'defined'

-    operator.  It is unclear whether this is valid; a macro that

-    "generates" 'defined' is not permitted, but the use of the word

-    "generates" within the C90 standard seems to imply more than simple

-    substitution of an expression itself containing a well-formed defined

-    operation.

-  Added ARM support to CMakeLists.txt (Andreas Franek).

-

-Version 1.6.27 [December 29, 2016]

-  Fixed a potential null pointer dereference in png_set_text_2() (bug report

-    and patch by Patrick Keshishian, CVE-2016-10087).

-

-Version 1.6.28rc01 [January 3, 2017]

-  Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna).

-  Added option to Cmake build allowing a custom location of zlib to be

-    specified in a scenario where libpng is being built as a subproject

-    alongside zlib by another project (Sam Serrels).

-  Changed png_ptr->options from a png_byte to png_uint_32, to accomodate

-    up to 16 options.

-

-Version 1.6.28rc02 [January 4, 2017]

-  Added "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna).

-  Moved SSE2 optimization code into the main libpng source directory.

-    Configure libpng with "configure --enable-intel-sse" or compile

-    libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it.

-

-Version 1.6.28rc03 [January 4, 2017]

-  Backed out the SSE optimization and last CMakeLists.txt to allow time for QA.

-

-Version 1.6.28 [January 5, 2017]

-  No changes.

-

-Version 1.6.29beta01 [January 12, 2017]

-  Readded "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna).

-  Moved SSE2 optimization code into the main libpng source directory.

-    Configure libpng with "configure --enable-intel-sse" or compile

-    libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it.

-  Simplified conditional compilation in pngvalid.c, for AIX (Michael Felt).

-

-Version 1.6.29beta02 [February 22, 2017]

-  Avoid conditional directives that break statements in pngrutil.c (Romero

-    Malaquias)

-  The contrib/examples/pngtopng.c recovery code was in the wrong "if"

-    branches; the comments were correct.

-  Added code for PowerPC VSX optimisation (Vadim Barkov).

-

-Version 1.6.29beta03 [March 1, 2017]

-  Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer).

-  Change test ZLIB_VERNUM >= 0x1281 to ZLIB_VERNUM >= 0x1290 in pngrutil.c

-    because Solaris 11 distributes zlib-1.2.8.f that is older than 1.2.8.1,

-    as suggested in zlib FAQ, item 24.

-  Suppress clang warnings about implicit sign changes in png.c

-

-Version 1.6.29 [March 16, 2017]

-  No changes.

-

-Version 1.6.30beta01 [April 1, 2017]

-  Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in

-    makefile.linux and makefile.solaris-x86 (Cosmin).

-  Revised documentation of png_get_error_ptr() in the libpng manual.

-  Silence clang -Wcomma and const drop warnings (Viktor Szakats).

-  Update Sourceforge URLs in documentation (https instead of http).

-

-Version 1.6.30beta02 [April 22, 2017]

-  Document need to check for integer overflow when allocating a pixel

-    buffer for multiple rows in contrib/gregbook, contrib/pngminus,

-    example.c, and in the manual (suggested by Jaeseung Choi). This

-    is similar to the bug reported against pngquant in CVE-2016-5735.

-  Removed reference to the obsolete PNG_SAFE_LIMITS macro in the documentation.

-

-Version 1.6.30beta03 [May 22, 2017]

-  Check for integer overflow in contrib/visupng and contrib/tools/genpng.

-  Do not double evaluate CMAKE_SYSTEM_PROCESSOR in CMakeLists.txt.

-  Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt.

-  Fix some URL in documentation.

-

-Version 1.6.30beta04 [June 7, 2017]

-  Avoid writing an empty IDAT when the last IDAT exactly fills the

-    compression buffer (bug report by Brian Baird). This bug was

-    introduced in libpng-1.6.0.

-

-Version 1.6.30rc01 [June 14, 2017]

-  No changes.

-

-Version 1.6.30rc02 [June 25, 2017]

-  Update copyright year in pnglibconf.h, make ltmain.sh executable.

-  Add a reference to the libpng.download site in README.

-

-Version 1.6.30 [June 28, 2017]

-  No changes.

-

-Version 1.6.31beta01 [July 5, 2017]

-  Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it;

-    bug report by Michael Felt).

-  Revised pngpriv.h to work around failure to compile arm/filter_neon.S

-    ("typedef" directive is unrecognized by the assembler). The problem

-    was introduced in libpng-1.6.30beta01.

-  Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx).

-  Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish).

-

-Version 1.6.31beta02 [July 8, 2017]

-  Added instructions for disabling hardware optimizations in INSTALL.

-  Added "--enable-hardware-optimizations" configuration flag to enable

-    or disable all hardware optimizations with one flag.

-

-Version 1.6.31beta03 [July 9, 2017]

-  Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms.

-  Changed "int" to "png_size_t" in intel/filter_sse2.c to prevent

-    possible integer overflow (Bug report by John Bowler).

-  Quieted "declaration after statement" warnings in intel/filter_sse2.c.

-  Added scripts/makefile-linux-opt, which has hardware optimizations enabled.

-

-Version 1.6.31beta04 [July 11, 2017]

-  Removed one of the GCC-7.1.0 'strict-overflow' warnings that result when

-    integers appear on both sides of a compare.  Worked around the others by

-    forcing the strict-overflow setting in the relevant functions to a level

-    where they are not reported (John Bowler).

-  Changed "FALL THROUGH" comments to "FALLTHROUGH" because GCC doesn't like

-    the space.

-  Worked around some C-style casts from (void*) because g++ 5.4.0 objects

-    to them.

-  Increased the buffer size for 'sprint' to pass the gcc 7.1.0 'sprint

-    overflow' check that is on by default with -Wall -Wextra.

-

-Version 1.6.31beta05 [July 13, 2017]

-  Added eXIf chunk support.

-

-Version 1.6.31beta06 [July 17, 2017]

-  Added a minimal eXIf chunk (with Orientation and FocalLengthIn35mmFilm

-    tags) to pngtest.png.

-

-Version 1.6.31beta07 [July 18, 2017]

-  Revised the eXIf chunk in pngtest.png to fix "Bad IFD1 Directory" warning.

-

-Version 1.6.31rc01 [July 19, 2017]

-  No changes.

-

-Version 1.6.31rc02 [July 25, 2017]

-  Fixed typo in example.c (png_free_image should be png_image_free) (Bug

-    report by John Smith)

-

-Version 1.6.31 [July 27, 2017]

-  No changes.

-

-Version 1.6.32beta01 [July 31, 2017]

-  Avoid possible NULL dereference in png_handle_eXIf when benign_errors

-    are allowed. Avoid leaking the input buffer "eXIf_buf".

-  Eliminated png_ptr->num_exif member from pngstruct.h and added num_exif

-    to arguments for png_get_eXIf() and png_set_eXIf().

-  Added calls to png_handle_eXIf(() in pngread.c and png_write_eXIf() in

-    pngwrite.c, and made various other fixes to png_write_eXIf().

-  Changed name of png_get_eXIF and png_set_eXIf() to png_get_eXIf_1() and

-    png_set_eXIf_1(), respectively, to avoid breaking API compatibility

-    with libpng-1.6.31.

-

-Version 1.6.32beta02 [August 1, 2017]

-  Updated contrib/libtests/pngunknown.c with eXIf chunk.

-

-Version 1.6.32beta03 [August 2, 2017]

-  Initialized btoa[] in pngstest.c

-  Stop memory leak when returning from png_handle_eXIf() with an error

-    (Bug report from the OSS-fuzz project).

-

-Version 1.6.32beta04 [August 2, 2017]

-  Replaced local eXIf_buf with info_ptr-eXIf_buf in png_handle_eXIf().

-  Update libpng.3 and libpng-manual.txt about eXIf functions.

-

-Version 1.6.32beta05 [August 2, 2017]

-  Restored png_get_eXIf() and png_set_eXIf() to maintain API compatability.

-

-Version 1.6.32beta06 [August 2, 2017]

-  Removed png_get_eXIf_1() and png_set_eXIf_1().

-

-Version 1.6.32beta07 [August 3, 2017]

-  Check length of all chunks except IDAT against user limit to fix an

-    OSS-fuzz issue (Fixes CVE-2017-12652).

-

-Version 1.6.32beta08 [August 3, 2017]

-  Check length of IDAT against maximum possible IDAT size, accounting

-    for height, rowbytes, interlacing and zlib/deflate overhead.

-  Restored png_get_eXIf_1() and png_set_eXIf_1(), because strlen(eXIf_buf)

-    does not work (the eXIf chunk data can contain zeroes).

-

-Version 1.6.32beta09 [August 3, 2017]

-  Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation,

-    no longer using deprecated cmake LOCATION feature (Clifford Yapp).

-  Fixed five-byte error in the calculation of IDAT maximum possible size.

-  

-Version 1.6.32beta10 [August 5, 2017]

-  Moved chunk-length check into a png_check_chunk_length() private

-    function (Suggested by Max Stepin).

-  Moved bad pngs from tests to contrib/libtests/crashers

-  Moved testing of bad pngs into a separate tests/pngtest-badpngs script

-  Added the --xfail (expected FAIL) option to pngtest.c. It writes XFAIL

-    in the output but PASS for the libpng test.

-  Require cmake-3.0.2 in CMakeLists.txt (Clifford Yapp).

-  Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the

-    num_exif argument to png_get_eXIf_1() (Github Issue 171).

-

-Version 1.6.32beta11 [August 7, 2017]

-  Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().

-  Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.

-  Make pngtest --strict, --relax, --xfail options imply -m (multiple).

-  Removed unused chunk_name parameter from png_check_chunk_length().

-  Relocated setting free_me for eXIf data, to stop an OSS-fuzz leak.

-  Initialize profile_header[] in png_handle_iCCP() to fix OSS-fuzz issue.

-  Initialize png_ptr->row_buf[0] to 255 in png_read_row() to fix OSS-fuzz UMR.

-  Attempt to fix a UMR in png_set_text_2() to fix OSS-fuzz issue.

-  Increase minimum zlib stream from 9 to 14 in png_handle_iCCP(), to account

-    for the minimum 'deflate' stream, and relocate the test to a point

-    after the keyword has been read.

-  Check that the eXIf chunk has at least 2 bytes and begins with "II" or "MM".

-

-Version 1.6.32rc01 [August 18, 2017]

-  Added a set of "huge_xxxx_chunk.png" files to contrib/testpngs/crashers,

-    one for each known chunk type, with length = 2GB-1.

-  Check for 0 return from png_get_rowbytes() and added some (size_t) typecasts

-    in contrib/pngminus/*.c to stop some Coverity issues (162705, 162706,

-    and 162707).

-  Renamed chunks in contrib/testpngs/crashers to avoid having files whose

-    names differ only in case; this causes problems with some platforms

-    (github issue #172).

-

-Version 1.6.32rc02 [August 22, 2017]

-  Added contrib/oss-fuzz directory which contains files used by the oss-fuzz

-    project (https://github.com/google/oss-fuzz/tree/master/projects/libpng).

-

-Version 1.6.32 [August 24, 2017]

-  No changes.

-

-Version 1.6.33beta01 [August 28, 2017]

-  Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing

-    parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).

-  Fixed off-by-one error in png_do_check_palette_indexes() (Bug report

-    by Mick P., Source Forge Issue #269).

-

-Version 1.6.33beta02 [September 3, 2017]

-  Initialize png_handler.row_ptr in contrib/oss-fuzz/libpng_read_fuzzer.cc

-    to fix shortlived oss-fuzz issue 3234.

-  Compute a larger limit on IDAT because some applications write a deflate

-    buffer for each row (Bug report by Andrew Church).

-  Use current date (DATE) instead of release-date (RDATE) in last

-    changed date of contrib/oss-fuzz files.

-  Enabled ARM support in CMakeLists.txt (Bernd Kuhls).

-

-Version 1.6.33beta03 [September 14, 2017]

-  Fixed incorrect typecast of some arguments to png_malloc() and

-    png_calloc() that were png_uint_32 instead of png_alloc_size_t

-    (Bug report by "irwir" in Github libpng issue #175).

-  Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github

-    issue 162, by rcdailey).

-

-Version 1.6.33rc01 [September 20, 2017]

-  Initialize memory allocated by png_inflate to zero, using memset, to

-    stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()

-    due to truncated iTXt or zTXt chunk.

-  Initialize memory allocated by png_read_buffer to zero, using memset, to

-    stop an oss-fuzz "use of uninitialized value" detection in

-    png_icc_check_tag_table() due to truncated iCCP chunk.

-  Removed a redundant test (suggested by "irwir" in Github issue #180).

-

-Version 1.6.33rc02 [September 23, 2017]

-  Added an interlaced version of each file in contrib/pngsuite.

-  Relocate new memset() call in pngrutil.c.

-  Removed more redundant tests (suggested by "irwir" in Github issue #180).

-  Add support for loading images with associated alpha in the Simplified

-    API (Samuel Williams).

-

-Version 1.6.33 [September 28, 2017]

-  Revert contrib/oss-fuzz/libpng_read_fuzzer.cc to libpng-1.6.32 state.

-  Initialize png_handler.row_ptr in contrib/oss-fuzz/libpng_read_fuzzer.cc

-  Add end_info structure and png_read_end() to the libpng fuzzer.

-

-Version 1.6.34 [September 29, 2017]

-  Removed contrib/pngsuite/i*.png; some of these were incorrect and caused

-    test failures.

-

-Send comments/corrections/commendations to png-mng-implement at lists.sf.net

-(subscription required; visit

-https://lists.sourceforge.net/lists/listinfo/png-mng-implement

-to subscribe)

-or to glennrp at users.sourceforge.net

-

-Glenn R-P

-#endif

diff --git a/plugins/AdvaImg/src/LibPNG/INSTALL b/plugins/AdvaImg/src/LibPNG/INSTALL
deleted file mode 100644
index ebc18bfbf5..0000000000
--- a/plugins/AdvaImg/src/LibPNG/INSTALL
+++ /dev/null
@@ -1,465 +0,0 @@
-

-    Installing libpng

-

-Contents

-

-       I. Simple installation

-      II. Rebuilding the configure scripts

-     III. Using scripts/makefile*

-      IV. Using cmake

-       V. Directory structure

-      VI. Building with project files

-     VII. Building with makefiles

-    VIII. Configuring libpng for 16-bit platforms

-      IX. Configuring for DOS

-       X. Configuring for Medium Model

-      XI. Prepending a prefix to exported symbols

-     XII. Configuring for compiler xxx:

-    XIII. Removing unwanted object code

-     XIV. Enabling or disabling hardware optimizations

-      XV. Changes to the build and configuration of libpng in libpng-1.5.x

-     XVI. Setjmp/longjmp issues

-    XVII. Common linking failures

-   XVIII. Other sources of information about libpng

-

-I. Simple installation

-

-On Unix/Linux and similar systems, you can simply type

-

-    ./configure [--prefix=/path]

-    make check

-    make install

-

-and ignore the rest of this document.  "/path" is the path to the directory

-where you want to install the libpng "lib", "include", and "bin"

-subdirectories.

-

-If you downloaded a GIT clone, you will need to run ./autogen.sh before

-running ./configure, to create "configure" and "Makefile.in" which are

-not included in the GIT repository.

-

-Note that "configure" is only included in the "*.tar" distributions and not

-in the "*.zip" or "*.7z" distributions. If you downloaded one of those

-distributions, see "Building with project files" or "Building with makefiles",

-below.

-

-II. Rebuilding the configure scripts

-

-If configure does not work on your system, or if you have a need to

-change configure.ac or Makefile.am, and you have a reasonably

-up-to-date set of tools, running ./autogen.sh in a git clone before

-running ./configure may fix the problem.  To be really sure that you

-aren't using any of the included pre-built scripts, especially if you

-are building from a tar distribution instead of a git distribution,

-do this:

-

-    ./configure --enable-maintainer-mode

-    make maintainer-clean

-    ./autogen.sh --maintainer --clean

-    ./autogen.sh --maintainer

-    ./configure [--prefix=/path] [other options]

-    make

-    make install

-    make check

-

-III. Using scripts/makefile*

-

-Instead, you can use one of the custom-built makefiles in the

-"scripts" directory

-

-    cp scripts/pnglibconf.h.prebuilt pnglibconf.h

-    cp scripts/makefile.system makefile

-    make test

-    make install

-

-The files that are presently available in the scripts directory

-are listed and described in scripts/README.txt.

-

-Or you can use one of the "projects" in the "projects" directory.

-

-Before installing libpng, you must first install zlib, if it

-is not already on your system.  zlib can usually be found

-wherever you got libpng; otherwise go to https://zlib.net/.  You can

-place zlib in the same directory as libpng or in another directory.

-

-If your system already has a preinstalled zlib you will still need

-to have access to the zlib.h and zconf.h include files that

-correspond to the version of zlib that's installed.

-

-If you wish to test with a particular zlib that is not first in the

-standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,

-and LD_LIBRARY_PATH in your environment before running "make test"

-or "make distcheck":

-

-    ZLIBLIB=/path/to/lib export ZLIBLIB

-    ZLIBINC=/path/to/include export ZLIBINC

-    CPPFLAGS="-I$ZLIBINC" export CPPFLAGS

-    LDFLAGS="-L$ZLIBLIB" export LDFLAGS

-    LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH

-

-If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC

-in your environment and type

-

-    make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test

-

-IV. Using cmake

-

-If you want to use "cmake" (see www.cmake.org), type

-

-    cmake . -DCMAKE_INSTALL_PREFIX=/path

-    make

-    make install

-

-As when using the simple configure method described above, "/path" points to

-the installation directory where you want to put the libpng "lib", "include",

-and "bin" subdirectories.

-

-V. Directory structure

-

-You can rename the directories that you downloaded (they

-might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.8"

-or "zlib128") so that you have directories called "zlib" and "libpng".

-

-Your directory structure should look like this:

-

-    .. (the parent directory)

-      libpng (this directory)

-          INSTALL (this file)

-          README

-          *.h, *.c  => libpng source files

-          CMakeLists.txt    =>  "cmake" script

-          configuration files:

-             configure.ac, configure, Makefile.am, Makefile.in,

-             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,

-             libpng-config.in, aclocal.m4, config.h.in, config.sub,

-             depcomp, install-sh, mkinstalldirs, test-pngtest.sh

-          contrib

-             arm-neon, conftest, examples, gregbook, libtests, pngminim,

-             pngminus, pngsuite, tools, visupng

-          projects

-             cbuilder5, owatcom, visualc71, vstudio, xcode

-          scripts

-             makefile.*

-             *.def (module definition files)

-             etc.

-          pngtest.png

-          etc.

-      zlib

-          README, *.h, *.c contrib, etc.

-

-If the line endings in the files look funny, you may wish to get the other

-distribution of libpng.  It is available in both tar.gz (UNIX style line

-endings) and zip (DOS style line endings) formats.

-

-VI. Building with project files

-

-If you are building libpng with MSVC, you can enter the

-libpng projects\visualc71 or vstudio directory and follow the instructions

-in README.txt.

-

-Otherwise enter the zlib directory and follow the instructions in zlib/README,

-then come back here and run "configure" or choose the appropriate

-makefile.sys in the scripts directory.

-

-VII. Building with makefiles

-

-Copy the file (or files) that you need from the

-scripts directory into this directory, for example

-

-MSDOS example:

-

-    copy scripts\makefile.msc makefile

-    copy scripts\pnglibconf.h.prebuilt pnglibconf.h

-

-UNIX example:

-

-    cp scripts/makefile.std makefile

-    cp scripts/pnglibconf.h.prebuilt pnglibconf.h

-

-Read the makefile to see if you need to change any source or

-target directories to match your preferences.

-

-Then read pnglibconf.dfa to see if you want to make any configuration

-changes.

-

-Then just run "make" which will create the libpng library in

-this directory and "make test" which will run a quick test that reads

-the "pngtest.png" file and writes a "pngout.png" file that should be

-identical to it.  Look for "9782 zero samples" in the output of the

-test.  For more confidence, you can run another test by typing

-"pngtest pngnow.png" and looking for "289 zero samples" in the output.

-Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare

-your output with the result shown in contrib/pngsuite/README.

-

-Most of the makefiles will allow you to run "make install" to

-put the library in its final resting place (if you want to

-do that, run "make install" in the zlib directory first if necessary).

-Some also allow you to run "make test-installed" after you have

-run "make install".

-

-VIII. Configuring libpng for 16-bit platforms

-

-You will want to look into zconf.h to tell zlib (and thus libpng) that

-it cannot allocate more than 64K at a time.  Even if you can, the memory

-won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.

-

-IX. Configuring for DOS

-

-For DOS users who only have access to the lower 640K, you will

-have to limit zlib's memory usage via a png_set_compression_mem_level()

-call.  See zlib.h or zconf.h in the zlib library for more information.

-

-X. Configuring for Medium Model

-

-Libpng's support for medium model has been tested on most of the popular

-compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets

-defined, and FAR gets defined to far in pngconf.h, and you should be

-all set.  Everything in the library (except for zlib's structure) is

-expecting far data.  You must use the typedefs with the p or pp on

-the end for pointers (or at least look at them and be careful).  Make

-note that the rows of data are defined as png_bytepp, which is

-an "unsigned char far * far *".

-

-XI. Prepending a prefix to exported symbols

-

-Starting with libpng-1.6.0, you can configure libpng (when using the

-"configure" script) to prefix all exported symbols by means of the

-configuration option "--with-libpng-prefix=FOO_", where FOO_ can be any

-string beginning with a letter and containing only uppercase

-and lowercase letters, digits, and the underscore (i.e., a C language

-identifier).  This creates a set of macros in pnglibconf.h, so this is

-transparent to applications; their function calls get transformed by

-the macros to use the modified names.

-

-XII. Configuring for compiler xxx:

-

-All includes for libpng are in pngconf.h.  If you need to add, change

-or delete an include, this is the place to do it.

-The includes that are not needed outside libpng are placed in pngpriv.h,

-which is only used by the routines inside libpng itself.

-The files in libpng proper only include pngpriv.h and png.h, which

-in turn includes pngconf.h and, as of libpng-1.5.0, pnglibconf.h.

-As of libpng-1.5.0, pngpriv.h also includes three other private header

-files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material

-that previously appeared in the public headers.

-

-XIII. Removing unwanted object code

-

-There are a bunch of #define's in pngconf.h that control what parts of

-libpng are compiled.  All the defines end in _SUPPORTED.  If you are

-never going to use a capability, you can change the #define to #undef

-before recompiling libpng and save yourself code and data space, or

-you can turn off individual capabilities with defines that begin with

-"PNG_NO_".

-

-In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead.

-

-You can also turn all of the transforms and ancillary chunk capabilities

-off en masse with compiler directives that define

-PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,

-or all four, along with directives to turn on any of the capabilities that

-you do want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the

-extra transformations but still leave the library fully capable of reading

-and writing PNG files with all known public chunks. Use of the

-PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library

-that is incapable of reading or writing ancillary chunks.  If you are

-not using the progressive reading capability, you can turn that off

-with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING

-capability, which you'll still have).

-

-All the reading and writing specific code are in separate files, so the

-linker should only grab the files it needs.  However, if you want to

-make sure, or if you are building a stand alone library, all the

-reading files start with "pngr" and all the writing files start with "pngw".

-The files that don't match either (like png.c, pngtrans.c, etc.)

-are used for both reading and writing, and always need to be included.

-The progressive reader is in pngpread.c

-

-If you are creating or distributing a dynamically linked library (a .so

-or DLL file), you should not remove or disable any parts of the library,

-as this will cause applications linked with different versions of the

-library to fail if they call functions not available in your library.

-The size of the library itself should not be an issue, because only

-those sections that are actually used will be loaded into memory.

-

-XIV. Enabling or disabling hardware optimizations

-

-Certain hardware capabilites, such as the Intel SSE instructions,

-are normally detected at run time. Enable them with configure options

-such as one of

-

-   --enable-arm-neon=yes

-   --enable-mips-msa=yes

-   --enable-intel-sse=yes

-   --enable-powerpc-vsx=yes

-

-or enable them all at once with

-

-   --enable-hardware-optimizations=yes

-

-or, if you are not using "configure", you can use one

-or more of

-

-   CPPFLAGS += "-DPNG_ARM_NEON"

-   CPPFLAGS += "-DPNG_MIPS_MSA"

-   CPPFLAGS += "-DPNG_INTEL_SSE"

-   CPPFLAGS += "-DPNG_POWERPC_VSX"

-

-See for example scripts/makefile.linux-opt

-

-If you wish to avoid using them,

-you can disable them via the configure option

-

-   --disable-hardware-optimizations

-

-to disable them all, or

-

-   --enable-intel-sse=no

-

-to disable a particular one,

-or via compiler-command options such as

-

-   CPPFLAGS += "-DPNG_ARM_NEON_OPT=0, -DPNG_MIPS_MSA_OPT=0,

-   -DPNG_INTEL_SSE_OPT=0, -DPNG_POWERPC_VSX_OPT=0"

-

-If you are using cmake, hardware optimizations are "on"

-by default. To disable them, use

-

-    cmake . -DPNG_ARM_NEON=no -DPNG_INTEL_SSE=no \

-            -DPNG_MIPS_MSA=no -DPNG_POWERPC_VSX=no

-

-or disable them all at once with

-

-    cmake . -DPNG_HARDWARE_OPTIMIZATIONS=no

-

-XV. Changes to the build and configuration of libpng in libpng-1.5.x

-

-Details of internal changes to the library code can be found in the CHANGES

-file and in the GIT repository logs.  These will be of no concern to the vast

-majority of library users or builders; however, the few who configure libpng

-to a non-default feature set may need to change how this is done.

-

-There should be no need for library builders to alter build scripts if

-these use the distributed build support - configure or the makefiles -

-however, users of the makefiles may care to update their build scripts

-to build pnglibconf.h where the corresponding makefile does not do so.

-

-Building libpng with a non-default configuration has changed completely.

-The old method using pngusr.h should still work correctly even though the

-way pngusr.h is used in the build has been changed; however, library

-builders will probably want to examine the changes to take advantage of

-new capabilities and to simplify their build system.

-

-A. Specific changes to library configuration capabilities

-

-The exact mechanism used to control attributes of API functions has

-changed.  A single set of operating system independent macro definitions

-is used and operating system specific directives are defined in

-pnglibconf.h

-

-As part of this the mechanism used to choose procedure call standards on

-those systems that allow a choice has been changed.  At present this only

-affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems

-running on Intel processors.  As before, PNGAPI is defined where required

-to control the exported API functions; however, two new macros, PNGCBAPI

-and PNGCAPI, are used instead for callback functions (PNGCBAPI) and

-(PNGCAPI) for functions that must match a C library prototype (currently

-only png_longjmp_ptr, which must match the C longjmp function.)  The new

-approach is documented in pngconf.h

-

-Despite these changes, libpng 1.5.0 only supports the native C function

-calling standard on those platforms tested so far ("__cdecl" on Microsoft

-Windows).  This is because the support requirements for alternative

-calling conventions seem to no longer exist.  Developers who find it

-necessary to set PNG_API_RULE to 1 should advise the mailing list

-(png-mng-implement) of this and library builders who use Openwatcom and

-therefore set PNG_API_RULE to 2 should also contact the mailing list.

-

-B. Changes to the configuration mechanism

-

-Prior to libpng-1.5.0 library builders who needed to configure libpng

-had either to modify the exported pngconf.h header file to add system

-specific configuration or had to write feature selection macros into

-pngusr.h and cause this to be included into pngconf.h by defining

-PNG_USER_CONFIG. The latter mechanism had the disadvantage that an

-application built without PNG_USER_CONFIG defined would see the

-unmodified, default, libpng API and thus would probably fail to link.

-

-These mechanisms still work in the configure build and in any makefile

-build that builds pnglibconf.h, although the feature selection macros

-have changed somewhat as described above.  In 1.5.0, however, pngusr.h is

-processed only once, at the time the exported header file pnglibconf.h is

-built.  pngconf.h no longer includes pngusr.h; therefore, pngusr.h is ignored

-after the build of pnglibconf.h and it is never included in an application

-build.

-

-The formerly used alternative of adding a list of feature macros to the

-CPPFLAGS setting in the build also still works; however, the macros will be

-copied to pnglibconf.h and this may produce macro redefinition warnings

-when the individual C files are compiled.

-

-All configuration now only works if pnglibconf.h is built from

-scripts/pnglibconf.dfa.  This requires the program awk.  Brian Kernighan

-(the original author of awk) maintains C source code of that awk and this

-and all known later implementations (often called by subtly different

-names - nawk and gawk for example) are adequate to build pnglibconf.h.

-The Sun Microsystems (now Oracle) program 'awk' is an earlier version

-and does not work; this may also apply to other systems that have a

-functioning awk called 'nawk'.

-

-Configuration options are now documented in scripts/pnglibconf.dfa.  This

-file also includes dependency information that ensures a configuration is

-consistent; that is, if a feature is switched off, dependent features are

-also switched off.  As a recommended alternative to using feature macros in

-pngusr.h a system builder may also define equivalent options in pngusr.dfa

-(or, indeed, any file) and add that to the configuration by setting

-DFA_XTRA to the file name.  The makefiles in contrib/pngminim illustrate

-how to do this, and also illustrate a case where pngusr.h is still required.

-

-After you have built libpng, the definitions that were recorded in

-pnglibconf.h are available to your application (pnglibconf.h is included

-in png.h and gets installed alongside png.h and pngconf.h in your

-$PREFIX/include directory).  Do not edit pnglibconf.h after you have built

-libpng, because than the settings would not accurately reflect the settings

-that were used to build libpng.

-

-XVI. Setjmp/longjmp issues

-

-Libpng uses setjmp()/longjmp() for error handling.  Unfortunately setjmp()

-is known to be not thread-safe on some platforms and we don't know of

-any platform where it is guaranteed to be thread-safe.  Therefore, if

-your application is going to be using multiple threads, you should

-configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with

--DPNG_NO_SETJMP on your compile line, or with

-

-    #undef PNG_SETJMP_SUPPORTED

-

-in your pnglibconf.h or pngusr.h.

-

-Starting with libpng-1.6.0, the library included a "simplified API".

-This requires setjmp/longjmp, so you must either build the library

-with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED

-and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined.

-

-XVII. Common linking failures

-

-If your application fails to find libpng or zlib entries while linking:

-

-  Be sure "-lz" appears after "-lpng" on your linking command.

-

-  Be sure you have built libpng, zlib, and your application for the

-  same platform (e.g., 32-bit or 64-bit).

-

-  If you are using the vstudio project, observe the WARNING in

-  project/vstudio/README.txt.

-

-XVIII. Other sources of information about libpng:

-

-Further information can be found in the README and libpng-manual.txt

-files, in the individual makefiles, in png.h, and the manual pages

-libpng.3 and png.5.

-

-Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson

-This document is released under the libpng license.

-For conditions of distribution and use, see the disclaimer

-and license in png.h.

diff --git a/plugins/AdvaImg/src/LibPNG/LICENSE b/plugins/AdvaImg/src/LibPNG/LICENSE
deleted file mode 100644
index 8248a963e4..0000000000
--- a/plugins/AdvaImg/src/LibPNG/LICENSE
+++ /dev/null
@@ -1,133 +0,0 @@
-

-This copy of the libpng notices is provided for your convenience.  In case of

-any discrepancy between this copy and the notices in the file png.h that is

-included in the libpng distribution, the latter shall prevail.

-

-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:

-

-If you modify libpng you may insert additional notices immediately following

-this sentence.

-

-This code is released under the libpng license.

-

-libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are

-Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are

-derived from libpng-1.0.6, and are distributed according to the same

-disclaimer and license as libpng-1.0.6 with the following individuals

-added to the list of Contributing Authors:

-

-   Simon-Pierre Cadieux

-   Eric S. Raymond

-   Mans Rullgard

-   Cosmin Truta

-   Gilles Vollant

-   James Yu

-   Mandar Sahastrabuddhe

-   Google Inc.

-   Vadim Barkov

-

-and with the following additions to the disclaimer:

-

-   There is no warranty against interference with your enjoyment of the

-   library or against infringement.  There is no warranty that our

-   efforts or the library will fulfill any of your particular purposes

-   or needs.  This library is provided with all faults, and the entire

-   risk of satisfactory quality, performance, accuracy, and effort is with

-   the user.

-

-Some files in the "contrib" directory and some configure-generated

-files that are distributed with libpng have other copyright owners and

-are released under other open source licenses.

-

-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are

-Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from

-libpng-0.96, and are distributed according to the same disclaimer and

-license as libpng-0.96, with the following individuals added to the list

-of Contributing Authors:

-

-   Tom Lane

-   Glenn Randers-Pehrson

-   Willem van Schaik

-

-libpng versions 0.89, June 1996, through 0.96, May 1997, are

-Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,

-and are distributed according to the same disclaimer and license as

-libpng-0.88, with the following individuals added to the list of

-Contributing Authors:

-

-   John Bowler

-   Kevin Bracey

-   Sam Bushell

-   Magnus Holmgren

-   Greg Roelofs

-   Tom Tanner

-

-Some files in the "scripts" directory have other copyright owners

-but are released under this license.

-

-libpng versions 0.5, May 1995, through 0.88, January 1996, are

-Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

-

-For the purposes of this copyright and license, "Contributing Authors"

-is defined as the following set of individuals:

-

-   Andreas Dilger

-   Dave Martindale

-   Guy Eric Schalnat

-   Paul Schmidt

-   Tim Wegner

-

-The PNG Reference Library is supplied "AS IS".  The Contributing Authors

-and Group 42, Inc. disclaim all warranties, expressed or implied,

-including, without limitation, the warranties of merchantability and of

-fitness for any purpose.  The Contributing Authors and Group 42, Inc.

-assume no liability for direct, indirect, incidental, special, exemplary,

-or consequential damages, which may result from the use of the PNG

-Reference Library, even if advised of the possibility of such damage.

-

-Permission is hereby granted to use, copy, modify, and distribute this

-source code, or portions hereof, for any purpose, without fee, subject

-to the following restrictions:

-

-  1. The origin of this source code must not be misrepresented.

-

-  2. Altered versions must be plainly marked as such and must not

-     be misrepresented as being the original source.

-

-  3. This Copyright notice may not be removed or altered from any

-     source or altered source distribution.

-

-The Contributing Authors and Group 42, Inc. specifically permit, without

-fee, and encourage the use of this source code as a component to

-supporting the PNG file format in commercial products.  If you use this

-source code in a product, acknowledgment is not required but would be

-appreciated.

-

-END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.

-

-TRADEMARK:

-

-The name "libpng" has not been registered by the Copyright owner

-as a trademark in any jurisdiction.  However, because libpng has

-been distributed and maintained world-wide, continually since 1995,

-the Copyright owner claims "common-law trademark protection" in any

-jurisdiction where common-law trademark is recognized.

-

-OSI CERTIFICATION:

-

-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is

-a certification mark of the Open Source Initiative. OSI has not addressed

-the additional disclaimers inserted at version 1.0.7.

-

-EXPORT CONTROL:

-

-The Copyright owner believes that the Export Control Classification

-Number (ECCN) for libpng is EAR99, which means not subject to export

-controls or International Traffic in Arms Regulations (ITAR) because

-it is open source, publicly available software, that does not contain

-any encryption software.  See the EAR, paragraphs 734.3(b)(3) and

-734.7(b).

-

-Glenn Randers-Pehrson

-glennrp at users.sourceforge.net

-September 29, 2017

diff --git a/plugins/AdvaImg/src/LibPNG/README b/plugins/AdvaImg/src/LibPNG/README
deleted file mode 100644
index 59b6a5d0ea..0000000000
--- a/plugins/AdvaImg/src/LibPNG/README
+++ /dev/null
@@ -1,222 +0,0 @@
-README for libpng version 1.6.34 - September 29, 2017 (shared library 16.0)

-See the note about version numbers near the top of png.h

-

-See INSTALL for instructions on how to install libpng.

-

-Libpng comes in several distribution formats.  Get libpng-*.tar.gz or

-libpng-*.tar.xz or if you want UNIX-style line endings in the text files,

-or lpng*.7z or lpng*.zip if you want DOS-style line endings.

-

-Version 0.89 was the first official release of libpng.  Don't let the

-fact that it's the first release fool you.  The libpng library has been in

-extensive use and testing since mid-1995.  By late 1997 it had

-finally gotten to the stage where there hadn't been significant

-changes to the API in some time, and people have a bad feeling about

-libraries with versions < 1.0.  Version 1.0.0 was released in

-March 1998.

-

-****

-Note that some of the changes to the png_info structure render this

-version of the library binary incompatible with libpng-0.89 or

-earlier versions if you are using a shared library.  The type of the

-"filler" parameter for png_set_filler() has changed from png_byte to

-png_uint_32, which will affect shared-library applications that use

-this function.

-

-To avoid problems with changes to the internals of the png info_struct,

-new APIs have been made available in 0.95 to avoid direct application

-access to info_ptr.  These functions are the png_set_<chunk> and

-png_get_<chunk> functions.  These functions should be used when

-accessing/storing the info_struct data, rather than manipulating it

-directly, to avoid such problems in the future.

-

-It is important to note that the APIs did not make current programs

-that access the info struct directly incompatible with the new

-library, through libpng-1.2.x.  In libpng-1.4.x, which was meant to

-be a transitional release, members of the png_struct and the

-info_struct can still be accessed, but the compiler will issue a

-warning about deprecated usage.  Since libpng-1.5.0, direct access

-to these structs is not allowed, and the definitions of the structs

-reside in private pngstruct.h and pnginfo.h header files that are not

-accessible to applications.  It is strongly suggested that new

-programs use the new APIs (as shown in example.c and pngtest.c), and

-older programs be converted to the new format, to facilitate upgrades

-in the future.

-****

-

-Additions since 0.90 include the ability to compile libpng as a

-Windows DLL, and new APIs for accessing data in the info struct.

-Experimental functions include the ability to set weighting and cost

-factors for row filter selection, direct reads of integers from buffers

-on big-endian processors that support misaligned data access, faster

-methods of doing alpha composition, and more accurate 16->8 bit color

-conversion.

-

-The additions since 0.89 include the ability to read from a PNG stream

-which has had some (or all) of the signature bytes read by the calling

-application.  This also allows the reading of embedded PNG streams that

-do not have the PNG file signature.  As well, it is now possible to set

-the library action on the detection of chunk CRC errors.  It is possible

-to set different actions based on whether the CRC error occurred in a

-critical or an ancillary chunk.

-

-The changes made to the library, and bugs fixed are based on discussions

-on the PNG-implement mailing list and not on material submitted

-privately to Guy, Andreas, or Glenn.  They will forward any good

-suggestions to the list.

-

-For a detailed description on using libpng, read libpng-manual.txt.  For

-examples of libpng in a program, see example.c and pngtest.c.  For usage

-information and restrictions (what little they are) on libpng, see

-png.h.  For a description on using zlib (the compression library used by

-libpng) and zlib's restrictions, see zlib.h

-

-I have included a general makefile, as well as several machine and

-compiler specific ones, but you may have to modify one for your own needs.

-

-You should use zlib 1.0.4 or later to run this, but it MAY work with

-versions as old as zlib 0.95.  Even so, there are bugs in older zlib

-versions which can cause the output of invalid compression streams for

-some images.  You will definitely need zlib 1.0.4 or later if you are

-taking advantage of the MS-DOS "far" structure allocation for the small

-and medium memory models.  You should also note that zlib is a

-compression library that is useful for more things than just PNG files.

-You can use zlib as a drop-in replacement for fread() and fwrite() if

-you are so inclined.

-

-zlib should be available at the same place that libpng is, or at zlib.net.

-

-You may also want a copy of the PNG specification.  It is available

-as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find

-these at http://www.libpng.org/pub/png/pngdocs.html .

-

-This code is currently being archived at libpng.sourceforge.io in the

-[DOWNLOAD] area, and at http://libpng.download/src .  If you

-can't find it in any of those places, e-mail me, and I'll help you find it.

-

-I am not a lawyer, but I believe that the Export Control Classification

-Number (ECCN) for libpng is EAR99, which means not subject to export

-controls or International Traffic in Arms Regulations (ITAR) because it

-is open source, publicly available software, that does not contain any

-encryption software.  See the EAR, paragraphs 734.3(b)(3) and 734.7(b).

-

-If you have any code changes, requests, problems, etc., please e-mail

-them to me.  Also, I'd appreciate any make files or project files,

-and any modifications you needed to make to get libpng to compile,

-along with a #define variable to tell what compiler/system you are on.

-If you needed to add transformations to libpng, or wish libpng would

-provide the image in a different way, drop me a note (and code, if

-possible), so I can consider supporting the transformation.

-Finally, if you get any warning messages when compiling libpng

-(note: not zlib), and they are easy to fix, I'd appreciate the

-fix.  Please mention "libpng" somewhere in the subject line.  Thanks.

-

-This release was created and will be supported by myself (of course

-based in a large way on Guy's and Andreas' earlier work), and the PNG

-development group.

-

-Send comments/corrections/commendations to png-mng-implement at

-lists.sourceforge.net (subscription required; visit

-https://lists.sourceforge.net/lists/listinfo/png-mng-implement

-to subscribe) or to glennrp at users.sourceforge.net

-

-You can't reach Guy, the original libpng author, at the addresses

-given in previous versions of this document.  He and Andreas will

-read mail addressed to the png-implement list, however.

-

-Please do not send general questions about PNG.  Send them to

-png-mng-misc at lists.sf.net (subscription required; visit

-https://lists.sourceforge.net/lists/listinfo/png-mng-misc to

-subscribe).  If you have a question about something

-in the PNG specification that is related to using libpng, send it

-to me.  Send me any questions that start with "I was using libpng,

-and ...".  If in doubt, send questions to me.  I'll bounce them

-to others, if necessary.

-

-Please do not send suggestions on how to change PNG.  We have

-been discussing PNG for twenty years now, and it is official and

-finished.  If you have suggestions for libpng, however, I'll

-gladly listen.  Even if your suggestion is not used immediately,

-it may be used later.

-

-Files in this distribution:

-

-      ANNOUNCE      =>  Announcement of this version, with recent changes

-      CHANGES       =>  Description of changes between libpng versions

-      KNOWNBUG      =>  List of known bugs and deficiencies

-      LICENSE       =>  License to use and redistribute libpng

-      README        =>  This file

-      TODO          =>  Things not implemented in the current library

-      Y2KINFO       =>  Statement of Y2K compliance

-      example.c     =>  Example code for using libpng functions

-      libpng.3      =>  manual page for libpng (includes libpng-manual.txt)

-      libpng-manual.txt  =>  Description of libpng and its functions

-      libpngpf.3    =>  manual page for libpng's private functions

-      png.5         =>  manual page for the PNG format

-      png.c         =>  Basic interface functions common to library

-      png.h         =>  Library function and interface declarations (public)

-      pngpriv.h     =>  Library function and interface declarations (private)

-      pngconf.h     =>  System specific library configuration (public)

-      pngstruct.h   =>  png_struct declaration (private)

-      pnginfo.h     =>  png_info struct declaration (private)

-      pngdebug.h    =>  debugging macros (private)

-      pngerror.c    =>  Error/warning message I/O functions

-      pngget.c      =>  Functions for retrieving info from struct

-      pngmem.c      =>  Memory handling functions

-      pngbar.png    =>  PNG logo, 88x31

-      pngnow.png    =>  PNG logo, 98x31

-      pngpread.c    =>  Progressive reading functions

-      pngread.c     =>  Read data/helper high-level functions

-      pngrio.c      =>  Lowest-level data read I/O functions

-      pngrtran.c    =>  Read data transformation functions

-      pngrutil.c    =>  Read data utility functions

-      pngset.c      =>  Functions for storing data into the info_struct

-      pngtest.c     =>  Library test program

-      pngtest.png   =>  Library test sample image

-      pngtrans.c    =>  Common data transformation functions

-      pngwio.c      =>  Lowest-level write I/O functions

-      pngwrite.c    =>  High-level write functions

-      pngwtran.c    =>  Write data transformations

-      pngwutil.c    =>  Write utility functions

-      arm           =>  Contains optimized code for the ARM platform

-      powerpc       =>  Contains optimized code for the PowerPC platform

-      contrib       =>  Contributions

-       arm-neon         =>  Optimized code for ARM-NEON platform

-       powerpc-vsx      =>  Optimized code for POWERPC-VSX platform

-       examples         =>  Example programs

-       gregbook         =>  source code for PNG reading and writing, from

-                            Greg Roelofs' "PNG: The Definitive Guide",

-                            O'Reilly, 1999

-       libtests         =>  Test programs

-       mips-msa         =>  Optimized code for MIPS-MSA platform

-       pngminim         =>  Minimal decoder, encoder, and progressive decoder

-                            programs demonstrating use of pngusr.dfa

-       pngminus         =>  Simple pnm2png and png2pnm programs

-       pngsuite         =>  Test images

-       testpngs

-       tools            =>  Various tools

-       visupng          =>  Contains a MSVC workspace for VisualPng

-      intel             =>  Optimized code for INTEL-SSE2 platform

-      mips              =>  Optimized code for MIPS platform

-      projects      =>  Contains project files and workspaces for

-                        building a DLL

-       owatcom          =>  Contains a WATCOM project for building libpng

-       visualc71        =>  Contains a Microsoft Visual C++ (MSVC)

-                            workspace for building libpng and zlib

-       vstudio          =>  Contains a Microsoft Visual C++ (MSVC)

-                            workspace for building libpng and zlib

-      scripts       =>  Directory containing scripts for building libpng:

-                            (see scripts/README.txt for the list of scripts)

-

-Good luck, and happy coding.

-

--Glenn Randers-Pehrson (current maintainer, since 1998)

- Internet: glennrp at users.sourceforge.net

-

--Andreas Eric Dilger (former maintainer, 1996-1997)

- Internet: adilger at enel.ucalgary.ca

- Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/

-

--Guy Eric Schalnat (original author and former maintainer, 1995-1996)

- (formerly of Group 42, Inc)

- Internet: gschal at infinet.com

diff --git a/plugins/AdvaImg/src/LibPNG/TODO b/plugins/AdvaImg/src/LibPNG/TODO
deleted file mode 100644
index b689060c42..0000000000
--- a/plugins/AdvaImg/src/LibPNG/TODO
+++ /dev/null
@@ -1,30 +0,0 @@
-/*

-TODO - list of things to do for libpng:

-

-Final bug fixes.

-Better C++ wrapper/full C++ implementation?

-Fix problem with C++ and EXTERN "C".

-cHRM transformation.

-Remove setjmp/longjmp usage in favor of returning error codes. As a start on

-  this, minimize the use of png_error(), replacing them with

-  png_warning(); return(0); or similar.

-Palette creation.

-Add "grayscale->palette" transformation and "palette->grayscale" detection.

-Improved dithering.

-Multi-lingual error and warning message support.

-Complete sRGB transformation (presently it simply uses gamma=0.45455).

-Man pages for function calls.

-Better documentation.

-Better filter selection

-   (counting huffman bits/precompression?  filter inertia?  filter costs?).

-Histogram creation.

-Text conversion between different code pages (Latin-1 -> Mac and DOS).

-Avoid building gamma tables whenever possible.

-Use greater precision when changing to linear gamma for compositing against

-  background and doing rgb-to-gray transformation.

-Investigate pre-incremented loop counters and other loop constructions.

-Add interpolated method of handling interlacing.

-Extend pngvalid.c to validate more of the libpng transformations.

-Refactor preprocessor conditionals to compile entire statements

-

-*/

diff --git a/plugins/AdvaImg/src/LibPNG/libpng-manual.txt b/plugins/AdvaImg/src/LibPNG/libpng-manual.txt
deleted file mode 100644
index 7007673175..0000000000
--- a/plugins/AdvaImg/src/LibPNG/libpng-manual.txt
+++ /dev/null
@@ -1,5464 +0,0 @@
-libpng-manual.txt - A description on how to use and modify libpng

-

- libpng version 1.6.34 - September 29, 2017

- Updated and distributed by Glenn Randers-Pehrson

- <glennrp at users.sourceforge.net>

- Copyright (c) 1998-2017 Glenn Randers-Pehrson

-

- This document is released under the libpng license.

- For conditions of distribution and use, see the disclaimer

- and license in png.h

-

- Based on:

-

- libpng versions 0.97, January 1998, through 1.6.34 - September 29, 2017

- Updated and distributed by Glenn Randers-Pehrson

- Copyright (c) 1998-2017 Glenn Randers-Pehrson

-

- libpng 1.0 beta 6 - version 0.96 - May 28, 1997

- Updated and distributed by Andreas Dilger

- Copyright (c) 1996, 1997 Andreas Dilger

-

- libpng 1.0 beta 2 - version 0.88 - January 26, 1996

- For conditions of distribution and use, see copyright

- notice in png.h. Copyright (c) 1995, 1996 Guy Eric

- Schalnat, Group 42, Inc.

-

- Updated/rewritten per request in the libpng FAQ

- Copyright (c) 1995, 1996 Frank J. T. Wojcik

- December 18, 1995 & January 20, 1996

-

- TABLE OF CONTENTS

-

-    I. Introduction

-   II. Structures

-  III. Reading

-   IV. Writing

-    V. Simplified API

-   VI. Modifying/Customizing libpng

-  VII. MNG support

- VIII. Changes to Libpng from version 0.88

-   IX. Changes to Libpng from version 1.0.x to 1.2.x

-    X. Changes to Libpng from version 1.0.x/1.2.x to 1.4.x

-   XI. Changes to Libpng from version 1.4.x to 1.5.x

-  XII. Changes to Libpng from version 1.5.x to 1.6.x

- XIII. Detecting libpng

-  XIV. Source code repository

-   XV. Coding style

-  XVI. Y2K Compliance in libpng

-

-I. Introduction

-

-This file describes how to use and modify the PNG reference library

-(known as libpng) for your own use.  In addition to this

-file, example.c is a good starting point for using the library, as

-it is heavily commented and should include everything most people

-will need.  We assume that libpng is already installed; see the

-INSTALL file for instructions on how to configure and install libpng.

-

-For examples of libpng usage, see the files "example.c", "pngtest.c",

-and the files in the "contrib" directory, all of which are included in

-the libpng distribution.

-

-Libpng was written as a companion to the PNG specification, as a way

-of reducing the amount of time and effort it takes to support the PNG

-file format in application programs.

-

-The PNG specification (second edition), November 2003, is available as

-a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2004 (E)) at

-<https://www.w3.org/TR/2003/REC-PNG-20031110/

-The W3C and ISO documents have identical technical content.

-

-The PNG-1.2 specification is available at

-<https://png-mng.sourceforge.io/pub/png/spec/1.2/>.

-It is technically equivalent

-to the PNG specification (second edition) but has some additional material.

-

-The PNG-1.0 specification is available as RFC 2083

-<https://png-mng.sourceforge.io/pub/png/spec/1.0/> and as a

-W3C Recommendation <https://www.w3.org/TR/REC-png-961001>.

-

-Some additional chunks are described in the special-purpose public chunks

-documents at <http://www.libpng.org/pub/png/spec/register/>

-

-Other information

-about PNG, and the latest version of libpng, can be found at the PNG home

-page, <http://www.libpng.org/pub/png/>.

-

-Most users will not have to modify the library significantly; advanced

-users may want to modify it more.  All attempts were made to make it as

-complete as possible, while keeping the code easy to understand.

-Currently, this library only supports C.  Support for other languages

-is being considered.

-

-Libpng has been designed to handle multiple sessions at one time,

-to be easily modifiable, to be portable to the vast majority of

-machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy

-to use.  The ultimate goal of libpng is to promote the acceptance of

-the PNG file format in whatever way possible.  While there is still

-work to be done (see the TODO file), libpng should cover the

-majority of the needs of its users.

-

-Libpng uses zlib for its compression and decompression of PNG files.

-Further information about zlib, and the latest version of zlib, can

-be found at the zlib home page, <https://zlib.net/>.

-The zlib compression utility is a general purpose utility that is

-useful for more than PNG files, and can be used without libpng.

-See the documentation delivered with zlib for more details.

-You can usually find the source files for the zlib utility wherever you

-find the libpng source files.

-

-Libpng is thread safe, provided the threads are using different

-instances of the structures.  Each thread should have its own

-png_struct and png_info instances, and thus its own image.

-Libpng does not protect itself against two threads using the

-same instance of a structure.

-

-II. Structures

-

-There are two main structures that are important to libpng, png_struct

-and png_info.  Both are internal structures that are no longer exposed

-in the libpng interface (as of libpng 1.5.0).

-

-The png_info structure is designed to provide information about the

-PNG file.  At one time, the fields of png_info were intended to be

-directly accessible to the user.  However, this tended to cause problems

-with applications using dynamically loaded libraries, and as a result

-a set of interface functions for png_info (the png_get_*() and png_set_*()

-functions) was developed, and direct access to the png_info fields was

-deprecated..

-

-The png_struct structure is the object used by the library to decode a

-single image.  As of 1.5.0 this structure is also not exposed.

-

-Almost all libpng APIs require a pointer to a png_struct as the first argument.

-Many (in particular the png_set and png_get APIs) also require a pointer

-to png_info as the second argument.  Some application visible macros

-defined in png.h designed for basic data access (reading and writing

-integers in the PNG format) don't take a png_info pointer, but it's almost

-always safe to assume that a (png_struct*) has to be passed to call an API

-function.

-

-You can have more than one png_info structure associated with an image,

-as illustrated in pngtest.c, one for information valid prior to the

-IDAT chunks and another (called "end_info" below) for things after them.

-

-The png.h header file is an invaluable reference for programming with libpng.

-And while I'm on the topic, make sure you include the libpng header file:

-

-#include <png.h>

-

-and also (as of libpng-1.5.0) the zlib header file, if you need it:

-

-#include <zlib.h>

-

-Types

-

-The png.h header file defines a number of integral types used by the

-APIs.  Most of these are fairly obvious; for example types corresponding

-to integers of particular sizes and types for passing color values.

-

-One exception is how non-integral numbers are handled.  For application

-convenience most APIs that take such numbers have C (double) arguments;

-however, internally PNG, and libpng, use 32 bit signed integers and encode

-the value by multiplying by 100,000.  As of libpng 1.5.0 a convenience

-macro PNG_FP_1 is defined in png.h along with a type (png_fixed_point)

-which is simply (png_int_32).

-

-All APIs that take (double) arguments also have a matching API that

-takes the corresponding fixed point integer arguments.  The fixed point

-API has the same name as the floating point one with "_fixed" appended.

-The actual range of values permitted in the APIs is frequently less than

-the full range of (png_fixed_point) (-21474 to +21474).  When APIs require

-a non-negative argument the type is recorded as png_uint_32 above.  Consult

-the header file and the text below for more information.

-

-Special care must be take with sCAL chunk handling because the chunk itself

-uses non-integral values encoded as strings containing decimal floating point

-numbers.  See the comments in the header file.

-

-Configuration

-

-The main header file function declarations are frequently protected by C

-preprocessing directives of the form:

-

-    #ifdef PNG_feature_SUPPORTED

-    declare-function

-    #endif

-    ...

-    #ifdef PNG_feature_SUPPORTED

-    use-function

-    #endif

-

-The library can be built without support for these APIs, although a

-standard build will have all implemented APIs.  Application programs

-should check the feature macros before using an API for maximum

-portability.  From libpng 1.5.0 the feature macros set during the build

-of libpng are recorded in the header file "pnglibconf.h" and this file

-is always included by png.h.

-

-If you don't need to change the library configuration from the default, skip to

-the next section ("Reading").

-

-Notice that some of the makefiles in the 'scripts' directory and (in 1.5.0) all

-of the build project files in the 'projects' directory simply copy

-scripts/pnglibconf.h.prebuilt to pnglibconf.h.  This means that these build

-systems do not permit easy auto-configuration of the library - they only

-support the default configuration.

-

-The easiest way to make minor changes to the libpng configuration when

-auto-configuration is supported is to add definitions to the command line

-using (typically) CPPFLAGS.  For example:

-

-CPPFLAGS=-DPNG_NO_FLOATING_ARITHMETIC

-

-will change the internal libpng math implementation for gamma correction and

-other arithmetic calculations to fixed point, avoiding the need for fast

-floating point support.  The result can be seen in the generated pnglibconf.h -

-make sure it contains the changed feature macro setting.

-

-If you need to make more extensive configuration changes - more than one or two

-feature macro settings - you can either add -DPNG_USER_CONFIG to the build

-command line and put a list of feature macro settings in pngusr.h or you can set

-DFA_XTRA (a makefile variable) to a file containing the same information in the

-form of 'option' settings.

-

-A. Changing pnglibconf.h

-

-A variety of methods exist to build libpng.  Not all of these support

-reconfiguration of pnglibconf.h.  To reconfigure pnglibconf.h it must either be

-rebuilt from scripts/pnglibconf.dfa using awk or it must be edited by hand.

-

-Hand editing is achieved by copying scripts/pnglibconf.h.prebuilt to

-pnglibconf.h and changing the lines defining the supported features, paying

-very close attention to the 'option' information in scripts/pnglibconf.dfa

-that describes those features and their requirements.  This is easy to get

-wrong.

-

-B. Configuration using DFA_XTRA

-

-Rebuilding from pnglibconf.dfa is easy if a functioning 'awk', or a later

-variant such as 'nawk' or 'gawk', is available.  The configure build will

-automatically find an appropriate awk and build pnglibconf.h.

-The scripts/pnglibconf.mak file contains a set of make rules for doing the

-same thing if configure is not used, and many of the makefiles in the scripts

-directory use this approach.

-

-When rebuilding simply write a new file containing changed options and set

-DFA_XTRA to the name of this file.  This causes the build to append the new file

-to the end of scripts/pnglibconf.dfa.  The pngusr.dfa file should contain lines

-of the following forms:

-

-everything = off

-

-This turns all optional features off.  Include it at the start of pngusr.dfa to

-make it easier to build a minimal configuration.  You will need to turn at least

-some features on afterward to enable either reading or writing code, or both.

-

-option feature on

-option feature off

-

-Enable or disable a single feature.  This will automatically enable other

-features required by a feature that is turned on or disable other features that

-require a feature which is turned off.  Conflicting settings will cause an error

-message to be emitted by awk.

-

-setting feature default value

-

-Changes the default value of setting 'feature' to 'value'.  There are a small

-number of settings listed at the top of pnglibconf.h, they are documented in the

-source code.  Most of these values have performance implications for the library

-but most of them have no visible effect on the API.  Some can also be overridden

-from the API.

-

-This method of building a customized pnglibconf.h is illustrated in

-contrib/pngminim/*.  See the "$(PNGCONF):" target in the makefile and

-pngusr.dfa in these directories.

-

-C. Configuration using PNG_USER_CONFIG

-

-If -DPNG_USER_CONFIG is added to the CPPFLAGS when pnglibconf.h is built,

-the file pngusr.h will automatically be included before the options in

-scripts/pnglibconf.dfa are processed.  Your pngusr.h file should contain only

-macro definitions turning features on or off or setting settings.

-

-Apart from the global setting "everything = off" all the options listed above

-can be set using macros in pngusr.h:

-

-#define PNG_feature_SUPPORTED

-

-is equivalent to:

-

-option feature on

-

-#define PNG_NO_feature

-

-is equivalent to:

-

-option feature off

-

-#define PNG_feature value

-

-is equivalent to:

-

-setting feature default value

-

-Notice that in both cases, pngusr.dfa and pngusr.h, the contents of the

-pngusr file you supply override the contents of scripts/pnglibconf.dfa

-

-If confusing or incomprehensible behavior results it is possible to

-examine the intermediate file pnglibconf.dfn to find the full set of

-dependency information for each setting and option.  Simply locate the

-feature in the file and read the C comments that precede it.

-

-This method is also illustrated in the contrib/pngminim/* makefiles and

-pngusr.h.

-

-III. Reading

-

-We'll now walk you through the possible functions to call when reading

-in a PNG file sequentially, briefly explaining the syntax and purpose

-of each one.  See example.c and png.h for more detail.  While

-progressive reading is covered in the next section, you will still

-need some of the functions discussed in this section to read a PNG

-file.

-

-Setup

-

-You will want to do the I/O initialization(*) before you get into libpng,

-so if it doesn't work, you don't have much to undo.  Of course, you

-will also want to insure that you are, in fact, dealing with a PNG

-file.  Libpng provides a simple check to see if a file is a PNG file.

-To use it, pass in the first 1 to 8 bytes of the file to the function

-png_sig_cmp(), and it will return 0 (false) if the bytes match the

-corresponding bytes of the PNG signature, or nonzero (true) otherwise.

-Of course, the more bytes you pass in, the greater the accuracy of the

-prediction.

-

-If you are intending to keep the file pointer open for use in libpng,

-you must ensure you don't read more than 8 bytes from the beginning

-of the file, and you also have to make a call to png_set_sig_bytes()

-with the number of bytes you read from the beginning.  Libpng will

-then only check the bytes (if any) that your program didn't read.

-

-(*): If you are not using the standard I/O functions, you will need

-to replace them with custom functions.  See the discussion under

-Customizing libpng.

-

-    FILE *fp = fopen(file_name, "rb");

-    if (!fp)

-    {

-       return (ERROR);

-    }

-

-    if (fread(header, 1, number, fp) != number)

-    {

-       return (ERROR);

-    }

-

-    is_png = !png_sig_cmp(header, 0, number);

-    if (!is_png)

-    {

-       return (NOT_PNG);

-    }

-

-Next, png_struct and png_info need to be allocated and initialized.  In

-order to ensure that the size of these structures is correct even with a

-dynamically linked libpng, there are functions to initialize and

-allocate the structures.  We also pass the library version, optional

-pointers to error handling functions, and a pointer to a data struct for

-use by the error functions, if necessary (the pointer and functions can

-be NULL if the default error handlers are to be used).  See the section

-on Changes to Libpng below regarding the old initialization functions.

-The structure allocation functions quietly return NULL if they fail to

-create the structure, so your application should check for that.

-

-    png_structp png_ptr = png_create_read_struct

-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,

-        user_error_fn, user_warning_fn);

-

-    if (!png_ptr)

-       return (ERROR);

-

-    png_infop info_ptr = png_create_info_struct(png_ptr);

-

-    if (!info_ptr)

-    {

-       png_destroy_read_struct(&png_ptr,

-           (png_infopp)NULL, (png_infopp)NULL);

-       return (ERROR);

-    }

-

-If you want to use your own memory allocation routines,

-use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use

-png_create_read_struct_2() instead of png_create_read_struct():

-

-    png_structp png_ptr = png_create_read_struct_2

-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,

-        user_error_fn, user_warning_fn, (png_voidp)

-        user_mem_ptr, user_malloc_fn, user_free_fn);

-

-The error handling routines passed to png_create_read_struct()

-and the memory alloc/free routines passed to png_create_struct_2()

-are only necessary if you are not using the libpng supplied error

-handling and memory alloc/free functions.

-

-When libpng encounters an error, it expects to longjmp back

-to your routine.  Therefore, you will need to call setjmp and pass

-your png_jmpbuf(png_ptr).  If you read the file from different

-routines, you will need to update the longjmp buffer every time you enter

-a new routine that will call a png_*() function.

-

-See your documentation of setjmp/longjmp for your compiler for more

-information on setjmp/longjmp.  See the discussion on libpng error

-handling in the Customizing Libpng section below for more information

-on the libpng error handling.  If an error occurs, and libpng longjmp's

-back to your setjmp, you will want to call png_destroy_read_struct() to

-free any memory.

-

-    if (setjmp(png_jmpbuf(png_ptr)))

-    {

-       png_destroy_read_struct(&png_ptr, &info_ptr,

-           &end_info);

-       fclose(fp);

-       return (ERROR);

-    }

-

-Pass (png_infopp)NULL instead of &end_info if you didn't create

-an end_info structure.

-

-If you would rather avoid the complexity of setjmp/longjmp issues,

-you can compile libpng with PNG_NO_SETJMP, in which case

-errors will result in a call to PNG_ABORT() which defaults to abort().

-

-You can #define PNG_ABORT() to a function that does something

-more useful than abort(), as long as your function does not

-return.

-

-Now you need to set up the input code.  The default for libpng is to

-use the C function fread().  If you use this, you will need to pass a

-valid FILE * in the function png_init_io().  Be sure that the file is

-opened in binary mode.  If you wish to handle reading data in another

-way, you need not call the png_init_io() function, but you must then

-implement the libpng I/O methods discussed in the Customizing Libpng

-section below.

-

-    png_init_io(png_ptr, fp);

-

-If you had previously opened the file and read any of the signature from

-the beginning in order to see if this was a PNG file, you need to let

-libpng know that there are some bytes missing from the start of the file.

-

-    png_set_sig_bytes(png_ptr, number);

-

-You can change the zlib compression buffer size to be used while

-reading compressed data with

-

-    png_set_compression_buffer_size(png_ptr, buffer_size);

-

-where the default size is 8192 bytes.  Note that the buffer size

-is changed immediately and the buffer is reallocated immediately,

-instead of setting a flag to be acted upon later.

-

-If you want CRC errors to be handled in a different manner than

-the default, use

-

-    png_set_crc_action(png_ptr, crit_action, ancil_action);

-

-The values for png_set_crc_action() say how libpng is to handle CRC errors in

-ancillary and critical chunks, and whether to use the data contained

-therein. Starting with libpng-1.6.26, this also governs how an ADLER32 error

-is handled while reading the IDAT chunk. Note that it is impossible to

-"discard" data in a critical chunk.

-

-Choices for (int) crit_action are

-   PNG_CRC_DEFAULT      0  error/quit

-   PNG_CRC_ERROR_QUIT   1  error/quit

-   PNG_CRC_WARN_USE     3  warn/use data

-   PNG_CRC_QUIET_USE    4  quiet/use data

-   PNG_CRC_NO_CHANGE    5  use the current value

-

-Choices for (int) ancil_action are

-   PNG_CRC_DEFAULT      0  error/quit

-   PNG_CRC_ERROR_QUIT   1  error/quit

-   PNG_CRC_WARN_DISCARD 2  warn/discard data

-   PNG_CRC_WARN_USE     3  warn/use data

-   PNG_CRC_QUIET_USE    4  quiet/use data

-   PNG_CRC_NO_CHANGE    5  use the current value

-

-When the setting for crit_action is PNG_CRC_QUIET_USE, the CRC and ADLER32

-checksums are not only ignored, but they are not evaluated.

-

-Setting up callback code

-

-You can set up a callback function to handle any unknown chunks in the

-input stream. You must supply the function

-

-    read_chunk_callback(png_structp png_ptr,

-         png_unknown_chunkp chunk);

-    {

-       /* The unknown chunk structure contains your

-          chunk data, along with similar data for any other

-          unknown chunks: */

-

-           png_byte name[5];

-           png_byte *data;

-           png_size_t size;

-

-       /* Note that libpng has already taken care of

-          the CRC handling */

-

-       /* put your code here.  Search for your chunk in the

-          unknown chunk structure, process it, and return one

-          of the following: */

-

-       return (-n); /* chunk had an error */

-       return (0); /* did not recognize */

-       return (n); /* success */

-    }

-

-(You can give your function another name that you like instead of

-"read_chunk_callback")

-

-To inform libpng about your function, use

-

-    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,

-        read_chunk_callback);

-

-This names not only the callback function, but also a user pointer that

-you can retrieve with

-

-    png_get_user_chunk_ptr(png_ptr);

-

-If you call the png_set_read_user_chunk_fn() function, then all unknown

-chunks which the callback does not handle will be saved when read.  You can

-cause them to be discarded by returning '1' ("handled") instead of '0'.  This

-behavior will change in libpng 1.7 and the default handling set by the

-png_set_keep_unknown_chunks() function, described below, will be used when the

-callback returns 0.  If you want the existing behavior you should set the global

-default to PNG_HANDLE_CHUNK_IF_SAFE now; this is compatible with all current

-versions of libpng and with 1.7.  Libpng 1.6 issues a warning if you keep the

-default, or PNG_HANDLE_CHUNK_NEVER, and the callback returns 0.

-

-At this point, you can set up a callback function that will be

-called after each row has been read, which you can use to control

-a progress meter or the like.  It's demonstrated in pngtest.c.

-You must supply a function

-

-    void read_row_callback(png_structp png_ptr,

-       png_uint_32 row, int pass);

-    {

-      /* put your code here */

-    }

-

-(You can give it another name that you like instead of "read_row_callback")

-

-To inform libpng about your function, use

-

-    png_set_read_status_fn(png_ptr, read_row_callback);

-

-When this function is called the row has already been completely processed and

-the 'row' and 'pass' refer to the next row to be handled.  For the

-non-interlaced case the row that was just handled is simply one less than the

-passed in row number, and pass will always be 0.  For the interlaced case the

-same applies unless the row value is 0, in which case the row just handled was

-the last one from one of the preceding passes.  Because interlacing may skip a

-pass you cannot be sure that the preceding pass is just 'pass-1'; if you really

-need to know what the last pass is record (row,pass) from the callback and use

-the last recorded value each time.

-

-As with the user transform you can find the output row using the

-PNG_ROW_FROM_PASS_ROW macro.

-

-Unknown-chunk handling

-

-Now you get to set the way the library processes unknown chunks in the

-input PNG stream. Both known and unknown chunks will be read.  Normal

-behavior is that known chunks will be parsed into information in

-various info_ptr members while unknown chunks will be discarded. This

-behavior can be wasteful if your application will never use some known

-chunk types. To change this, you can call:

-

-    png_set_keep_unknown_chunks(png_ptr, keep,

-        chunk_list, num_chunks);

-

-    keep       - 0: default unknown chunk handling

-                 1: ignore; do not keep

-                 2: keep only if safe-to-copy

-                 3: keep even if unsafe-to-copy

-

-               You can use these definitions:

-                 PNG_HANDLE_CHUNK_AS_DEFAULT   0

-                 PNG_HANDLE_CHUNK_NEVER        1

-                 PNG_HANDLE_CHUNK_IF_SAFE      2

-                 PNG_HANDLE_CHUNK_ALWAYS       3

-

-    chunk_list - list of chunks affected (a byte string,

-                 five bytes per chunk, NULL or '\0' if

-                 num_chunks is positive; ignored if

-                 numchunks <= 0).

-

-    num_chunks - number of chunks affected; if 0, all

-                 unknown chunks are affected.  If positive,

-                 only the chunks in the list are affected,

-                 and if negative all unknown chunks and

-                 all known chunks except for the IHDR,

-                 PLTE, tRNS, IDAT, and IEND chunks are

-                 affected.

-

-Unknown chunks declared in this way will be saved as raw data onto a

-list of png_unknown_chunk structures.  If a chunk that is normally

-known to libpng is named in the list, it will be handled as unknown,

-according to the "keep" directive.  If a chunk is named in successive

-instances of png_set_keep_unknown_chunks(), the final instance will

-take precedence.  The IHDR and IEND chunks should not be named in

-chunk_list; if they are, libpng will process them normally anyway.

-If you know that your application will never make use of some particular

-chunks, use PNG_HANDLE_CHUNK_NEVER (or 1) as demonstrated below.

-

-Here is an example of the usage of png_set_keep_unknown_chunks(),

-where the private "vpAg" chunk will later be processed by a user chunk

-callback function:

-

-    png_byte vpAg[5]={118, 112,  65, 103, (png_byte) '\0'};

-

-    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)

-      png_byte unused_chunks[]=

-      {

-        104,  73,  83,  84, (png_byte) '\0',   /* hIST */

-        105,  84,  88, 116, (png_byte) '\0',   /* iTXt */

-        112,  67,  65,  76, (png_byte) '\0',   /* pCAL */

-        115,  67,  65,  76, (png_byte) '\0',   /* sCAL */

-        115,  80,  76,  84, (png_byte) '\0',   /* sPLT */

-        116,  73,  77,  69, (png_byte) '\0',   /* tIME */

-      };

-    #endif

-

-    ...

-

-    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)

-      /* ignore all unknown chunks

-       * (use global setting "2" for libpng16 and earlier):

-       */

-      png_set_keep_unknown_chunks(read_ptr, 2, NULL, 0);

-

-      /* except for vpAg: */

-      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);

-

-      /* also ignore unused known chunks: */

-      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,

-         (int)(sizeof unused_chunks)/5);

-    #endif

-

-User limits

-

-The PNG specification allows the width and height of an image to be as

-large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.

-For safety, libpng imposes a default limit of 1 million rows and columns.

-Larger images will be rejected immediately with a png_error() call. If

-you wish to change these limits, you can use

-

-   png_set_user_limits(png_ptr, width_max, height_max);

-

-to set your own limits (libpng may reject some very wide images

-anyway because of potential buffer overflow conditions).

-

-You should put this statement after you create the PNG structure and

-before calling png_read_info(), png_read_png(), or png_process_data().

-

-When writing a PNG datastream, put this statement before calling

-png_write_info() or png_write_png().

-

-If you need to retrieve the limits that are being applied, use

-

-   width_max = png_get_user_width_max(png_ptr);

-   height_max = png_get_user_height_max(png_ptr);

-

-The PNG specification sets no limit on the number of ancillary chunks

-allowed in a PNG datastream.  By default, libpng imposes a limit of

-a total of 1000 sPLT, tEXt, iTXt, zTXt, and unknown chunks to be stored.

-If you have set up both info_ptr and end_info_ptr, the limit applies

-separately to each.  You can change the limit on the total number of such

-chunks that will be stored, with

-

-   png_set_chunk_cache_max(png_ptr, user_chunk_cache_max);

-

-where 0x7fffffffL means unlimited.  You can retrieve this limit with

-

-   chunk_cache_max = png_get_chunk_cache_max(png_ptr);

-

-Libpng imposes a limit of 8 Megabytes (8,000,000 bytes) on the amount of

-memory that any chunk other than IDAT can occupy, originally or when

-decompressed (prior to libpng-1.6.32 the limit was only applied to compressed

-chunks after decompression). You can change this limit with

-

-   png_set_chunk_malloc_max(png_ptr, user_chunk_malloc_max);

-

-and you can retrieve the limit with

-

-   chunk_malloc_max = png_get_chunk_malloc_max(png_ptr);

-

-Any chunks that would cause either of these limits to be exceeded will

-be ignored.

-

-Information about your system

-

-If you intend to display the PNG or to incorporate it in other image data you

-need to tell libpng information about your display or drawing surface so that

-libpng can convert the values in the image to match the display.

-

-From libpng-1.5.4 this information can be set before reading the PNG file

-header.  In earlier versions png_set_gamma() existed but behaved incorrectly if

-called before the PNG file header had been read and png_set_alpha_mode() did not

-exist.

-

-If you need to support versions prior to libpng-1.5.4 test the version number

-as illustrated below using "PNG_LIBPNG_VER >= 10504" and follow the procedures

-described in the appropriate manual page.

-

-You give libpng the encoding expected by your system expressed as a 'gamma'

-value.  You can also specify a default encoding for the PNG file in

-case the required information is missing from the file.  By default libpng

-assumes that the PNG data matches your system, to keep this default call:

-

-   png_set_gamma(png_ptr, screen_gamma, output_gamma);

-

-or you can use the fixed point equivalent:

-

-   png_set_gamma_fixed(png_ptr, PNG_FP_1*screen_gamma,

-      PNG_FP_1*output_gamma);

-

-If you don't know the gamma for your system it is probably 2.2 - a good

-approximation to the IEC standard for display systems (sRGB).  If images are

-too contrasty or washed out you got the value wrong - check your system

-documentation!

-

-Many systems permit the system gamma to be changed via a lookup table in the

-display driver, a few systems, including older Macs, change the response by

-default.  As of 1.5.4 three special values are available to handle common

-situations:

-

-   PNG_DEFAULT_sRGB: Indicates that the system conforms to the

-                     IEC 61966-2-1 standard.  This matches almost

-                     all systems.

-   PNG_GAMMA_MAC_18: Indicates that the system is an older

-                     (pre Mac OS 10.6) Apple Macintosh system with

-                     the default settings.

-   PNG_GAMMA_LINEAR: Just the fixed point value for 1.0 - indicates

-                     that the system expects data with no gamma

-                     encoding.

-

-You would use the linear (unencoded) value if you need to process the pixel

-values further because this avoids the need to decode and re-encode each

-component value whenever arithmetic is performed.  A lot of graphics software

-uses linear values for this reason, often with higher precision component values

-to preserve overall accuracy.

-

-

-The output_gamma value expresses how to decode the output values, not how

-they are encoded.  The values used correspond to the normal numbers used to

-describe the overall gamma of a computer display system; for example 2.2 for

-an sRGB conformant system.  The values are scaled by 100000 in the _fixed

-version of the API (so 220000 for sRGB.)

-

-The inverse of the value is always used to provide a default for the PNG file

-encoding if it has no gAMA chunk and if png_set_gamma() has not been called

-to override the PNG gamma information.

-

-When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode

-opaque pixels however pixels with lower alpha values are not encoded,

-regardless of the output gamma setting.

-

-When the standard Porter Duff handling is requested with mode 1 the output

-encoding is set to be linear and the output_gamma value is only relevant

-as a default for input data that has no gamma information.  The linear output

-encoding will be overridden if png_set_gamma() is called - the results may be

-highly unexpected!

-

-The following numbers are derived from the sRGB standard and the research

-behind it.  sRGB is defined to be approximated by a PNG gAMA chunk value of

-0.45455 (1/2.2) for PNG.  The value implicitly includes any viewing

-correction required to take account of any differences in the color

-environment of the original scene and the intended display environment; the

-value expresses how to *decode* the image for display, not how the original

-data was *encoded*.

-

-sRGB provides a peg for the PNG standard by defining a viewing environment.

-sRGB itself, and earlier TV standards, actually use a more complex transform

-(a linear portion then a gamma 2.4 power law) than PNG can express.  (PNG is

-limited to simple power laws.)  By saying that an image for direct display on

-an sRGB conformant system should be stored with a gAMA chunk value of 45455

-(11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification

-makes it possible to derive values for other display systems and

-environments.

-

-The Mac value is deduced from the sRGB based on an assumption that the actual

-extra viewing correction used in early Mac display systems was implemented as

-a power 1.45 lookup table.

-

-Any system where a programmable lookup table is used or where the behavior of

-the final display device characteristics can be changed requires system

-specific code to obtain the current characteristic.  However this can be

-difficult and most PNG gamma correction only requires an approximate value.

-

-By default, if png_set_alpha_mode() is not called, libpng assumes that all

-values are unencoded, linear, values and that the output device also has a

-linear characteristic.  This is only very rarely correct - it is invariably

-better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the

-default if you don't know what the right answer is!

-

-The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS

-10.6) which used a correction table to implement a somewhat lower gamma on an

-otherwise sRGB system.

-

-Both these values are reserved (not simple gamma values) in order to allow

-more precise correction internally in the future.

-

-NOTE: the values can be passed to either the fixed or floating

-point APIs, but the floating point API will also accept floating point

-values.

-

-The second thing you may need to tell libpng about is how your system handles

-alpha channel information.  Some, but not all, PNG files contain an alpha

-channel.  To display these files correctly you need to compose the data onto a

-suitable background, as described in the PNG specification.

-

-Libpng only supports composing onto a single color (using png_set_background;

-see below).  Otherwise you must do the composition yourself and, in this case,

-you may need to call png_set_alpha_mode:

-

-   #if PNG_LIBPNG_VER >= 10504

-      png_set_alpha_mode(png_ptr, mode, screen_gamma);

-   #else

-      png_set_gamma(png_ptr, screen_gamma, 1.0/screen_gamma);

-   #endif

-

-The screen_gamma value is the same as the argument to png_set_gamma; however,

-how it affects the output depends on the mode.  png_set_alpha_mode() sets the

-file gamma default to 1/screen_gamma, so normally you don't need to call

-png_set_gamma.  If you need different defaults call png_set_gamma() before

-png_set_alpha_mode() - if you call it after it will override the settings made

-by png_set_alpha_mode().

-

-The mode is as follows:

-

-    PNG_ALPHA_PNG: The data is encoded according to the PNG

-specification.  Red, green and blue, or gray, components are

-gamma encoded color values and are not premultiplied by the

-alpha value.  The alpha value is a linear measure of the

-contribution of the pixel to the corresponding final output pixel.

-

-You should normally use this format if you intend to perform

-color correction on the color values; most, maybe all, color

-correction software has no handling for the alpha channel and,

-anyway, the math to handle pre-multiplied component values is

-unnecessarily complex.

-

-Before you do any arithmetic on the component values you need

-to remove the gamma encoding and multiply out the alpha

-channel.  See the PNG specification for more detail.  It is

-important to note that when an image with an alpha channel is

-scaled, linear encoded, pre-multiplied component values must

-be used!

-

-The remaining modes assume you don't need to do any further color correction or

-that if you do, your color correction software knows all about alpha (it

-probably doesn't!).  They 'associate' the alpha with the color information by

-storing color channel values that have been scaled by the alpha.  The

-advantage is that the color channels can be resampled (the image can be

-scaled) in this form.  The disadvantage is that normal practice is to store

-linear, not (gamma) encoded, values and this requires 16-bit channels for

-still images rather than the 8-bit channels that are just about sufficient if

-gamma encoding is used.  In addition all non-transparent pixel values,

-including completely opaque ones, must be gamma encoded to produce the final

-image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes

-described below (the latter being the two common names for associated alpha

-color channels). Note that PNG files always contain non-associated color

-channels; png_set_alpha_mode() with one of the modes causes the decoder to

-convert the pixels to an associated form before returning them to your

-application. 

-

-Since it is not necessary to perform arithmetic on opaque color values so

-long as they are not to be resampled and are in the final color space it is

-possible to optimize the handling of alpha by storing the opaque pixels in

-the PNG format (adjusted for the output color space) while storing partially

-opaque pixels in the standard, linear, format.  The accuracy required for

-standard alpha composition is relatively low, because the pixels are

-isolated, therefore typically the accuracy loss in storing 8-bit linear

-values is acceptable.  (This is not true if the alpha channel is used to

-simulate transparency over large areas - use 16 bits or the PNG mode in

-this case!)  This is the 'OPTIMIZED' mode.  For this mode a pixel is

-treated as opaque only if the alpha value is equal to the maximum value.

-

-    PNG_ALPHA_STANDARD:  The data libpng produces is encoded in the

-standard way assumed by most correctly written graphics software.

-The gamma encoding will be removed by libpng and the

-linear component values will be pre-multiplied by the

-alpha channel.

-

-With this format the final image must be re-encoded to

-match the display gamma before the image is displayed.

-If your system doesn't do that, yet still seems to

-perform arithmetic on the pixels without decoding them,

-it is broken - check out the modes below.

-

-With PNG_ALPHA_STANDARD libpng always produces linear

-component values, whatever screen_gamma you supply.  The

-screen_gamma value is, however, used as a default for

-the file gamma if the PNG file has no gamma information.

-

-If you call png_set_gamma() after png_set_alpha_mode() you

-will override the linear encoding.  Instead the

-pre-multiplied pixel values will be gamma encoded but

-the alpha channel will still be linear.  This may

-actually match the requirements of some broken software,

-but it is unlikely.

-

-While linear 8-bit data is often used it has

-insufficient precision for any image with a reasonable

-dynamic range.  To avoid problems, and if your software

-supports it, use png_set_expand_16() to force all

-components to 16 bits.

-

-    PNG_ALPHA_OPTIMIZED: This mode is the same as PNG_ALPHA_STANDARD

-except that completely opaque pixels are gamma encoded according to

-the screen_gamma value.  Pixels with alpha less than 1.0

-will still have linear components.

-

-Use this format if you have control over your

-compositing software and so don't do other arithmetic

-(such as scaling) on the data you get from libpng.  Your

-compositing software can simply copy opaque pixels to

-the output but still has linear values for the

-non-opaque pixels.

-

-In normal compositing, where the alpha channel encodes

-partial pixel coverage (as opposed to broad area

-translucency), the inaccuracies of the 8-bit

-representation of non-opaque pixels are irrelevant.

-

-You can also try this format if your software is broken;

-it might look better.

-

-    PNG_ALPHA_BROKEN: This is PNG_ALPHA_STANDARD; however, all component

-values, including the alpha channel are gamma encoded.  This is

-broken because, in practice, no implementation that uses this choice

-correctly undoes the encoding before handling alpha composition.  Use this

-choice only if other serious errors in the software or hardware you use

-mandate it.  In most cases of broken software or hardware the bug in the

-final display manifests as a subtle halo around composited parts of the

-image.  You may not even perceive this as a halo; the composited part of

-the image may simply appear separate from the background, as though it had

-been cut out of paper and pasted on afterward.

-

-If you don't have to deal with bugs in software or hardware, or if you can fix

-them, there are three recommended ways of using png_set_alpha_mode():

-

-   png_set_alpha_mode(png_ptr, PNG_ALPHA_PNG,

-       screen_gamma);

-

-You can do color correction on the result (libpng does not currently

-support color correction internally).  When you handle the alpha channel

-you need to undo the gamma encoding and multiply out the alpha.

-

-   png_set_alpha_mode(png_ptr, PNG_ALPHA_STANDARD,

-       screen_gamma);

-   png_set_expand_16(png_ptr);

-

-If you are using the high level interface, don't call png_set_expand_16();

-instead pass PNG_TRANSFORM_EXPAND_16 to the interface.

-

-With this mode you can't do color correction, but you can do arithmetic,

-including composition and scaling, on the data without further processing.

-

-   png_set_alpha_mode(png_ptr, PNG_ALPHA_OPTIMIZED,

-       screen_gamma);

-

-You can avoid the expansion to 16-bit components with this mode, but you

-lose the ability to scale the image or perform other linear arithmetic.

-All you can do is compose the result onto a matching output.  Since this

-mode is libpng-specific you also need to write your own composition

-software.

-

-The following are examples of calls to png_set_alpha_mode to achieve the

-required overall gamma correction and, where necessary, alpha

-premultiplication.

-

-    png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);

-

-Choices for the alpha_mode are

-

-    PNG_ALPHA_PNG           0 /* according to the PNG standard */

-    PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */

-    PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */

-    PNG_ALPHA_PREMULTIPLIED 1 /* as above */

-    PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */

-    PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */

-

-PNG_ALPHA_PNG is the default libpng handling of the alpha channel. It is not

-pre-multiplied into the color components. In addition the call states

-that the output is for a sRGB system and causes all PNG files without gAMA

-chunks to be assumed to be encoded using sRGB.

-

-    png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);

-

-In this case the output is assumed to be something like an sRGB conformant

-display preceeded by a power-law lookup table of power 1.45.  This is how

-early Mac systems behaved.

-

-    png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);

-

-This is the classic Jim Blinn approach and will work in academic

-environments where everything is done by the book.  It has the shortcoming

-of assuming that input PNG data with no gamma information is linear - this

-is unlikely to be correct unless the PNG files were generated locally.

-Most of the time the output precision will be so low as to show

-significant banding in dark areas of the image.

-

-    png_set_expand_16(pp);

-    png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);

-

-This is a somewhat more realistic Jim Blinn inspired approach.  PNG files

-are assumed to have the sRGB encoding if not marked with a gamma value and

-the output is always 16 bits per component.  This permits accurate scaling

-and processing of the data.  If you know that your input PNG files were

-generated locally you might need to replace PNG_DEFAULT_sRGB with the

-correct value for your system.

-

-    png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);

-

-If you just need to composite the PNG image onto an existing background

-and if you control the code that does this you can use the optimization

-setting.  In this case you just copy completely opaque pixels to the

-output.  For pixels that are not completely transparent (you just skip

-those) you do the composition math using png_composite or png_composite_16

-below then encode the resultant 8-bit or 16-bit values to match the output

-encoding.

-

-    Other cases

-

-If neither the PNG nor the standard linear encoding work for you because

-of the software or hardware you use then you have a big problem.  The PNG

-case will probably result in halos around the image.  The linear encoding

-will probably result in a washed out, too bright, image (it's actually too

-contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably

-substantially reduce the halos.  Alternatively try:

-

-    png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);

-

-This option will also reduce the halos, but there will be slight dark

-halos round the opaque parts of the image where the background is light.

-In the OPTIMIZED mode the halos will be light halos where the background

-is dark.  Take your pick - the halos are unavoidable unless you can get

-your hardware/software fixed!  (The OPTIMIZED approach is slightly

-faster.)

-

-When the default gamma of PNG files doesn't match the output gamma.

-If you have PNG files with no gamma information png_set_alpha_mode allows

-you to provide a default gamma, but it also sets the ouput gamma to the

-matching value.  If you know your PNG files have a gamma that doesn't

-match the output you can take advantage of the fact that

-png_set_alpha_mode always sets the output gamma but only sets the PNG

-default if it is not already set:

-

-    png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);

-    png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);

-

-The first call sets both the default and the output gamma values, the

-second call overrides the output gamma without changing the default.  This

-is easier than achieving the same effect with png_set_gamma.  You must use

-PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will

-fire if more than one call to png_set_alpha_mode and png_set_background is

-made in the same read operation, however multiple calls with PNG_ALPHA_PNG

-are ignored.

-

-If you don't need, or can't handle, the alpha channel you can call

-png_set_background() to remove it by compositing against a fixed color.  Don't

-call png_set_strip_alpha() to do this - it will leave spurious pixel values in

-transparent parts of this image.

-

-   png_set_background(png_ptr, &background_color,

-       PNG_BACKGROUND_GAMMA_SCREEN, 0, 1);

-

-The background_color is an RGB or grayscale value according to the data format

-libpng will produce for you.  Because you don't yet know the format of the PNG

-file, if you call png_set_background at this point you must arrange for the

-format produced by libpng to always have 8-bit or 16-bit components and then

-store the color as an 8-bit or 16-bit color as appropriate.  The color contains

-separate gray and RGB component values, so you can let libpng produce gray or

-RGB output according to the input format, but low bit depth grayscale images

-must always be converted to at least 8-bit format.  (Even though low bit depth

-grayscale images can't have an alpha channel they can have a transparent

-color!)

-

-You set the transforms you need later, either as flags to the high level

-interface or libpng API calls for the low level interface.  For reference the

-settings and API calls required are:

-

-8-bit values:

-   PNG_TRANSFORM_SCALE_16 | PNG_EXPAND

-   png_set_expand(png_ptr); png_set_scale_16(png_ptr);

-

-   If you must get exactly the same inaccurate results

-   produced by default in versions prior to libpng-1.5.4,

-   use PNG_TRANSFORM_STRIP_16 and png_set_strip_16(png_ptr)

-   instead.

-

-16-bit values:

-   PNG_TRANSFORM_EXPAND_16

-   png_set_expand_16(png_ptr);

-

-In either case palette image data will be expanded to RGB.  If you just want

-color data you can add PNG_TRANSFORM_GRAY_TO_RGB or png_set_gray_to_rgb(png_ptr)

-to the list.

-

-Calling png_set_background before the PNG file header is read will not work

-prior to libpng-1.5.4.  Because the failure may result in unexpected warnings or

-errors it is therefore much safer to call png_set_background after the head has

-been read.  Unfortunately this means that prior to libpng-1.5.4 it cannot be

-used with the high level interface.

-

-The high-level read interface

-

-At this point there are two ways to proceed; through the high-level

-read interface, or through a sequence of low-level read operations.

-You can use the high-level interface if (a) you are willing to read

-the entire image into memory, and (b) the input transformations

-you want to do are limited to the following set:

-

-    PNG_TRANSFORM_IDENTITY      No transformation

-    PNG_TRANSFORM_SCALE_16      Strip 16-bit samples to

-                                8-bit accurately

-    PNG_TRANSFORM_STRIP_16      Chop 16-bit samples to

-                                8-bit less accurately

-    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel

-    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit

-                                samples to bytes

-    PNG_TRANSFORM_PACKSWAP      Change order of packed

-                                pixels to LSB first

-    PNG_TRANSFORM_EXPAND        Perform set_expand()

-    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images

-    PNG_TRANSFORM_SHIFT         Normalize pixels to the

-                                sBIT depth

-    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA

-                                to BGRA

-    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA

-                                to AG

-    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity

-                                to transparency

-    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples

-    PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples

-                                to RGB (or GA to RGBA)

-    PNG_TRANSFORM_EXPAND_16     Expand samples to 16 bits

-

-(This excludes setting a background color, doing gamma transformation,

-quantizing, and setting filler.)  If this is the case, simply do this:

-

-    png_read_png(png_ptr, info_ptr, png_transforms, NULL)

-

-where png_transforms is an integer containing the bitwise OR of some

-set of transformation flags.  This call is equivalent to png_read_info(),

-followed the set of transformations indicated by the transform mask,

-then png_read_image(), and finally png_read_end().

-

-(The final parameter of this call is not yet used.  Someday it might point

-to transformation parameters required by some future input transform.)

-

-You must use png_transforms and not call any png_set_transform() functions

-when you use png_read_png().

-

-After you have called png_read_png(), you can retrieve the image data

-with

-

-   row_pointers = png_get_rows(png_ptr, info_ptr);

-

-where row_pointers is an array of pointers to the pixel data for each row:

-

-   png_bytep row_pointers[height];

-

-If you know your image size and pixel size ahead of time, you can allocate

-row_pointers prior to calling png_read_png() with

-

-   if (height > PNG_UINT_32_MAX/(sizeof (png_byte)))

-      png_error (png_ptr,

-          "Image is too tall to process in memory");

-

-   if (width > PNG_UINT_32_MAX/pixel_size)

-      png_error (png_ptr,

-          "Image is too wide to process in memory");

-

-   row_pointers = png_malloc(png_ptr,

-       height*(sizeof (png_bytep)));

-

-   for (int i=0; i<height, i++)

-      row_pointers[i]=NULL;  /* security precaution */

-

-   for (int i=0; i<height, i++)

-      row_pointers[i]=png_malloc(png_ptr,

-          width*pixel_size);

-

-   png_set_rows(png_ptr, info_ptr, &row_pointers);

-

-Alternatively you could allocate your image in one big block and define

-row_pointers[i] to point into the proper places in your block, but first

-be sure that your platform is able to allocate such a large buffer:

-

-   /* Guard against integer overflow */

-   if (height > PNG_SIZE_MAX/(width*pixel_size)) {

-        png_error(png_ptr,"image_data buffer would be too large");

-   }

-

-   png_bytep buffer=png_malloc(png_ptr,height*width*pixel_size);

-

-   for (int i=0; i<height, i++)

-      row_pointers[i]=buffer+i*width*pixel_size;

-

-   png_set_rows(png_ptr, info_ptr, &row_pointers);

-

-If you use png_set_rows(), the application is responsible for freeing

-row_pointers (and row_pointers[i], if they were separately allocated).

-

-If you don't allocate row_pointers ahead of time, png_read_png() will

-do it, and it'll be free'ed by libpng when you call png_destroy_*().

-

-The low-level read interface

-

-If you are going the low-level route, you are now ready to read all

-the file information up to the actual image data.  You do this with a

-call to png_read_info().

-

-    png_read_info(png_ptr, info_ptr);

-

-This will process all chunks up to but not including the image data.

-

-This also copies some of the data from the PNG file into the decode structure

-for use in later transformations.  Important information copied in is:

-

-1) The PNG file gamma from the gAMA chunk.  This overwrites the default value

-provided by an earlier call to png_set_gamma or png_set_alpha_mode.

-

-2) Prior to libpng-1.5.4 the background color from a bKGd chunk.  This

-damages the information provided by an earlier call to png_set_background

-resulting in unexpected behavior.  Libpng-1.5.4 no longer does this.

-

-3) The number of significant bits in each component value.  Libpng uses this to

-optimize gamma handling by reducing the internal lookup table sizes.

-

-4) The transparent color information from a tRNS chunk.  This can be modified by

-a later call to png_set_tRNS.

-

-Querying the info structure

-

-Functions are used to get the information from the info_ptr once it

-has been read.  Note that these fields may not be completely filled

-in until png_read_end() has read the chunk data following the image.

-

-    png_get_IHDR(png_ptr, info_ptr, &width, &height,

-       &bit_depth, &color_type, &interlace_type,

-       &compression_type, &filter_method);

-

-    width          - holds the width of the image

-                     in pixels (up to 2^31).

-

-    height         - holds the height of the image

-                     in pixels (up to 2^31).

-

-    bit_depth      - holds the bit depth of one of the

-                     image channels.  (valid values are

-                     1, 2, 4, 8, 16 and depend also on

-                     the color_type.  See also

-                     significant bits (sBIT) below).

-

-    color_type     - describes which color/alpha channels

-                         are present.

-                     PNG_COLOR_TYPE_GRAY

-                        (bit depths 1, 2, 4, 8, 16)

-                     PNG_COLOR_TYPE_GRAY_ALPHA

-                        (bit depths 8, 16)

-                     PNG_COLOR_TYPE_PALETTE

-                        (bit depths 1, 2, 4, 8)

-                     PNG_COLOR_TYPE_RGB

-                        (bit_depths 8, 16)

-                     PNG_COLOR_TYPE_RGB_ALPHA

-                        (bit_depths 8, 16)

-

-                     PNG_COLOR_MASK_PALETTE

-                     PNG_COLOR_MASK_COLOR

-                     PNG_COLOR_MASK_ALPHA

-

-    interlace_type - (PNG_INTERLACE_NONE or

-                     PNG_INTERLACE_ADAM7)

-

-    compression_type - (must be PNG_COMPRESSION_TYPE_BASE

-                     for PNG 1.0)

-

-    filter_method  - (must be PNG_FILTER_TYPE_BASE

-                     for PNG 1.0, and can also be

-                     PNG_INTRAPIXEL_DIFFERENCING if

-                     the PNG datastream is embedded in

-                     a MNG-1.0 datastream)

-

-    Any of width, height, color_type, bit_depth,

-    interlace_type, compression_type, or filter_method can

-    be NULL if you are not interested in their values.

-

-    Note that png_get_IHDR() returns 32-bit data into

-    the application's width and height variables.

-    This is an unsafe situation if these are not png_uint_32

-    variables.  In such situations, the

-    png_get_image_width() and png_get_image_height()

-    functions described below are safer.

-

-    width            = png_get_image_width(png_ptr,

-                         info_ptr);

-

-    height           = png_get_image_height(png_ptr,

-                         info_ptr);

-

-    bit_depth        = png_get_bit_depth(png_ptr,

-                         info_ptr);

-

-    color_type       = png_get_color_type(png_ptr,

-                         info_ptr);

-

-    interlace_type   = png_get_interlace_type(png_ptr,

-                         info_ptr);

-

-    compression_type = png_get_compression_type(png_ptr,

-                         info_ptr);

-

-    filter_method    = png_get_filter_type(png_ptr,

-                         info_ptr);

-

-    channels = png_get_channels(png_ptr, info_ptr);

-

-    channels       - number of channels of info for the

-                     color type (valid values are 1 (GRAY,

-                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),

-                     4 (RGB_ALPHA or RGB + filler byte))

-

-    rowbytes = png_get_rowbytes(png_ptr, info_ptr);

-

-    rowbytes       - number of bytes needed to hold a row

-                     This value, the bit_depth, color_type,

-                     and the number of channels can change

-                     if you use transforms such as

-                     png_set_expand(). See

-                     png_read_update_info(), below.

-

-    signature = png_get_signature(png_ptr, info_ptr);

-

-    signature      - holds the signature read from the

-                     file (if any).  The data is kept in

-                     the same offset it would be if the

-                     whole signature were read (i.e. if an

-                     application had already read in 4

-                     bytes of signature before starting

-                     libpng, the remaining 4 bytes would

-                     be in signature[4] through signature[7]

-                     (see png_set_sig_bytes())).

-

-These are also important, but their validity depends on whether the chunk

-has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and

-png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the

-data has been read, or zero if it is missing.  The parameters to the

-png_get_<chunk> are set directly if they are simple data types, or a

-pointer into the info_ptr is returned for any complex types.

-

-The colorspace data from gAMA, cHRM, sRGB, iCCP, and sBIT chunks

-is simply returned to give the application information about how the

-image was encoded.  Libpng itself only does transformations using the file

-gamma when combining semitransparent pixels with the background color, and,

-since libpng-1.6.0, when converting between 8-bit sRGB and 16-bit linear pixels

-within the simplified API.  Libpng also uses the file gamma when converting

-RGB to gray, beginning with libpng-1.0.5, if the application calls

-png_set_rgb_to_gray()).

-

-    png_get_PLTE(png_ptr, info_ptr, &palette,

-                     &num_palette);

-

-    palette        - the palette for the file

-                     (array of png_color)

-

-    num_palette    - number of entries in the palette

-

-    png_get_gAMA(png_ptr, info_ptr, &file_gamma);

-    png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);

-

-    file_gamma     - the gamma at which the file is

-                     written (PNG_INFO_gAMA)

-

-    int_file_gamma - 100,000 times the gamma at which the

-                     file is written

-

-    png_get_cHRM(png_ptr, info_ptr,  &white_x, &white_y, &red_x,

-                     &red_y, &green_x, &green_y, &blue_x, &blue_y)

-    png_get_cHRM_XYZ(png_ptr, info_ptr, &red_X, &red_Y, &red_Z,

-                     &green_X, &green_Y, &green_Z, &blue_X, &blue_Y,

-                     &blue_Z)

-    png_get_cHRM_fixed(png_ptr, info_ptr, &int_white_x,

-                     &int_white_y, &int_red_x, &int_red_y,

-                     &int_green_x, &int_green_y, &int_blue_x,

-                     &int_blue_y)

-    png_get_cHRM_XYZ_fixed(png_ptr, info_ptr, &int_red_X, &int_red_Y,

-                     &int_red_Z, &int_green_X, &int_green_Y,

-                     &int_green_Z, &int_blue_X, &int_blue_Y,

-                     &int_blue_Z)

-

-    {white,red,green,blue}_{x,y}

-                     A color space encoding specified using the

-                     chromaticities of the end points and the

-                     white point. (PNG_INFO_cHRM)

-

-    {red,green,blue}_{X,Y,Z}

-                     A color space encoding specified using the

-                     encoding end points - the CIE tristimulus

-                     specification of the intended color of the red,

-                     green and blue channels in the PNG RGB data.

-                     The white point is simply the sum of the three

-                     end points. (PNG_INFO_cHRM)

-

-    png_get_sRGB(png_ptr, info_ptr, &srgb_intent);

-

-    srgb_intent -    the rendering intent (PNG_INFO_sRGB)

-                     The presence of the sRGB chunk

-                     means that the pixel data is in the

-                     sRGB color space.  This chunk also

-                     implies specific values of gAMA and

-                     cHRM.

-

-    png_get_iCCP(png_ptr, info_ptr, &name,

-       &compression_type, &profile, &proflen);

-

-    name             - The profile name.

-

-    compression_type - The compression type; always

-                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.

-                       You may give NULL to this argument to

-                       ignore it.

-

-    profile          - International Color Consortium color

-                       profile data. May contain NULs.

-

-    proflen          - length of profile data in bytes.

-

-    png_get_sBIT(png_ptr, info_ptr, &sig_bit);

-

-    sig_bit        - the number of significant bits for

-                     (PNG_INFO_sBIT) each of the gray,

-                     red, green, and blue channels,

-                     whichever are appropriate for the

-                     given color type (png_color_16)

-

-    png_get_tRNS(png_ptr, info_ptr, &trans_alpha,

-                     &num_trans, &trans_color);

-

-    trans_alpha    - array of alpha (transparency)

-                     entries for palette (PNG_INFO_tRNS)

-

-    num_trans      - number of transparent entries

-                     (PNG_INFO_tRNS)

-

-    trans_color    - graylevel or color sample values of

-                     the single transparent color for

-                     non-paletted images (PNG_INFO_tRNS)

-

-    png_get_eXIf_1(png_ptr, info_ptr, &num_exif, &exif);

-                     (PNG_INFO_eXIf)

-

-    exif           - Exif profile (array of png_byte)

-

-    png_get_hIST(png_ptr, info_ptr, &hist);

-                     (PNG_INFO_hIST)

-

-    hist           - histogram of palette (array of

-                     png_uint_16)

-

-    png_get_tIME(png_ptr, info_ptr, &mod_time);

-

-    mod_time       - time image was last modified

-                    (PNG_VALID_tIME)

-

-    png_get_bKGD(png_ptr, info_ptr, &background);

-

-    background     - background color (of type

-                     png_color_16p) (PNG_VALID_bKGD)

-                     valid 16-bit red, green and blue

-                     values, regardless of color_type

-

-    num_comments   = png_get_text(png_ptr, info_ptr,

-                     &text_ptr, &num_text);

-

-    num_comments   - number of comments

-

-    text_ptr       - array of png_text holding image

-                     comments

-

-    text_ptr[i].compression - type of compression used

-                 on "text" PNG_TEXT_COMPRESSION_NONE

-                           PNG_TEXT_COMPRESSION_zTXt

-                           PNG_ITXT_COMPRESSION_NONE

-                           PNG_ITXT_COMPRESSION_zTXt

-

-    text_ptr[i].key   - keyword for comment.  Must contain

-                         1-79 characters.

-

-    text_ptr[i].text  - text comments for current

-                         keyword.  Can be empty.

-

-    text_ptr[i].text_length - length of text string,

-                 after decompression, 0 for iTXt

-

-    text_ptr[i].itxt_length - length of itxt string,

-                 after decompression, 0 for tEXt/zTXt

-

-    text_ptr[i].lang  - language of comment (empty

-                         string for unknown).

-

-    text_ptr[i].lang_key  - keyword in UTF-8

-                         (empty string for unknown).

-

-    Note that the itxt_length, lang, and lang_key

-    members of the text_ptr structure only exist when the

-    library is built with iTXt chunk support.  Prior to

-    libpng-1.4.0 the library was built by default without

-    iTXt support. Also note that when iTXt is supported,

-    they contain NULL pointers when the "compression"

-    field contains PNG_TEXT_COMPRESSION_NONE or

-    PNG_TEXT_COMPRESSION_zTXt.

-

-    num_text       - number of comments (same as

-                     num_comments; you can put NULL here

-                     to avoid the duplication)

-

-    Note while png_set_text() will accept text, language,

-    and translated keywords that can be NULL pointers, the

-    structure returned by png_get_text will always contain

-    regular zero-terminated C strings.  They might be

-    empty strings but they will never be NULL pointers.

-

-    num_spalettes = png_get_sPLT(png_ptr, info_ptr,

-       &palette_ptr);

-

-    num_spalettes  - number of sPLT chunks read.

-

-    palette_ptr    - array of palette structures holding

-                     contents of one or more sPLT chunks

-                     read.

-

-    png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,

-       &unit_type);

-

-    offset_x       - positive offset from the left edge

-                     of the screen (can be negative)

-

-    offset_y       - positive offset from the top edge

-                     of the screen (can be negative)

-

-    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER

-

-    png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,

-       &unit_type);

-

-    res_x          - pixels/unit physical resolution in

-                     x direction

-

-    res_y          - pixels/unit physical resolution in

-                     x direction

-

-    unit_type      - PNG_RESOLUTION_UNKNOWN,

-                     PNG_RESOLUTION_METER

-

-    png_get_sCAL(png_ptr, info_ptr, &unit, &width,

-       &height)

-

-    unit        - physical scale units (an integer)

-

-    width       - width of a pixel in physical scale units

-

-    height      - height of a pixel in physical scale units

-                 (width and height are doubles)

-

-    png_get_sCAL_s(png_ptr, info_ptr, &unit, &width,

-       &height)

-

-    unit        - physical scale units (an integer)

-

-    width       - width of a pixel in physical scale units

-                  (expressed as a string)

-

-    height      - height of a pixel in physical scale units

-                 (width and height are strings like "2.54")

-

-    num_unknown_chunks = png_get_unknown_chunks(png_ptr,

-       info_ptr, &unknowns)

-

-    unknowns          - array of png_unknown_chunk

-                        structures holding unknown chunks

-

-    unknowns[i].name  - name of unknown chunk

-

-    unknowns[i].data  - data of unknown chunk

-

-    unknowns[i].size  - size of unknown chunk's data

-

-    unknowns[i].location - position of chunk in file

-

-    The value of "i" corresponds to the order in which the

-    chunks were read from the PNG file or inserted with the

-    png_set_unknown_chunks() function.

-

-    The value of "location" is a bitwise "or" of

-

-         PNG_HAVE_IHDR  (0x01)

-         PNG_HAVE_PLTE  (0x02)

-         PNG_AFTER_IDAT (0x08)

-

-The data from the pHYs chunk can be retrieved in several convenient

-forms:

-

-    res_x = png_get_x_pixels_per_meter(png_ptr,

-       info_ptr)

-

-    res_y = png_get_y_pixels_per_meter(png_ptr,

-       info_ptr)

-

-    res_x_and_y = png_get_pixels_per_meter(png_ptr,

-       info_ptr)

-

-    res_x = png_get_x_pixels_per_inch(png_ptr,

-       info_ptr)

-

-    res_y = png_get_y_pixels_per_inch(png_ptr,

-       info_ptr)

-

-    res_x_and_y = png_get_pixels_per_inch(png_ptr,

-       info_ptr)

-

-    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,

-       info_ptr)

-

-    Each of these returns 0 [signifying "unknown"] if

-       the data is not present or if res_x is 0;

-       res_x_and_y is 0 if res_x != res_y

-

-    Note that because of the way the resolutions are

-       stored internally, the inch conversions won't

-       come out to exactly even number.  For example,

-       72 dpi is stored as 0.28346 pixels/meter, and

-       when this is retrieved it is 71.9988 dpi, so

-       be sure to round the returned value appropriately

-       if you want to display a reasonable-looking result.

-

-The data from the oFFs chunk can be retrieved in several convenient

-forms:

-

-    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);

-

-    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);

-

-    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);

-

-    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);

-

-    Each of these returns 0 [signifying "unknown" if both

-       x and y are 0] if the data is not present or if the

-       chunk is present but the unit is the pixel.  The

-       remark about inexact inch conversions applies here

-       as well, because a value in inches can't always be

-       converted to microns and back without some loss

-       of precision.

-

-For more information, see the

-PNG specification for chunk contents.  Be careful with trusting

-rowbytes, as some of the transformations could increase the space

-needed to hold a row (expand, filler, gray_to_rgb, etc.).

-See png_read_update_info(), below.

-

-A quick word about text_ptr and num_text.  PNG stores comments in

-keyword/text pairs, one pair per chunk, with no limit on the number

-of text chunks, and a 2^31 byte limit on their size.  While there are

-suggested keywords, there is no requirement to restrict the use to these

-strings.  It is strongly suggested that keywords and text be sensible

-to humans (that's the point), so don't use abbreviations.  Non-printing

-symbols are not allowed.  See the PNG specification for more details.

-There is also no requirement to have text after the keyword.

-

-Keywords should be limited to 79 Latin-1 characters without leading or

-trailing spaces, but non-consecutive spaces are allowed within the

-keyword.  It is possible to have the same keyword any number of times.

-The text_ptr is an array of png_text structures, each holding a

-pointer to a language string, a pointer to a keyword and a pointer to

-a text string.  The text string, language code, and translated

-keyword may be empty or NULL pointers.  The keyword/text

-pairs are put into the array in the order that they are received.

-However, some or all of the text chunks may be after the image, so, to

-make sure you have read all the text chunks, don't mess with these

-until after you read the stuff after the image.  This will be

-mentioned again below in the discussion that goes with png_read_end().

-

-Input transformations

-

-After you've read the header information, you can set up the library

-to handle any special transformations of the image data.  The various

-ways to transform the data will be described in the order that they

-should occur.  This is important, as some of these change the color

-type and/or bit depth of the data, and some others only work on

-certain color types and bit depths.

-

-Transformations you request are ignored if they don't have any meaning for a

-particular input data format.  However some transformations can have an effect

-as a result of a previous transformation.  If you specify a contradictory set of

-transformations, for example both adding and removing the alpha channel, you

-cannot predict the final result.

-

-The color used for the transparency values should be supplied in the same

-format/depth as the current image data.  It is stored in the same format/depth

-as the image data in a tRNS chunk, so this is what libpng expects for this data.

-

-The color used for the background value depends on the need_expand argument as

-described below.

-

-Data will be decoded into the supplied row buffers packed into bytes

-unless the library has been told to transform it into another format.

-For example, 4 bit/pixel paletted or grayscale data will be returned

-2 pixels/byte with the leftmost pixel in the high-order bits of the byte,

-unless png_set_packing() is called.  8-bit RGB data will be stored

-in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()

-is called to insert filler bytes, either before or after each RGB triplet.

-

-16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant

-byte of the color value first, unless png_set_scale_16() is called to

-transform it to regular RGB RGB triplets, or png_set_filler() or

-png_set_add alpha() is called to insert two filler bytes, either before

-or after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can

-be modified with png_set_filler(), png_set_add_alpha(), png_set_strip_16(),

-or png_set_scale_16().

-

-The following code transforms grayscale images of less than 8 to 8 bits,

-changes paletted images to RGB, and adds a full alpha channel if there is

-transparency information in a tRNS chunk.  This is most useful on

-grayscale images with bit depths of 2 or 4 or if there is a multiple-image

-viewing application that wishes to treat all images in the same way.

-

-    if (color_type == PNG_COLOR_TYPE_PALETTE)

-        png_set_palette_to_rgb(png_ptr);

-

-    if (png_get_valid(png_ptr, info_ptr,

-        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);

-

-    if (color_type == PNG_COLOR_TYPE_GRAY &&

-        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);

-

-The first two functions are actually aliases for png_set_expand(), added

-in libpng version 1.0.4, with the function names expanded to improve code

-readability.  In some future version they may actually do different

-things.

-

-As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was

-added.  It expands the sample depth without changing tRNS to alpha.

-

-As of libpng version 1.5.2, png_set_expand_16() was added.  It behaves as

-png_set_expand(); however, the resultant channels have 16 bits rather than 8.

-Use this when the output color or gray channels are made linear to avoid fairly

-severe accuracy loss.

-

-   if (bit_depth < 16)

-      png_set_expand_16(png_ptr);

-

-PNG can have files with 16 bits per channel.  If you only can handle

-8 bits per channel, this will strip the pixels down to 8-bit.

-

-    if (bit_depth == 16)

-#if PNG_LIBPNG_VER >= 10504

-       png_set_scale_16(png_ptr);

-#else

-       png_set_strip_16(png_ptr);

-#endif

-

-(The more accurate "png_set_scale_16()" API became available in libpng version

-1.5.4).

-

-If you need to process the alpha channel on the image separately from the image

-data (for example if you convert it to a bitmap mask) it is possible to have

-libpng strip the channel leaving just RGB or gray data:

-

-    if (color_type & PNG_COLOR_MASK_ALPHA)

-       png_set_strip_alpha(png_ptr);

-

-If you strip the alpha channel you need to find some other way of dealing with

-the information.  If, instead, you want to convert the image to an opaque

-version with no alpha channel use png_set_background; see below.

-

-As of libpng version 1.5.2, almost all useful expansions are supported, the

-major ommissions are conversion of grayscale to indexed images (which can be

-done trivially in the application) and conversion of indexed to grayscale (which

-can be done by a trivial manipulation of the palette.)

-

-In the following table, the 01 means grayscale with depth<8, 31 means

-indexed with depth<8, other numerals represent the color type, "T" means

-the tRNS chunk is present, A means an alpha channel is present, and O

-means tRNS or alpha is present but all pixels in the image are opaque.

-

-  FROM  01  31   0  0T  0O   2  2T  2O   3  3T  3O  4A  4O  6A  6O

-   TO

-   01    -  [G]  -   -   -   -   -   -   -   -   -   -   -   -   -

-   31   [Q]  Q  [Q] [Q] [Q]  Q   Q   Q   Q   Q   Q  [Q] [Q]  Q   Q

-    0    1   G   +   .   .   G   G   G   G   G   G   B   B  GB  GB

-   0T    lt  Gt  t   +   .   Gt  G   G   Gt  G   G   Bt  Bt GBt GBt

-   0O    lt  Gt  t   .   +   Gt  Gt  G   Gt  Gt  G   Bt  Bt GBt GBt

-    2    C   P   C   C   C   +   .   .   C   -   -  CB  CB   B   B

-   2T    Ct  -   Ct  C   C   t   +   t   -   -   -  CBt CBt  Bt  Bt

-   2O    Ct  -   Ct  C   C   t   t   +   -   -   -  CBt CBt  Bt  Bt

-    3   [Q]  p  [Q] [Q] [Q]  Q   Q   Q   +   .   .  [Q] [Q]  Q   Q

-   3T   [Qt] p  [Qt][Q] [Q]  Qt  Qt  Qt  t   +   t  [Qt][Qt] Qt  Qt

-   3O   [Qt] p  [Qt][Q] [Q]  Qt  Qt  Qt  t   t   +  [Qt][Qt] Qt  Qt

-   4A    lA  G   A   T   T   GA  GT  GT  GA  GT  GT  +   BA  G  GBA

-   4O    lA GBA  A   T   T   GA  GT  GT  GA  GT  GT  BA  +  GBA  G

-   6A    CA  PA  CA  C   C   A   T  tT   PA  P   P   C  CBA  +   BA

-   6O    CA PBA  CA  C   C   A  tT   T   PA  P   P  CBA  C   BA  +

-

-Within the matrix,

-     "+" identifies entries where 'from' and 'to' are the same.

-     "-" means the transformation is not supported.

-     "." means nothing is necessary (a tRNS chunk can just be ignored).

-     "t" means the transformation is obtained by png_set_tRNS.

-     "A" means the transformation is obtained by png_set_add_alpha().

-     "X" means the transformation is obtained by png_set_expand().

-     "1" means the transformation is obtained by

-         png_set_expand_gray_1_2_4_to_8() (and by png_set_expand()

-         if there is no transparency in the original or the final

-         format).

-     "C" means the transformation is obtained by png_set_gray_to_rgb().

-     "G" means the transformation is obtained by png_set_rgb_to_gray().

-     "P" means the transformation is obtained by

-         png_set_expand_palette_to_rgb().

-     "p" means the transformation is obtained by png_set_packing().

-     "Q" means the transformation is obtained by png_set_quantize().

-     "T" means the transformation is obtained by

-         png_set_tRNS_to_alpha().

-     "B" means the transformation is obtained by

-         png_set_background(), or png_strip_alpha().

-

-When an entry has multiple transforms listed all are required to cause the

-right overall transformation.  When two transforms are separated by a comma

-either will do the job.  When transforms are enclosed in [] the transform should

-do the job but this is currently unimplemented - a different format will result

-if the suggested transformations are used.

-

-In PNG files, the alpha channel in an image

-is the level of opacity.  If you need the alpha channel in an image to

-be the level of transparency instead of opacity, you can invert the

-alpha channel (or the tRNS chunk data) after it's read, so that 0 is

-fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit

-images) is fully transparent, with

-

-    png_set_invert_alpha(png_ptr);

-

-PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as

-they can, resulting in, for example, 8 pixels per byte for 1 bit

-files.  This code expands to 1 pixel per byte without changing the

-values of the pixels:

-

-    if (bit_depth < 8)

-       png_set_packing(png_ptr);

-

-PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels

-stored in a PNG image have been "scaled" or "shifted" up to the next

-higher possible bit depth (e.g. from 5 bits/sample in the range [0,31]

-to 8 bits/sample in the range [0, 255]).  However, it is also possible

-to convert the PNG pixel data back to the original bit depth of the

-image.  This call reduces the pixels back down to the original bit depth:

-

-    png_color_8p sig_bit;

-

-    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))

-       png_set_shift(png_ptr, sig_bit);

-

-PNG files store 3-color pixels in red, green, blue order.  This code

-changes the storage of the pixels to blue, green, red:

-

-    if (color_type == PNG_COLOR_TYPE_RGB ||

-        color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-       png_set_bgr(png_ptr);

-

-PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them

-into 4 or 8 bytes for windowing systems that need them in this format:

-

-    if (color_type == PNG_COLOR_TYPE_RGB)

-       png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);

-

-where "filler" is the 8-bit or 16-bit number to fill with, and the location

-is either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether

-you want the filler before the RGB or after. When filling an 8-bit pixel,

-the least significant 8 bits of the number are used, if a 16-bit number is

-supplied.  This transformation does not affect images that already have full

-alpha channels.  To add an opaque alpha channel, use filler=0xffff and

-PNG_FILLER_AFTER which will generate RGBA pixels.

-

-Note that png_set_filler() does not change the color type.  If you want

-to do that, you can add a true alpha channel with

-

-    if (color_type == PNG_COLOR_TYPE_RGB ||

-       color_type == PNG_COLOR_TYPE_GRAY)

-       png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);

-

-where "filler" contains the alpha value to assign to each pixel.

-The png_set_add_alpha() function was added in libpng-1.2.7.

-

-If you are reading an image with an alpha channel, and you need the

-data as ARGB instead of the normal PNG format RGBA:

-

-    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-       png_set_swap_alpha(png_ptr);

-

-For some uses, you may want a grayscale image to be represented as

-RGB.  This code will do that conversion:

-

-    if (color_type == PNG_COLOR_TYPE_GRAY ||

-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-       png_set_gray_to_rgb(png_ptr);

-

-Conversely, you can convert an RGB or RGBA image to grayscale or grayscale

-with alpha.

-

-    if (color_type == PNG_COLOR_TYPE_RGB ||

-        color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-       png_set_rgb_to_gray(png_ptr, error_action,

-          double red_weight, double green_weight);

-

-    error_action = 1: silently do the conversion

-

-    error_action = 2: issue a warning if the original

-                      image has any pixel where

-                      red != green or red != blue

-

-    error_action = 3: issue an error and abort the

-                      conversion if the original

-                      image has any pixel where

-                      red != green or red != blue

-

-    red_weight:       weight of red component

-

-    green_weight:     weight of green component

-                      If either weight is negative, default

-                      weights are used.

-

-In the corresponding fixed point API the red_weight and green_weight values are

-simply scaled by 100,000:

-

-    png_set_rgb_to_gray(png_ptr, error_action,

-       png_fixed_point red_weight,

-       png_fixed_point green_weight);

-

-If you have set error_action = 1 or 2, you can

-later check whether the image really was gray, after processing

-the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.

-It will return a png_byte that is zero if the image was gray or

-1 if there were any non-gray pixels.  Background and sBIT data

-will be silently converted to grayscale, using the green channel

-data for sBIT, regardless of the error_action setting.

-

-The default values come from the PNG file cHRM chunk if present; otherwise, the

-defaults correspond to the ITU-R recommendation 709, and also the sRGB color

-space, as recommended in the Charles Poynton's Colour FAQ,

-Copyright (c) 2006-11-28 Charles Poynton, in section 9:

-

-<http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC9>

-

-    Y = 0.2126 * R + 0.7152 * G + 0.0722 * B

-

-Previous versions of this document, 1998 through 2002, recommended a slightly

-different formula:

-

-    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B

-

-Libpng uses an integer approximation:

-

-    Y = (6968 * R + 23434 * G + 2366 * B)/32768

-

-The calculation is done in a linear colorspace, if the image gamma

-can be determined.

-

-The png_set_background() function has been described already; it tells libpng to

-composite images with alpha or simple transparency against the supplied

-background color.  For compatibility with versions of libpng earlier than

-libpng-1.5.4 it is recommended that you call the function after reading the file

-header, even if you don't want to use the color in a bKGD chunk, if one exists.

-

-If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),

-you may use this color, or supply another color more suitable for

-the current display (e.g., the background color from a web page).  You

-need to tell libpng how the color is represented, both the format of the

-component values in the color (the number of bits) and the gamma encoding of the

-color.  The function takes two arguments, background_gamma_mode and need_expand

-to convey this information; however, only two combinations are likely to be

-useful:

-

-    png_color_16 my_background;

-    png_color_16p image_background;

-

-    if (png_get_bKGD(png_ptr, info_ptr, &image_background))

-       png_set_background(png_ptr, image_background,

-           PNG_BACKGROUND_GAMMA_FILE, 1/*needs to be expanded*/, 1);

-    else

-       png_set_background(png_ptr, &my_background,

-           PNG_BACKGROUND_GAMMA_SCREEN, 0/*do not expand*/, 1);

-

-The second call was described above - my_background is in the format of the

-final, display, output produced by libpng.  Because you now know the format of

-the PNG it is possible to avoid the need to choose either 8-bit or 16-bit

-output and to retain palette images (the palette colors will be modified

-appropriately and the tRNS chunk removed.)  However, if you are doing this,

-take great care not to ask for transformations without checking first that

-they apply!

-

-In the first call the background color has the original bit depth and color type

-of the PNG file.  So, for palette images the color is supplied as a palette

-index and for low bit greyscale images the color is a reduced bit value in

-image_background->gray.

-

-If you didn't call png_set_gamma() before reading the file header, for example

-if you need your code to remain compatible with older versions of libpng prior

-to libpng-1.5.4, this is the place to call it.

-

-Do not call it if you called png_set_alpha_mode(); doing so will damage the

-settings put in place by png_set_alpha_mode().  (If png_set_alpha_mode() is

-supported then you can certainly do png_set_gamma() before reading the PNG

-header.)

-

-This API unconditionally sets the screen and file gamma values, so it will

-override the value in the PNG file unless it is called before the PNG file

-reading starts.  For this reason you must always call it with the PNG file

-value when you call it in this position:

-

-   if (png_get_gAMA(png_ptr, info_ptr, &file_gamma))

-      png_set_gamma(png_ptr, screen_gamma, file_gamma);

-

-   else

-      png_set_gamma(png_ptr, screen_gamma, 0.45455);

-

-If you need to reduce an RGB file to a paletted file, or if a paletted

-file has more entries than will fit on your screen, png_set_quantize()

-will do that.  Note that this is a simple match quantization that merely

-finds the closest color available.  This should work fairly well with

-optimized palettes, but fairly badly with linear color cubes.  If you

-pass a palette that is larger than maximum_colors, the file will

-reduce the number of colors in the palette so it will fit into

-maximum_colors.  If there is a histogram, libpng will use it to make

-more intelligent choices when reducing the palette.  If there is no

-histogram, it may not do as good a job.

-

-   if (color_type & PNG_COLOR_MASK_COLOR)

-   {

-      if (png_get_valid(png_ptr, info_ptr,

-          PNG_INFO_PLTE))

-      {

-         png_uint_16p histogram = NULL;

-

-         png_get_hIST(png_ptr, info_ptr,

-             &histogram);

-         png_set_quantize(png_ptr, palette, num_palette,

-            max_screen_colors, histogram, 1);

-      }

-

-      else

-      {

-         png_color std_color_cube[MAX_SCREEN_COLORS] =

-            { ... colors ... };

-

-         png_set_quantize(png_ptr, std_color_cube,

-            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,

-            NULL,0);

-      }

-   }

-

-PNG files describe monochrome as black being zero and white being one.

-The following code will reverse this (make black be one and white be

-zero):

-

-   if (bit_depth == 1 && color_type == PNG_COLOR_TYPE_GRAY)

-      png_set_invert_mono(png_ptr);

-

-This function can also be used to invert grayscale and gray-alpha images:

-

-   if (color_type == PNG_COLOR_TYPE_GRAY ||

-       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      png_set_invert_mono(png_ptr);

-

-PNG files store 16-bit pixels in network byte order (big-endian,

-ie. most significant bits first).  This code changes the storage to the

-other way (little-endian, i.e. least significant bits first, the

-way PCs store them):

-

-    if (bit_depth == 16)

-       png_set_swap(png_ptr);

-

-If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you

-need to change the order the pixels are packed into bytes, you can use:

-

-    if (bit_depth < 8)

-       png_set_packswap(png_ptr);

-

-Finally, you can write your own transformation function if none of

-the existing ones meets your needs.  This is done by setting a callback

-with

-

-    png_set_read_user_transform_fn(png_ptr,

-        read_transform_fn);

-

-You must supply the function

-

-    void read_transform_fn(png_structp png_ptr, png_row_infop

-        row_info, png_bytep data)

-

-See pngtest.c for a working example.  Your function will be called

-after all of the other transformations have been processed.  Take care with

-interlaced images if you do the interlace yourself - the width of the row is the

-width in 'row_info', not the overall image width.

-

-If supported, libpng provides two information routines that you can use to find

-where you are in processing the image:

-

-   png_get_current_pass_number(png_structp png_ptr);

-   png_get_current_row_number(png_structp png_ptr);

-

-Don't try using these outside a transform callback - firstly they are only

-supported if user transforms are supported, secondly they may well return

-unexpected results unless the row is actually being processed at the moment they

-are called.

-

-With interlaced

-images the value returned is the row in the input sub-image image.  Use

-PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to

-find the output pixel (x,y) given an interlaced sub-image pixel (row,col,pass).

-

-The discussion of interlace handling above contains more information on how to

-use these values.

-

-You can also set up a pointer to a user structure for use by your

-callback function, and you can inform libpng that your transform

-function will change the number of channels or bit depth with the

-function

-

-    png_set_user_transform_info(png_ptr, user_ptr,

-        user_depth, user_channels);

-

-The user's application, not libpng, is responsible for allocating and

-freeing any memory required for the user structure.

-

-You can retrieve the pointer via the function

-png_get_user_transform_ptr().  For example:

-

-    voidp read_user_transform_ptr =

-        png_get_user_transform_ptr(png_ptr);

-

-The last thing to handle is interlacing; this is covered in detail below,

-but you must call the function here if you want libpng to handle expansion

-of the interlaced image.

-

-    number_of_passes = png_set_interlace_handling(png_ptr);

-

-After setting the transformations, libpng can update your png_info

-structure to reflect any transformations you've requested with this

-call.

-

-    png_read_update_info(png_ptr, info_ptr);

-

-This is most useful to update the info structure's rowbytes

-field so you can use it to allocate your image memory.  This function

-will also update your palette with the correct screen_gamma and

-background if these have been given with the calls above.  You may

-only call png_read_update_info() once with a particular info_ptr.

-

-After you call png_read_update_info(), you can allocate any

-memory you need to hold the image.  The row data is simply

-raw byte data for all forms of images.  As the actual allocation

-varies among applications, no example will be given.  If you

-are allocating one large chunk, you will need to build an

-array of pointers to each row, as it will be needed for some

-of the functions below.

-

-Be sure that your platform can allocate the buffer that you'll need.

-libpng internally checks for oversize width, but you'll need to

-do your own check for number_of_rows*width*pixel_size if you are using

-a multiple-row buffer:

-

-   /* Guard against integer overflow */

-   if (number_of_rows > PNG_SIZE_MAX/(width*pixel_size)) {

-        png_error(png_ptr,"image_data buffer would be too large");

-   }

-

-Remember: Before you call png_read_update_info(), the png_get_*()

-functions return the values corresponding to the original PNG image.

-After you call png_read_update_info the values refer to the image

-that libpng will output.  Consequently you must call all the png_set_

-functions before you call png_read_update_info().  This is particularly

-important for png_set_interlace_handling() - if you are going to call

-png_read_update_info() you must call png_set_interlace_handling() before

-it unless you want to receive interlaced output.

-

-Reading image data

-

-After you've allocated memory, you can read the image data.

-The simplest way to do this is in one function call.  If you are

-allocating enough memory to hold the whole image, you can just

-call png_read_image() and libpng will read in all the image data

-and put it in the memory area supplied.  You will need to pass in

-an array of pointers to each row.

-

-This function automatically handles interlacing, so you don't

-need to call png_set_interlace_handling() (unless you call

-png_read_update_info()) or call this function multiple times, or any

-of that other stuff necessary with png_read_rows().

-

-   png_read_image(png_ptr, row_pointers);

-

-where row_pointers is:

-

-   png_bytep row_pointers[height];

-

-You can point to void or char or whatever you use for pixels.

-

-If you don't want to read in the whole image at once, you can

-use png_read_rows() instead.  If there is no interlacing (check

-interlace_type == PNG_INTERLACE_NONE), this is simple:

-

-    png_read_rows(png_ptr, row_pointers, NULL,

-        number_of_rows);

-

-where row_pointers is the same as in the png_read_image() call.

-

-If you are doing this just one row at a time, you can do this with

-a single row_pointer instead of an array of row_pointers:

-

-    png_bytep row_pointer = row;

-    png_read_row(png_ptr, row_pointer, NULL);

-

-If the file is interlaced (interlace_type != 0 in the IHDR chunk), things

-get somewhat harder.  The only current (PNG Specification version 1.2)

-interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7);

-a somewhat complicated 2D interlace scheme, known as Adam7, that

-breaks down an image into seven smaller images of varying size, based

-on an 8x8 grid.  This number is defined (from libpng 1.5) as

-PNG_INTERLACE_ADAM7_PASSES in png.h

-

-libpng can fill out those images or it can give them to you "as is".

-It is almost always better to have libpng handle the interlacing for you.

-If you want the images filled out, there are two ways to do that.  The one

-mentioned in the PNG specification is to expand each pixel to cover

-those pixels that have not been read yet (the "rectangle" method).

-This results in a blocky image for the first pass, which gradually

-smooths out as more pixels are read.  The other method is the "sparkle"

-method, where pixels are drawn only in their final locations, with the

-rest of the image remaining whatever colors they were initialized to

-before the start of the read.  The first method usually looks better,

-but tends to be slower, as there are more pixels to put in the rows.

-

-If, as is likely, you want libpng to expand the images, call this before

-calling png_start_read_image() or png_read_update_info():

-

-    if (interlace_type == PNG_INTERLACE_ADAM7)

-       number_of_passes

-           = png_set_interlace_handling(png_ptr);

-

-This will return the number of passes needed.  Currently, this is seven,

-but may change if another interlace type is added.  This function can be

-called even if the file is not interlaced, where it will return one pass.

-You then need to read the whole image 'number_of_passes' times.  Each time

-will distribute the pixels from the current pass to the correct place in

-the output image, so you need to supply the same rows to png_read_rows in

-each pass.

-

-If you are not going to display the image after each pass, but are

-going to wait until the entire image is read in, use the sparkle

-effect.  This effect is faster and the end result of either method

-is exactly the same.  If you are planning on displaying the image

-after each pass, the "rectangle" effect is generally considered the

-better looking one.

-

-If you only want the "sparkle" effect, just call png_read_row() or

-png_read_rows() as

-normal, with the third parameter NULL.  Make sure you make pass over

-the image number_of_passes times, and you don't change the data in the

-rows between calls.  You can change the locations of the data, just

-not the data.  Each pass only writes the pixels appropriate for that

-pass, and assumes the data from previous passes is still valid.

-

-    png_read_rows(png_ptr, row_pointers, NULL,

-        number_of_rows);

-    or

-    png_read_row(png_ptr, row_pointers, NULL);

-

-If you only want the first effect (the rectangles), do the same as

-before except pass the row buffer in the third parameter, and leave

-the second parameter NULL.

-

-    png_read_rows(png_ptr, NULL, row_pointers,

-        number_of_rows);

-    or

-    png_read_row(png_ptr, NULL, row_pointers);

-

-If you don't want libpng to handle the interlacing details, just call

-png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.

-Each of the images is a valid image by itself; however, you will almost

-certainly need to distribute the pixels from each sub-image to the

-correct place.  This is where everything gets very tricky.

-

-If you want to retrieve the separate images you must pass the correct

-number of rows to each successive call of png_read_rows().  The calculation

-gets pretty complicated for small images, where some sub-images may

-not even exist because either their width or height ends up zero.

-libpng provides two macros to help you in 1.5 and later versions:

-

-   png_uint_32 width = PNG_PASS_COLS(image_width, pass_number);

-   png_uint_32 height = PNG_PASS_ROWS(image_height, pass_number);

-

-Respectively these tell you the width and height of the sub-image

-corresponding to the numbered pass.  'pass' is in in the range 0 to 6 -

-this can be confusing because the specification refers to the same passes

-as 1 to 7!  Be careful, you must check both the width and height before

-calling png_read_rows() and not call it for that pass if either is zero.

-

-You can, of course, read each sub-image row by row.  If you want to

-produce optimal code to make a pixel-by-pixel transformation of an

-interlaced image this is the best approach; read each row of each pass,

-transform it, and write it out to a new interlaced image.

-

-If you want to de-interlace the image yourself libpng provides further

-macros to help that tell you where to place the pixels in the output image.

-Because the interlacing scheme is rectangular - sub-image pixels are always

-arranged on a rectangular grid - all you need to know for each pass is the

-starting column and row in the output image of the first pixel plus the

-spacing between each pixel.  As of libpng 1.5 there are four macros to

-retrieve this information:

-

-   png_uint_32 x = PNG_PASS_START_COL(pass);

-   png_uint_32 y = PNG_PASS_START_ROW(pass);

-   png_uint_32 xStep = 1U << PNG_PASS_COL_SHIFT(pass);

-   png_uint_32 yStep = 1U << PNG_PASS_ROW_SHIFT(pass);

-

-These allow you to write the obvious loop:

-

-   png_uint_32 input_y = 0;

-   png_uint_32 output_y = PNG_PASS_START_ROW(pass);

-

-   while (output_y < output_image_height)

-   {

-      png_uint_32 input_x = 0;

-      png_uint_32 output_x = PNG_PASS_START_COL(pass);

-

-      while (output_x < output_image_width)

-      {

-         image[output_y][output_x] =

-             subimage[pass][input_y][input_x++];

-

-         output_x += xStep;

-      }

-

-      ++input_y;

-      output_y += yStep;

-   }

-

-Notice that the steps between successive output rows and columns are

-returned as shifts.  This is possible because the pixels in the subimages

-are always a power of 2 apart - 1, 2, 4 or 8 pixels - in the original

-image.  In practice you may need to directly calculate the output coordinate

-given an input coordinate.  libpng provides two further macros for this

-purpose:

-

-   png_uint_32 output_x = PNG_COL_FROM_PASS_COL(input_x, pass);

-   png_uint_32 output_y = PNG_ROW_FROM_PASS_ROW(input_y, pass);

-

-Finally a pair of macros are provided to tell you if a particular image

-row or column appears in a given pass:

-

-   int col_in_pass = PNG_COL_IN_INTERLACE_PASS(output_x, pass);

-   int row_in_pass = PNG_ROW_IN_INTERLACE_PASS(output_y, pass);

-

-Bear in mind that you will probably also need to check the width and height

-of the pass in addition to the above to be sure the pass even exists!

-

-With any luck you are convinced by now that you don't want to do your own

-interlace handling.  In reality normally the only good reason for doing this

-is if you are processing PNG files on a pixel-by-pixel basis and don't want

-to load the whole file into memory when it is interlaced.

-

-libpng includes a test program, pngvalid, that illustrates reading and

-writing of interlaced images.  If you can't get interlacing to work in your

-code and don't want to leave it to libpng (the recommended approach), see

-how pngvalid.c does it.

-

-Finishing a sequential read

-

-After you are finished reading the image through the

-low-level interface, you can finish reading the file.

-

-If you want to use a different crc action for handling CRC errors in

-chunks after the image data, you can call png_set_crc_action()

-again at this point.

-

-If you are interested in comments or time, which may be stored either

-before or after the image data, you should pass the separate png_info

-struct if you want to keep the comments from before and after the image

-separate.

-

-    png_infop end_info = png_create_info_struct(png_ptr);

-

-    if (!end_info)

-    {

-       png_destroy_read_struct(&png_ptr, &info_ptr,

-           (png_infopp)NULL);

-       return (ERROR);

-    }

-

-   png_read_end(png_ptr, end_info);

-

-If you are not interested, you should still call png_read_end()

-but you can pass NULL, avoiding the need to create an end_info structure.

-If you do this, libpng will not process any chunks after IDAT other than

-skipping over them and perhaps (depending on whether you have called

-png_set_crc_action) checking their CRCs while looking for the IEND chunk.

-

-   png_read_end(png_ptr, (png_infop)NULL);

-

-If you don't call png_read_end(), then your file pointer will be

-left pointing to the first chunk after the last IDAT, which is probably

-not what you want if you expect to read something beyond the end of

-the PNG datastream.

-

-When you are done, you can free all memory allocated by libpng like this:

-

-   png_destroy_read_struct(&png_ptr, &info_ptr,

-       &end_info);

-

-or, if you didn't create an end_info structure,

-

-   png_destroy_read_struct(&png_ptr, &info_ptr,

-       (png_infopp)NULL);

-

-It is also possible to individually free the info_ptr members that

-point to libpng-allocated storage with the following function:

-

-    png_free_data(png_ptr, info_ptr, mask, seq)

-

-    mask - identifies data to be freed, a mask

-           containing the bitwise OR of one or

-           more of

-             PNG_FREE_PLTE, PNG_FREE_TRNS,

-             PNG_FREE_HIST, PNG_FREE_ICCP,

-             PNG_FREE_PCAL, PNG_FREE_ROWS,

-             PNG_FREE_SCAL, PNG_FREE_SPLT,

-             PNG_FREE_TEXT, PNG_FREE_UNKN,

-           or simply PNG_FREE_ALL

-

-    seq  - sequence number of item to be freed

-           (-1 for all items)

-

-This function may be safely called when the relevant storage has

-already been freed, or has not yet been allocated, or was allocated

-by the user and not by libpng,  and will in those cases do nothing.

-The "seq" parameter is ignored if only one item of the selected data

-type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items

-are allowed for the data type identified in the mask, such as text or

-sPLT, only the n'th item in the structure is freed, where n is "seq".

-

-The default behavior is only to free data that was allocated internally

-by libpng.  This can be changed, so that libpng will not free the data,

-or so that it will free data that was allocated by the user with png_malloc()

-or png_calloc() and passed in via a png_set_*() function, with

-

-    png_data_freer(png_ptr, info_ptr, freer, mask)

-

-    freer  - one of

-               PNG_DESTROY_WILL_FREE_DATA

-               PNG_SET_WILL_FREE_DATA

-               PNG_USER_WILL_FREE_DATA

-

-    mask   - which data elements are affected

-             same choices as in png_free_data()

-

-This function only affects data that has already been allocated.

-You can call this function after reading the PNG data but before calling

-any png_set_*() functions, to control whether the user or the png_set_*()

-function is responsible for freeing any existing data that might be present,

-and again after the png_set_*() functions to control whether the user

-or png_destroy_*() is supposed to free the data.  When the user assumes

-responsibility for libpng-allocated data, the application must use

-png_free() to free it, and when the user transfers responsibility to libpng

-for data that the user has allocated, the user must have used png_malloc()

-or png_calloc() to allocate it.

-

-If you allocated your row_pointers in a single block, as suggested above in

-the description of the high level read interface, you must not transfer

-responsibility for freeing it to the png_set_rows or png_read_destroy function,

-because they would also try to free the individual row_pointers[i].

-

-If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword

-separately, do not transfer responsibility for freeing text_ptr to libpng,

-because when libpng fills a png_text structure it combines these members with

-the key member, and png_free_data() will free only text_ptr.key.  Similarly,

-if you transfer responsibility for free'ing text_ptr from libpng to your

-application, your application must not separately free those members.

-

-The png_free_data() function will turn off the "valid" flag for anything

-it frees.  If you need to turn the flag off for a chunk that was freed by

-your application instead of by libpng, you can use

-

-    png_set_invalid(png_ptr, info_ptr, mask);

-

-    mask - identifies the chunks to be made invalid,

-           containing the bitwise OR of one or

-           more of

-             PNG_INFO_gAMA, PNG_INFO_sBIT,

-             PNG_INFO_cHRM, PNG_INFO_PLTE,

-             PNG_INFO_tRNS, PNG_INFO_bKGD,

-             PNG_INFO_eXIf,

-             PNG_INFO_hIST, PNG_INFO_pHYs,

-             PNG_INFO_oFFs, PNG_INFO_tIME,

-             PNG_INFO_pCAL, PNG_INFO_sRGB,

-             PNG_INFO_iCCP, PNG_INFO_sPLT,

-             PNG_INFO_sCAL, PNG_INFO_IDAT

-

-For a more compact example of reading a PNG image, see the file example.c.

-

-Reading PNG files progressively

-

-The progressive reader is slightly different from the non-progressive

-reader.  Instead of calling png_read_info(), png_read_rows(), and

-png_read_end(), you make one call to png_process_data(), which calls

-callbacks when it has the info, a row, or the end of the image.  You

-set up these callbacks with png_set_progressive_read_fn().  You don't

-have to worry about the input/output functions of libpng, as you are

-giving the library the data directly in png_process_data().  I will

-assume that you have read the section on reading PNG files above,

-so I will only highlight the differences (although I will show

-all of the code).

-

-png_structp png_ptr;

-png_infop info_ptr;

-

- /*  An example code fragment of how you would

-     initialize the progressive reader in your

-     application. */

- int

- initialize_png_reader()

- {

-    png_ptr = png_create_read_struct

-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,

-         user_error_fn, user_warning_fn);

-

-    if (!png_ptr)

-        return (ERROR);

-

-    info_ptr = png_create_info_struct(png_ptr);

-

-    if (!info_ptr)

-    {

-       png_destroy_read_struct(&png_ptr,

-          (png_infopp)NULL, (png_infopp)NULL);

-       return (ERROR);

-    }

-

-    if (setjmp(png_jmpbuf(png_ptr)))

-    {

-       png_destroy_read_struct(&png_ptr, &info_ptr,

-          (png_infopp)NULL);

-       return (ERROR);

-    }

-

-    /* This one's new.  You can provide functions

-       to be called when the header info is valid,

-       when each row is completed, and when the image

-       is finished.  If you aren't using all functions,

-       you can specify NULL parameters.  Even when all

-       three functions are NULL, you need to call

-       png_set_progressive_read_fn().  You can use

-       any struct as the user_ptr (cast to a void pointer

-       for the function call), and retrieve the pointer

-       from inside the callbacks using the function

-

-          png_get_progressive_ptr(png_ptr);

-

-       which will return a void pointer, which you have

-       to cast appropriately.

-     */

-    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,

-        info_callback, row_callback, end_callback);

-

-    return 0;

- }

-

- /* A code fragment that you call as you receive blocks

-   of data */

- int

- process_data(png_bytep buffer, png_uint_32 length)

- {

-    if (setjmp(png_jmpbuf(png_ptr)))

-    {

-       png_destroy_read_struct(&png_ptr, &info_ptr,

-           (png_infopp)NULL);

-       return (ERROR);

-    }

-

-    /* This one's new also.  Simply give it a chunk

-       of data from the file stream (in order, of

-       course).  On machines with segmented memory

-       models machines, don't give it any more than

-       64K.  The library seems to run fine with sizes

-       of 4K. Although you can give it much less if

-       necessary (I assume you can give it chunks of

-       1 byte, I haven't tried less than 256 bytes

-       yet).  When this function returns, you may

-       want to display any rows that were generated

-       in the row callback if you don't already do

-       so there.

-     */

-    png_process_data(png_ptr, info_ptr, buffer, length);

-

-    /* At this point you can call png_process_data_skip if

-       you want to handle data the library will skip yourself;

-       it simply returns the number of bytes to skip (and stops

-       libpng skipping that number of bytes on the next

-       png_process_data call).

-    return 0;

- }

-

- /* This function is called (as set by

-    png_set_progressive_read_fn() above) when enough data

-    has been supplied so all of the header has been

-    read.

- */

- void

- info_callback(png_structp png_ptr, png_infop info)

- {

-    /* Do any setup here, including setting any of

-       the transformations mentioned in the Reading

-       PNG files section.  For now, you _must_ call

-       either png_start_read_image() or

-       png_read_update_info() after all the

-       transformations are set (even if you don't set

-       any).  You may start getting rows before

-       png_process_data() returns, so this is your

-       last chance to prepare for that.

-

-       This is where you turn on interlace handling,

-       assuming you don't want to do it yourself.

-

-       If you need to you can stop the processing of

-       your original input data at this point by calling

-       png_process_data_pause.  This returns the number

-       of unprocessed bytes from the last png_process_data

-       call - it is up to you to ensure that the next call

-       sees these bytes again.  If you don't want to bother

-       with this you can get libpng to cache the unread

-       bytes by setting the 'save' parameter (see png.h) but

-       then libpng will have to copy the data internally.

-     */

- }

-

- /* This function is called when each row of image

-    data is complete */

- void

- row_callback(png_structp png_ptr, png_bytep new_row,

-    png_uint_32 row_num, int pass)

- {

-    /* If the image is interlaced, and you turned

-       on the interlace handler, this function will

-       be called for every row in every pass.  Some

-       of these rows will not be changed from the

-       previous pass.  When the row is not changed,

-       the new_row variable will be NULL.  The rows

-       and passes are called in order, so you don't

-       really need the row_num and pass, but I'm

-       supplying them because it may make your life

-       easier.

-

-       If you did not turn on interlace handling then

-       the callback is called for each row of each

-       sub-image when the image is interlaced.  In this

-       case 'row_num' is the row in the sub-image, not

-       the row in the output image as it is in all other

-       cases.

-

-       For the non-NULL rows of interlaced images when

-       you have switched on libpng interlace handling,

-       you must call png_progressive_combine_row()

-       passing in the row and the old row.  You can

-       call this function for NULL rows (it will just

-       return) and for non-interlaced images (it just

-       does the memcpy for you) if it will make the

-       code easier.  Thus, you can just do this for

-       all cases if you switch on interlace handling;

-     */

-

-        png_progressive_combine_row(png_ptr, old_row,

-          new_row);

-

-    /* where old_row is what was displayed

-       previously for the row.  Note that the first

-       pass (pass == 0, really) will completely cover

-       the old row, so the rows do not have to be

-       initialized.  After the first pass (and only

-       for interlaced images), you will have to pass

-       the current row, and the function will combine

-       the old row and the new row.

-

-       You can also call png_process_data_pause in this

-       callback - see above.

-    */

- }

-

- void

- end_callback(png_structp png_ptr, png_infop info)

- {

-    /* This function is called after the whole image

-       has been read, including any chunks after the

-       image (up to and including the IEND).  You

-       will usually have the same info chunk as you

-       had in the header, although some data may have

-       been added to the comments and time fields.

-

-       Most people won't do much here, perhaps setting

-       a flag that marks the image as finished.

-     */

- }

-

-

-

-IV. Writing

-

-Much of this is very similar to reading.  However, everything of

-importance is repeated here, so you won't have to constantly look

-back up in the reading section to understand writing.

-

-Setup

-

-You will want to do the I/O initialization before you get into libpng,

-so if it doesn't work, you don't have anything to undo. If you are not

-using the standard I/O functions, you will need to replace them with

-custom writing functions.  See the discussion under Customizing libpng.

-

-    FILE *fp = fopen(file_name, "wb");

-

-    if (!fp)

-       return (ERROR);

-

-Next, png_struct and png_info need to be allocated and initialized.

-As these can be both relatively large, you may not want to store these

-on the stack, unless you have stack space to spare.  Of course, you

-will want to check if they return NULL.  If you are also reading,

-you won't want to name your read structure and your write structure

-both "png_ptr"; you can call them anything you like, such as

-"read_ptr" and "write_ptr".  Look at pngtest.c, for example.

-

-    png_structp png_ptr = png_create_write_struct

-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,

-        user_error_fn, user_warning_fn);

-

-    if (!png_ptr)

-       return (ERROR);

-

-    png_infop info_ptr = png_create_info_struct(png_ptr);

-    if (!info_ptr)

-    {

-       png_destroy_write_struct(&png_ptr,

-           (png_infopp)NULL);

-       return (ERROR);

-    }

-

-If you want to use your own memory allocation routines,

-define PNG_USER_MEM_SUPPORTED and use

-png_create_write_struct_2() instead of png_create_write_struct():

-

-    png_structp png_ptr = png_create_write_struct_2

-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,

-        user_error_fn, user_warning_fn, (png_voidp)

-        user_mem_ptr, user_malloc_fn, user_free_fn);

-

-After you have these structures, you will need to set up the

-error handling.  When libpng encounters an error, it expects to

-longjmp() back to your routine.  Therefore, you will need to call

-setjmp() and pass the png_jmpbuf(png_ptr).  If you

-write the file from different routines, you will need to update

-the png_jmpbuf(png_ptr) every time you enter a new routine that will

-call a png_*() function.  See your documentation of setjmp/longjmp

-for your compiler for more information on setjmp/longjmp.  See

-the discussion on libpng error handling in the Customizing Libpng

-section below for more information on the libpng error handling.

-

-    if (setjmp(png_jmpbuf(png_ptr)))

-    {

-    png_destroy_write_struct(&png_ptr, &info_ptr);

-       fclose(fp);

-       return (ERROR);

-    }

-    ...

-    return;

-

-If you would rather avoid the complexity of setjmp/longjmp issues,

-you can compile libpng with PNG_NO_SETJMP, in which case

-errors will result in a call to PNG_ABORT() which defaults to abort().

-

-You can #define PNG_ABORT() to a function that does something

-more useful than abort(), as long as your function does not

-return.

-

-Checking for invalid palette index on write was added at libpng

-1.5.10.  If a pixel contains an invalid (out-of-range) index libpng issues

-a benign error.  This is enabled by default because this condition is an

-error according to the PNG specification, Clause 11.3.2, but the error can

-be ignored in each png_ptr with

-

-   png_set_check_for_invalid_index(png_ptr, 0);

-

-If the error is ignored, or if png_benign_error() treats it as a warning,

-any invalid pixels are written as-is by the encoder, resulting in an

-invalid PNG datastream as output.  In this case the application is

-responsible for ensuring that the pixel indexes are in range when it writes

-a PLTE chunk with fewer entries than the bit depth would allow.

-

-Now you need to set up the output code.  The default for libpng is to

-use the C function fwrite().  If you use this, you will need to pass a

-valid FILE * in the function png_init_io().  Be sure that the file is

-opened in binary mode.  Again, if you wish to handle writing data in

-another way, see the discussion on libpng I/O handling in the Customizing

-Libpng section below.

-

-    png_init_io(png_ptr, fp);

-

-If you are embedding your PNG into a datastream such as MNG, and don't

-want libpng to write the 8-byte signature, or if you have already

-written the signature in your application, use

-

-    png_set_sig_bytes(png_ptr, 8);

-

-to inform libpng that it should not write a signature.

-

-Write callbacks

-

-At this point, you can set up a callback function that will be

-called after each row has been written, which you can use to control

-a progress meter or the like.  It's demonstrated in pngtest.c.

-You must supply a function

-

-    void write_row_callback(png_structp png_ptr, png_uint_32 row,

-       int pass);

-    {

-      /* put your code here */

-    }

-

-(You can give it another name that you like instead of "write_row_callback")

-

-To inform libpng about your function, use

-

-    png_set_write_status_fn(png_ptr, write_row_callback);

-

-When this function is called the row has already been completely processed and

-it has also been written out.  The 'row' and 'pass' refer to the next row to be

-handled.  For the

-non-interlaced case the row that was just handled is simply one less than the

-passed in row number, and pass will always be 0.  For the interlaced case the

-same applies unless the row value is 0, in which case the row just handled was

-the last one from one of the preceding passes.  Because interlacing may skip a

-pass you cannot be sure that the preceding pass is just 'pass-1', if you really

-need to know what the last pass is record (row,pass) from the callback and use

-the last recorded value each time.

-

-As with the user transform you can find the output row using the

-PNG_ROW_FROM_PASS_ROW macro.

-

-You now have the option of modifying how the compression library will

-run.  The following functions are mainly for testing, but may be useful

-in some cases, like if you need to write PNG files extremely fast and

-are willing to give up some compression, or if you want to get the

-maximum possible compression at the expense of slower writing.  If you

-have no special needs in this area, let the library do what it wants by

-not calling this function at all, as it has been tuned to deliver a good

-speed/compression ratio. The second parameter to png_set_filter() is

-the filter method, for which the only valid values are 0 (as of the

-July 1999 PNG specification, version 1.2) or 64 (if you are writing

-a PNG datastream that is to be embedded in a MNG datastream).  The third

-parameter is a flag that indicates which filter type(s) are to be tested

-for each scanline.  See the PNG specification for details on the specific

-filter types.

-

-

-    /* turn on or off filtering, and/or choose

-       specific filters.  You can use either a single

-       PNG_FILTER_VALUE_NAME or the bitwise OR of one

-       or more PNG_FILTER_NAME masks.

-     */

-    png_set_filter(png_ptr, 0,

-       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |

-       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |

-       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |

-       PNG_FILTER_AVG   | PNG_FILTER_VALUE_AVG  |

-       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|

-       PNG_ALL_FILTERS  | PNG_FAST_FILTERS);

-

-If an application wants to start and stop using particular filters during

-compression, it should start out with all of the filters (to ensure that

-the previous row of pixels will be stored in case it's needed later),

-and then add and remove them after the start of compression.

-

-If you are writing a PNG datastream that is to be embedded in a MNG

-datastream, the second parameter can be either 0 or 64.

-

-The png_set_compression_*() functions interface to the zlib compression

-library, and should mostly be ignored unless you really know what you are

-doing.  The only generally useful call is png_set_compression_level()

-which changes how much time zlib spends on trying to compress the image

-data.  See the Compression Library (zlib.h and algorithm.txt, distributed

-with zlib) for details on the compression levels.

-

-    #include zlib.h

-

-    /* Set the zlib compression level */

-    png_set_compression_level(png_ptr,

-        Z_BEST_COMPRESSION);

-

-    /* Set other zlib parameters for compressing IDAT */

-    png_set_compression_mem_level(png_ptr, 8);

-    png_set_compression_strategy(png_ptr,

-        Z_DEFAULT_STRATEGY);

-    png_set_compression_window_bits(png_ptr, 15);

-    png_set_compression_method(png_ptr, 8);

-    png_set_compression_buffer_size(png_ptr, 8192)

-

-    /* Set zlib parameters for text compression

-     * If you don't call these, the parameters

-     * fall back on those defined for IDAT chunks

-     */

-    png_set_text_compression_mem_level(png_ptr, 8);

-    png_set_text_compression_strategy(png_ptr,

-        Z_DEFAULT_STRATEGY);

-    png_set_text_compression_window_bits(png_ptr, 15);

-    png_set_text_compression_method(png_ptr, 8);

-

-Setting the contents of info for output

-

-You now need to fill in the png_info structure with all the data you

-wish to write before the actual image.  Note that the only thing you

-are allowed to write after the image is the text chunks and the time

-chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and

-the latest PNG specification for more information on that.  If you

-wish to write them before the image, fill them in now, and flag that

-data as being valid.  If you want to wait until after the data, don't

-fill them until png_write_end().  For all the fields in png_info and

-their data types, see png.h.  For explanations of what the fields

-contain, see the PNG specification.

-

-Some of the more important parts of the png_info are:

-

-    png_set_IHDR(png_ptr, info_ptr, width, height,

-       bit_depth, color_type, interlace_type,

-       compression_type, filter_method)

-

-    width          - holds the width of the image

-                     in pixels (up to 2^31).

-

-    height         - holds the height of the image

-                     in pixels (up to 2^31).

-

-    bit_depth      - holds the bit depth of one of the

-                     image channels.

-                     (valid values are 1, 2, 4, 8, 16

-                     and depend also on the

-                     color_type.  See also significant

-                     bits (sBIT) below).

-

-    color_type     - describes which color/alpha

-                     channels are present.

-                     PNG_COLOR_TYPE_GRAY

-                        (bit depths 1, 2, 4, 8, 16)

-                     PNG_COLOR_TYPE_GRAY_ALPHA

-                        (bit depths 8, 16)

-                     PNG_COLOR_TYPE_PALETTE

-                        (bit depths 1, 2, 4, 8)

-                     PNG_COLOR_TYPE_RGB

-                        (bit_depths 8, 16)

-                     PNG_COLOR_TYPE_RGB_ALPHA

-                        (bit_depths 8, 16)

-

-                     PNG_COLOR_MASK_PALETTE

-                     PNG_COLOR_MASK_COLOR

-                     PNG_COLOR_MASK_ALPHA

-

-    interlace_type - PNG_INTERLACE_NONE or

-                     PNG_INTERLACE_ADAM7

-

-    compression_type - (must be

-                     PNG_COMPRESSION_TYPE_DEFAULT)

-

-    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT

-                     or, if you are writing a PNG to

-                     be embedded in a MNG datastream,

-                     can also be

-                     PNG_INTRAPIXEL_DIFFERENCING)

-

-If you call png_set_IHDR(), the call must appear before any of the

-other png_set_*() functions, because they might require access to some of

-the IHDR settings.  The remaining png_set_*() functions can be called

-in any order.

-

-If you wish, you can reset the compression_type, interlace_type, or

-filter_method later by calling png_set_IHDR() again; if you do this, the

-width, height, bit_depth, and color_type must be the same in each call.

-

-    png_set_PLTE(png_ptr, info_ptr, palette,

-       num_palette);

-

-    palette        - the palette for the file

-                     (array of png_color)

-    num_palette    - number of entries in the palette

-

-

-    png_set_gAMA(png_ptr, info_ptr, file_gamma);

-    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);

-

-    file_gamma     - the gamma at which the image was

-                     created (PNG_INFO_gAMA)

-

-    int_file_gamma - 100,000 times the gamma at which

-                     the image was created

-

-    png_set_cHRM(png_ptr, info_ptr,  white_x, white_y, red_x, red_y,

-                     green_x, green_y, blue_x, blue_y)

-    png_set_cHRM_XYZ(png_ptr, info_ptr, red_X, red_Y, red_Z, green_X,

-                     green_Y, green_Z, blue_X, blue_Y, blue_Z)

-    png_set_cHRM_fixed(png_ptr, info_ptr, int_white_x, int_white_y,

-                     int_red_x, int_red_y, int_green_x, int_green_y,

-                     int_blue_x, int_blue_y)

-    png_set_cHRM_XYZ_fixed(png_ptr, info_ptr, int_red_X, int_red_Y,

-                     int_red_Z, int_green_X, int_green_Y, int_green_Z,

-                     int_blue_X, int_blue_Y, int_blue_Z)

-

-    {white,red,green,blue}_{x,y}

-                     A color space encoding specified using the chromaticities

-                     of the end points and the white point.

-

-    {red,green,blue}_{X,Y,Z}

-                     A color space encoding specified using the encoding end

-                     points - the CIE tristimulus specification of the intended

-                     color of the red, green and blue channels in the PNG RGB

-                     data.  The white point is simply the sum of the three end

-                     points.

-

-    png_set_sRGB(png_ptr, info_ptr, srgb_intent);

-

-    srgb_intent    - the rendering intent

-                     (PNG_INFO_sRGB) The presence of

-                     the sRGB chunk means that the pixel

-                     data is in the sRGB color space.

-                     This chunk also implies specific

-                     values of gAMA and cHRM.  Rendering

-                     intent is the CSS-1 property that

-                     has been defined by the International

-                     Color Consortium

-                     (http://www.color.org).

-                     It can be one of

-                     PNG_sRGB_INTENT_SATURATION,

-                     PNG_sRGB_INTENT_PERCEPTUAL,

-                     PNG_sRGB_INTENT_ABSOLUTE, or

-                     PNG_sRGB_INTENT_RELATIVE.

-

-

-    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,

-       srgb_intent);

-

-    srgb_intent    - the rendering intent

-                     (PNG_INFO_sRGB) The presence of the

-                     sRGB chunk means that the pixel

-                     data is in the sRGB color space.

-                     This function also causes gAMA and

-                     cHRM chunks with the specific values

-                     that are consistent with sRGB to be

-                     written.

-

-    png_set_iCCP(png_ptr, info_ptr, name, compression_type,

-                       profile, proflen);

-

-    name             - The profile name.

-

-    compression_type - The compression type; always

-                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.

-                       You may give NULL to this argument to

-                       ignore it.

-

-    profile          - International Color Consortium color

-                       profile data. May contain NULs.

-

-    proflen          - length of profile data in bytes.

-

-    png_set_sBIT(png_ptr, info_ptr, sig_bit);

-

-    sig_bit        - the number of significant bits for

-                     (PNG_INFO_sBIT) each of the gray, red,

-                     green, and blue channels, whichever are

-                     appropriate for the given color type

-                     (png_color_16)

-

-    png_set_tRNS(png_ptr, info_ptr, trans_alpha,

-       num_trans, trans_color);

-

-    trans_alpha    - array of alpha (transparency)

-                     entries for palette (PNG_INFO_tRNS)

-

-    num_trans      - number of transparent entries

-                     (PNG_INFO_tRNS)

-

-    trans_color    - graylevel or color sample values

-                     (in order red, green, blue) of the

-                     single transparent color for

-                     non-paletted images (PNG_INFO_tRNS)

-

-    png_set_eXIf_1(png_ptr, info_ptr, num_exif, exif);

-

-    exif           - Exif profile (array of

-                     png_byte) (PNG_INFO_eXIf)

-

-    png_set_hIST(png_ptr, info_ptr, hist);

-

-    hist           - histogram of palette (array of

-                     png_uint_16) (PNG_INFO_hIST)

-

-    png_set_tIME(png_ptr, info_ptr, mod_time);

-

-    mod_time       - time image was last modified

-                     (PNG_VALID_tIME)

-

-    png_set_bKGD(png_ptr, info_ptr, background);

-

-    background     - background color (of type

-                     png_color_16p) (PNG_VALID_bKGD)

-

-    png_set_text(png_ptr, info_ptr, text_ptr, num_text);

-

-    text_ptr       - array of png_text holding image

-                     comments

-

-    text_ptr[i].compression - type of compression used

-                 on "text" PNG_TEXT_COMPRESSION_NONE

-                           PNG_TEXT_COMPRESSION_zTXt

-                           PNG_ITXT_COMPRESSION_NONE

-                           PNG_ITXT_COMPRESSION_zTXt

-    text_ptr[i].key   - keyword for comment.  Must contain

-                 1-79 characters.

-    text_ptr[i].text  - text comments for current

-                         keyword.  Can be NULL or empty.

-    text_ptr[i].text_length - length of text string,

-                 after decompression, 0 for iTXt

-    text_ptr[i].itxt_length - length of itxt string,

-                 after decompression, 0 for tEXt/zTXt

-    text_ptr[i].lang  - language of comment (NULL or

-                         empty for unknown).

-    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL

-                         or empty for unknown).

-

-    Note that the itxt_length, lang, and lang_key

-    members of the text_ptr structure only exist when the

-    library is built with iTXt chunk support.  Prior to

-    libpng-1.4.0 the library was built by default without

-    iTXt support. Also note that when iTXt is supported,

-    they contain NULL pointers when the "compression"

-    field contains PNG_TEXT_COMPRESSION_NONE or

-    PNG_TEXT_COMPRESSION_zTXt.

-

-    num_text       - number of comments

-

-    png_set_sPLT(png_ptr, info_ptr, &palette_ptr,

-       num_spalettes);

-

-    palette_ptr    - array of png_sPLT_struct structures

-                     to be added to the list of palettes

-                     in the info structure.

-    num_spalettes  - number of palette structures to be

-                     added.

-

-    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,

-        unit_type);

-

-    offset_x  - positive offset from the left

-                     edge of the screen

-

-    offset_y  - positive offset from the top

-                     edge of the screen

-

-    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER

-

-    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,

-        unit_type);

-

-    res_x       - pixels/unit physical resolution

-                  in x direction

-

-    res_y       - pixels/unit physical resolution

-                  in y direction

-

-    unit_type   - PNG_RESOLUTION_UNKNOWN,

-                  PNG_RESOLUTION_METER

-

-    png_set_sCAL(png_ptr, info_ptr, unit, width, height)

-

-    unit        - physical scale units (an integer)

-

-    width       - width of a pixel in physical scale units

-

-    height      - height of a pixel in physical scale units

-                  (width and height are doubles)

-

-    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)

-

-    unit        - physical scale units (an integer)

-

-    width       - width of a pixel in physical scale units

-                  expressed as a string

-

-    height      - height of a pixel in physical scale units

-                 (width and height are strings like "2.54")

-

-    png_set_unknown_chunks(png_ptr, info_ptr, &unknowns,

-       num_unknowns)

-

-    unknowns          - array of png_unknown_chunk

-                        structures holding unknown chunks

-    unknowns[i].name  - name of unknown chunk

-    unknowns[i].data  - data of unknown chunk

-    unknowns[i].size  - size of unknown chunk's data

-    unknowns[i].location - position to write chunk in file

-                           0: do not write chunk

-                           PNG_HAVE_IHDR: before PLTE

-                           PNG_HAVE_PLTE: before IDAT

-                           PNG_AFTER_IDAT: after IDAT

-

-The "location" member is set automatically according to

-what part of the output file has already been written.

-You can change its value after calling png_set_unknown_chunks()

-as demonstrated in pngtest.c.  Within each of the "locations",

-the chunks are sequenced according to their position in the

-structure (that is, the value of "i", which is the order in which

-the chunk was either read from the input file or defined with

-png_set_unknown_chunks).

-

-A quick word about text and num_text.  text is an array of png_text

-structures.  num_text is the number of valid structures in the array.

-Each png_text structure holds a language code, a keyword, a text value,

-and a compression type.

-

-The compression types have the same valid numbers as the compression

-types of the image data.  Currently, the only valid number is zero.

-However, you can store text either compressed or uncompressed, unlike

-images, which always have to be compressed.  So if you don't want the

-text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.

-Because tEXt and zTXt chunks don't have a language field, if you

-specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt

-any language code or translated keyword will not be written out.

-

-Until text gets around a few hundred bytes, it is not worth compressing it.

-After the text has been written out to the file, the compression type

-is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,

-so that it isn't written out again at the end (in case you are calling

-png_write_end() with the same struct).

-

-The keywords that are given in the PNG Specification are:

-

-    Title            Short (one line) title or

-                     caption for image

-

-    Author           Name of image's creator

-

-    Description      Description of image (possibly long)

-

-    Copyright        Copyright notice

-

-    Creation Time    Time of original image creation

-                     (usually RFC 1123 format, see below)

-

-    Software         Software used to create the image

-

-    Disclaimer       Legal disclaimer

-

-    Warning          Warning of nature of content

-

-    Source           Device used to create the image

-

-    Comment          Miscellaneous comment; conversion

-                     from other image format

-

-The keyword-text pairs work like this.  Keywords should be short

-simple descriptions of what the comment is about.  Some typical

-keywords are found in the PNG specification, as is some recommendations

-on keywords.  You can repeat keywords in a file.  You can even write

-some text before the image and some after.  For example, you may want

-to put a description of the image before the image, but leave the

-disclaimer until after, so viewers working over modem connections

-don't have to wait for the disclaimer to go over the modem before

-they start seeing the image.  Finally, keywords should be full

-words, not abbreviations.  Keywords and text are in the ISO 8859-1

-(Latin-1) character set (a superset of regular ASCII) and can not

-contain NUL characters, and should not contain control or other

-unprintable characters.  To make the comments widely readable, stick

-with basic ASCII, and avoid machine specific character set extensions

-like the IBM-PC character set.  The keyword must be present, but

-you can leave off the text string on non-compressed pairs.

-Compressed pairs must have a text string, as only the text string

-is compressed anyway, so the compression would be meaningless.

-

-PNG supports modification time via the png_time structure.  Two

-conversion routines are provided, png_convert_from_time_t() for

-time_t and png_convert_from_struct_tm() for struct tm.  The

-time_t routine uses gmtime().  You don't have to use either of

-these, but if you wish to fill in the png_time structure directly,

-you should provide the time in universal time (GMT) if possible

-instead of your local time.  Note that the year number is the full

-year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and

-that months start with 1.

-

-If you want to store the time of the original image creation, you should

-use a plain tEXt chunk with the "Creation Time" keyword.  This is

-necessary because the "creation time" of a PNG image is somewhat vague,

-depending on whether you mean the PNG file, the time the image was

-created in a non-PNG format, a still photo from which the image was

-scanned, or possibly the subject matter itself.  In order to facilitate

-machine-readable dates, it is recommended that the "Creation Time"

-tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),

-although this isn't a requirement.  Unlike the tIME chunk, the

-"Creation Time" tEXt chunk is not expected to be automatically changed

-by the software.  To facilitate the use of RFC 1123 dates, a function

-png_convert_to_rfc1123_buffer(buffer, png_timep) is provided to

-convert from PNG time to an RFC 1123 format string.  The caller must provide

-a writeable buffer of at least 29 bytes.

-

-Writing unknown chunks

-

-You can use the png_set_unknown_chunks function to queue up private chunks

-for writing.  You give it a chunk name, location, raw data, and a size.  You

-also must use png_set_keep_unknown_chunks() to ensure that libpng will

-handle them.  That's all there is to it.  The chunks will be written by the

-next following png_write_info_before_PLTE, png_write_info, or png_write_end

-function, depending upon the specified location.  Any chunks previously

-read into the info structure's unknown-chunk list will also be written out

-in a sequence that satisfies the PNG specification's ordering rules.

-

-Here is an example of writing two private chunks, prVt and miNE:

-

-    #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-    /* Set unknown chunk data */

-    png_unknown_chunk unk_chunk[2];

-    strcpy((char *) unk_chunk[0].name, "prVt";

-    unk_chunk[0].data = (unsigned char *) "PRIVATE DATA";

-    unk_chunk[0].size = strlen(unk_chunk[0].data)+1;

-    unk_chunk[0].location = PNG_HAVE_IHDR;

-    strcpy((char *) unk_chunk[1].name, "miNE";

-    unk_chunk[1].data = (unsigned char *) "MY CHUNK DATA";

-    unk_chunk[1].size = strlen(unk_chunk[0].data)+1;

-    unk_chunk[1].location = PNG_AFTER_IDAT;

-    png_set_unknown_chunks(write_ptr, write_info_ptr,

-        unk_chunk, 2);

-    /* Needed because miNE is not safe-to-copy */

-    png_set_keep_unknown_chunks(png, PNG_HANDLE_CHUNK_ALWAYS,

-       (png_bytep) "miNE", 1);

-    # if PNG_LIBPNG_VER < 10600

-      /* Deal with unknown chunk location bug in 1.5.x and earlier */

-      png_set_unknown_chunk_location(png, info, 0, PNG_HAVE_IHDR);

-      png_set_unknown_chunk_location(png, info, 1, PNG_AFTER_IDAT);

-    # endif

-    # if PNG_LIBPNG_VER < 10500

-      /* PNG_AFTER_IDAT writes two copies of the chunk prior to libpng-1.5.0,

-       * one before IDAT and another after IDAT, so don't use it; only use

-       * PNG_HAVE_IHDR location.  This call resets the location previously

-       * set by assignment and png_set_unknown_chunk_location() for chunk 1.

-       */

-      png_set_unknown_chunk_location(png, info, 1, PNG_HAVE_IHDR);

-    # endif

-    #endif

-

-The high-level write interface

-

-At this point there are two ways to proceed; through the high-level

-write interface, or through a sequence of low-level write operations.

-You can use the high-level interface if your image data is present

-in the info structure.  All defined output

-transformations are permitted, enabled by the following masks.

-

-    PNG_TRANSFORM_IDENTITY      No transformation

-    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples

-    PNG_TRANSFORM_PACKSWAP      Change order of packed

-                                pixels to LSB first

-    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images

-    PNG_TRANSFORM_SHIFT         Normalize pixels to the

-                                sBIT depth

-    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA

-                                to BGRA

-    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA

-                                to AG

-    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity

-                                to transparency

-    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples

-    PNG_TRANSFORM_STRIP_FILLER        Strip out filler

-                                      bytes (deprecated).

-    PNG_TRANSFORM_STRIP_FILLER_BEFORE Strip out leading

-                                      filler bytes

-    PNG_TRANSFORM_STRIP_FILLER_AFTER  Strip out trailing

-                                      filler bytes

-

-If you have valid image data in the info structure (you can use

-png_set_rows() to put image data in the info structure), simply do this:

-

-    png_write_png(png_ptr, info_ptr, png_transforms, NULL)

-

-where png_transforms is an integer containing the bitwise OR of some set of

-transformation flags.  This call is equivalent to png_write_info(),

-followed the set of transformations indicated by the transform mask,

-then png_write_image(), and finally png_write_end().

-

-(The final parameter of this call is not yet used.  Someday it might point

-to transformation parameters required by some future output transform.)

-

-You must use png_transforms and not call any png_set_transform() functions

-when you use png_write_png().

-

-The low-level write interface

-

-If you are going the low-level route instead, you are now ready to

-write all the file information up to the actual image data.  You do

-this with a call to png_write_info().

-

-    png_write_info(png_ptr, info_ptr);

-

-Note that there is one transformation you may need to do before

-png_write_info().  In PNG files, the alpha channel in an image is the

-level of opacity.  If your data is supplied as a level of transparency,

-you can invert the alpha channel before you write it, so that 0 is

-fully transparent and 255 (in 8-bit or paletted images) or 65535

-(in 16-bit images) is fully opaque, with

-

-    png_set_invert_alpha(png_ptr);

-

-This must appear before png_write_info() instead of later with the

-other transformations because in the case of paletted images the tRNS

-chunk data has to be inverted before the tRNS chunk is written.  If

-your image is not a paletted image, the tRNS data (which in such cases

-represents a single color to be rendered as transparent) won't need to

-be changed, and you can safely do this transformation after your

-png_write_info() call.

-

-If you need to write a private chunk that you want to appear before

-the PLTE chunk when PLTE is present, you can write the PNG info in

-two steps, and insert code to write your own chunk between them:

-

-    png_write_info_before_PLTE(png_ptr, info_ptr);

-    png_set_unknown_chunks(png_ptr, info_ptr, ...);

-    png_write_info(png_ptr, info_ptr);

-

-After you've written the file information, you can set up the library

-to handle any special transformations of the image data.  The various

-ways to transform the data will be described in the order that they

-should occur.  This is important, as some of these change the color

-type and/or bit depth of the data, and some others only work on

-certain color types and bit depths.  Even though each transformation

-checks to see if it has data that it can do something with, you should

-make sure to only enable a transformation if it will be valid for the

-data.  For example, don't swap red and blue on grayscale data.

-

-PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells

-the library to strip input data that has 4 or 8 bytes per pixel down

-to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2

-bytes per pixel).

-

-    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);

-

-where the 0 is unused, and the location is either PNG_FILLER_BEFORE or

-PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel

-is stored XRGB or RGBX.

-

-PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as

-they can, resulting in, for example, 8 pixels per byte for 1 bit files.

-If the data is supplied at 1 pixel per byte, use this code, which will

-correctly pack the pixels into a single byte:

-

-    png_set_packing(png_ptr);

-

-PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your

-data is of another bit depth, you can write an sBIT chunk into the

-file so that decoders can recover the original data if desired.

-

-    /* Set the true bit depth of the image data */

-    if (color_type & PNG_COLOR_MASK_COLOR)

-    {

-       sig_bit.red = true_bit_depth;

-       sig_bit.green = true_bit_depth;

-       sig_bit.blue = true_bit_depth;

-    }

-

-    else

-    {

-       sig_bit.gray = true_bit_depth;

-    }

-

-    if (color_type & PNG_COLOR_MASK_ALPHA)

-    {

-       sig_bit.alpha = true_bit_depth;

-    }

-

-    png_set_sBIT(png_ptr, info_ptr, &sig_bit);

-

-If the data is stored in the row buffer in a bit depth other than

-one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),

-this will scale the values to appear to be the correct bit depth as

-is required by PNG.

-

-    png_set_shift(png_ptr, &sig_bit);

-

-PNG files store 16-bit pixels in network byte order (big-endian,

-ie. most significant bits first).  This code would be used if they are

-supplied the other way (little-endian, i.e. least significant bits

-first, the way PCs store them):

-

-    if (bit_depth > 8)

-       png_set_swap(png_ptr);

-

-If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you

-need to change the order the pixels are packed into bytes, you can use:

-

-    if (bit_depth < 8)

-       png_set_packswap(png_ptr);

-

-PNG files store 3 color pixels in red, green, blue order.  This code

-would be used if they are supplied as blue, green, red:

-

-    png_set_bgr(png_ptr);

-

-PNG files describe monochrome as black being zero and white being

-one. This code would be used if the pixels are supplied with this reversed

-(black being one and white being zero):

-

-    png_set_invert_mono(png_ptr);

-

-Finally, you can write your own transformation function if none of

-the existing ones meets your needs.  This is done by setting a callback

-with

-

-    png_set_write_user_transform_fn(png_ptr,

-       write_transform_fn);

-

-You must supply the function

-

-    void write_transform_fn(png_structp png_ptr, png_row_infop

-       row_info, png_bytep data)

-

-See pngtest.c for a working example.  Your function will be called

-before any of the other transformations are processed.  If supported

-libpng also supplies an information routine that may be called from

-your callback:

-

-   png_get_current_row_number(png_ptr);

-   png_get_current_pass_number(png_ptr);

-

-This returns the current row passed to the transform.  With interlaced

-images the value returned is the row in the input sub-image image.  Use

-PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to

-find the output pixel (x,y) given an interlaced sub-image pixel (row,col,pass).

-

-The discussion of interlace handling above contains more information on how to

-use these values.

-

-You can also set up a pointer to a user structure for use by your

-callback function.

-

-    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);

-

-The user_channels and user_depth parameters of this function are ignored

-when writing; you can set them to zero as shown.

-

-You can retrieve the pointer via the function png_get_user_transform_ptr().

-For example:

-

-    voidp write_user_transform_ptr =

-       png_get_user_transform_ptr(png_ptr);

-

-It is possible to have libpng flush any pending output, either manually,

-or automatically after a certain number of lines have been written.  To

-flush the output stream a single time call:

-

-    png_write_flush(png_ptr);

-

-and to have libpng flush the output stream periodically after a certain

-number of scanlines have been written, call:

-

-    png_set_flush(png_ptr, nrows);

-

-Note that the distance between rows is from the last time png_write_flush()

-was called, or the first row of the image if it has never been called.

-So if you write 50 lines, and then png_set_flush 25, it will flush the

-output on the next scanline, and every 25 lines thereafter, unless

-png_write_flush() is called before 25 more lines have been written.

-If nrows is too small (less than about 10 lines for a 640 pixel wide

-RGB image) the image compression may decrease noticeably (although this

-may be acceptable for real-time applications).  Infrequent flushing will

-only degrade the compression performance by a few percent over images

-that do not use flushing.

-

-Writing the image data

-

-That's it for the transformations.  Now you can write the image data.

-The simplest way to do this is in one function call.  If you have the

-whole image in memory, you can just call png_write_image() and libpng

-will write the image.  You will need to pass in an array of pointers to

-each row.  This function automatically handles interlacing, so you don't

-need to call png_set_interlace_handling() or call this function multiple

-times, or any of that other stuff necessary with png_write_rows().

-

-    png_write_image(png_ptr, row_pointers);

-

-where row_pointers is:

-

-    png_byte *row_pointers[height];

-

-You can point to void or char or whatever you use for pixels.

-

-If you don't want to write the whole image at once, you can

-use png_write_rows() instead.  If the file is not interlaced,

-this is simple:

-

-    png_write_rows(png_ptr, row_pointers,

-       number_of_rows);

-

-row_pointers is the same as in the png_write_image() call.

-

-If you are just writing one row at a time, you can do this with

-a single row_pointer instead of an array of row_pointers:

-

-    png_bytep row_pointer = row;

-

-    png_write_row(png_ptr, row_pointer);

-

-When the file is interlaced, things can get a good deal more complicated.

-The only currently (as of the PNG Specification version 1.2, dated July

-1999) defined interlacing scheme for PNG files is the "Adam7" interlace

-scheme, that breaks down an image into seven smaller images of varying

-size.  libpng will build these images for you, or you can do them

-yourself.  If you want to build them yourself, see the PNG specification

-for details of which pixels to write when.

-

-If you don't want libpng to handle the interlacing details, just

-use png_set_interlace_handling() and call png_write_rows() the

-correct number of times to write all the sub-images

-(png_set_interlace_handling() returns the number of sub-images.)

-

-If you want libpng to build the sub-images, call this before you start

-writing any rows:

-

-    number_of_passes = png_set_interlace_handling(png_ptr);

-

-This will return the number of passes needed.  Currently, this is seven,

-but may change if another interlace type is added.

-

-Then write the complete image number_of_passes times.

-

-    png_write_rows(png_ptr, row_pointers, number_of_rows);

-

-Think carefully before you write an interlaced image.  Typically code that

-reads such images reads all the image data into memory, uncompressed, before

-doing any processing.  Only code that can display an image on the fly can

-take advantage of the interlacing and even then the image has to be exactly

-the correct size for the output device, because scaling an image requires

-adjacent pixels and these are not available until all the passes have been

-read.

-

-If you do write an interlaced image you will hardly ever need to handle

-the interlacing yourself.  Call png_set_interlace_handling() and use the

-approach described above.

-

-The only time it is conceivable that you will really need to write an

-interlaced image pass-by-pass is when you have read one pass by pass and

-made some pixel-by-pixel transformation to it, as described in the read

-code above.  In this case use the PNG_PASS_ROWS and PNG_PASS_COLS macros

-to determine the size of each sub-image in turn and simply write the rows

-you obtained from the read code.

-

-Finishing a sequential write

-

-After you are finished writing the image, you should finish writing

-the file.  If you are interested in writing comments or time, you should

-pass an appropriately filled png_info pointer.  If you are not interested,

-you can pass NULL.

-

-    png_write_end(png_ptr, info_ptr);

-

-When you are done, you can free all memory used by libpng like this:

-

-    png_destroy_write_struct(&png_ptr, &info_ptr);

-

-It is also possible to individually free the info_ptr members that

-point to libpng-allocated storage with the following function:

-

-    png_free_data(png_ptr, info_ptr, mask, seq)

-

-    mask  - identifies data to be freed, a mask

-            containing the bitwise OR of one or

-            more of

-              PNG_FREE_PLTE, PNG_FREE_TRNS,

-              PNG_FREE_HIST, PNG_FREE_ICCP,

-              PNG_FREE_PCAL, PNG_FREE_ROWS,

-              PNG_FREE_SCAL, PNG_FREE_SPLT,

-              PNG_FREE_TEXT, PNG_FREE_UNKN,

-            or simply PNG_FREE_ALL

-

-    seq   - sequence number of item to be freed

-            (-1 for all items)

-

-This function may be safely called when the relevant storage has

-already been freed, or has not yet been allocated, or was allocated

-by the user  and not by libpng,  and will in those cases do nothing.

-The "seq" parameter is ignored if only one item of the selected data

-type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items

-are allowed for the data type identified in the mask, such as text or

-sPLT, only the n'th item in the structure is freed, where n is "seq".

-

-If you allocated data such as a palette that you passed in to libpng

-with png_set_*, you must not free it until just before the call to

-png_destroy_write_struct().

-

-The default behavior is only to free data that was allocated internally

-by libpng.  This can be changed, so that libpng will not free the data,

-or so that it will free data that was allocated by the user with png_malloc()

-or png_calloc() and passed in via a png_set_*() function, with

-

-    png_data_freer(png_ptr, info_ptr, freer, mask)

-

-    freer  - one of

-               PNG_DESTROY_WILL_FREE_DATA

-               PNG_SET_WILL_FREE_DATA

-               PNG_USER_WILL_FREE_DATA

-

-    mask   - which data elements are affected

-             same choices as in png_free_data()

-

-For example, to transfer responsibility for some data from a read structure

-to a write structure, you could use

-

-    png_data_freer(read_ptr, read_info_ptr,

-       PNG_USER_WILL_FREE_DATA,

-       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)

-

-    png_data_freer(write_ptr, write_info_ptr,

-       PNG_DESTROY_WILL_FREE_DATA,

-       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)

-

-thereby briefly reassigning responsibility for freeing to the user but

-immediately afterwards reassigning it once more to the write_destroy

-function.  Having done this, it would then be safe to destroy the read

-structure and continue to use the PLTE, tRNS, and hIST data in the write

-structure.

-

-This function only affects data that has already been allocated.

-You can call this function before calling after the png_set_*() functions

-to control whether the user or png_destroy_*() is supposed to free the data.

-When the user assumes responsibility for libpng-allocated data, the

-application must use

-png_free() to free it, and when the user transfers responsibility to libpng

-for data that the user has allocated, the user must have used png_malloc()

-or png_calloc() to allocate it.

-

-If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword

-separately, do not transfer responsibility for freeing text_ptr to libpng,

-because when libpng fills a png_text structure it combines these members with

-the key member, and png_free_data() will free only text_ptr.key.  Similarly,

-if you transfer responsibility for free'ing text_ptr from libpng to your

-application, your application must not separately free those members.

-For a more compact example of writing a PNG image, see the file example.c.

-

-V. Simplified API

-

-The simplified API, which became available in libpng-1.6.0, hides the details

-of both libpng and the PNG file format itself.

-It allows PNG files to be read into a very limited number of

-in-memory bitmap formats or to be written from the same formats.  If these

-formats do not accommodate your needs then you can, and should, use the more

-sophisticated APIs above - these support a wide variety of in-memory formats

-and a wide variety of sophisticated transformations to those formats as well

-as a wide variety of APIs to manipulate ancilliary information.

-

-To read a PNG file using the simplified API:

-

-  1) Declare a 'png_image' structure (see below) on the stack, set the

-     version field to PNG_IMAGE_VERSION and the 'opaque' pointer to NULL

-     (this is REQUIRED, your program may crash if you don't do it.)

-

-  2) Call the appropriate png_image_begin_read... function.

-

-  3) Set the png_image 'format' member to the required sample format.

-

-  4) Allocate a buffer for the image and, if required, the color-map.

-

-  5) Call png_image_finish_read to read the image and, if required, the

-     color-map into your buffers.

-

-There are no restrictions on the format of the PNG input itself; all valid

-color types, bit depths, and interlace methods are acceptable, and the

-input image is transformed as necessary to the requested in-memory format

-during the png_image_finish_read() step.  The only caveat is that if you

-request a color-mapped image from a PNG that is full-color or makes

-complex use of an alpha channel the transformation is extremely lossy and the

-result may look terrible.

-

-To write a PNG file using the simplified API:

-

-  1) Declare a 'png_image' structure on the stack and memset()

-     it to all zero.

-

-  2) Initialize the members of the structure that describe the

-     image, setting the 'format' member to the format of the

-     image samples.

-

-  3) Call the appropriate png_image_write... function with a

-     pointer to the image and, if necessary, the color-map to write

-     the PNG data.

-

-png_image is a structure that describes the in-memory format of an image

-when it is being read or defines the in-memory format of an image that you

-need to write.  The "png_image" structure contains the following members:

-

-   png_controlp opaque  Initialize to NULL, free with png_image_free

-   png_uint_32  version Set to PNG_IMAGE_VERSION

-   png_uint_32  width   Image width in pixels (columns)

-   png_uint_32  height  Image height in pixels (rows)

-   png_uint_32  format  Image format as defined below

-   png_uint_32  flags   A bit mask containing informational flags

-   png_uint_32  colormap_entries; Number of entries in the color-map

-   png_uint_32  warning_or_error;

-   char         message[64];

-

-In the event of an error or warning the "warning_or_error"

-field will be set to a non-zero value and the 'message' field will contain

-a '\0' terminated string with the libpng error or warning message.  If both

-warnings and an error were encountered, only the error is recorded.  If there

-are multiple warnings, only the first one is recorded.

-

-The upper 30 bits of the "warning_or_error" value are reserved; the low two

-bits contain a two bit code such that a value more than 1 indicates a failure

-in the API just called:

-

-   0 - no warning or error

-   1 - warning

-   2 - error

-   3 - error preceded by warning

-

-The pixels (samples) of the image have one to four channels whose components

-have original values in the range 0 to 1.0:

-

-  1: A single gray or luminance channel (G).

-  2: A gray/luminance channel and an alpha channel (GA).

-  3: Three red, green, blue color channels (RGB).

-  4: Three color channels and an alpha channel (RGBA).

-

-The channels are encoded in one of two ways:

-

-  a) As a small integer, value 0..255, contained in a single byte.  For the

-alpha channel the original value is simply value/255.  For the color or

-luminance channels the value is encoded according to the sRGB specification

-and matches the 8-bit format expected by typical display devices.

-

-The color/gray channels are not scaled (pre-multiplied) by the alpha

-channel and are suitable for passing to color management software.

-

-  b) As a value in the range 0..65535, contained in a 2-byte integer, in

-the native byte order of the platform on which the application is running.

-All channels can be converted to the original value by dividing by 65535; all

-channels are linear.  Color channels use the RGB encoding (RGB end-points) of

-the sRGB specification.  This encoding is identified by the

-PNG_FORMAT_FLAG_LINEAR flag below.

-

-When the simplified API needs to convert between sRGB and linear colorspaces,

-the actual sRGB transfer curve defined in the sRGB specification (see the

-article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2

-approximation used elsewhere in libpng.

-

-When an alpha channel is present it is expected to denote pixel coverage

-of the color or luminance channels and is returned as an associated alpha

-channel: the color/gray channels are scaled (pre-multiplied) by the alpha

-value.

-

-The samples are either contained directly in the image data, between 1 and 8

-bytes per pixel according to the encoding, or are held in a color-map indexed

-by bytes in the image data.  In the case of a color-map the color-map entries

-are individual samples, encoded as above, and the image data has one byte per

-pixel to select the relevant sample from the color-map.

-

-PNG_FORMAT_*

-

-The #defines to be used in png_image::format.  Each #define identifies a

-particular layout of channel data and, if present, alpha values.  There are

-separate defines for each of the two component encodings.

-

-A format is built up using single bit flag values.  All combinations are

-valid.  Formats can be built up from the flag values or you can use one of

-the predefined values below.  When testing formats always use the FORMAT_FLAG

-macros to test for individual features - future versions of the library may

-add new flags.

-

-When reading or writing color-mapped images the format should be set to the

-format of the entries in the color-map then png_image_{read,write}_colormap

-called to read or write the color-map and set the format correctly for the

-image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!

-

-NOTE: libpng can be built with particular features disabled. If you see

-compiler errors because the definition of one of the following flags has been

-compiled out it is because libpng does not have the required support.  It is

-possible, however, for the libpng configuration to enable the format on just

-read or just write; in that case you may see an error at run time.

-You can guard against this by checking for the definition of the

-appropriate "_SUPPORTED" macro, one of:

-

-   PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED

-

-   PNG_FORMAT_FLAG_ALPHA    format with an alpha channel

-   PNG_FORMAT_FLAG_COLOR    color format: otherwise grayscale

-   PNG_FORMAT_FLAG_LINEAR   2-byte channels else 1-byte

-   PNG_FORMAT_FLAG_COLORMAP image data is color-mapped

-   PNG_FORMAT_FLAG_BGR      BGR colors, else order is RGB

-   PNG_FORMAT_FLAG_AFIRST   alpha channel comes first

-

-Supported formats are as follows.  Future versions of libpng may support more

-formats; for compatibility with older versions simply check if the format

-macro is defined using #ifdef.  These defines describe the in-memory layout

-of the components of the pixels of the image.

-

-First the single byte (sRGB) formats:

-

-   PNG_FORMAT_GRAY

-   PNG_FORMAT_GA

-   PNG_FORMAT_AG

-   PNG_FORMAT_RGB

-   PNG_FORMAT_BGR

-   PNG_FORMAT_RGBA

-   PNG_FORMAT_ARGB

-   PNG_FORMAT_BGRA

-   PNG_FORMAT_ABGR

-

-Then the linear 2-byte formats.  When naming these "Y" is used to

-indicate a luminance (gray) channel.  The component order within the pixel

-is always the same - there is no provision for swapping the order of the

-components in the linear format.  The components are 16-bit integers in

-the native byte order for your platform, and there is no provision for

-swapping the bytes to a different endian condition.

-

-   PNG_FORMAT_LINEAR_Y

-   PNG_FORMAT_LINEAR_Y_ALPHA

-   PNG_FORMAT_LINEAR_RGB

-   PNG_FORMAT_LINEAR_RGB_ALPHA

-

-With color-mapped formats the image data is one byte for each pixel. The byte

-is an index into the color-map which is formatted as above.  To obtain a

-color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP

-to one of the above definitions, or you can use one of the definitions below.

-

-   PNG_FORMAT_RGB_COLORMAP

-   PNG_FORMAT_BGR_COLORMAP

-   PNG_FORMAT_RGBA_COLORMAP

-   PNG_FORMAT_ARGB_COLORMAP

-   PNG_FORMAT_BGRA_COLORMAP

-   PNG_FORMAT_ABGR_COLORMAP

-

-PNG_IMAGE macros

-

-These are convenience macros to derive information from a png_image

-structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the

-actual image sample values - either the entries in the color-map or the

-pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values

-for the pixels and will always return 1 for color-mapped formats.  The

-remaining macros return information about the rows in the image and the

-complete image.

-

-NOTE: All the macros that take a png_image::format parameter are compile time

-constants if the format parameter is, itself, a constant.  Therefore these

-macros can be used in array declarations and case labels where required.

-Similarly the macros are also pre-processor constants (sizeof is not used) so

-they can be used in #if tests.

-

-  PNG_IMAGE_SAMPLE_CHANNELS(fmt)

-    Returns the total number of channels in a given format: 1..4

-

-  PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)

-    Returns the size in bytes of a single component of a pixel or color-map

-    entry (as appropriate) in the image: 1 or 2.

-

-  PNG_IMAGE_SAMPLE_SIZE(fmt)

-    This is the size of the sample data for one sample.  If the image is

-    color-mapped it is the size of one color-map entry (and image pixels are

-    one byte in size), otherwise it is the size of one image pixel.

-

-  PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)

-    The maximum size of the color-map required by the format expressed in a

-    count of components.  This can be used to compile-time allocate a

-    color-map:

-

-    png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];

-

-    png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];

-

-    Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the

-    information from one of the png_image_begin_read_ APIs and dynamically

-    allocate the required memory.

-

-  PNG_IMAGE_COLORMAP_SIZE(fmt)

-   The size of the color-map required by the format; this is the size of the

-   color-map buffer passed to the png_image_{read,write}_colormap APIs. It is

-   a fixed number determined by the format so can easily be allocated on the

-   stack if necessary.

-

-Corresponding information about the pixels

-

-  PNG_IMAGE_PIXEL_CHANNELS(fmt)

-   The number of separate channels (components) in a pixel; 1 for a

-   color-mapped image.

-

-  PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\

-   The size, in bytes, of each component in a pixel; 1 for a color-mapped

-   image.

-

-  PNG_IMAGE_PIXEL_SIZE(fmt)

-   The size, in bytes, of a complete pixel; 1 for a color-mapped image.

-

-Information about the whole row, or whole image

-

-  PNG_IMAGE_ROW_STRIDE(image)

-   Returns the total number of components in a single row of the image; this

-   is the minimum 'row stride', the minimum count of components between each

-   row.  For a color-mapped image this is the minimum number of bytes in a

-   row.

-

-   If you need the stride measured in bytes, row_stride_bytes is

-   PNG_IMAGE_ROW_STRIDE(image) * PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)

-   plus any padding bytes that your application might need, for example

-   to start the next row on a 4-byte boundary.

-

-  PNG_IMAGE_BUFFER_SIZE(image, row_stride)

-   Return the size, in bytes, of an image buffer given a png_image and a row

-   stride - the number of components to leave space for in each row.

-

-  PNG_IMAGE_SIZE(image)

-   Return the size, in bytes, of the image in memory given just a png_image;

-   the row stride is the minimum stride required for the image.

-

-  PNG_IMAGE_COLORMAP_SIZE(image)

-   Return the size, in bytes, of the color-map of this image.  If the image

-   format is not a color-map format this will return a size sufficient for

-   256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if

-   you don't want to allocate a color-map in this case.

-

-PNG_IMAGE_FLAG_*

-

-Flags containing additional information about the image are held in

-the 'flags' field of png_image.

-

-  PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB == 0x01

-    This indicates the the RGB values of the in-memory bitmap do not

-    correspond to the red, green and blue end-points defined by sRGB.

-

-  PNG_IMAGE_FLAG_FAST == 0x02

-   On write emphasise speed over compression; the resultant PNG file will be

-   larger but will be produced significantly faster, particular for large

-   images.  Do not use this option for images which will be distributed, only

-   used it when producing intermediate files that will be read back in

-   repeatedly.  For a typical 24-bit image the option will double the read

-   speed at the cost of increasing the image size by 25%, however for many

-   more compressible images the PNG file can be 10 times larger with only a

-   slight speed gain.

-

-  PNG_IMAGE_FLAG_16BIT_sRGB == 0x04

-    On read if the image is a 16-bit per component image and there is no gAMA

-    or sRGB chunk assume that the components are sRGB encoded.  Notice that

-    images output by the simplified API always have gamma information; setting

-    this flag only affects the interpretation of 16-bit images from an

-    external source.  It is recommended that the application expose this flag

-    to the user; the user can normally easily recognize the difference between

-    linear and sRGB encoding.  This flag has no effect on write - the data

-    passed to the write APIs must have the correct encoding (as defined

-    above.)

-

-    If the flag is not set (the default) input 16-bit per component data is

-    assumed to be linear.

-

-    NOTE: the flag can only be set after the png_image_begin_read_ call,

-    because that call initializes the 'flags' field.

-

-READ APIs

-

-   The png_image passed to the read APIs must have been initialized by setting

-   the png_controlp field 'opaque' to NULL (or, better, memset the whole thing.)

-

-   int png_image_begin_read_from_file( png_imagep image,

-     const char *file_name)

-

-     The named file is opened for read and the image header

-     is filled in from the PNG header in the file.

-

-   int png_image_begin_read_from_stdio (png_imagep image,

-     FILE* file)

-

-      The PNG header is read from the stdio FILE object.

-

-   int png_image_begin_read_from_memory(png_imagep image,

-      png_const_voidp memory, png_size_t size)

-

-      The PNG header is read from the given memory buffer.

-

-   int png_image_finish_read(png_imagep image,

-      png_colorp background, void *buffer,

-      png_int_32 row_stride, void *colormap));

-

-      Finish reading the image into the supplied buffer and

-      clean up the png_image structure.

-

-      row_stride is the step, in png_byte or png_uint_16 units

-      as appropriate, between adjacent rows.  A positive stride

-      indicates that the top-most row is first in the buffer -

-      the normal top-down arrangement.  A negative stride

-      indicates that the bottom-most row is first in the buffer.

-

-      background need only be supplied if an alpha channel must

-      be removed from a png_byte format and the removal is to be

-      done by compositing on a solid color; otherwise it may be

-      NULL and any composition will be done directly onto the

-      buffer.  The value is an sRGB color to use for the

-      background, for grayscale output the green channel is used.

-

-      For linear output removing the alpha channel is always done

-      by compositing on black.

-

-   void png_image_free(png_imagep image)

-

-      Free any data allocated by libpng in image->opaque,

-      setting the pointer to NULL.  May be called at any time

-      after the structure is initialized.

-

-When the simplified API needs to convert between sRGB and linear colorspaces,

-the actual sRGB transfer curve defined in the sRGB specification (see the

-article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2

-approximation used elsewhere in libpng.

-

-WRITE APIS

-

-For write you must initialize a png_image structure to describe the image to

-be written:

-

-   version: must be set to PNG_IMAGE_VERSION

-   opaque: must be initialized to NULL

-   width: image width in pixels

-   height: image height in rows

-   format: the format of the data you wish to write

-   flags: set to 0 unless one of the defined flags applies; set

-      PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images

-      where the RGB values do not correspond to the colors in sRGB.

-   colormap_entries: set to the number of entries in the color-map (0 to 256)

-

-   int png_image_write_to_file, (png_imagep image,

-      const char *file, int convert_to_8bit, const void *buffer,

-      png_int_32 row_stride, const void *colormap));

-

-      Write the image to the named file.

-

-   int png_image_write_to_memory (png_imagep image, void *memory,

-      png_alloc_size_t * PNG_RESTRICT memory_bytes,

-      int convert_to_8_bit, const void *buffer, ptrdiff_t row_stride,

-      const void *colormap));

-

-      Write the image to memory.

-

-   int png_image_write_to_stdio(png_imagep image, FILE *file,

-      int convert_to_8_bit, const void *buffer,

-      png_int_32 row_stride, const void *colormap)

-

-      Write the image to the given (FILE*).

-

-With all write APIs if image is in one of the linear formats with

-(png_uint_16) data then setting convert_to_8_bit will cause the output to be

-a (png_byte) PNG gamma encoded according to the sRGB specification, otherwise

-a 16-bit linear encoded PNG file is written.

-

-With all APIs row_stride is handled as in the read APIs - it is the spacing

-from one row to the next in component sized units (float) and if negative

-indicates a bottom-up row layout in the buffer.  If you pass zero, libpng will

-calculate the row_stride for you from the width and number of channels.

-

-Note that the write API does not support interlacing, sub-8-bit pixels,

-indexed (paletted) images, or most ancillary chunks.

-

-VI. Modifying/Customizing libpng

-

-There are two issues here.  The first is changing how libpng does

-standard things like memory allocation, input/output, and error handling.

-The second deals with more complicated things like adding new chunks,

-adding new transformations, and generally changing how libpng works.

-Both of those are compile-time issues; that is, they are generally

-determined at the time the code is written, and there is rarely a need

-to provide the user with a means of changing them.

-

-Memory allocation, input/output, and error handling

-

-All of the memory allocation, input/output, and error handling in libpng

-goes through callbacks that are user-settable.  The default routines are

-in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change

-these functions, call the appropriate png_set_*_fn() function.

-

-Memory allocation is done through the functions png_malloc(), png_calloc(),

-and png_free().  The png_malloc() and png_free() functions currently just

-call the standard C functions and png_calloc() calls png_malloc() and then

-clears the newly allocated memory to zero; note that png_calloc(png_ptr, size)

-is not the same as the calloc(number, size) function provided by stdlib.h.

-There is limited support for certain systems with segmented memory

-architectures and the types of pointers declared by png.h match this; you

-will have to use appropriate pointers in your application.  If you prefer

-to use a different method of allocating and freeing data, you can use

-png_create_read_struct_2() or png_create_write_struct_2() to register your

-own functions as described above.  These functions also provide a void

-pointer that can be retrieved via

-

-    mem_ptr=png_get_mem_ptr(png_ptr);

-

-Your replacement memory functions must have prototypes as follows:

-

-    png_voidp malloc_fn(png_structp png_ptr,

-       png_alloc_size_t size);

-

-    void free_fn(png_structp png_ptr, png_voidp ptr);

-

-Your malloc_fn() must return NULL in case of failure.  The png_malloc()

-function will normally call png_error() if it receives a NULL from the

-system memory allocator or from your replacement malloc_fn().

-

-Your free_fn() will never be called with a NULL ptr, since libpng's

-png_free() checks for NULL before calling free_fn().

-

-Input/Output in libpng is done through png_read() and png_write(),

-which currently just call fread() and fwrite().  The FILE * is stored in

-png_struct and is initialized via png_init_io().  If you wish to change

-the method of I/O, the library supplies callbacks that you can set

-through the function png_set_read_fn() and png_set_write_fn() at run

-time, instead of calling the png_init_io() function.  These functions

-also provide a void pointer that can be retrieved via the function

-png_get_io_ptr().  For example:

-

-    png_set_read_fn(png_structp read_ptr,

-        voidp read_io_ptr, png_rw_ptr read_data_fn)

-

-    png_set_write_fn(png_structp write_ptr,

-        voidp write_io_ptr, png_rw_ptr write_data_fn,

-        png_flush_ptr output_flush_fn);

-

-    voidp read_io_ptr = png_get_io_ptr(read_ptr);

-    voidp write_io_ptr = png_get_io_ptr(write_ptr);

-

-The replacement I/O functions must have prototypes as follows:

-

-    void user_read_data(png_structp png_ptr,

-        png_bytep data, png_size_t length);

-

-    void user_write_data(png_structp png_ptr,

-        png_bytep data, png_size_t length);

-

-    void user_flush_data(png_structp png_ptr);

-

-The user_read_data() function is responsible for detecting and

-handling end-of-data errors.

-

-Supplying NULL for the read, write, or flush functions sets them back

-to using the default C stream functions, which expect the io_ptr to

-point to a standard *FILE structure.  It is probably a mistake

-to use NULL for one of write_data_fn and output_flush_fn but not both

-of them, unless you have built libpng with PNG_NO_WRITE_FLUSH defined.

-It is an error to read from a write stream, and vice versa.

-

-Error handling in libpng is done through png_error() and png_warning().

-Errors handled through png_error() are fatal, meaning that png_error()

-should never return to its caller.  Currently, this is handled via

-setjmp() and longjmp() (unless you have compiled libpng with

-PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()),

-but you could change this to do things like exit() if you should wish,

-as long as your function does not return.

-

-On non-fatal errors, png_warning() is called

-to print a warning message, and then control returns to the calling code.

-By default png_error() and png_warning() print a message on stderr via

-fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined

-(because you don't want the messages) or PNG_NO_STDIO defined (because

-fprintf() isn't available).  If you wish to change the behavior of the error

-functions, you will need to set up your own message callbacks.  These

-functions are normally supplied at the time that the png_struct is created.

-It is also possible to redirect errors and warnings to your own replacement

-functions after png_create_*_struct() has been called by calling:

-

-    png_set_error_fn(png_structp png_ptr,

-        png_voidp error_ptr, png_error_ptr error_fn,

-        png_error_ptr warning_fn);

-

-If NULL is supplied for either error_fn or warning_fn, then the libpng

-default function will be used, calling fprintf() and/or longjmp() if a

-problem is encountered.  The replacement error functions should have

-parameters as follows:

-

-    void user_error_fn(png_structp png_ptr,

-        png_const_charp error_msg);

-

-    void user_warning_fn(png_structp png_ptr,

-        png_const_charp warning_msg);

-

-Then, within your user_error_fn or user_warning_fn, you can retrieve

-the error_ptr if you need it, by calling

-

-    png_voidp error_ptr = png_get_error_ptr(png_ptr);

-

-The motivation behind using setjmp() and longjmp() is the C++ throw and

-catch exception handling methods.  This makes the code much easier to write,

-as there is no need to check every return code of every function call.

-However, there are some uncertainties about the status of local variables

-after a longjmp, so the user may want to be careful about doing anything

-after setjmp returns non-zero besides returning itself.  Consult your

-compiler documentation for more details.  For an alternative approach, you

-may wish to use the "cexcept" facility (see https://cexcept.sourceforge.io/),

-which is illustrated in pngvalid.c and in contrib/visupng.

-

-Beginning in libpng-1.4.0, the png_set_benign_errors() API became available.

-You can use this to handle certain errors (normally handled as errors)

-as warnings.

-

-    png_set_benign_errors (png_ptr, int allowed);

-

-    allowed: 0: treat png_benign_error() as an error.

-             1: treat png_benign_error() as a warning.

-

-As of libpng-1.6.0, the default condition is to treat benign errors as

-warnings while reading and as errors while writing.

-

-Custom chunks

-

-If you need to read or write custom chunks, you may need to get deeper

-into the libpng code.  The library now has mechanisms for storing

-and writing chunks of unknown type; you can even declare callbacks

-for custom chunks.  However, this may not be good enough if the

-library code itself needs to know about interactions between your

-chunk and existing `intrinsic' chunks.

-

-If you need to write a new intrinsic chunk, first read the PNG

-specification. Acquire a first level of understanding of how it works.

-Pay particular attention to the sections that describe chunk names,

-and look at how other chunks were designed, so you can do things

-similarly.  Second, check out the sections of libpng that read and

-write chunks.  Try to find a chunk that is similar to yours and use

-it as a template.  More details can be found in the comments inside

-the code.  It is best to handle private or unknown chunks in a generic method,

-via callback functions, instead of by modifying libpng functions. This

-is illustrated in pngtest.c, which uses a callback function to handle a

-private "vpAg" chunk and the new "sTER" chunk, which are both unknown to

-libpng.

-

-If you wish to write your own transformation for the data, look through

-the part of the code that does the transformations, and check out some of

-the simpler ones to get an idea of how they work.  Try to find a similar

-transformation to the one you want to add and copy off of it.  More details

-can be found in the comments inside the code itself.

-

-Configuring for gui/windowing platforms:

-

-You will need to write new error and warning functions that use the GUI

-interface, as described previously, and set them to be the error and

-warning functions at the time that png_create_*_struct() is called,

-in order to have them available during the structure initialization.

-They can be changed later via png_set_error_fn().  On some compilers,

-you may also have to change the memory allocators (png_malloc, etc.).

-

-Configuring zlib:

-

-There are special functions to configure the compression.  Perhaps the

-most useful one changes the compression level, which currently uses

-input compression values in the range 0 - 9.  The library normally

-uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests

-have shown that for a large majority of images, compression values in

-the range 3-6 compress nearly as well as higher levels, and do so much

-faster.  For online applications it may be desirable to have maximum speed

-(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also

-specify no compression (Z_NO_COMPRESSION = 0), but this would create

-files larger than just storing the raw bitmap.  You can specify the

-compression level by calling:

-

-    #include zlib.h

-    png_set_compression_level(png_ptr, level);

-

-Another useful one is to reduce the memory level used by the library.

-The memory level defaults to 8, but it can be lowered if you are

-short on memory (running DOS, for example, where you only have 640K).

-Note that the memory level does have an effect on compression; among

-other things, lower levels will result in sections of incompressible

-data being emitted in smaller stored blocks, with a correspondingly

-larger relative overhead of up to 15% in the worst case.

-

-    #include zlib.h

-    png_set_compression_mem_level(png_ptr, level);

-

-The other functions are for configuring zlib.  They are not recommended

-for normal use and may result in writing an invalid PNG file.  See

-zlib.h for more information on what these mean.

-

-    #include zlib.h

-    png_set_compression_strategy(png_ptr,

-        strategy);

-

-    png_set_compression_window_bits(png_ptr,

-        window_bits);

-

-    png_set_compression_method(png_ptr, method);

-

-This controls the size of the IDAT chunks (default 8192):

-

-    png_set_compression_buffer_size(png_ptr, size);

-

-As of libpng version 1.5.4, additional APIs became

-available to set these separately for non-IDAT

-compressed chunks such as zTXt, iTXt, and iCCP:

-

-    #include zlib.h

-    #if PNG_LIBPNG_VER >= 10504

-    png_set_text_compression_level(png_ptr, level);

-

-    png_set_text_compression_mem_level(png_ptr, level);

-

-    png_set_text_compression_strategy(png_ptr,

-        strategy);

-

-    png_set_text_compression_window_bits(png_ptr,

-        window_bits);

-

-    png_set_text_compression_method(png_ptr, method);

-    #endif

-

-Controlling row filtering

-

-If you want to control whether libpng uses filtering or not, which

-filters are used, and how it goes about picking row filters, you

-can call one of these functions.  The selection and configuration

-of row filters can have a significant impact on the size and

-encoding speed and a somewhat lesser impact on the decoding speed

-of an image.  Filtering is enabled by default for RGB and grayscale

-images (with and without alpha), but not for paletted images nor

-for any images with bit depths less than 8 bits/pixel.

-

-The 'method' parameter sets the main filtering method, which is

-currently only '0' in the PNG 1.2 specification.  The 'filters'

-parameter sets which filter(s), if any, should be used for each

-scanline.  Possible values are PNG_ALL_FILTERS, PNG_NO_FILTERS,

-or PNG_FAST_FILTERS to turn filtering on and off, or to turn on

-just the fast-decoding subset of filters, respectively.

-

-Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,

-PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise

-ORed together with '|' to specify one or more filters to use.

-These filters are described in more detail in the PNG specification.

-If you intend to change the filter type during the course of writing

-the image, you should start with flags set for all of the filters

-you intend to use so that libpng can initialize its internal

-structures appropriately for all of the filter types.  (Note that this

-means the first row must always be adaptively filtered, because libpng

-currently does not allocate the filter buffers until png_write_row()

-is called for the first time.)

-

-    filters = PNG_NO_FILTERS;

-    filters = PNG_ALL_FILTERS;

-    filters = PNG_FAST_FILTERS;

-

-    or

-

-    filters = PNG_FILTER_NONE | PNG_FILTER_SUB |

-              PNG_FILTER_UP | PNG_FILTER_AVG |

-              PNG_FILTER_PAETH;

-

-    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,

-       filters);

-

-              The second parameter can also be

-              PNG_INTRAPIXEL_DIFFERENCING if you are

-              writing a PNG to be embedded in a MNG

-              datastream.  This parameter must be the

-              same as the value of filter_method used

-              in png_set_IHDR().

-

-Requesting debug printout

-

-The macro definition PNG_DEBUG can be used to request debugging

-printout.  Set it to an integer value in the range 0 to 3.  Higher

-numbers result in increasing amounts of debugging information.  The

-information is printed to the "stderr" file, unless another file

-name is specified in the PNG_DEBUG_FILE macro definition.

-

-When PNG_DEBUG > 0, the following functions (macros) become available:

-

-   png_debug(level, message)

-   png_debug1(level, message, p1)

-   png_debug2(level, message, p1, p2)

-

-in which "level" is compared to PNG_DEBUG to decide whether to print

-the message, "message" is the formatted string to be printed,

-and p1 and p2 are parameters that are to be embedded in the string

-according to printf-style formatting directives.  For example,

-

-   png_debug1(2, "foo=%d", foo);

-

-is expanded to

-

-   if (PNG_DEBUG > 2)

-      fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);

-

-When PNG_DEBUG is defined but is zero, the macros aren't defined, but you

-can still use PNG_DEBUG to control your own debugging:

-

-   #ifdef PNG_DEBUG

-       fprintf(stderr, ...

-   #endif

-

-When PNG_DEBUG = 1, the macros are defined, but only png_debug statements

-having level = 0 will be printed.  There aren't any such statements in

-this version of libpng, but if you insert some they will be printed.

-

-VII.  MNG support

-

-The MNG specification (available at http://www.libpng.org/pub/mng) allows

-certain extensions to PNG for PNG images that are embedded in MNG datastreams.

-Libpng can support some of these extensions.  To enable them, use the

-png_permit_mng_features() function:

-

-   feature_set = png_permit_mng_features(png_ptr, mask)

-

-   mask is a png_uint_32 containing the bitwise OR of the

-        features you want to enable.  These include

-        PNG_FLAG_MNG_EMPTY_PLTE

-        PNG_FLAG_MNG_FILTER_64

-        PNG_ALL_MNG_FEATURES

-

-   feature_set is a png_uint_32 that is the bitwise AND of

-      your mask with the set of MNG features that is

-      supported by the version of libpng that you are using.

-

-It is an error to use this function when reading or writing a standalone

-PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped

-in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature

-and the MHDR and MEND chunks.  Libpng does not provide support for these

-or any other MNG chunks; your application must provide its own support for

-them.  You may wish to consider using libmng (available at

-https://www.libmng.com/) instead.

-

-VIII.  Changes to Libpng from version 0.88

-

-It should be noted that versions of libpng later than 0.96 are not

-distributed by the original libpng author, Guy Schalnat, nor by

-Andreas Dilger, who had taken over from Guy during 1996 and 1997, and

-distributed versions 0.89 through 0.96, but rather by another member

-of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are

-still alive and well, but they have moved on to other things.

-

-The old libpng functions png_read_init(), png_write_init(),

-png_info_init(), png_read_destroy(), and png_write_destroy() have been

-moved to PNG_INTERNAL in version 0.95 to discourage their use.  These

-functions will be removed from libpng version 1.4.0.

-

-The preferred method of creating and initializing the libpng structures is

-via the png_create_read_struct(), png_create_write_struct(), and

-png_create_info_struct() because they isolate the size of the structures

-from the application, allow version error checking, and also allow the

-use of custom error handling routines during the initialization, which

-the old functions do not.  The functions png_read_destroy() and

-png_write_destroy() do not actually free the memory that libpng

-allocated for these structs, but just reset the data structures, so they

-can be used instead of png_destroy_read_struct() and

-png_destroy_write_struct() if you feel there is too much system overhead

-allocating and freeing the png_struct for each image read.

-

-Setting the error callbacks via png_set_message_fn() before

-png_read_init() as was suggested in libpng-0.88 is no longer supported

-because this caused applications that do not use custom error functions

-to fail if the png_ptr was not initialized to zero.  It is still possible

-to set the error callbacks AFTER png_read_init(), or to change them with

-png_set_error_fn(), which is essentially the same function, but with a new

-name to force compilation errors with applications that try to use the old

-method.

-

-Support for the sCAL, iCCP, iTXt, and sPLT chunks was added at libpng-1.0.6;

-however, iTXt support was not enabled by default.

-

-Starting with version 1.0.7, you can find out which version of the library

-you are using at run-time:

-

-   png_uint_32 libpng_vn = png_access_version_number();

-

-The number libpng_vn is constructed from the major version, minor

-version with leading zero, and release number with leading zero,

-(e.g., libpng_vn for version 1.0.7 is 10007).

-

-Note that this function does not take a png_ptr, so you can call it

-before you've created one.

-

-You can also check which version of png.h you used when compiling your

-application:

-

-   png_uint_32 application_vn = PNG_LIBPNG_VER;

-

-IX.  Changes to Libpng from version 1.0.x to 1.2.x

-

-Support for user memory management was enabled by default.  To

-accomplish this, the functions png_create_read_struct_2(),

-png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(),

-png_malloc_default(), and png_free_default() were added.

-

-Support for the iTXt chunk has been enabled by default as of

-version 1.2.41.

-

-Support for certain MNG features was enabled.

-

-Support for numbered error messages was added.  However, we never got

-around to actually numbering the error messages.  The function

-png_set_strip_error_numbers() was added (Note: the prototype for this

-function was inadvertently removed from png.h in PNG_NO_ASSEMBLER_CODE

-builds of libpng-1.2.15.  It was restored in libpng-1.2.36).

-

-The png_malloc_warn() function was added at libpng-1.2.3.  This issues

-a png_warning and returns NULL instead of aborting when it fails to

-acquire the requested memory allocation.

-

-Support for setting user limits on image width and height was enabled

-by default.  The functions png_set_user_limits(), png_get_user_width_max(),

-and png_get_user_height_max() were added at libpng-1.2.6.

-

-The png_set_add_alpha() function was added at libpng-1.2.7.

-

-The function png_set_expand_gray_1_2_4_to_8() was added at libpng-1.2.9.

-Unlike png_set_gray_1_2_4_to_8(), the new function does not expand the

-tRNS chunk to alpha. The png_set_gray_1_2_4_to_8() function is

-deprecated.

-

-A number of macro definitions in support of runtime selection of

-assembler code features (especially Intel MMX code support) were

-added at libpng-1.2.0:

-

-    PNG_ASM_FLAG_MMX_SUPPORT_COMPILED

-    PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU

-    PNG_ASM_FLAG_MMX_READ_COMBINE_ROW

-    PNG_ASM_FLAG_MMX_READ_INTERLACE

-    PNG_ASM_FLAG_MMX_READ_FILTER_SUB

-    PNG_ASM_FLAG_MMX_READ_FILTER_UP

-    PNG_ASM_FLAG_MMX_READ_FILTER_AVG

-    PNG_ASM_FLAG_MMX_READ_FILTER_PAETH

-    PNG_ASM_FLAGS_INITIALIZED

-    PNG_MMX_READ_FLAGS

-    PNG_MMX_FLAGS

-    PNG_MMX_WRITE_FLAGS

-    PNG_MMX_FLAGS

-

-We added the following functions in support of runtime

-selection of assembler code features:

-

-    png_get_mmx_flagmask()

-    png_set_mmx_thresholds()

-    png_get_asm_flags()

-    png_get_mmx_bitdepth_threshold()

-    png_get_mmx_rowbytes_threshold()

-    png_set_asm_flags()

-

-We replaced all of these functions with simple stubs in libpng-1.2.20,

-when the Intel assembler code was removed due to a licensing issue.

-

-These macros are deprecated:

-

-    PNG_READ_TRANSFORMS_NOT_SUPPORTED

-    PNG_PROGRESSIVE_READ_NOT_SUPPORTED

-    PNG_NO_SEQUENTIAL_READ_SUPPORTED

-    PNG_WRITE_TRANSFORMS_NOT_SUPPORTED

-    PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED

-    PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED

-

-They have been replaced, respectively, by:

-

-    PNG_NO_READ_TRANSFORMS

-    PNG_NO_PROGRESSIVE_READ

-    PNG_NO_SEQUENTIAL_READ

-    PNG_NO_WRITE_TRANSFORMS

-    PNG_NO_READ_ANCILLARY_CHUNKS

-    PNG_NO_WRITE_ANCILLARY_CHUNKS

-

-PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been

-deprecated since libpng-1.0.16 and libpng-1.2.6.

-

-The function

-    png_check_sig(sig, num)

-was replaced with

-    !png_sig_cmp(sig, 0, num)

-It has been deprecated since libpng-0.90.

-

-The function

-    png_set_gray_1_2_4_to_8()

-which also expands tRNS to alpha was replaced with

-    png_set_expand_gray_1_2_4_to_8()

-which does not. It has been deprecated since libpng-1.0.18 and 1.2.9.

-

-X.  Changes to Libpng from version 1.0.x/1.2.x to 1.4.x

-

-Private libpng prototypes and macro definitions were moved from

-png.h and pngconf.h into a new pngpriv.h header file.

-

-Functions png_set_benign_errors(), png_benign_error(), and

-png_chunk_benign_error() were added.

-

-Support for setting the maximum amount of memory that the application

-will allocate for reading chunks was added, as a security measure.

-The functions png_set_chunk_cache_max() and png_get_chunk_cache_max()

-were added to the library.

-

-We implemented support for I/O states by adding png_ptr member io_state

-and functions png_get_io_chunk_name() and png_get_io_state() in pngget.c

-

-We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level

-input transforms.

-

-Checking for and reporting of errors in the IHDR chunk is more thorough.

-

-Support for global arrays was removed, to improve thread safety.

-

-Some obsolete/deprecated macros and functions have been removed.

-

-Typecasted NULL definitions such as

-   #define png_voidp_NULL            (png_voidp)NULL

-were eliminated.  If you used these in your application, just use

-NULL instead.

-

-The png_struct and info_struct members "trans" and "trans_values" were

-changed to "trans_alpha" and "trans_color", respectively.

-

-The obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles

-were removed.

-

-The PNG_1_0_X and PNG_1_2_X macros were eliminated.

-

-The PNG_LEGACY_SUPPORTED macro was eliminated.

-

-Many WIN32_WCE #ifdefs were removed.

-

-The functions png_read_init(info_ptr), png_write_init(info_ptr),

-png_info_init(info_ptr), png_read_destroy(), and png_write_destroy()

-have been removed.  They have been deprecated since libpng-0.95.

-

-The png_permit_empty_plte() was removed. It has been deprecated

-since libpng-1.0.9.  Use png_permit_mng_features() instead.

-

-We removed the obsolete stub functions png_get_mmx_flagmask(),

-png_set_mmx_thresholds(), png_get_asm_flags(),

-png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),

-png_set_asm_flags(), and png_mmx_supported()

-

-We removed the obsolete png_check_sig(), png_memcpy_check(), and

-png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),

-and memset(), respectively.

-

-The function png_set_gray_1_2_4_to_8() was removed. It has been

-deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with

-png_set_expand_gray_1_2_4_to_8() because the former function also

-expanded any tRNS chunk to an alpha channel.

-

-Macros for png_get_uint_16, png_get_uint_32, and png_get_int_32

-were added and are used by default instead of the corresponding

-functions. Unfortunately,

-from libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the

-function) incorrectly returned a value of type png_uint_32.

-

-We changed the prototype for png_malloc() from

-    png_malloc(png_structp png_ptr, png_uint_32 size)

-to

-    png_malloc(png_structp png_ptr, png_alloc_size_t size)

-

-This also applies to the prototype for the user replacement malloc_fn().

-

-The png_calloc() function was added and is used in place of

-of "png_malloc(); memset();" except in the case in png_read_png()

-where the array consists of pointers; in this case a "for" loop is used

-after the png_malloc() to set the pointers to NULL, to give robust.

-behavior in case the application runs out of memory part-way through

-the process.

-

-We changed the prototypes of png_get_compression_buffer_size() and

-png_set_compression_buffer_size() to work with png_size_t instead of

-png_uint_32.

-

-Support for numbered error messages was removed by default, since we

-never got around to actually numbering the error messages. The function

-png_set_strip_error_numbers() was removed from the library by default.

-

-The png_zalloc() and png_zfree() functions are no longer exported.

-The png_zalloc() function no longer zeroes out the memory that it

-allocates.  Applications that called png_zalloc(png_ptr, number, size)

-can call png_calloc(png_ptr, number*size) instead, and can call

-png_free() instead of png_zfree().

-

-Support for dithering was disabled by default in libpng-1.4.0, because

-it has not been well tested and doesn't actually "dither".

-The code was not

-removed, however, and could be enabled by building libpng with

-PNG_READ_DITHER_SUPPORTED defined.  In libpng-1.4.2, this support

-was re-enabled, but the function was renamed png_set_quantize() to

-reflect more accurately what it actually does.  At the same time,

-the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros were also renamed to

-PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS, and PNG_READ_DITHER_SUPPORTED

-was renamed to PNG_READ_QUANTIZE_SUPPORTED.

-

-We removed the trailing '.' from the warning and error messages.

-

-XI.  Changes to Libpng from version 1.4.x to 1.5.x

-

-From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the

-function) incorrectly returned a value of type png_uint_32.

-The incorrect macro was removed from libpng-1.4.5.

-

-Checking for invalid palette index on write was added at libpng

-1.5.10.  If a pixel contains an invalid (out-of-range) index libpng issues

-a benign error.  This is enabled by default because this condition is an

-error according to the PNG specification, Clause 11.3.2, but the error can

-be ignored in each png_ptr with

-

-   png_set_check_for_invalid_index(png_ptr, allowed);

-

-      allowed  - one of

-                 0: disable benign error (accept the

-                    invalid data without warning).

-                 1: enable benign error (treat the

-                    invalid data as an error or a

-                    warning).

-

-If the error is ignored, or if png_benign_error() treats it as a warning,

-any invalid pixels are decoded as opaque black by the decoder and written

-as-is by the encoder.

-

-Retrieving the maximum palette index found was added at libpng-1.5.15.

-This statement must appear after png_read_png() or png_read_image() while

-reading, and after png_write_png() or png_write_image() while writing.

-

-   int max_palette = png_get_palette_max(png_ptr, info_ptr);

-

-This will return the maximum palette index found in the image, or "-1" if

-the palette was not checked, or "0" if no palette was found.  Note that this

-does not account for any palette index used by ancillary chunks such as the

-bKGD chunk; you must check those separately to determine the maximum

-palette index actually used.

-

-There are no substantial API changes between the non-deprecated parts of

-the 1.4.5 API and the 1.5.0 API; however, the ability to directly access

-members of the main libpng control structures, png_struct and png_info,

-deprecated in earlier versions of libpng, has been completely removed from

-libpng 1.5, and new private "pngstruct.h", "pnginfo.h", and "pngdebug.h"

-header files were created.

-

-We no longer include zlib.h in png.h.  The include statement has been moved

-to pngstruct.h, where it is not accessible by applications. Applications that

-need access to information in zlib.h will need to add the '#include "zlib.h"'

-directive.  It does not matter whether this is placed prior to or after

-the '"#include png.h"' directive.

-

-The png_sprintf(), png_strcpy(), and png_strncpy() macros are no longer used

-and were removed.

-

-We moved the png_strlen(), png_memcpy(), png_memset(), and png_memcmp()

-macros into a private header file (pngpriv.h) that is not accessible to

-applications.

-

-In png_get_iCCP, the type of "profile" was changed from png_charpp

-to png_bytepp, and in png_set_iCCP, from png_charp to png_const_bytep.

-

-There are changes of form in png.h, including new and changed macros to

-declare parts of the API.  Some API functions with arguments that are

-pointers to data not modified within the function have been corrected to

-declare these arguments with PNG_CONST.

-

-Much of the internal use of C macros to control the library build has also

-changed and some of this is visible in the exported header files, in

-particular the use of macros to control data and API elements visible

-during application compilation may require significant revision to

-application code.  (It is extremely rare for an application to do this.)

-

-Any program that compiled against libpng 1.4 and did not use deprecated

-features or access internal library structures should compile and work

-against libpng 1.5, except for the change in the prototype for

-png_get_iCCP() and png_set_iCCP() API functions mentioned above.

-

-libpng 1.5.0 adds PNG_ PASS macros to help in the reading and writing of

-interlaced images.  The macros return the number of rows and columns in

-each pass and information that can be used to de-interlace and (if

-absolutely necessary) interlace an image.

-

-libpng 1.5.0 adds an API png_longjmp(png_ptr, value).  This API calls

-the application-provided png_longjmp_ptr on the internal, but application

-initialized, longjmp buffer.  It is provided as a convenience to avoid

-the need to use the png_jmpbuf macro, which had the unnecessary side

-effect of resetting the internal png_longjmp_ptr value.

-

-libpng 1.5.0 includes a complete fixed point API.  By default this is

-present along with the corresponding floating point API.  In general the

-fixed point API is faster and smaller than the floating point one because

-the PNG file format used fixed point, not floating point.  This applies

-even if the library uses floating point in internal calculations.  A new

-macro, PNG_FLOATING_ARITHMETIC_SUPPORTED, reveals whether the library

-uses floating point arithmetic (the default) or fixed point arithmetic

-internally for performance critical calculations such as gamma correction.

-In some cases, the gamma calculations may produce slightly different

-results.  This has changed the results in png_rgb_to_gray and in alpha

-composition (png_set_background for example). This applies even if the

-original image was already linear (gamma == 1.0) and, therefore, it is

-not necessary to linearize the image.  This is because libpng has *not*

-been changed to optimize that case correctly, yet.

-

-Fixed point support for the sCAL chunk comes with an important caveat;

-the sCAL specification uses a decimal encoding of floating point values

-and the accuracy of PNG fixed point values is insufficient for

-representation of these values. Consequently a "string" API

-(png_get_sCAL_s and png_set_sCAL_s) is the only reliable way of reading

-arbitrary sCAL chunks in the absence of either the floating point API or

-internal floating point calculations.  Starting with libpng-1.5.0, both

-of these functions are present when PNG_sCAL_SUPPORTED is defined.  Prior

-to libpng-1.5.0, their presence also depended upon PNG_FIXED_POINT_SUPPORTED

-being defined and PNG_FLOATING_POINT_SUPPORTED not being defined.

-

-Applications no longer need to include the optional distribution header

-file pngusr.h or define the corresponding macros during application

-build in order to see the correct variant of the libpng API.  From 1.5.0

-application code can check for the corresponding _SUPPORTED macro:

-

-#ifdef PNG_INCH_CONVERSIONS_SUPPORTED

-   /* code that uses the inch conversion APIs. */

-#endif

-

-This macro will only be defined if the inch conversion functions have been

-compiled into libpng.  The full set of macros, and whether or not support

-has been compiled in, are available in the header file pnglibconf.h.

-This header file is specific to the libpng build.  Notice that prior to

-1.5.0 the _SUPPORTED macros would always have the default definition unless

-reset by pngusr.h or by explicit settings on the compiler command line.

-These settings may produce compiler warnings or errors in 1.5.0 because

-of macro redefinition.

-

-Applications can now choose whether to use these macros or to call the

-corresponding function by defining PNG_USE_READ_MACROS or

-PNG_NO_USE_READ_MACROS before including png.h.  Notice that this is

-only supported from 1.5.0; defining PNG_NO_USE_READ_MACROS prior to 1.5.0

-will lead to a link failure.

-

-Prior to libpng-1.5.4, the zlib compressor used the same set of parameters

-when compressing the IDAT data and textual data such as zTXt and iCCP.

-In libpng-1.5.4 we reinitialized the zlib stream for each type of data.

-We added five png_set_text_*() functions for setting the parameters to

-use with textual data.

-

-Prior to libpng-1.5.4, the PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED

-option was off by default, and slightly inaccurate scaling occurred.

-This option can no longer be turned off, and the choice of accurate

-or inaccurate 16-to-8 scaling is by using the new png_set_scale_16_to_8()

-API for accurate scaling or the old png_set_strip_16_to_8() API for simple

-chopping.  In libpng-1.5.4, the PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED

-macro became PNG_READ_SCALE_16_TO_8_SUPPORTED, and the PNG_READ_16_TO_8

-macro became PNG_READ_STRIP_16_TO_8_SUPPORTED, to enable the two

-png_set_*_16_to_8() functions separately.

-

-Prior to libpng-1.5.4, the png_set_user_limits() function could only be

-used to reduce the width and height limits from the value of

-PNG_USER_WIDTH_MAX and PNG_USER_HEIGHT_MAX, although this document said

-that it could be used to override them.  Now this function will reduce or

-increase the limits.

-

-Starting in libpng-1.5.22, default user limits were established. These

-can be overridden by application calls to png_set_user_limits(),

-png_set_user_chunk_cache_max(), and/or png_set_user_malloc_max().

-The limits are now

-                             max possible  default

-   png_user_width_max        0x7fffffff    1,000,000

-   png_user_height_max       0x7fffffff    1,000,000

-   png_user_chunk_cache_max  0 (unlimited) 1000

-   png_user_chunk_malloc_max 0 (unlimited) 8,000,000

-

-The png_set_option() function (and the "options" member of the png struct) was

-added to libpng-1.5.15, with option PNG_ARM_NEON.

-

-The library now supports a complete fixed point implementation and can

-thus be used on systems that have no floating point support or very

-limited or slow support.  Previously gamma correction, an essential part

-of complete PNG support, required reasonably fast floating point.

-

-As part of this the choice of internal implementation has been made

-independent of the choice of fixed versus floating point APIs and all the

-missing fixed point APIs have been implemented.

-

-The exact mechanism used to control attributes of API functions has

-changed, as described in the INSTALL file.

-

-A new test program, pngvalid, is provided in addition to pngtest.

-pngvalid validates the arithmetic accuracy of the gamma correction

-calculations and includes a number of validations of the file format.

-A subset of the full range of tests is run when "make check" is done

-(in the 'configure' build.)  pngvalid also allows total allocated memory

-usage to be evaluated and performs additional memory overwrite validation.

-

-Many changes to individual feature macros have been made. The following

-are the changes most likely to be noticed by library builders who

-configure libpng:

-

-1) All feature macros now have consistent naming:

-

-#define PNG_NO_feature turns the feature off

-#define PNG_feature_SUPPORTED turns the feature on

-

-pnglibconf.h contains one line for each feature macro which is either:

-

-#define PNG_feature_SUPPORTED

-

-if the feature is supported or:

-

-/*#undef PNG_feature_SUPPORTED*/

-

-if it is not.  Library code consistently checks for the 'SUPPORTED' macro.

-It does not, and libpng applications should not, check for the 'NO' macro

-which will not normally be defined even if the feature is not supported.

-The 'NO' macros are only used internally for setting or not setting the

-corresponding 'SUPPORTED' macros.

-

-Compatibility with the old names is provided as follows:

-

-PNG_INCH_CONVERSIONS turns on PNG_INCH_CONVERSIONS_SUPPORTED

-

-And the following definitions disable the corresponding feature:

-

-PNG_SETJMP_NOT_SUPPORTED disables SETJMP

-PNG_READ_TRANSFORMS_NOT_SUPPORTED disables READ_TRANSFORMS

-PNG_NO_READ_COMPOSITED_NODIV disables READ_COMPOSITE_NODIV

-PNG_WRITE_TRANSFORMS_NOT_SUPPORTED disables WRITE_TRANSFORMS

-PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED disables READ_ANCILLARY_CHUNKS

-PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED disables WRITE_ANCILLARY_CHUNKS

-

-Library builders should remove use of the above, inconsistent, names.

-

-2) Warning and error message formatting was previously conditional on

-the STDIO feature. The library has been changed to use the

-CONSOLE_IO feature instead. This means that if CONSOLE_IO is disabled

-the library no longer uses the printf(3) functions, even though the

-default read/write implementations use (FILE) style stdio.h functions.

-

-3) Three feature macros now control the fixed/floating point decisions:

-

-PNG_FLOATING_POINT_SUPPORTED enables the floating point APIs

-

-PNG_FIXED_POINT_SUPPORTED enables the fixed point APIs; however, in

-practice these are normally required internally anyway (because the PNG

-file format is fixed point), therefore in most cases PNG_NO_FIXED_POINT

-merely stops the function from being exported.

-

-PNG_FLOATING_ARITHMETIC_SUPPORTED chooses between the internal floating

-point implementation or the fixed point one.  Typically the fixed point

-implementation is larger and slower than the floating point implementation

-on a system that supports floating point; however, it may be faster on a

-system which lacks floating point hardware and therefore uses a software

-emulation.

-

-4) Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the

-functions to read and write ints to be disabled independently of

-PNG_USE_READ_MACROS, which allows libpng to be built with the functions

-even though the default is to use the macros - this allows applications

-to choose at app buildtime whether or not to use macros (previously

-impossible because the functions weren't in the default build.)

-

-XII.  Changes to Libpng from version 1.5.x to 1.6.x

-

-A "simplified API" has been added (see documentation in png.h and a simple

-example in contrib/examples/pngtopng.c).  The new publicly visible API

-includes the following:

-

-   macros:

-     PNG_FORMAT_*

-     PNG_IMAGE_*

-   structures:

-     png_control

-     png_image

-   read functions

-     png_image_begin_read_from_file()

-     png_image_begin_read_from_stdio()

-     png_image_begin_read_from_memory()

-     png_image_finish_read()

-     png_image_free()

-   write functions

-     png_image_write_to_file()

-     png_image_write_to_memory()

-     png_image_write_to_stdio()

-

-Starting with libpng-1.6.0, you can configure libpng to prefix all exported

-symbols, using the PNG_PREFIX macro.

-

-We no longer include string.h in png.h.  The include statement has been moved

-to pngpriv.h, where it is not accessible by applications.  Applications that

-need access to information in string.h must add an '#include <string.h>'

-directive.  It does not matter whether this is placed prior to or after

-the '#include "png.h"' directive.

-

-The following API are now DEPRECATED:

-   png_info_init_3()

-   png_convert_to_rfc1123() which has been replaced

-     with png_convert_to_rfc1123_buffer()

-   png_malloc_default()

-   png_free_default()

-   png_reset_zstream()

-

-The following have been removed:

-   png_get_io_chunk_name(), which has been replaced

-     with png_get_io_chunk_type().  The new

-     function returns a 32-bit integer instead of

-     a string.

-   The png_sizeof(), png_strlen(), png_memcpy(), png_memcmp(), and

-     png_memset() macros are no longer used in the libpng sources and

-     have been removed.  These had already been made invisible to applications

-     (i.e., defined in the private pngpriv.h header file) since libpng-1.5.0.

-

-The signatures of many exported functions were changed, such that

-   png_structp became png_structrp or png_const_structrp

-   png_infop became png_inforp or png_const_inforp

-where "rp" indicates a "restricted pointer".

-

-Dropped support for 16-bit platforms. The support for FAR/far types has

-been eliminated and the definition of png_alloc_size_t is now controlled

-by a flag so that 'small size_t' systems can select it if necessary.

-

-Error detection in some chunks has improved; in particular the iCCP chunk

-reader now does pretty complete validation of the basic format.  Some bad

-profiles that were previously accepted are now accepted with a warning or

-rejected, depending upon the png_set_benign_errors() setting, in particular

-the very old broken Microsoft/HP 3144-byte sRGB profile.  Starting with

-libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by

-means of

-

-    #if defined(PNG_SKIP_sRGB_CHECK_PROFILE) && \

-        defined(PNG_SET_OPTION_SUPPORTED)

-       png_set_option(png_ptr, PNG_SKIP_sRGB_CHECK_PROFILE,

-           PNG_OPTION_ON);

-    #endif

-

-It's not a good idea to do this if you are using the "simplified API",

-which needs to be able to recognize sRGB profiles conveyed via the iCCP

-chunk.

-

-The PNG spec requirement that only grayscale profiles may appear in images

-with color type 0 or 4 and that even if the image only contains gray pixels,

-only RGB profiles may appear in images with color type 2, 3, or 6, is now

-enforced.  The sRGB chunk is allowed to appear in images with any color type

-and is interpreted by libpng to convey a one-tracer-curve gray profile or a

-three-tracer-curve RGB profile as appropriate.

-

-Libpng 1.5.x erroneously used /MD for Debug DLL builds; if you used the debug

-builds in your app and you changed your app to use /MD you will need to

-change it back to /MDd for libpng 1.6.x.

-

-Prior to libpng-1.6.0 a warning would be issued if the iTXt chunk contained

-an empty language field or an empty translated keyword.  Both of these

-are allowed by the PNG specification, so these warnings are no longer issued.

-

-The library now issues an error if the application attempts to set a

-transform after it calls png_read_update_info() or if it attempts to call

-both png_read_update_info() and png_start_read_image() or to call either

-of them more than once.

-

-The default condition for benign_errors is now to treat benign errors as

-warnings while reading and as errors while writing.

-

-The library now issues a warning if both background processing and RGB to

-gray are used when gamma correction happens. As with previous versions of

-the library the results are numerically very incorrect in this case.

-

-There are some minor arithmetic changes in some transforms such as

-png_set_background(), that might be detected by certain regression tests.

-

-Unknown chunk handling has been improved internally, without any API change.

-This adds more correct option control of the unknown handling, corrects

-a pre-existing bug where the per-chunk 'keep' setting is ignored, and makes

-it possible to skip IDAT chunks in the sequential reader.

-

-The machine-generated configure files are no longer included in branches

-libpng16 and later of the GIT repository.  They continue to be included

-in the tarball releases, however.

-

-Libpng-1.6.0 through 1.6.2 used the CMF bytes at the beginning of the IDAT

-stream to set the size of the sliding window for reading instead of using the

-default 32-kbyte sliding window size.  It was discovered that there are

-hundreds of PNG files in the wild that have incorrect CMF bytes that caused

-zlib to issue the "invalid distance too far back" error and reject the file.

-Libpng-1.6.3 and later calculate their own safe CMF from the image dimensions,

-provide a way to revert to the libpng-1.5.x behavior (ignoring the CMF bytes

-and using a 32-kbyte sliding window), by using

-

-    png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW,

-        PNG_OPTION_ON);

-

-and provide a tool (contrib/tools/pngfix) for rewriting a PNG file while

-optimizing the CMF bytes in its IDAT chunk correctly.

-

-Libpng-1.6.0 and libpng-1.6.1 wrote uncompressed iTXt chunks with the wrong

-length, which resulted in PNG files that cannot be read beyond the bad iTXt

-chunk.  This error was fixed in libpng-1.6.3, and a tool (called

-contrib/tools/png-fix-itxt) has been added to the libpng distribution.

-

-Starting with libpng-1.6.17, the PNG_SAFE_LIMITS macro was eliminated

-and safe limits are used by default (users who need larger limits

-can still override them at compile time or run time, as described above).

-

-The new limits are

-                                default   spec limit

-   png_user_width_max         1,000,000  2,147,483,647

-   png_user_height_max        1,000,000  2,147,483,647

-   png_user_chunk_cache_max         128  unlimited

-   png_user_chunk_malloc_max  8,000,000  unlimited

-

-Starting with libpng-1.6.18, a PNG_RELEASE_BUILD macro was added, which allows

-library builders to control compilation for an installed system (a release build).

-It can be set for testing debug or beta builds to ensure that they will compile

-when the build type is switched to RC or STABLE. In essence this overrides the

-PNG_LIBPNG_BUILD_BASE_TYPE definition which is not directly user controllable.

-

-Starting with libpng-1.6.19, attempting to set an over-length PLTE chunk

-is an error. Previously this requirement of the PNG specification was not

-enforced, and the palette was always limited to 256 entries. An over-length

-PLTE chunk found in an input PNG is silently truncated.

-

-Starting with libpng-1.6.31, the eXIf chunk is supported. Libpng does not

-attempt to decode the Exif profile; it simply returns a byte array

-containing the profile to the calling application which must do its own

-decoding.

-

-XIII.  Detecting libpng

-

-The png_get_io_ptr() function has been present since libpng-0.88, has never

-changed, and is unaffected by conditional compilation macros.  It is the

-best choice for use in configure scripts for detecting the presence of any

-libpng version since 0.88.  In an autoconf "configure.in" you could use

-

-    AC_CHECK_LIB(png, png_get_io_ptr, ...

-

-XV. Source code repository

-

-Since about February 2009, version 1.2.34, libpng has been under "git" source

-control.  The git repository was built from old libpng-x.y.z.tar.gz files

-going back to version 0.70.  You can access the git repository (read only)

-at

-

-    https://github.com/glennrp/libpng or

-    https://git.code.sf.net/p/libpng/code.git

-

-or you can browse it with a web browser at

-

-    https://github.com/glennrp/libpng or

-    https://sourceforge.net/p/libpng/code/ci/libpng16/tree/

-

-Patches can be sent to glennrp at users.sourceforge.net or to

-png-mng-implement at lists.sourceforge.net or you can upload them to

-the libpng bug tracker at

-

-    https://libpng.sourceforge.io/

-

-or as a "pull request" to

-

-    https://github.com/glennrp/libpng/pulls

-

-We also accept patches built from the tar or zip distributions, and

-simple verbal discriptions of bug fixes, reported either to the

-SourceForge bug tracker, to the png-mng-implement at lists.sf.net

-mailing list, as github issues, or directly to glennrp.

-

-XV. Coding style

-

-Our coding style is similar to the "Allman" style

-(See https://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly

-braces on separate lines:

-

-    if (condition)

-    {

-       action;

-    }

-

-    else if (another condition)

-    {

-       another action;

-    }

-

-The braces can be omitted from simple one-line actions:

-

-    if (condition)

-       return (0);

-

-We use 3-space indentation, except for continued statements which

-are usually indented the same as the first line of the statement

-plus four more spaces.

-

-For macro definitions we use 2-space indentation, always leaving the "#"

-in the first column.

-

-    #ifndef PNG_NO_FEATURE

-    #  ifndef PNG_FEATURE_SUPPORTED

-    #    define PNG_FEATURE_SUPPORTED

-    #  endif

-    #endif

-

-Comments appear with the leading "/*" at the same indentation as

-the statement that follows the comment:

-

-    /* Single-line comment */

-    statement;

-

-    /* This is a multiple-line

-     * comment.

-     */

-    statement;

-

-Very short comments can be placed after the end of the statement

-to which they pertain:

-

-    statement;    /* comment */

-

-We don't use C++ style ("//") comments. We have, however,

-used them in the past in some now-abandoned MMX assembler

-code.

-

-Functions and their curly braces are not indented, and

-exported functions are marked with PNGAPI:

-

- /* This is a public function that is visible to

-  * application programmers. It does thus-and-so.

-  */

- void PNGAPI

- png_exported_function(png_ptr, png_info, foo)

- {

-    body;

- }

-

-The return type and decorations are placed on a separate line

-ahead of the function name, as illustrated above.

-

-The prototypes for all exported functions appear in png.h,

-above the comment that says

-

-    /* Maintainer: Put new public prototypes here ... */

-

-We mark all non-exported functions with "/* PRIVATE */"":

-

- void /* PRIVATE */

- png_non_exported_function(png_ptr, png_info, foo)

- {

-    body;

- }

-

-The prototypes for non-exported functions (except for those in

-pngtest) appear in pngpriv.h above the comment that says

-

-  /* Maintainer: Put new private prototypes here ^ */

-

-To avoid polluting the global namespace, the names of all exported

-functions and variables begin with "png_", and all publicly visible C

-preprocessor macros begin with "PNG".  We request that applications that

-use libpng *not* begin any of their own symbols with either of these strings.

-

-We put a space after the "sizeof" operator and we omit the

-optional parentheses around its argument when the argument

-is an expression, not a type name, and we always enclose the

-sizeof operator, with its argument, in parentheses:

-

-  (sizeof (png_uint_32))

-  (sizeof array)

-

-Prior to libpng-1.6.0 we used a "png_sizeof()" macro, formatted as

-though it were a function.

-

-Control keywords if, for, while, and switch are always followed by a space

-to distinguish them from function calls, which have no trailing space.

-

-We put a space after each comma and after each semicolon

-in "for" statements, and we put spaces before and after each

-C binary operator and after "for" or "while", and before

-"?".  We don't put a space between a typecast and the expression

-being cast, nor do we put one between a function name and the

-left parenthesis that follows it:

-

-    for (i = 2; i > 0; --i)

-       y[i] = a(x) + (int)b;

-

-We prefer #ifdef and #ifndef to #if defined() and #if !defined()

-when there is only one macro being tested.  We always use parentheses

-with "defined".

-

-We express integer constants that are used as bit masks in hex format,

-with an even number of lower-case hex digits, and to make them unsigned

-(e.g., 0x00U, 0xffU, 0x0100U) and long if they are greater than 0x7fff

-(e.g., 0xffffUL).

-

-We prefer to use underscores rather than camelCase in names, except

-for a few type names that we inherit from zlib.h.

-

-We prefer "if (something != 0)" and "if (something == 0)" over

-"if (something)" and if "(!something)", respectively, and for pointers

-we prefer "if (some_pointer != NULL)" or "if (some_pointer == NULL)".

-

-We do not use the TAB character for indentation in the C sources.

-

-Lines do not exceed 80 characters.

-

-Other rules can be inferred by inspecting the libpng source.

-

-XVI. Y2K Compliance in libpng

-

-Since the PNG Development group is an ad-hoc body, we can't make

-an official declaration.

-

-This is your unofficial assurance that libpng from version 0.71 and

-upward through 1.6.34 are Y2K compliant.  It is my belief that earlier

-versions were also Y2K compliant.

-

-Libpng only has two year fields.  One is a 2-byte unsigned integer

-that will hold years up to 65535.  The other, which is deprecated,

-holds the date in text format, and will hold years up to 9999.

-

-The integer is

-    "png_uint_16 year" in png_time_struct.

-

-The string is

-    "char time_buffer[29]" in png_struct.  This is no longer used

-in libpng-1.6.x and will be removed from libpng-1.7.0.

-

-There are seven time-related functions:

-

-    png_convert_to_rfc_1123_buffer() in png.c

-      (formerly png_convert_to_rfc_1152() in error, and

-      also formerly png_convert_to_rfc_1123())

-    png_convert_from_struct_tm() in pngwrite.c, called

-      in pngwrite.c

-    png_convert_from_time_t() in pngwrite.c

-    png_get_tIME() in pngget.c

-    png_handle_tIME() in pngrutil.c, called in pngread.c

-    png_set_tIME() in pngset.c

-    png_write_tIME() in pngwutil.c, called in pngwrite.c

-

-All appear to handle dates properly in a Y2K environment.  The

-png_convert_from_time_t() function calls gmtime() to convert from system

-clock time, which returns (year - 1900), which we properly convert to

-the full 4-digit year.  There is a possibility that applications using

-libpng are not passing 4-digit years into the png_convert_to_rfc_1123()

-function, or that they are incorrectly passing only a 2-digit year

-instead of "year - 1900" into the png_convert_from_struct_tm() function,

-but this is not under our control.  The libpng documentation has always

-stated that it works with 4-digit years, and the APIs have been

-documented as such.

-

-The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned

-integer to hold the year, and can hold years as large as 65535.

-

-zlib, upon which libpng depends, is also Y2K compliant.  It contains

-no date-related code.

-

-

-   Glenn Randers-Pehrson

-   libpng maintainer

-   PNG Development Group

diff --git a/plugins/AdvaImg/src/LibPNG/png.c b/plugins/AdvaImg/src/LibPNG/png.c
deleted file mode 100644
index a7dadf6595..0000000000
--- a/plugins/AdvaImg/src/LibPNG/png.c
+++ /dev/null
@@ -1,4614 +0,0 @@
-

-/* png.c - location for general purpose libpng functions

- *

- * Last changed in libpng 1.6.33 [September 28, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-

-/* Generate a compiler error if there is an old png.h in the search path. */

-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;

-

-#ifdef __GNUC__

-/* The version tests may need to be added to, but the problem warning has

- * consistently been fixed in GCC versions which obtain wide-spread release.

- * The problem is that many versions of GCC rearrange comparison expressions in

- * the optimizer in such a way that the results of the comparison will change

- * if signed integer overflow occurs.  Such comparisons are not permitted in

- * ANSI C90, however GCC isn't clever enough to work out that that do not occur

- * below in png_ascii_from_fp and png_muldiv, so it produces a warning with

- * -Wextra.  Unfortunately this is highly dependent on the optimizer and the

- * machine architecture so the warning comes and goes unpredictably and is

- * impossible to "fix", even were that a good idea.

- */

-#if __GNUC__ == 7 && __GNUC_MINOR__ == 1

-#define GCC_STRICT_OVERFLOW 1

-#endif /* GNU 7.1.x */

-#endif /* GNU */

-#ifndef GCC_STRICT_OVERFLOW

-#define GCC_STRICT_OVERFLOW 0

-#endif

-

-/* Tells libpng that we have already handled the first "num_bytes" bytes

- * of the PNG file signature.  If the PNG data is embedded into another

- * stream we can set num_bytes = 8 so that libpng will not attempt to read

- * or write any of the magic bytes before it starts on the IHDR.

- */

-

-#ifdef PNG_READ_SUPPORTED

-void PNGAPI

-png_set_sig_bytes(png_structrp png_ptr, int num_bytes)

-{

-   unsigned int nb = (unsigned int)num_bytes;

-

-   png_debug(1, "in png_set_sig_bytes");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (num_bytes < 0)

-      nb = 0;

-

-   if (nb > 8)

-      png_error(png_ptr, "Too many bytes for PNG signature");

-

-   png_ptr->sig_bytes = (png_byte)nb;

-}

-

-/* Checks whether the supplied bytes match the PNG signature.  We allow

- * checking less than the full 8-byte signature so that those apps that

- * already read the first few bytes of a file to determine the file type

- * can simply check the remaining bytes for extra assurance.  Returns

- * an integer less than, equal to, or greater than zero if sig is found,

- * respectively, to be less than, to match, or be greater than the correct

- * PNG signature (this is the same behavior as strcmp, memcmp, etc).

- */

-int PNGAPI

-png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)

-{

-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};

-

-   if (num_to_check > 8)

-      num_to_check = 8;

-

-   else if (num_to_check < 1)

-      return (-1);

-

-   if (start > 7)

-      return (-1);

-

-   if (start + num_to_check > 8)

-      num_to_check = 8 - start;

-

-   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));

-}

-

-#endif /* READ */

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-/* Function to allocate memory for zlib */

-PNG_FUNCTION(voidpf /* PRIVATE */,

-png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)

-{

-   png_alloc_size_t num_bytes = size;

-

-   if (png_ptr == NULL)

-      return NULL;

-

-   if (items >= (~(png_alloc_size_t)0)/size)

-   {

-      png_warning (png_voidcast(png_structrp, png_ptr),

-          "Potential overflow in png_zalloc()");

-      return NULL;

-   }

-

-   num_bytes *= items;

-   return png_malloc_warn(png_voidcast(png_structrp, png_ptr), num_bytes);

-}

-

-/* Function to free memory for zlib */

-void /* PRIVATE */

-png_zfree(voidpf png_ptr, voidpf ptr)

-{

-   png_free(png_voidcast(png_const_structrp,png_ptr), ptr);

-}

-

-/* Reset the CRC variable to 32 bits of 1's.  Care must be taken

- * in case CRC is > 32 bits to leave the top bits 0.

- */

-void /* PRIVATE */

-png_reset_crc(png_structrp png_ptr)

-{

-   /* The cast is safe because the crc is a 32-bit value. */

-   png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);

-}

-

-/* Calculate the CRC over a section of data.  We can only pass as

- * much data to this routine as the largest single buffer size.  We

- * also check that this data will actually be used before going to the

- * trouble of calculating it.

- */

-void /* PRIVATE */

-png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)

-{

-   int need_crc = 1;

-

-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)

-   {

-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==

-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))

-         need_crc = 0;

-   }

-

-   else /* critical */

-   {

-      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)

-         need_crc = 0;

-   }

-

-   /* 'uLong' is defined in zlib.h as unsigned long; this means that on some

-    * systems it is a 64-bit value.  crc32, however, returns 32 bits so the

-    * following cast is safe.  'uInt' may be no more than 16 bits, so it is

-    * necessary to perform a loop here.

-    */

-   if (need_crc != 0 && length > 0)

-   {

-      uLong crc = png_ptr->crc; /* Should never issue a warning */

-

-      do

-      {

-         uInt safe_length = (uInt)length;

-#ifndef __COVERITY__

-         if (safe_length == 0)

-            safe_length = (uInt)-1; /* evil, but safe */

-#endif

-

-         crc = crc32(crc, ptr, safe_length);

-

-         /* The following should never issue compiler warnings; if they do the

-          * target system has characteristics that will probably violate other

-          * assumptions within the libpng code.

-          */

-         ptr += safe_length;

-         length -= safe_length;

-      }

-      while (length > 0);

-

-      /* And the following is always safe because the crc is only 32 bits. */

-      png_ptr->crc = (png_uint_32)crc;

-   }

-}

-

-/* Check a user supplied version number, called from both read and write

- * functions that create a png_struct.

- */

-int

-png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)

-{

-   /* Libpng versions 1.0.0 and later are binary compatible if the version

-    * string matches through the second '.'; we must recompile any

-    * applications that use any older library version.

-    */

-

-   if (user_png_ver != NULL)

-   {

-      int i = -1;

-      int found_dots = 0;

-

-      do

-      {

-         i++;

-         if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])

-            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;

-         if (user_png_ver[i] == '.')

-            found_dots++;

-      } while (found_dots < 2 && user_png_ver[i] != 0 &&

-            PNG_LIBPNG_VER_STRING[i] != 0);

-   }

-

-   else

-      png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;

-

-   if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0)

-   {

-#ifdef PNG_WARNINGS_SUPPORTED

-      size_t pos = 0;

-      char m[128];

-

-      pos = png_safecat(m, (sizeof m), pos,

-          "Application built with libpng-");

-      pos = png_safecat(m, (sizeof m), pos, user_png_ver);

-      pos = png_safecat(m, (sizeof m), pos, " but running with ");

-      pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING);

-      PNG_UNUSED(pos)

-

-      png_warning(png_ptr, m);

-#endif

-

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-      png_ptr->flags = 0;

-#endif

-

-      return 0;

-   }

-

-   /* Success return. */

-   return 1;

-}

-

-/* Generic function to create a png_struct for either read or write - this

- * contains the common initialization.

- */

-PNG_FUNCTION(png_structp /* PRIVATE */,

-png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,

-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)

-{

-   png_struct create_struct;

-#  ifdef PNG_SETJMP_SUPPORTED

-      jmp_buf create_jmp_buf;

-#  endif

-

-   /* This temporary stack-allocated structure is used to provide a place to

-    * build enough context to allow the user provided memory allocator (if any)

-    * to be called.

-    */

-   memset(&create_struct, 0, (sizeof create_struct));

-

-   /* Added at libpng-1.2.6 */

-#  ifdef PNG_USER_LIMITS_SUPPORTED

-      create_struct.user_width_max = PNG_USER_WIDTH_MAX;

-      create_struct.user_height_max = PNG_USER_HEIGHT_MAX;

-

-#     ifdef PNG_USER_CHUNK_CACHE_MAX

-      /* Added at libpng-1.2.43 and 1.4.0 */

-      create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;

-#     endif

-

-#     ifdef PNG_USER_CHUNK_MALLOC_MAX

-      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists

-       * in png_struct regardless.

-       */

-      create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;

-#     endif

-#  endif

-

-   /* The following two API calls simply set fields in png_struct, so it is safe

-    * to do them now even though error handling is not yet set up.

-    */

-#  ifdef PNG_USER_MEM_SUPPORTED

-      png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn);

-#  else

-      PNG_UNUSED(mem_ptr)

-      PNG_UNUSED(malloc_fn)

-      PNG_UNUSED(free_fn)

-#  endif

-

-   /* (*error_fn) can return control to the caller after the error_ptr is set,

-    * this will result in a memory leak unless the error_fn does something

-    * extremely sophisticated.  The design lacks merit but is implicit in the

-    * API.

-    */

-   png_set_error_fn(&create_struct, error_ptr, error_fn, warn_fn);

-

-#  ifdef PNG_SETJMP_SUPPORTED

-      if (!setjmp(create_jmp_buf))

-#  endif

-      {

-#  ifdef PNG_SETJMP_SUPPORTED

-         /* Temporarily fake out the longjmp information until we have

-          * successfully completed this function.  This only works if we have

-          * setjmp() support compiled in, but it is safe - this stuff should

-          * never happen.

-          */

-         create_struct.jmp_buf_ptr = &create_jmp_buf;

-         create_struct.jmp_buf_size = 0; /*stack allocation*/

-         create_struct.longjmp_fn = longjmp;

-#  endif

-         /* Call the general version checker (shared with read and write code):

-          */

-         if (png_user_version_check(&create_struct, user_png_ver) != 0)

-         {

-            png_structrp png_ptr = png_voidcast(png_structrp,

-                png_malloc_warn(&create_struct, (sizeof *png_ptr)));

-

-            if (png_ptr != NULL)

-            {

-               /* png_ptr->zstream holds a back-pointer to the png_struct, so

-                * this can only be done now:

-                */

-               create_struct.zstream.zalloc = png_zalloc;

-               create_struct.zstream.zfree = png_zfree;

-               create_struct.zstream.opaque = png_ptr;

-

-#              ifdef PNG_SETJMP_SUPPORTED

-               /* Eliminate the local error handling: */

-               create_struct.jmp_buf_ptr = NULL;

-               create_struct.jmp_buf_size = 0;

-               create_struct.longjmp_fn = 0;

-#              endif

-

-               *png_ptr = create_struct;

-

-               /* This is the successful return point */

-               return png_ptr;

-            }

-         }

-      }

-

-   /* A longjmp because of a bug in the application storage allocator or a

-    * simple failure to allocate the png_struct.

-    */

-   return NULL;

-}

-

-/* Allocate the memory for an info_struct for the application. */

-PNG_FUNCTION(png_infop,PNGAPI

-png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)

-{

-   png_inforp info_ptr;

-

-   png_debug(1, "in png_create_info_struct");

-

-   if (png_ptr == NULL)

-      return NULL;

-

-   /* Use the internal API that does not (or at least should not) error out, so

-    * that this call always returns ok.  The application typically sets up the

-    * error handling *after* creating the info_struct because this is the way it

-    * has always been done in 'example.c'.

-    */

-   info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,

-       (sizeof *info_ptr)));

-

-   if (info_ptr != NULL)

-      memset(info_ptr, 0, (sizeof *info_ptr));

-

-   return info_ptr;

-}

-

-/* This function frees the memory associated with a single info struct.

- * Normally, one would use either png_destroy_read_struct() or

- * png_destroy_write_struct() to free an info struct, but this may be

- * useful for some applications.  From libpng 1.6.0 this function is also used

- * internally to implement the png_info release part of the 'struct' destroy

- * APIs.  This ensures that all possible approaches free the same data (all of

- * it).

- */

-void PNGAPI

-png_destroy_info_struct(png_const_structrp png_ptr, png_infopp info_ptr_ptr)

-{

-   png_inforp info_ptr = NULL;

-

-   png_debug(1, "in png_destroy_info_struct");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (info_ptr_ptr != NULL)

-      info_ptr = *info_ptr_ptr;

-

-   if (info_ptr != NULL)

-   {

-      /* Do this first in case of an error below; if the app implements its own

-       * memory management this can lead to png_free calling png_error, which

-       * will abort this routine and return control to the app error handler.

-       * An infinite loop may result if it then tries to free the same info

-       * ptr.

-       */

-      *info_ptr_ptr = NULL;

-

-      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);

-      memset(info_ptr, 0, (sizeof *info_ptr));

-      png_free(png_ptr, info_ptr);

-   }

-}

-

-/* Initialize the info structure.  This is now an internal function (0.89)

- * and applications using it are urged to use png_create_info_struct()

- * instead.  Use deprecated in 1.6.0, internal use removed (used internally it

- * is just a memset).

- *

- * NOTE: it is almost inconceivable that this API is used because it bypasses

- * the user-memory mechanism and the user error handling/warning mechanisms in

- * those cases where it does anything other than a memset.

- */

-PNG_FUNCTION(void,PNGAPI

-png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),

-    PNG_DEPRECATED)

-{

-   png_inforp info_ptr = *ptr_ptr;

-

-   png_debug(1, "in png_info_init_3");

-

-   if (info_ptr == NULL)

-      return;

-

-   if ((sizeof (png_info)) > png_info_struct_size)

-   {

-      *ptr_ptr = NULL;

-      /* The following line is why this API should not be used: */

-      free(info_ptr);

-      info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,

-          (sizeof *info_ptr)));

-      if (info_ptr == NULL)

-         return;

-      *ptr_ptr = info_ptr;

-   }

-

-   /* Set everything to 0 */

-   memset(info_ptr, 0, (sizeof *info_ptr));

-}

-

-/* The following API is not called internally */

-void PNGAPI

-png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,

-    int freer, png_uint_32 mask)

-{

-   png_debug(1, "in png_data_freer");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if (freer == PNG_DESTROY_WILL_FREE_DATA)

-      info_ptr->free_me |= mask;

-

-   else if (freer == PNG_USER_WILL_FREE_DATA)

-      info_ptr->free_me &= ~mask;

-

-   else

-      png_error(png_ptr, "Unknown freer parameter in png_data_freer");

-}

-

-void PNGAPI

-png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,

-    int num)

-{

-   png_debug(1, "in png_free_data");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-#ifdef PNG_TEXT_SUPPORTED

-   /* Free text item num or (if num == -1) all text items */

-   if (info_ptr->text != NULL &&

-       ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)

-   {

-      if (num != -1)

-      {

-         png_free(png_ptr, info_ptr->text[num].key);

-         info_ptr->text[num].key = NULL;

-      }

-

-      else

-      {

-         int i;

-

-         for (i = 0; i < info_ptr->num_text; i++)

-            png_free(png_ptr, info_ptr->text[i].key);

-

-         png_free(png_ptr, info_ptr->text);

-         info_ptr->text = NULL;

-         info_ptr->num_text = 0;

-         info_ptr->max_text = 0;

-      }

-   }

-#endif

-

-#ifdef PNG_tRNS_SUPPORTED

-   /* Free any tRNS entry */

-   if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0)

-   {

-      info_ptr->valid &= ~PNG_INFO_tRNS;

-      png_free(png_ptr, info_ptr->trans_alpha);

-      info_ptr->trans_alpha = NULL;

-      info_ptr->num_trans = 0;

-   }

-#endif

-

-#ifdef PNG_sCAL_SUPPORTED

-   /* Free any sCAL entry */

-   if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0)

-   {

-      png_free(png_ptr, info_ptr->scal_s_width);

-      png_free(png_ptr, info_ptr->scal_s_height);

-      info_ptr->scal_s_width = NULL;

-      info_ptr->scal_s_height = NULL;

-      info_ptr->valid &= ~PNG_INFO_sCAL;

-   }

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-   /* Free any pCAL entry */

-   if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0)

-   {

-      png_free(png_ptr, info_ptr->pcal_purpose);

-      png_free(png_ptr, info_ptr->pcal_units);

-      info_ptr->pcal_purpose = NULL;

-      info_ptr->pcal_units = NULL;

-

-      if (info_ptr->pcal_params != NULL)

-         {

-            int i;

-

-            for (i = 0; i < info_ptr->pcal_nparams; i++)

-               png_free(png_ptr, info_ptr->pcal_params[i]);

-

-            png_free(png_ptr, info_ptr->pcal_params);

-            info_ptr->pcal_params = NULL;

-         }

-      info_ptr->valid &= ~PNG_INFO_pCAL;

-   }

-#endif

-

-#ifdef PNG_iCCP_SUPPORTED

-   /* Free any profile entry */

-   if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0)

-   {

-      png_free(png_ptr, info_ptr->iccp_name);

-      png_free(png_ptr, info_ptr->iccp_profile);

-      info_ptr->iccp_name = NULL;

-      info_ptr->iccp_profile = NULL;

-      info_ptr->valid &= ~PNG_INFO_iCCP;

-   }

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */

-   if (info_ptr->splt_palettes != NULL &&

-       ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)

-   {

-      if (num != -1)

-      {

-         png_free(png_ptr, info_ptr->splt_palettes[num].name);

-         png_free(png_ptr, info_ptr->splt_palettes[num].entries);

-         info_ptr->splt_palettes[num].name = NULL;

-         info_ptr->splt_palettes[num].entries = NULL;

-      }

-

-      else

-      {

-         int i;

-

-         for (i = 0; i < info_ptr->splt_palettes_num; i++)

-         {

-            png_free(png_ptr, info_ptr->splt_palettes[i].name);

-            png_free(png_ptr, info_ptr->splt_palettes[i].entries);

-         }

-

-         png_free(png_ptr, info_ptr->splt_palettes);

-         info_ptr->splt_palettes = NULL;

-         info_ptr->splt_palettes_num = 0;

-         info_ptr->valid &= ~PNG_INFO_sPLT;

-      }

-   }

-#endif

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-   if (info_ptr->unknown_chunks != NULL &&

-       ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)

-   {

-      if (num != -1)

-      {

-          png_free(png_ptr, info_ptr->unknown_chunks[num].data);

-          info_ptr->unknown_chunks[num].data = NULL;

-      }

-

-      else

-      {

-         int i;

-

-         for (i = 0; i < info_ptr->unknown_chunks_num; i++)

-            png_free(png_ptr, info_ptr->unknown_chunks[i].data);

-

-         png_free(png_ptr, info_ptr->unknown_chunks);

-         info_ptr->unknown_chunks = NULL;

-         info_ptr->unknown_chunks_num = 0;

-      }

-   }

-#endif

-

-#ifdef PNG_eXIf_SUPPORTED

-   /* Free any eXIf entry */

-   if (((mask & PNG_FREE_EXIF) & info_ptr->free_me) != 0)

-   {

-# ifdef PNG_READ_eXIf_SUPPORTED

-      if (info_ptr->eXIf_buf)

-      {

-         png_free(png_ptr, info_ptr->eXIf_buf);

-         info_ptr->eXIf_buf = NULL;

-      }

-# endif

-      if (info_ptr->exif)

-      {

-         png_free(png_ptr, info_ptr->exif);

-         info_ptr->exif = NULL;

-      }

-      info_ptr->valid &= ~PNG_INFO_eXIf;

-   }

-#endif

-

-#ifdef PNG_hIST_SUPPORTED

-   /* Free any hIST entry */

-   if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0)

-   {

-      png_free(png_ptr, info_ptr->hist);

-      info_ptr->hist = NULL;

-      info_ptr->valid &= ~PNG_INFO_hIST;

-   }

-#endif

-

-   /* Free any PLTE entry that was internally allocated */

-   if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0)

-   {

-      png_free(png_ptr, info_ptr->palette);

-      info_ptr->palette = NULL;

-      info_ptr->valid &= ~PNG_INFO_PLTE;

-      info_ptr->num_palette = 0;

-   }

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-   /* Free any image bits attached to the info structure */

-   if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)

-   {

-      if (info_ptr->row_pointers != NULL)

-      {

-         png_uint_32 row;

-         for (row = 0; row < info_ptr->height; row++)

-            png_free(png_ptr, info_ptr->row_pointers[row]);

-

-         png_free(png_ptr, info_ptr->row_pointers);

-         info_ptr->row_pointers = NULL;

-      }

-      info_ptr->valid &= ~PNG_INFO_IDAT;

-   }

-#endif

-

-   if (num != -1)

-      mask &= ~PNG_FREE_MUL;

-

-   info_ptr->free_me &= ~mask;

-}

-#endif /* READ || WRITE */

-

-/* This function returns a pointer to the io_ptr associated with the user

- * functions.  The application should free any memory associated with this

- * pointer before png_write_destroy() or png_read_destroy() are called.

- */

-png_voidp PNGAPI

-png_get_io_ptr(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return (NULL);

-

-   return (png_ptr->io_ptr);

-}

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-#  ifdef PNG_STDIO_SUPPORTED

-/* Initialize the default input/output functions for the PNG file.  If you

- * use your own read or write routines, you can call either png_set_read_fn()

- * or png_set_write_fn() instead of png_init_io().  If you have defined

- * PNG_NO_STDIO or otherwise disabled PNG_STDIO_SUPPORTED, you must use a

- * function of your own because "FILE *" isn't necessarily available.

- */

-void PNGAPI

-png_init_io(png_structrp png_ptr, png_FILE_p fp)

-{

-   png_debug(1, "in png_init_io");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->io_ptr = (png_voidp)fp;

-}

-#  endif

-

-#  ifdef PNG_SAVE_INT_32_SUPPORTED

-/* PNG signed integers are saved in 32-bit 2's complement format.  ANSI C-90

- * defines a cast of a signed integer to an unsigned integer either to preserve

- * the value, if it is positive, or to calculate:

- *

- *     (UNSIGNED_MAX+1) + integer

- *

- * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the

- * negative integral value is added the result will be an unsigned value

- * correspnding to the 2's complement representation.

- */

-void PNGAPI

-png_save_int_32(png_bytep buf, png_int_32 i)

-{

-   png_save_uint_32(buf, (png_uint_32)i);

-}

-#  endif

-

-#  ifdef PNG_TIME_RFC1123_SUPPORTED

-/* Convert the supplied time into an RFC 1123 string suitable for use in

- * a "Creation Time" or other text-based time string.

- */

-int PNGAPI

-png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)

-{

-   static PNG_CONST char short_months[12][4] =

-        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",

-         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};

-

-   if (out == NULL)

-      return 0;

-

-   if (ptime->year > 9999 /* RFC1123 limitation */ ||

-       ptime->month == 0    ||  ptime->month > 12  ||

-       ptime->day   == 0    ||  ptime->day   > 31  ||

-       ptime->hour  > 23    ||  ptime->minute > 59 ||

-       ptime->second > 60)

-      return 0;

-

-   {

-      size_t pos = 0;

-      char number_buf[5]; /* enough for a four-digit year */

-

-#     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))

-#     define APPEND_NUMBER(format, value)\

-         APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))

-#     define APPEND(ch) if (pos < 28) out[pos++] = (ch)

-

-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);

-      APPEND(' ');

-      APPEND_STRING(short_months[(ptime->month - 1)]);

-      APPEND(' ');

-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->year);

-      APPEND(' ');

-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour);

-      APPEND(':');

-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute);

-      APPEND(':');

-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);

-      APPEND_STRING(" +0000"); /* This reliably terminates the buffer */

-      PNG_UNUSED (pos)

-

-#     undef APPEND

-#     undef APPEND_NUMBER

-#     undef APPEND_STRING

-   }

-

-   return 1;

-}

-

-#    if PNG_LIBPNG_VER < 10700

-/* To do: remove the following from libpng-1.7 */

-/* Original API that uses a private buffer in png_struct.

- * Deprecated because it causes png_struct to carry a spurious temporary

- * buffer (png_struct::time_buffer), better to have the caller pass this in.

- */

-png_const_charp PNGAPI

-png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)

-{

-   if (png_ptr != NULL)

-   {

-      /* The only failure above if png_ptr != NULL is from an invalid ptime */

-      if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)

-         png_warning(png_ptr, "Ignoring invalid time value");

-

-      else

-         return png_ptr->time_buffer;

-   }

-

-   return NULL;

-}

-#    endif /* LIBPNG_VER < 10700 */

-#  endif /* TIME_RFC1123 */

-

-#endif /* READ || WRITE */

-

-png_const_charp PNGAPI

-png_get_copyright(png_const_structrp png_ptr)

-{

-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */

-#ifdef PNG_STRING_COPYRIGHT

-   return PNG_STRING_COPYRIGHT

-#else

-#  ifdef __STDC__

-   return PNG_STRING_NEWLINE \

-      "libpng version 1.6.34 - September 29, 2017" PNG_STRING_NEWLINE \

-      "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \

-      PNG_STRING_NEWLINE \

-      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \

-      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \

-      PNG_STRING_NEWLINE;

-#  else

-   return "libpng version 1.6.34 - September 29, 2017\

-      Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\

-      Copyright (c) 1996-1997 Andreas Dilger\

-      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

-#  endif

-#endif

-}

-

-/* The following return the library version as a short string in the

- * format 1.0.0 through 99.99.99zz.  To get the version of *.h files

- * used with your application, print out PNG_LIBPNG_VER_STRING, which

- * is defined in png.h.

- * Note: now there is no difference between png_get_libpng_ver() and

- * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,

- * it is guaranteed that png.c uses the correct version of png.h.

- */

-png_const_charp PNGAPI

-png_get_libpng_ver(png_const_structrp png_ptr)

-{

-   /* Version of *.c files used when building libpng */

-   return png_get_header_ver(png_ptr);

-}

-

-png_const_charp PNGAPI

-png_get_header_ver(png_const_structrp png_ptr)

-{

-   /* Version of *.h files used when building libpng */

-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */

-   return PNG_LIBPNG_VER_STRING;

-}

-

-png_const_charp PNGAPI

-png_get_header_version(png_const_structrp png_ptr)

-{

-   /* Returns longer string containing both version and date */

-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */

-#ifdef __STDC__

-   return PNG_HEADER_VERSION_STRING

-#  ifndef PNG_READ_SUPPORTED

-      " (NO READ SUPPORT)"

-#  endif

-      PNG_STRING_NEWLINE;

-#else

-   return PNG_HEADER_VERSION_STRING;

-#endif

-}

-

-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED

-/* NOTE: this routine is not used internally! */

-/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth

- * large of png_color.  This lets grayscale images be treated as

- * paletted.  Most useful for gamma correction and simplification

- * of code.  This API is not used internally.

- */

-void PNGAPI

-png_build_grayscale_palette(int bit_depth, png_colorp palette)

-{

-   int num_palette;

-   int color_inc;

-   int i;

-   int v;

-

-   png_debug(1, "in png_do_build_grayscale_palette");

-

-   if (palette == NULL)

-      return;

-

-   switch (bit_depth)

-   {

-      case 1:

-         num_palette = 2;

-         color_inc = 0xff;

-         break;

-

-      case 2:

-         num_palette = 4;

-         color_inc = 0x55;

-         break;

-

-      case 4:

-         num_palette = 16;

-         color_inc = 0x11;

-         break;

-

-      case 8:

-         num_palette = 256;

-         color_inc = 1;

-         break;

-

-      default:

-         num_palette = 0;

-         color_inc = 0;

-         break;

-   }

-

-   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)

-   {

-      palette[i].red = (png_byte)(v & 0xff);

-      palette[i].green = (png_byte)(v & 0xff);

-      palette[i].blue = (png_byte)(v & 0xff);

-   }

-}

-#endif

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-int PNGAPI

-png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)

-{

-   /* Check chunk_name and return "keep" value if it's on the list, else 0 */

-   png_const_bytep p, p_end;

-

-   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)

-      return PNG_HANDLE_CHUNK_AS_DEFAULT;

-

-   p_end = png_ptr->chunk_list;

-   p = p_end + png_ptr->num_chunk_list*5; /* beyond end */

-

-   /* The code is the fifth byte after each four byte string.  Historically this

-    * code was always searched from the end of the list, this is no longer

-    * necessary because the 'set' routine handles duplicate entries correcty.

-    */

-   do /* num_chunk_list > 0, so at least one */

-   {

-      p -= 5;

-

-      if (memcmp(chunk_name, p, 4) == 0)

-         return p[4];

-   }

-   while (p > p_end);

-

-   /* This means that known chunks should be processed and unknown chunks should

-    * be handled according to the value of png_ptr->unknown_default; this can be

-    * confusing because, as a result, there are two levels of defaulting for

-    * unknown chunks.

-    */

-   return PNG_HANDLE_CHUNK_AS_DEFAULT;

-}

-

-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\

-   defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)

-int /* PRIVATE */

-png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)

-{

-   png_byte chunk_string[5];

-

-   PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);

-   return png_handle_as_unknown(png_ptr, chunk_string);

-}

-#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */

-#endif /* SET_UNKNOWN_CHUNKS */

-

-#ifdef PNG_READ_SUPPORTED

-/* This function, added to libpng-1.0.6g, is untested. */

-int PNGAPI

-png_reset_zstream(png_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return Z_STREAM_ERROR;

-

-   /* WARNING: this resets the window bits to the maximum! */

-   return (inflateReset(&png_ptr->zstream));

-}

-#endif /* READ */

-

-/* This function was added to libpng-1.0.7 */

-png_uint_32 PNGAPI

-png_access_version_number(void)

-{

-   /* Version of *.c files used when building libpng */

-   return((png_uint_32)PNG_LIBPNG_VER);

-}

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-/* Ensure that png_ptr->zstream.msg holds some appropriate error message string.

- * If it doesn't 'ret' is used to set it to something appropriate, even in cases

- * like Z_OK or Z_STREAM_END where the error code is apparently a success code.

- */

-void /* PRIVATE */

-png_zstream_error(png_structrp png_ptr, int ret)

-{

-   /* Translate 'ret' into an appropriate error string, priority is given to the

-    * one in zstream if set.  This always returns a string, even in cases like

-    * Z_OK or Z_STREAM_END where the error code is a success code.

-    */

-   if (png_ptr->zstream.msg == NULL) switch (ret)

-   {

-      default:

-      case Z_OK:

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return code");

-         break;

-

-      case Z_STREAM_END:

-         /* Normal exit */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected end of LZ stream");

-         break;

-

-      case Z_NEED_DICT:

-         /* This means the deflate stream did not have a dictionary; this

-          * indicates a bogus PNG.

-          */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("missing LZ dictionary");

-         break;

-

-      case Z_ERRNO:

-         /* gz APIs only: should not happen */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("zlib IO error");

-         break;

-

-      case Z_STREAM_ERROR:

-         /* internal libpng error */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("bad parameters to zlib");

-         break;

-

-      case Z_DATA_ERROR:

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("damaged LZ stream");

-         break;

-

-      case Z_MEM_ERROR:

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("insufficient memory");

-         break;

-

-      case Z_BUF_ERROR:

-         /* End of input or output; not a problem if the caller is doing

-          * incremental read or write.

-          */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("truncated");

-         break;

-

-      case Z_VERSION_ERROR:

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unsupported zlib version");

-         break;

-

-      case PNG_UNEXPECTED_ZLIB_RETURN:

-         /* Compile errors here mean that zlib now uses the value co-opted in

-          * pngpriv.h for PNG_UNEXPECTED_ZLIB_RETURN; update the switch above

-          * and change pngpriv.h.  Note that this message is "... return",

-          * whereas the default/Z_OK one is "... return code".

-          */

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return");

-         break;

-   }

-}

-

-/* png_convert_size: a PNGAPI but no longer in png.h, so deleted

- * at libpng 1.5.5!

- */

-

-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */

-#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */

-static int

-png_colorspace_check_gamma(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, png_fixed_point gAMA, int from)

-   /* This is called to check a new gamma value against an existing one.  The

-    * routine returns false if the new gamma value should not be written.

-    *

-    * 'from' says where the new gamma value comes from:

-    *

-    *    0: the new gamma value is the libpng estimate for an ICC profile

-    *    1: the new gamma value comes from a gAMA chunk

-    *    2: the new gamma value comes from an sRGB chunk

-    */

-{

-   png_fixed_point gtest;

-

-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&

-       (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||

-      png_gamma_significant(gtest) != 0))

-   {

-      /* Either this is an sRGB image, in which case the calculated gamma

-       * approximation should match, or this is an image with a profile and the

-       * value libpng calculates for the gamma of the profile does not match the

-       * value recorded in the file.  The former, sRGB, case is an error, the

-       * latter is just a warning.

-       */

-      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)

-      {

-         png_chunk_report(png_ptr, "gamma value does not match sRGB",

-             PNG_CHUNK_ERROR);

-         /* Do not overwrite an sRGB value */

-         return from == 2;

-      }

-

-      else /* sRGB tag not involved */

-      {

-         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",

-             PNG_CHUNK_WARNING);

-         return from == 1;

-      }

-   }

-

-   return 1;

-}

-

-void /* PRIVATE */

-png_colorspace_set_gamma(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, png_fixed_point gAMA)

-{

-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't

-    * occur.  Since the fixed point representation is asymetrical it is

-    * possible for 1/gamma to overflow the limit of 21474 and this means the

-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For

-    * safety the limits here are a little narrower.  The values are 0.00016 to

-    * 6250.0, which are truly ridiculous gamma values (and will produce

-    * displays that are all black or all white.)

-    *

-    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk

-    * handling code, which only required the value to be >0.

-    */

-   png_const_charp errmsg;

-

-   if (gAMA < 16 || gAMA > 625000000)

-      errmsg = "gamma value out of range";

-

-#  ifdef PNG_READ_gAMA_SUPPORTED

-   /* Allow the application to set the gamma value more than once */

-   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&

-      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)

-      errmsg = "duplicate";

-#  endif

-

-   /* Do nothing if the colorspace is already invalid */

-   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)

-      return;

-

-   else

-   {

-      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,

-          1/*from gAMA*/) != 0)

-      {

-         /* Store this gamma value. */

-         colorspace->gamma = gAMA;

-         colorspace->flags |=

-            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);

-      }

-

-      /* At present if the check_gamma test fails the gamma of the colorspace is

-       * not updated however the colorspace is not invalidated.  This

-       * corresponds to the case where the existing gamma comes from an sRGB

-       * chunk or profile.  An error message has already been output.

-       */

-      return;

-   }

-

-   /* Error exit - errmsg has been set. */

-   colorspace->flags |= PNG_COLORSPACE_INVALID;

-   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);

-}

-

-void /* PRIVATE */

-png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)

-{

-   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)

-   {

-      /* Everything is invalid */

-      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|

-         PNG_INFO_iCCP);

-

-#     ifdef PNG_COLORSPACE_SUPPORTED

-      /* Clean up the iCCP profile now if it won't be used. */

-      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);

-#     else

-      PNG_UNUSED(png_ptr)

-#     endif

-   }

-

-   else

-   {

-#     ifdef PNG_COLORSPACE_SUPPORTED

-      /* Leave the INFO_iCCP flag set if the pngset.c code has already set

-       * it; this allows a PNG to contain a profile which matches sRGB and

-       * yet still have that profile retrievable by the application.

-       */

-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)

-         info_ptr->valid |= PNG_INFO_sRGB;

-

-      else

-         info_ptr->valid &= ~PNG_INFO_sRGB;

-

-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-         info_ptr->valid |= PNG_INFO_cHRM;

-

-      else

-         info_ptr->valid &= ~PNG_INFO_cHRM;

-#     endif

-

-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)

-         info_ptr->valid |= PNG_INFO_gAMA;

-

-      else

-         info_ptr->valid &= ~PNG_INFO_gAMA;

-   }

-}

-

-#ifdef PNG_READ_SUPPORTED

-void /* PRIVATE */

-png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)

-{

-   if (info_ptr == NULL) /* reduce code size; check here not in the caller */

-      return;

-

-   info_ptr->colorspace = png_ptr->colorspace;

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-#endif

-#endif /* GAMMA */

-

-#ifdef PNG_COLORSPACE_SUPPORTED

-/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for

- * cHRM, as opposed to using chromaticities.  These internal APIs return

- * non-zero on a parameter error.  The X, Y and Z values are required to be

- * positive and less than 1.0.

- */

-static int

-png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)

-{

-   png_int_32 d, dwhite, whiteX, whiteY;

-

-   d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;

-   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)

-      return 1;

-   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)

-      return 1;

-   dwhite = d;

-   whiteX = XYZ->red_X;

-   whiteY = XYZ->red_Y;

-

-   d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;

-   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)

-      return 1;

-   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)

-      return 1;

-   dwhite += d;

-   whiteX += XYZ->green_X;

-   whiteY += XYZ->green_Y;

-

-   d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;

-   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)

-      return 1;

-   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)

-      return 1;

-   dwhite += d;

-   whiteX += XYZ->blue_X;

-   whiteY += XYZ->blue_Y;

-

-   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,

-    * thus:

-    */

-   if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)

-      return 1;

-   if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)

-      return 1;

-

-   return 0;

-}

-

-static int

-png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)

-{

-   png_fixed_point red_inverse, green_inverse, blue_scale;

-   png_fixed_point left, right, denominator;

-

-   /* Check xy and, implicitly, z.  Note that wide gamut color spaces typically

-    * have end points with 0 tristimulus values (these are impossible end

-    * points, but they are used to cover the possible colors).  We check

-    * xy->whitey against 5, not 0, to avoid a possible integer overflow.

-    */

-   if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;

-   if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;

-   if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;

-   if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;

-   if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;

-   if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;

-   if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;

-   if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;

-

-   /* The reverse calculation is more difficult because the original tristimulus

-    * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8

-    * derived values were recorded in the cHRM chunk;

-    * (red,green,blue,white)x(x,y).  This loses one degree of freedom and

-    * therefore an arbitrary ninth value has to be introduced to undo the

-    * original transformations.

-    *

-    * Think of the original end-points as points in (X,Y,Z) space.  The

-    * chromaticity values (c) have the property:

-    *

-    *           C

-    *   c = ---------

-    *       X + Y + Z

-    *

-    * For each c (x,y,z) from the corresponding original C (X,Y,Z).  Thus the

-    * three chromaticity values (x,y,z) for each end-point obey the

-    * relationship:

-    *

-    *   x + y + z = 1

-    *

-    * This describes the plane in (X,Y,Z) space that intersects each axis at the

-    * value 1.0; call this the chromaticity plane.  Thus the chromaticity

-    * calculation has scaled each end-point so that it is on the x+y+z=1 plane

-    * and chromaticity is the intersection of the vector from the origin to the

-    * (X,Y,Z) value with the chromaticity plane.

-    *

-    * To fully invert the chromaticity calculation we would need the three

-    * end-point scale factors, (red-scale, green-scale, blue-scale), but these

-    * were not recorded.  Instead we calculated the reference white (X,Y,Z) and

-    * recorded the chromaticity of this.  The reference white (X,Y,Z) would have

-    * given all three of the scale factors since:

-    *

-    *    color-C = color-c * color-scale

-    *    white-C = red-C + green-C + blue-C

-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale

-    *

-    * But cHRM records only white-x and white-y, so we have lost the white scale

-    * factor:

-    *

-    *    white-C = white-c*white-scale

-    *

-    * To handle this the inverse transformation makes an arbitrary assumption

-    * about white-scale:

-    *

-    *    Assume: white-Y = 1.0

-    *    Hence:  white-scale = 1/white-y

-    *    Or:     red-Y + green-Y + blue-Y = 1.0

-    *

-    * Notice the last statement of the assumption gives an equation in three of

-    * the nine values we want to calculate.  8 more equations come from the

-    * above routine as summarised at the top above (the chromaticity

-    * calculation):

-    *

-    *    Given: color-x = color-X / (color-X + color-Y + color-Z)

-    *    Hence: (color-x - 1)*color-X + color.x*color-Y + color.x*color-Z = 0

-    *

-    * This is 9 simultaneous equations in the 9 variables "color-C" and can be

-    * solved by Cramer's rule.  Cramer's rule requires calculating 10 9x9 matrix

-    * determinants, however this is not as bad as it seems because only 28 of

-    * the total of 90 terms in the various matrices are non-zero.  Nevertheless

-    * Cramer's rule is notoriously numerically unstable because the determinant

-    * calculation involves the difference of large, but similar, numbers.  It is

-    * difficult to be sure that the calculation is stable for real world values

-    * and it is certain that it becomes unstable where the end points are close

-    * together.

-    *

-    * So this code uses the perhaps slightly less optimal but more

-    * understandable and totally obvious approach of calculating color-scale.

-    *

-    * This algorithm depends on the precision in white-scale and that is

-    * (1/white-y), so we can immediately see that as white-y approaches 0 the

-    * accuracy inherent in the cHRM chunk drops off substantially.

-    *

-    * libpng arithmetic: a simple inversion of the above equations

-    * ------------------------------------------------------------

-    *

-    *    white_scale = 1/white-y

-    *    white-X = white-x * white-scale

-    *    white-Y = 1.0

-    *    white-Z = (1 - white-x - white-y) * white_scale

-    *

-    *    white-C = red-C + green-C + blue-C

-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale

-    *

-    * This gives us three equations in (red-scale,green-scale,blue-scale) where

-    * all the coefficients are now known:

-    *

-    *    red-x*red-scale + green-x*green-scale + blue-x*blue-scale

-    *       = white-x/white-y

-    *    red-y*red-scale + green-y*green-scale + blue-y*blue-scale = 1

-    *    red-z*red-scale + green-z*green-scale + blue-z*blue-scale

-    *       = (1 - white-x - white-y)/white-y

-    *

-    * In the last equation color-z is (1 - color-x - color-y) so we can add all

-    * three equations together to get an alternative third:

-    *

-    *    red-scale + green-scale + blue-scale = 1/white-y = white-scale

-    *

-    * So now we have a Cramer's rule solution where the determinants are just

-    * 3x3 - far more tractible.  Unfortunately 3x3 determinants still involve

-    * multiplication of three coefficients so we can't guarantee to avoid

-    * overflow in the libpng fixed point representation.  Using Cramer's rule in

-    * floating point is probably a good choice here, but it's not an option for

-    * fixed point.  Instead proceed to simplify the first two equations by

-    * eliminating what is likely to be the largest value, blue-scale:

-    *

-    *    blue-scale = white-scale - red-scale - green-scale

-    *

-    * Hence:

-    *

-    *    (red-x - blue-x)*red-scale + (green-x - blue-x)*green-scale =

-    *                (white-x - blue-x)*white-scale

-    *

-    *    (red-y - blue-y)*red-scale + (green-y - blue-y)*green-scale =

-    *                1 - blue-y*white-scale

-    *

-    * And now we can trivially solve for (red-scale,green-scale):

-    *

-    *    green-scale =

-    *                (white-x - blue-x)*white-scale - (red-x - blue-x)*red-scale

-    *                -----------------------------------------------------------

-    *                                  green-x - blue-x

-    *

-    *    red-scale =

-    *                1 - blue-y*white-scale - (green-y - blue-y) * green-scale

-    *                ---------------------------------------------------------

-    *                                  red-y - blue-y

-    *

-    * Hence:

-    *

-    *    red-scale =

-    *          ( (green-x - blue-x) * (white-y - blue-y) -

-    *            (green-y - blue-y) * (white-x - blue-x) ) / white-y

-    * -------------------------------------------------------------------------

-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)

-    *

-    *    green-scale =

-    *          ( (red-y - blue-y) * (white-x - blue-x) -

-    *            (red-x - blue-x) * (white-y - blue-y) ) / white-y

-    * -------------------------------------------------------------------------

-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)

-    *

-    * Accuracy:

-    * The input values have 5 decimal digits of accuracy.  The values are all in

-    * the range 0 < value < 1, so simple products are in the same range but may

-    * need up to 10 decimal digits to preserve the original precision and avoid

-    * underflow.  Because we are using a 32-bit signed representation we cannot

-    * match this; the best is a little over 9 decimal digits, less than 10.

-    *

-    * The approach used here is to preserve the maximum precision within the

-    * signed representation.  Because the red-scale calculation above uses the

-    * difference between two products of values that must be in the range -1..+1

-    * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The

-    * factor is irrelevant in the calculation because it is applied to both

-    * numerator and denominator.

-    *

-    * Note that the values of the differences of the products of the

-    * chromaticities in the above equations tend to be small, for example for

-    * the sRGB chromaticities they are:

-    *

-    * red numerator:    -0.04751

-    * green numerator:  -0.08788

-    * denominator:      -0.2241 (without white-y multiplication)

-    *

-    *  The resultant Y coefficients from the chromaticities of some widely used

-    *  color space definitions are (to 15 decimal places):

-    *

-    *  sRGB

-    *    0.212639005871510 0.715168678767756 0.072192315360734

-    *  Kodak ProPhoto

-    *    0.288071128229293 0.711843217810102 0.000085653960605

-    *  Adobe RGB

-    *    0.297344975250536 0.627363566255466 0.075291458493998

-    *  Adobe Wide Gamut RGB

-    *    0.258728243040113 0.724682314948566 0.016589442011321

-    */

-   /* By the argument, above overflow should be impossible here. The return

-    * value of 2 indicates an internal error to the caller.

-    */

-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)

-      return 2;

-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)

-      return 2;

-   denominator = left - right;

-

-   /* Now find the red numerator. */

-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)

-      return 2;

-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)

-      return 2;

-

-   /* Overflow is possible here and it indicates an extreme set of PNG cHRM

-    * chunk values.  This calculation actually returns the reciprocal of the

-    * scale value because this allows us to delay the multiplication of white-y

-    * into the denominator, which tends to produce a small number.

-    */

-   if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||

-       red_inverse <= xy->whitey /* r+g+b scales = white scale */)

-      return 1;

-

-   /* Similarly for green_inverse: */

-   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)

-      return 2;

-   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)

-      return 2;

-   if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||

-       green_inverse <= xy->whitey)

-      return 1;

-

-   /* And the blue scale, the checks above guarantee this can't overflow but it

-    * can still produce 0 for extreme cHRM values.

-    */

-   blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -

-       png_reciprocal(green_inverse);

-   if (blue_scale <= 0)

-      return 1;

-

-

-   /* And fill in the png_XYZ: */

-   if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,

-       red_inverse) == 0)

-      return 1;

-

-   if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,

-       green_inverse) == 0)

-      return 1;

-

-   if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)

-      return 1;

-   if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,

-       PNG_FP_1) == 0)

-      return 1;

-

-   return 0; /*success*/

-}

-

-static int

-png_XYZ_normalize(png_XYZ *XYZ)

-{

-   png_int_32 Y;

-

-   if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||

-      XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||

-      XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)

-      return 1;

-

-   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.

-    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore

-    * relying on addition of two positive values producing a negative one is not

-    * safe.

-    */

-   Y = XYZ->red_Y;

-   if (0x7fffffff - Y < XYZ->green_X)

-      return 1;

-   Y += XYZ->green_Y;

-   if (0x7fffffff - Y < XYZ->blue_X)

-      return 1;

-   Y += XYZ->blue_Y;

-

-   if (Y != PNG_FP_1)

-   {

-      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)

-         return 1;

-

-      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)

-         return 1;

-

-      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)

-         return 1;

-      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)

-         return 1;

-   }

-

-   return 0;

-}

-

-static int

-png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)

-{

-   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */

-   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||

-       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||

-       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||

-       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||

-       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||

-       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||

-       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||

-       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))

-      return 0;

-   return 1;

-}

-

-/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM

- * chunk chromaticities.  Earlier checks used to simply look for the overflow

- * condition (where the determinant of the matrix to solve for XYZ ends up zero

- * because the chromaticity values are not all distinct.)  Despite this it is

- * theoretically possible to produce chromaticities that are apparently valid

- * but that rapidly degrade to invalid, potentially crashing, sets because of

- * arithmetic inaccuracies when calculations are performed on them.  The new

- * check is to round-trip xy -> XYZ -> xy and then check that the result is

- * within a small percentage of the original.

- */

-static int

-png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)

-{

-   int result;

-   png_xy xy_test;

-

-   /* As a side-effect this routine also returns the XYZ endpoints. */

-   result = png_XYZ_from_xy(XYZ, xy);

-   if (result != 0)

-      return result;

-

-   result = png_xy_from_XYZ(&xy_test, XYZ);

-   if (result != 0)

-      return result;

-

-   if (png_colorspace_endpoints_match(xy, &xy_test,

-       5/*actually, the math is pretty accurate*/) != 0)

-      return 0;

-

-   /* Too much slip */

-   return 1;

-}

-

-/* This is the check going the other way.  The XYZ is modified to normalize it

- * (another side-effect) and the xy chromaticities are returned.

- */

-static int

-png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)

-{

-   int result;

-   png_XYZ XYZtemp;

-

-   result = png_XYZ_normalize(XYZ);

-   if (result != 0)

-      return result;

-

-   result = png_xy_from_XYZ(xy, XYZ);

-   if (result != 0)

-      return result;

-

-   XYZtemp = *XYZ;

-   return png_colorspace_check_xy(&XYZtemp, xy);

-}

-

-/* Used to check for an endpoint match against sRGB */

-static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */

-{

-   /* color      x       y */

-   /* red   */ 64000, 33000,

-   /* green */ 30000, 60000,

-   /* blue  */ 15000,  6000,

-   /* white */ 31270, 32900

-};

-

-static int

-png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,

-    int preferred)

-{

-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)

-      return 0;

-

-   /* The consistency check is performed on the chromaticities; this factors out

-    * variations because of the normalization (or not) of the end point Y

-    * values.

-    */

-   if (preferred < 2 &&

-       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      /* The end points must be reasonably close to any we already have.  The

-       * following allows an error of up to +/-.001

-       */

-      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,

-          100) == 0)

-      {

-         colorspace->flags |= PNG_COLORSPACE_INVALID;

-         png_benign_error(png_ptr, "inconsistent chromaticities");

-         return 0; /* failed */

-      }

-

-      /* Only overwrite with preferred values */

-      if (preferred == 0)

-         return 1; /* ok, but no change */

-   }

-

-   colorspace->end_points_xy = *xy;

-   colorspace->end_points_XYZ = *XYZ;

-   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;

-

-   /* The end points are normally quoted to two decimal digits, so allow +/-0.01

-    * on this test.

-    */

-   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)

-      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;

-

-   else

-      colorspace->flags &= PNG_COLORSPACE_CANCEL(

-         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);

-

-   return 2; /* ok and changed */

-}

-

-int /* PRIVATE */

-png_colorspace_set_chromaticities(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, const png_xy *xy, int preferred)

-{

-   /* We must check the end points to ensure they are reasonable - in the past

-    * color management systems have crashed as a result of getting bogus

-    * colorant values, while this isn't the fault of libpng it is the

-    * responsibility of libpng because PNG carries the bomb and libpng is in a

-    * position to protect against it.

-    */

-   png_XYZ XYZ;

-

-   switch (png_colorspace_check_xy(&XYZ, xy))

-   {

-      case 0: /* success */

-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,

-             preferred);

-

-      case 1:

-         /* We can't invert the chromaticities so we can't produce value XYZ

-          * values.  Likely as not a color management system will fail too.

-          */

-         colorspace->flags |= PNG_COLORSPACE_INVALID;

-         png_benign_error(png_ptr, "invalid chromaticities");

-         break;

-

-      default:

-         /* libpng is broken; this should be a warning but if it happens we

-          * want error reports so for the moment it is an error.

-          */

-         colorspace->flags |= PNG_COLORSPACE_INVALID;

-         png_error(png_ptr, "internal error checking chromaticities");

-   }

-

-   return 0; /* failed */

-}

-

-int /* PRIVATE */

-png_colorspace_set_endpoints(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)

-{

-   png_XYZ XYZ = *XYZ_in;

-   png_xy xy;

-

-   switch (png_colorspace_check_XYZ(&xy, &XYZ))

-   {

-      case 0:

-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,

-             preferred);

-

-      case 1:

-         /* End points are invalid. */

-         colorspace->flags |= PNG_COLORSPACE_INVALID;

-         png_benign_error(png_ptr, "invalid end points");

-         break;

-

-      default:

-         colorspace->flags |= PNG_COLORSPACE_INVALID;

-         png_error(png_ptr, "internal error checking chromaticities");

-   }

-

-   return 0; /* failed */

-}

-

-#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)

-/* Error message generation */

-static char

-png_icc_tag_char(png_uint_32 byte)

-{

-   byte &= 0xff;

-   if (byte >= 32 && byte <= 126)

-      return (char)byte;

-   else

-      return '?';

-}

-

-static void

-png_icc_tag_name(char *name, png_uint_32 tag)

-{

-   name[0] = '\'';

-   name[1] = png_icc_tag_char(tag >> 24);

-   name[2] = png_icc_tag_char(tag >> 16);

-   name[3] = png_icc_tag_char(tag >>  8);

-   name[4] = png_icc_tag_char(tag      );

-   name[5] = '\'';

-}

-

-static int

-is_ICC_signature_char(png_alloc_size_t it)

-{

-   return it == 32 || (it >= 48 && it <= 57) || (it >= 65 && it <= 90) ||

-      (it >= 97 && it <= 122);

-}

-

-static int

-is_ICC_signature(png_alloc_size_t it)

-{

-   return is_ICC_signature_char(it >> 24) /* checks all the top bits */ &&

-      is_ICC_signature_char((it >> 16) & 0xff) &&

-      is_ICC_signature_char((it >> 8) & 0xff) &&

-      is_ICC_signature_char(it & 0xff);

-}

-

-static int

-png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_alloc_size_t value, png_const_charp reason)

-{

-   size_t pos;

-   char message[196]; /* see below for calculation */

-

-   if (colorspace != NULL)

-      colorspace->flags |= PNG_COLORSPACE_INVALID;

-

-   pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */

-   pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */

-   pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */

-   if (is_ICC_signature(value) != 0)

-   {

-      /* So 'value' is at most 4 bytes and the following cast is safe */

-      png_icc_tag_name(message+pos, (png_uint_32)value);

-      pos += 6; /* total +8; less than the else clause */

-      message[pos++] = ':';

-      message[pos++] = ' ';

-   }

-#  ifdef PNG_WARNINGS_SUPPORTED

-   else

-      {

-         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/

-

-         pos = png_safecat(message, (sizeof message), pos,

-             png_format_number(number, number+(sizeof number),

-             PNG_NUMBER_FORMAT_x, value));

-         pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/

-      }

-#  endif

-   /* The 'reason' is an arbitrary message, allow +79 maximum 195 */

-   pos = png_safecat(message, (sizeof message), pos, reason);

-   PNG_UNUSED(pos)

-

-   /* This is recoverable, but make it unconditionally an app_error on write to

-    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them

-    * on read, with a warning, but on write unless the app turns off

-    * application errors the PNG won't be written.)

-    */

-   png_chunk_report(png_ptr, message,

-       (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);

-

-   return 0;

-}

-#endif /* sRGB || iCCP */

-

-#ifdef PNG_sRGB_SUPPORTED

-int /* PRIVATE */

-png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    int intent)

-{

-   /* sRGB sets known gamma, end points and (from the chunk) intent. */

-   /* IMPORTANT: these are not necessarily the values found in an ICC profile

-    * because ICC profiles store values adapted to a D50 environment; it is

-    * expected that the ICC profile mediaWhitePointTag will be D50; see the

-    * checks and code elsewhere to understand this better.

-    *

-    * These XYZ values, which are accurate to 5dp, produce rgb to gray

-    * coefficients of (6968,23435,2366), which are reduced (because they add up

-    * to 32769 not 32768) to (6968,23434,2366).  These are the values that

-    * libpng has traditionally used (and are the best values given the 15bit

-    * algorithm used by the rgb to gray code.)

-    */

-   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */

-   {

-      /* color      X      Y      Z */

-      /* red   */ 41239, 21264,  1933,

-      /* green */ 35758, 71517, 11919,

-      /* blue  */ 18048,  7219, 95053

-   };

-

-   /* Do nothing if the colorspace is already invalidated. */

-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)

-      return 0;

-

-   /* Check the intent, then check for existing settings.  It is valid for the

-    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must

-    * be consistent with the correct values.  If, however, this function is

-    * called below because an iCCP chunk matches sRGB then it is quite

-    * conceivable that an older app recorded incorrect gAMA and cHRM because of

-    * an incorrect calculation based on the values in the profile - this does

-    * *not* invalidate the profile (though it still produces an error, which can

-    * be ignored.)

-    */

-   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)

-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",

-          (png_alloc_size_t)intent, "invalid sRGB rendering intent");

-

-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&

-       colorspace->rendering_intent != intent)

-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",

-         (png_alloc_size_t)intent, "inconsistent rendering intents");

-

-   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)

-   {

-      png_benign_error(png_ptr, "duplicate sRGB information ignored");

-      return 0;

-   }

-

-   /* If the standard sRGB cHRM chunk does not match the one from the PNG file

-    * warn but overwrite the value with the correct one.

-    */

-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&

-       !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,

-       100))

-      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",

-         PNG_CHUNK_ERROR);

-

-   /* This check is just done for the error reporting - the routine always

-    * returns true when the 'from' argument corresponds to sRGB (2).

-    */

-   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,

-       2/*from sRGB*/);

-

-   /* intent: bugs in GCC force 'int' to be used as the parameter type. */

-   colorspace->rendering_intent = (png_uint_16)intent;

-   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;

-

-   /* endpoints */

-   colorspace->end_points_xy = sRGB_xy;

-   colorspace->end_points_XYZ = sRGB_XYZ;

-   colorspace->flags |=

-      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);

-

-   /* gamma */

-   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;

-   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;

-

-   /* Finally record that we have an sRGB profile */

-   colorspace->flags |=

-      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);

-

-   return 1; /* set */

-}

-#endif /* sRGB */

-

-#ifdef PNG_iCCP_SUPPORTED

-/* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value

- * is XYZ(0.9642,1.0,0.8249), which scales to:

- *

- *    (63189.8112, 65536, 54060.6464)

- */

-static const png_byte D50_nCIEXYZ[12] =

-   { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };

-

-static int /* bool */

-icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_uint_32 profile_length)

-{

-   if (profile_length < 132)

-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,

-          "too short");

-   return 1;

-}

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-int /* PRIVATE */

-png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_uint_32 profile_length)

-{

-   if (!icc_check_length(png_ptr, colorspace, name, profile_length))

-      return 0;

-

-   /* This needs to be here because the 'normal' check is in

-    * png_decompress_chunk, yet this happens after the attempt to

-    * png_malloc_base the required data.  We only need this on read; on write

-    * the caller supplies the profile buffer so libpng doesn't allocate it.  See

-    * the call to icc_check_length below (the write case).

-    */

-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED

-      else if (png_ptr->user_chunk_malloc_max > 0 &&

-               png_ptr->user_chunk_malloc_max < profile_length)

-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,

-             "exceeds application limits");

-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0

-      else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)

-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,

-             "exceeds libpng limits");

-#  else /* !SET_USER_LIMITS */

-      /* This will get compiled out on all 32-bit and better systems. */

-      else if (PNG_SIZE_MAX < profile_length)

-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,

-             "exceeds system limits");

-#  endif /* !SET_USER_LIMITS */

-

-   return 1;

-}

-#endif /* READ_iCCP */

-

-int /* PRIVATE */

-png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_uint_32 profile_length,

-    png_const_bytep profile/* first 132 bytes only */, int color_type)

-{

-   png_uint_32 temp;

-

-   /* Length check; this cannot be ignored in this code because profile_length

-    * is used later to check the tag table, so even if the profile seems over

-    * long profile_length from the caller must be correct.  The caller can fix

-    * this up on read or write by just passing in the profile header length.

-    */

-   temp = png_get_uint_32(profile);

-   if (temp != profile_length)

-      return png_icc_profile_error(png_ptr, colorspace, name, temp,

-          "length does not match profile");

-

-   temp = (png_uint_32) (*(profile+8));

-   if (temp > 3 && (profile_length & 3))

-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,

-          "invalid length");

-

-   temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */

-   if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */

-      profile_length < 132+12*temp) /* truncated tag table */

-      return png_icc_profile_error(png_ptr, colorspace, name, temp,

-          "tag count too large");

-

-   /* The 'intent' must be valid or we can't store it, ICC limits the intent to

-    * 16 bits.

-    */

-   temp = png_get_uint_32(profile+64);

-   if (temp >= 0xffff) /* The ICC limit */

-      return png_icc_profile_error(png_ptr, colorspace, name, temp,

-          "invalid rendering intent");

-

-   /* This is just a warning because the profile may be valid in future

-    * versions.

-    */

-   if (temp >= PNG_sRGB_INTENT_LAST)

-      (void)png_icc_profile_error(png_ptr, NULL, name, temp,

-          "intent outside defined range");

-

-   /* At this point the tag table can't be checked because it hasn't necessarily

-    * been loaded; however, various header fields can be checked.  These checks

-    * are for values permitted by the PNG spec in an ICC profile; the PNG spec

-    * restricts the profiles that can be passed in an iCCP chunk (they must be

-    * appropriate to processing PNG data!)

-    */

-

-   /* Data checks (could be skipped).  These checks must be independent of the

-    * version number; however, the version number doesn't accomodate changes in

-    * the header fields (just the known tags and the interpretation of the

-    * data.)

-    */

-   temp = png_get_uint_32(profile+36); /* signature 'ascp' */

-   if (temp != 0x61637370)

-      return png_icc_profile_error(png_ptr, colorspace, name, temp,

-          "invalid signature");

-

-   /* Currently the PCS illuminant/adopted white point (the computational

-    * white point) are required to be D50,

-    * however the profile contains a record of the illuminant so perhaps ICC

-    * expects to be able to change this in the future (despite the rationale in

-    * the introduction for using a fixed PCS adopted white.)  Consequently the

-    * following is just a warning.

-    */

-   if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)

-      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,

-          "PCS illuminant is not D50");

-

-   /* The PNG spec requires this:

-    * "If the iCCP chunk is present, the image samples conform to the colour

-    * space represented by the embedded ICC profile as defined by the

-    * International Color Consortium [ICC]. The colour space of the ICC profile

-    * shall be an RGB colour space for colour images (PNG colour types 2, 3, and

-    * 6), or a greyscale colour space for greyscale images (PNG colour types 0

-    * and 4)."

-    *

-    * This checking code ensures the embedded profile (on either read or write)

-    * conforms to the specification requirements.  Notice that an ICC 'gray'

-    * color-space profile contains the information to transform the monochrome

-    * data to XYZ or L*a*b (according to which PCS the profile uses) and this

-    * should be used in preference to the standard libpng K channel replication

-    * into R, G and B channels.

-    *

-    * Previously it was suggested that an RGB profile on grayscale data could be

-    * handled.  However it it is clear that using an RGB profile in this context

-    * must be an error - there is no specification of what it means.  Thus it is

-    * almost certainly more correct to ignore the profile.

-    */

-   temp = png_get_uint_32(profile+16); /* data colour space field */

-   switch (temp)

-   {

-      case 0x52474220: /* 'RGB ' */

-         if ((color_type & PNG_COLOR_MASK_COLOR) == 0)

-            return png_icc_profile_error(png_ptr, colorspace, name, temp,

-                "RGB color space not permitted on grayscale PNG");

-         break;

-

-      case 0x47524159: /* 'GRAY' */

-         if ((color_type & PNG_COLOR_MASK_COLOR) != 0)

-            return png_icc_profile_error(png_ptr, colorspace, name, temp,

-                "Gray color space not permitted on RGB PNG");

-         break;

-

-      default:

-         return png_icc_profile_error(png_ptr, colorspace, name, temp,

-             "invalid ICC profile color space");

-   }

-

-   /* It is up to the application to check that the profile class matches the

-    * application requirements; the spec provides no guidance, but it's pretty

-    * weird if the profile is not scanner ('scnr'), monitor ('mntr'), printer

-    * ('prtr') or 'spac' (for generic color spaces).  Issue a warning in these

-    * cases.  Issue an error for device link or abstract profiles - these don't

-    * contain the records necessary to transform the color-space to anything

-    * other than the target device (and not even that for an abstract profile).

-    * Profiles of these classes may not be embedded in images.

-    */

-   temp = png_get_uint_32(profile+12); /* profile/device class */

-   switch (temp)

-   {

-      case 0x73636e72: /* 'scnr' */

-      case 0x6d6e7472: /* 'mntr' */

-      case 0x70727472: /* 'prtr' */

-      case 0x73706163: /* 'spac' */

-         /* All supported */

-         break;

-

-      case 0x61627374: /* 'abst' */

-         /* May not be embedded in an image */

-         return png_icc_profile_error(png_ptr, colorspace, name, temp,

-             "invalid embedded Abstract ICC profile");

-

-      case 0x6c696e6b: /* 'link' */

-         /* DeviceLink profiles cannot be interpreted in a non-device specific

-          * fashion, if an app uses the AToB0Tag in the profile the results are

-          * undefined unless the result is sent to the intended device,

-          * therefore a DeviceLink profile should not be found embedded in a

-          * PNG.

-          */

-         return png_icc_profile_error(png_ptr, colorspace, name, temp,

-             "unexpected DeviceLink ICC profile class");

-

-      case 0x6e6d636c: /* 'nmcl' */

-         /* A NamedColor profile is also device specific, however it doesn't

-          * contain an AToB0 tag that is open to misinterpretation.  Almost

-          * certainly it will fail the tests below.

-          */

-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,

-             "unexpected NamedColor ICC profile class");

-         break;

-

-      default:

-         /* To allow for future enhancements to the profile accept unrecognized

-          * profile classes with a warning, these then hit the test below on the

-          * tag content to ensure they are backward compatible with one of the

-          * understood profiles.

-          */

-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,

-             "unrecognized ICC profile class");

-         break;

-   }

-

-   /* For any profile other than a device link one the PCS must be encoded

-    * either in XYZ or Lab.

-    */

-   temp = png_get_uint_32(profile+20);

-   switch (temp)

-   {

-      case 0x58595a20: /* 'XYZ ' */

-      case 0x4c616220: /* 'Lab ' */

-         break;

-

-      default:

-         return png_icc_profile_error(png_ptr, colorspace, name, temp,

-             "unexpected ICC PCS encoding");

-   }

-

-   return 1;

-}

-

-int /* PRIVATE */

-png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_uint_32 profile_length,

-    png_const_bytep profile /* header plus whole tag table */)

-{

-   png_uint_32 tag_count = png_get_uint_32(profile+128);

-   png_uint_32 itag;

-   png_const_bytep tag = profile+132; /* The first tag */

-

-   /* First scan all the tags in the table and add bits to the icc_info value

-    * (temporarily in 'tags').

-    */

-   for (itag=0; itag < tag_count; ++itag, tag += 12)

-   {

-      png_uint_32 tag_id = png_get_uint_32(tag+0);

-      png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */

-      png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */

-

-      /* The ICC specification does not exclude zero length tags, therefore the

-       * start might actually be anywhere if there is no data, but this would be

-       * a clear abuse of the intent of the standard so the start is checked for

-       * being in range.  All defined tag types have an 8 byte header - a 4 byte

-       * type signature then 0.

-       */

-

-      /* This is a hard error; potentially it can cause read outside the

-       * profile.

-       */

-      if (tag_start > profile_length || tag_length > profile_length - tag_start)

-         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,

-             "ICC profile tag outside profile");

-

-      if ((tag_start & 3) != 0)

-      {

-         /* CNHP730S.icc shipped with Microsoft Windows 64 violates this; it is

-          * only a warning here because libpng does not care about the

-          * alignment.

-          */

-         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,

-             "ICC profile tag start not a multiple of 4");

-      }

-   }

-

-   return 1; /* success, maybe with warnings */

-}

-

-#ifdef PNG_sRGB_SUPPORTED

-#if PNG_sRGB_PROFILE_CHECKS >= 0

-/* Information about the known ICC sRGB profiles */

-static const struct

-{

-   png_uint_32 adler, crc, length;

-   png_uint_32 md5[4];

-   png_byte    have_md5;

-   png_byte    is_broken;

-   png_uint_16 intent;

-

-#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)

-#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\

-      { adler, crc, length, md5, broke, intent },

-

-} png_sRGB_checks[] =

-{

-   /* This data comes from contrib/tools/checksum-icc run on downloads of

-    * all four ICC sRGB profiles from www.color.org.

-    */

-   /* adler32, crc32, MD5[4], intent, date, length, file-name */

-   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,

-       PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,

-       "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")

-

-   /* ICC sRGB v2 perceptual no black-compensation: */

-   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,

-       PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,

-       "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")

-

-   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,

-       PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,

-       "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")

-

-   /* ICC sRGB v4 perceptual */

-   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,

-       PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,

-       "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")

-

-   /* The following profiles have no known MD5 checksum. If there is a match

-    * on the (empty) MD5 the other fields are used to attempt a match and

-    * a warning is produced.  The first two of these profiles have a 'cprt' tag

-    * which suggests that they were also made by Hewlett Packard.

-    */

-   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,

-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,

-       "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")

-

-   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not

-    * match the D50 PCS illuminant in the header (it is in fact the D65 values,

-    * so the white point is recorded as the un-adapted value.)  The profiles

-    * below only differ in one byte - the intent - and are basically the same as

-    * the previous profile except for the mediaWhitePointTag error and a missing

-    * chromaticAdaptationTag.

-    */

-   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,

-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,

-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")

-

-   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,

-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,

-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")

-};

-

-static int

-png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,

-    png_const_bytep profile, uLong adler)

-{

-   /* The quick check is to verify just the MD5 signature and trust the

-    * rest of the data.  Because the profile has already been verified for

-    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'

-    * field too, so if the profile has been edited with an intent not defined

-    * by sRGB (but maybe defined by a later ICC specification) the read of

-    * the profile will fail at that point.

-    */

-

-   png_uint_32 length = 0;

-   png_uint_32 intent = 0x10000; /* invalid */

-#if PNG_sRGB_PROFILE_CHECKS > 1

-   uLong crc = 0; /* the value for 0 length data */

-#endif

-   unsigned int i;

-

-#ifdef PNG_SET_OPTION_SUPPORTED

-   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */

-   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==

-               PNG_OPTION_ON)

-      return 0;

-#endif

-

-   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)

-   {

-      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&

-         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&

-         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&

-         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])

-      {

-         /* This may be one of the old HP profiles without an MD5, in that

-          * case we can only use the length and Adler32 (note that these

-          * are not used by default if there is an MD5!)

-          */

-#        if PNG_sRGB_PROFILE_CHECKS == 0

-            if (png_sRGB_checks[i].have_md5 != 0)

-               return 1+png_sRGB_checks[i].is_broken;

-#        endif

-

-         /* Profile is unsigned or more checks have been configured in. */

-         if (length == 0)

-         {

-            length = png_get_uint_32(profile);

-            intent = png_get_uint_32(profile+64);

-         }

-

-         /* Length *and* intent must match */

-         if (length == (png_uint_32) png_sRGB_checks[i].length &&

-            intent == (png_uint_32) png_sRGB_checks[i].intent)

-         {

-            /* Now calculate the adler32 if not done already. */

-            if (adler == 0)

-            {

-               adler = adler32(0, NULL, 0);

-               adler = adler32(adler, profile, length);

-            }

-

-            if (adler == png_sRGB_checks[i].adler)

-            {

-               /* These basic checks suggest that the data has not been

-                * modified, but if the check level is more than 1 perform

-                * our own crc32 checksum on the data.

-                */

-#              if PNG_sRGB_PROFILE_CHECKS > 1

-                  if (crc == 0)

-                  {

-                     crc = crc32(0, NULL, 0);

-                     crc = crc32(crc, profile, length);

-                  }

-

-                  /* So this check must pass for the 'return' below to happen.

-                   */

-                  if (crc == png_sRGB_checks[i].crc)

-#              endif

-               {

-                  if (png_sRGB_checks[i].is_broken != 0)

-                  {

-                     /* These profiles are known to have bad data that may cause

-                      * problems if they are used, therefore attempt to

-                      * discourage their use, skip the 'have_md5' warning below,

-                      * which is made irrelevant by this error.

-                      */

-                     png_chunk_report(png_ptr, "known incorrect sRGB profile",

-                         PNG_CHUNK_ERROR);

-                  }

-

-                  /* Warn that this being done; this isn't even an error since

-                   * the profile is perfectly valid, but it would be nice if

-                   * people used the up-to-date ones.

-                   */

-                  else if (png_sRGB_checks[i].have_md5 == 0)

-                  {

-                     png_chunk_report(png_ptr,

-                         "out-of-date sRGB profile with no signature",

-                         PNG_CHUNK_WARNING);

-                  }

-

-                  return 1+png_sRGB_checks[i].is_broken;

-               }

-            }

-

-# if PNG_sRGB_PROFILE_CHECKS > 0

-         /* The signature matched, but the profile had been changed in some

-          * way.  This probably indicates a data error or uninformed hacking.

-          * Fall through to "no match".

-          */

-         png_chunk_report(png_ptr,

-             "Not recognizing known sRGB profile that has been edited",

-             PNG_CHUNK_WARNING);

-         break;

-# endif

-         }

-      }

-   }

-

-   return 0; /* no match */

-}

-

-void /* PRIVATE */

-png_icc_set_sRGB(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, png_const_bytep profile, uLong adler)

-{

-   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set

-    * the sRGB information.

-    */

-   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)

-      (void)png_colorspace_set_sRGB(png_ptr, colorspace,

-         (int)/*already checked*/png_get_uint_32(profile+64));

-}

-#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */

-#endif /* sRGB */

-

-int /* PRIVATE */

-png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,

-    png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,

-    int color_type)

-{

-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)

-      return 0;

-

-   if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&

-       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,

-           color_type) != 0 &&

-       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,

-           profile) != 0)

-   {

-#     if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0

-         /* If no sRGB support, don't try storing sRGB information */

-         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);

-#     endif

-      return 1;

-   }

-

-   /* Failure case */

-   return 0;

-}

-#endif /* iCCP */

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-void /* PRIVATE */

-png_colorspace_set_rgb_coefficients(png_structrp png_ptr)

-{

-   /* Set the rgb_to_gray coefficients from the colorspace. */

-   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&

-      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      /* png_set_background has not been called, get the coefficients from the Y

-       * values of the colorspace colorants.

-       */

-      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;

-      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;

-      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;

-      png_fixed_point total = r+g+b;

-

-      if (total > 0 &&

-         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&

-         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&

-         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&

-         r+g+b <= 32769)

-      {

-         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or

-          * all of the coefficients were rounded up.  Handle this by

-          * reducing the *largest* coefficient by 1; this matches the

-          * approach used for the default coefficients in pngrtran.c

-          */

-         int add = 0;

-

-         if (r+g+b > 32768)

-            add = -1;

-         else if (r+g+b < 32768)

-            add = 1;

-

-         if (add != 0)

-         {

-            if (g >= r && g >= b)

-               g += add;

-            else if (r >= g && r >= b)

-               r += add;

-            else

-               b += add;

-         }

-

-         /* Check for an internal error. */

-         if (r+g+b != 32768)

-            png_error(png_ptr,

-                "internal error handling cHRM coefficients");

-

-         else

-         {

-            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;

-            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;

-         }

-      }

-

-      /* This is a png_error at present even though it could be ignored -

-       * it should never happen, but it is important that if it does, the

-       * bug is fixed.

-       */

-      else

-         png_error(png_ptr, "internal error handling cHRM->XYZ");

-   }

-}

-#endif /* READ_RGB_TO_GRAY */

-

-#endif /* COLORSPACE */

-

-#ifdef __GNUC__

-/* This exists solely to work round a warning from GNU C. */

-static int /* PRIVATE */

-png_gt(size_t a, size_t b)

-{

-   return a > b;

-}

-#else

-#   define png_gt(a,b) ((a) > (b))

-#endif

-

-void /* PRIVATE */

-png_check_IHDR(png_const_structrp png_ptr,

-    png_uint_32 width, png_uint_32 height, int bit_depth,

-    int color_type, int interlace_type, int compression_type,

-    int filter_type)

-{

-   int error = 0;

-

-   /* Check for width and height valid values */

-   if (width == 0)

-   {

-      png_warning(png_ptr, "Image width is zero in IHDR");

-      error = 1;

-   }

-

-   if (width > PNG_UINT_31_MAX)

-   {

-      png_warning(png_ptr, "Invalid image width in IHDR");

-      error = 1;

-   }

-

-   if (png_gt(((width + 7) & (~7U)),

-       ((PNG_SIZE_MAX

-           - 48        /* big_row_buf hack */

-           - 1)        /* filter byte */

-           / 8)        /* 8-byte RGBA pixels */

-           - 1))       /* extra max_pixel_depth pad */

-   {

-      /* The size of the row must be within the limits of this architecture.

-       * Because the read code can perform arbitrary transformations the

-       * maximum size is checked here.  Because the code in png_read_start_row

-       * adds extra space "for safety's sake" in several places a conservative

-       * limit is used here.

-       *

-       * NOTE: it would be far better to check the size that is actually used,

-       * but the effect in the real world is minor and the changes are more

-       * extensive, therefore much more dangerous and much more difficult to

-       * write in a way that avoids compiler warnings.

-       */

-      png_warning(png_ptr, "Image width is too large for this architecture");

-      error = 1;

-   }

-

-#ifdef PNG_SET_USER_LIMITS_SUPPORTED

-   if (width > png_ptr->user_width_max)

-#else

-   if (width > PNG_USER_WIDTH_MAX)

-#endif

-   {

-      png_warning(png_ptr, "Image width exceeds user limit in IHDR");

-      error = 1;

-   }

-

-   if (height == 0)

-   {

-      png_warning(png_ptr, "Image height is zero in IHDR");

-      error = 1;

-   }

-

-   if (height > PNG_UINT_31_MAX)

-   {

-      png_warning(png_ptr, "Invalid image height in IHDR");

-      error = 1;

-   }

-

-#ifdef PNG_SET_USER_LIMITS_SUPPORTED

-   if (height > png_ptr->user_height_max)

-#else

-   if (height > PNG_USER_HEIGHT_MAX)

-#endif

-   {

-      png_warning(png_ptr, "Image height exceeds user limit in IHDR");

-      error = 1;

-   }

-

-   /* Check other values */

-   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&

-       bit_depth != 8 && bit_depth != 16)

-   {

-      png_warning(png_ptr, "Invalid bit depth in IHDR");

-      error = 1;

-   }

-

-   if (color_type < 0 || color_type == 1 ||

-       color_type == 5 || color_type > 6)

-   {

-      png_warning(png_ptr, "Invalid color type in IHDR");

-      error = 1;

-   }

-

-   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||

-       ((color_type == PNG_COLOR_TYPE_RGB ||

-         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||

-         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))

-   {

-      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");

-      error = 1;

-   }

-

-   if (interlace_type >= PNG_INTERLACE_LAST)

-   {

-      png_warning(png_ptr, "Unknown interlace method in IHDR");

-      error = 1;

-   }

-

-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)

-   {

-      png_warning(png_ptr, "Unknown compression method in IHDR");

-      error = 1;

-   }

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   /* Accept filter_method 64 (intrapixel differencing) only if

-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and

-    * 2. Libpng did not read a PNG signature (this filter_method is only

-    *    used in PNG datastreams that are embedded in MNG datastreams) and

-    * 3. The application called png_permit_mng_features with a mask that

-    *    included PNG_FLAG_MNG_FILTER_64 and

-    * 4. The filter_method is 64 and

-    * 5. The color_type is RGB or RGBA

-    */

-   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&

-       png_ptr->mng_features_permitted != 0)

-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");

-

-   if (filter_type != PNG_FILTER_TYPE_BASE)

-   {

-      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&

-          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&

-          ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&

-          (color_type == PNG_COLOR_TYPE_RGB ||

-          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))

-      {

-         png_warning(png_ptr, "Unknown filter method in IHDR");

-         error = 1;

-      }

-

-      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)

-      {

-         png_warning(png_ptr, "Invalid filter method in IHDR");

-         error = 1;

-      }

-   }

-

-#else

-   if (filter_type != PNG_FILTER_TYPE_BASE)

-   {

-      png_warning(png_ptr, "Unknown filter method in IHDR");

-      error = 1;

-   }

-#endif

-

-   if (error == 1)

-      png_error(png_ptr, "Invalid IHDR data");

-}

-

-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)

-/* ASCII to fp functions */

-/* Check an ASCII formated floating point value, see the more detailed

- * comments in pngpriv.h

- */

-/* The following is used internally to preserve the sticky flags */

-#define png_fp_add(state, flags) ((state) |= (flags))

-#define png_fp_set(state, value) ((state) = (value) | ((state) & PNG_FP_STICKY))

-

-int /* PRIVATE */

-png_check_fp_number(png_const_charp string, png_size_t size, int *statep,

-    png_size_tp whereami)

-{

-   int state = *statep;

-   png_size_t i = *whereami;

-

-   while (i < size)

-   {

-      int type;

-      /* First find the type of the next character */

-      switch (string[i])

-      {

-      case 43:  type = PNG_FP_SAW_SIGN;                   break;

-      case 45:  type = PNG_FP_SAW_SIGN + PNG_FP_NEGATIVE; break;

-      case 46:  type = PNG_FP_SAW_DOT;                    break;

-      case 48:  type = PNG_FP_SAW_DIGIT;                  break;

-      case 49: case 50: case 51: case 52:

-      case 53: case 54: case 55: case 56:

-      case 57:  type = PNG_FP_SAW_DIGIT + PNG_FP_NONZERO; break;

-      case 69:

-      case 101: type = PNG_FP_SAW_E;                      break;

-      default:  goto PNG_FP_End;

-      }

-

-      /* Now deal with this type according to the current

-       * state, the type is arranged to not overlap the

-       * bits of the PNG_FP_STATE.

-       */

-      switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))

-      {

-      case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:

-         if ((state & PNG_FP_SAW_ANY) != 0)

-            goto PNG_FP_End; /* not a part of the number */

-

-         png_fp_add(state, type);

-         break;

-

-      case PNG_FP_INTEGER + PNG_FP_SAW_DOT:

-         /* Ok as trailer, ok as lead of fraction. */

-         if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */

-            goto PNG_FP_End;

-

-         else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */

-            png_fp_add(state, type);

-

-         else

-            png_fp_set(state, PNG_FP_FRACTION | type);

-

-         break;

-

-      case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:

-         if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */

-            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);

-

-         png_fp_add(state, type | PNG_FP_WAS_VALID);

-

-         break;

-

-      case PNG_FP_INTEGER + PNG_FP_SAW_E:

-         if ((state & PNG_FP_SAW_DIGIT) == 0)

-            goto PNG_FP_End;

-

-         png_fp_set(state, PNG_FP_EXPONENT);

-

-         break;

-

-   /* case PNG_FP_FRACTION + PNG_FP_SAW_SIGN:

-         goto PNG_FP_End; ** no sign in fraction */

-

-   /* case PNG_FP_FRACTION + PNG_FP_SAW_DOT:

-         goto PNG_FP_End; ** Because SAW_DOT is always set */

-

-      case PNG_FP_FRACTION + PNG_FP_SAW_DIGIT:

-         png_fp_add(state, type | PNG_FP_WAS_VALID);

-         break;

-

-      case PNG_FP_FRACTION + PNG_FP_SAW_E:

-         /* This is correct because the trailing '.' on an

-          * integer is handled above - so we can only get here

-          * with the sequence ".E" (with no preceding digits).

-          */

-         if ((state & PNG_FP_SAW_DIGIT) == 0)

-            goto PNG_FP_End;

-

-         png_fp_set(state, PNG_FP_EXPONENT);

-

-         break;

-

-      case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:

-         if ((state & PNG_FP_SAW_ANY) != 0)

-            goto PNG_FP_End; /* not a part of the number */

-

-         png_fp_add(state, PNG_FP_SAW_SIGN);

-

-         break;

-

-   /* case PNG_FP_EXPONENT + PNG_FP_SAW_DOT:

-         goto PNG_FP_End; */

-

-      case PNG_FP_EXPONENT + PNG_FP_SAW_DIGIT:

-         png_fp_add(state, PNG_FP_SAW_DIGIT | PNG_FP_WAS_VALID);

-

-         break;

-

-   /* case PNG_FP_EXPONEXT + PNG_FP_SAW_E:

-         goto PNG_FP_End; */

-

-      default: goto PNG_FP_End; /* I.e. break 2 */

-      }

-

-      /* The character seems ok, continue. */

-      ++i;

-   }

-

-PNG_FP_End:

-   /* Here at the end, update the state and return the correct

-    * return code.

-    */

-   *statep = state;

-   *whereami = i;

-

-   return (state & PNG_FP_SAW_DIGIT) != 0;

-}

-

-

-/* The same but for a complete string. */

-int

-png_check_fp_string(png_const_charp string, png_size_t size)

-{

-   int        state=0;

-   png_size_t char_index=0;

-

-   if (png_check_fp_number(string, size, &state, &char_index) != 0 &&

-      (char_index == size || string[char_index] == 0))

-      return state /* must be non-zero - see above */;

-

-   return 0; /* i.e. fail */

-}

-#endif /* pCAL || sCAL */

-

-#ifdef PNG_sCAL_SUPPORTED

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-/* Utility used below - a simple accurate power of ten from an integral

- * exponent.

- */

-static double

-png_pow10(int power)

-{

-   int recip = 0;

-   double d = 1;

-

-   /* Handle negative exponent with a reciprocal at the end because

-    * 10 is exact whereas .1 is inexact in base 2

-    */

-   if (power < 0)

-   {

-      if (power < DBL_MIN_10_EXP) return 0;

-      recip = 1; power = -power;

-   }

-

-   if (power > 0)

-   {

-      /* Decompose power bitwise. */

-      double mult = 10;

-      do

-      {

-         if (power & 1) d *= mult;

-         mult *= mult;

-         power >>= 1;

-      }

-      while (power > 0);

-

-      if (recip != 0) d = 1/d;

-   }

-   /* else power is 0 and d is 1 */

-

-   return d;

-}

-

-/* Function to format a floating point value in ASCII with a given

- * precision.

- */

-#if GCC_STRICT_OVERFLOW

-#pragma GCC diagnostic push

-/* The problem arises below with exp_b10, which can never overflow because it

- * comes, originally, from frexp and is therefore limited to a range which is

- * typically +/-710 (log2(DBL_MAX)/log2(DBL_MIN)).

- */

-#pragma GCC diagnostic warning "-Wstrict-overflow=2"

-#endif /* GCC_STRICT_OVERFLOW */

-void /* PRIVATE */

-png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,

-    double fp, unsigned int precision)

-{

-   /* We use standard functions from math.h, but not printf because

-    * that would require stdio.  The caller must supply a buffer of

-    * sufficient size or we will png_error.  The tests on size and

-    * the space in ascii[] consumed are indicated below.

-    */

-   if (precision < 1)

-      precision = DBL_DIG;

-

-   /* Enforce the limit of the implementation precision too. */

-   if (precision > DBL_DIG+1)

-      precision = DBL_DIG+1;

-

-   /* Basic sanity checks */

-   if (size >= precision+5) /* See the requirements below. */

-   {

-      if (fp < 0)

-      {

-         fp = -fp;

-         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1 */

-         --size;

-      }

-

-      if (fp >= DBL_MIN && fp <= DBL_MAX)

-      {

-         int exp_b10;   /* A base 10 exponent */

-         double base;   /* 10^exp_b10 */

-

-         /* First extract a base 10 exponent of the number,

-          * the calculation below rounds down when converting

-          * from base 2 to base 10 (multiply by log10(2) -

-          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to

-          * be increased.  Note that the arithmetic shift

-          * performs a floor() unlike C arithmetic - using a

-          * C multiply would break the following for negative

-          * exponents.

-          */

-         (void)frexp(fp, &exp_b10); /* exponent to base 2 */

-

-         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */

-

-         /* Avoid underflow here. */

-         base = png_pow10(exp_b10); /* May underflow */

-

-         while (base < DBL_MIN || base < fp)

-         {

-            /* And this may overflow. */

-            double test = png_pow10(exp_b10+1);

-

-            if (test <= DBL_MAX)

-            {

-               ++exp_b10; base = test;

-            }

-

-            else

-               break;

-         }

-

-         /* Normalize fp and correct exp_b10, after this fp is in the

-          * range [.1,1) and exp_b10 is both the exponent and the digit

-          * *before* which the decimal point should be inserted

-          * (starting with 0 for the first digit).  Note that this

-          * works even if 10^exp_b10 is out of range because of the

-          * test on DBL_MAX above.

-          */

-         fp /= base;

-         while (fp >= 1)

-         {

-            fp /= 10; ++exp_b10;

-         }

-

-         /* Because of the code above fp may, at this point, be

-          * less than .1, this is ok because the code below can

-          * handle the leading zeros this generates, so no attempt

-          * is made to correct that here.

-          */

-

-         {

-            unsigned int czero, clead, cdigits;

-            char exponent[10];

-

-            /* Allow up to two leading zeros - this will not lengthen

-             * the number compared to using E-n.

-             */

-            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */

-            {

-               czero = 0U-exp_b10; /* PLUS 2 digits: TOTAL 3 */

-               exp_b10 = 0;      /* Dot added below before first output. */

-            }

-            else

-               czero = 0;    /* No zeros to add */

-

-            /* Generate the digit list, stripping trailing zeros and

-             * inserting a '.' before a digit if the exponent is 0.

-             */

-            clead = czero; /* Count of leading zeros */

-            cdigits = 0;   /* Count of digits in list. */

-

-            do

-            {

-               double d;

-

-               fp *= 10;

-               /* Use modf here, not floor and subtract, so that

-                * the separation is done in one step.  At the end

-                * of the loop don't break the number into parts so

-                * that the final digit is rounded.

-                */

-               if (cdigits+czero+1 < precision+clead)

-                  fp = modf(fp, &d);

-

-               else

-               {

-                  d = floor(fp + .5);

-

-                  if (d > 9)

-                  {

-                     /* Rounding up to 10, handle that here. */

-                     if (czero > 0)

-                     {

-                        --czero; d = 1;

-                        if (cdigits == 0) --clead;

-                     }

-                     else

-                     {

-                        while (cdigits > 0 && d > 9)

-                        {

-                           int ch = *--ascii;

-

-                           if (exp_b10 != (-1))

-                              ++exp_b10;

-

-                           else if (ch == 46)

-                           {

-                              ch = *--ascii; ++size;

-                              /* Advance exp_b10 to '1', so that the

-                               * decimal point happens after the

-                               * previous digit.

-                               */

-                              exp_b10 = 1;

-                           }

-

-                           --cdigits;

-                           d = ch - 47;  /* I.e. 1+(ch-48) */

-                        }

-

-                        /* Did we reach the beginning? If so adjust the

-                         * exponent but take into account the leading

-                         * decimal point.

-                         */

-                        if (d > 9)  /* cdigits == 0 */

-                        {

-                           if (exp_b10 == (-1))

-                           {

-                              /* Leading decimal point (plus zeros?), if

-                               * we lose the decimal point here it must

-                               * be reentered below.

-                               */

-                              int ch = *--ascii;

-

-                              if (ch == 46)

-                              {

-                                 ++size; exp_b10 = 1;

-                              }

-

-                              /* Else lost a leading zero, so 'exp_b10' is

-                               * still ok at (-1)

-                               */

-                           }

-                           else

-                              ++exp_b10;

-

-                           /* In all cases we output a '1' */

-                           d = 1;

-                        }

-                     }

-                  }

-                  fp = 0; /* Guarantees termination below. */

-               }

-

-               if (d == 0)

-               {

-                  ++czero;

-                  if (cdigits == 0) ++clead;

-               }

-               else

-               {

-                  /* Included embedded zeros in the digit count. */

-                  cdigits += czero - clead;

-                  clead = 0;

-

-                  while (czero > 0)

-                  {

-                     /* exp_b10 == (-1) means we just output the decimal

-                      * place - after the DP don't adjust 'exp_b10' any

-                      * more!

-                      */

-                     if (exp_b10 != (-1))

-                     {

-                        if (exp_b10 == 0)

-                        {

-                           *ascii++ = 46; --size;

-                        }

-                        /* PLUS 1: TOTAL 4 */

-                        --exp_b10;

-                     }

-                     *ascii++ = 48; --czero;

-                  }

-

-                  if (exp_b10 != (-1))

-                  {

-                     if (exp_b10 == 0)

-                     {

-                        *ascii++ = 46; --size; /* counted above */

-                     }

-

-                     --exp_b10;

-                  }

-                  *ascii++ = (char)(48 + (int)d); ++cdigits;

-               }

-            }

-            while (cdigits+czero < precision+clead && fp > DBL_MIN);

-

-            /* The total output count (max) is now 4+precision */

-

-            /* Check for an exponent, if we don't need one we are

-             * done and just need to terminate the string.  At

-             * this point exp_b10==(-1) is effectively a flag - it got

-             * to '-1' because of the decrement after outputting

-             * the decimal point above (the exponent required is

-             * *not* -1!)

-             */

-            if (exp_b10 >= (-1) && exp_b10 <= 2)

-            {

-               /* The following only happens if we didn't output the

-                * leading zeros above for negative exponent, so this

-                * doesn't add to the digit requirement.  Note that the

-                * two zeros here can only be output if the two leading

-                * zeros were *not* output, so this doesn't increase

-                * the output count.

-                */

-               while (exp_b10-- > 0) *ascii++ = 48;

-

-               *ascii = 0;

-

-               /* Total buffer requirement (including the '\0') is

-                * 5+precision - see check at the start.

-                */

-               return;

-            }

-

-            /* Here if an exponent is required, adjust size for

-             * the digits we output but did not count.  The total

-             * digit output here so far is at most 1+precision - no

-             * decimal point and no leading or trailing zeros have

-             * been output.

-             */

-            size -= cdigits;

-

-            *ascii++ = 69; --size;    /* 'E': PLUS 1 TOTAL 2+precision */

-

-            /* The following use of an unsigned temporary avoids ambiguities in

-             * the signed arithmetic on exp_b10 and permits GCC at least to do

-             * better optimization.

-             */

-            {

-               unsigned int uexp_b10;

-

-               if (exp_b10 < 0)

-               {

-                  *ascii++ = 45; --size; /* '-': PLUS 1 TOTAL 3+precision */

-                  uexp_b10 = 0U-exp_b10;

-               }

-

-               else

-                  uexp_b10 = 0U+exp_b10;

-

-               cdigits = 0;

-

-               while (uexp_b10 > 0)

-               {

-                  exponent[cdigits++] = (char)(48 + uexp_b10 % 10);

-                  uexp_b10 /= 10;

-               }

-            }

-

-            /* Need another size check here for the exponent digits, so

-             * this need not be considered above.

-             */

-            if (size > cdigits)

-            {

-               while (cdigits > 0) *ascii++ = exponent[--cdigits];

-

-               *ascii = 0;

-

-               return;

-            }

-         }

-      }

-      else if (!(fp >= DBL_MIN))

-      {

-         *ascii++ = 48; /* '0' */

-         *ascii = 0;

-         return;

-      }

-      else

-      {

-         *ascii++ = 105; /* 'i' */

-         *ascii++ = 110; /* 'n' */

-         *ascii++ = 102; /* 'f' */

-         *ascii = 0;

-         return;

-      }

-   }

-

-   /* Here on buffer too small. */

-   png_error(png_ptr, "ASCII conversion buffer too small");

-}

-#if GCC_STRICT_OVERFLOW

-#pragma GCC diagnostic pop

-#endif /* GCC_STRICT_OVERFLOW */

-

-#  endif /* FLOATING_POINT */

-

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-/* Function to format a fixed point value in ASCII.

- */

-void /* PRIVATE */

-png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,

-    png_size_t size, png_fixed_point fp)

-{

-   /* Require space for 10 decimal digits, a decimal point, a minus sign and a

-    * trailing \0, 13 characters:

-    */

-   if (size > 12)

-   {

-      png_uint_32 num;

-

-      /* Avoid overflow here on the minimum integer. */

-      if (fp < 0)

-      {

-         *ascii++ = 45; num = (png_uint_32)(-fp);

-      }

-      else

-         num = (png_uint_32)fp;

-

-      if (num <= 0x80000000) /* else overflowed */

-      {

-         unsigned int ndigits = 0, first = 16 /* flag value */;

-         char digits[10];

-

-         while (num)

-         {

-            /* Split the low digit off num: */

-            unsigned int tmp = num/10;

-            num -= tmp*10;

-            digits[ndigits++] = (char)(48 + num);

-            /* Record the first non-zero digit, note that this is a number

-             * starting at 1, it's not actually the array index.

-             */

-            if (first == 16 && num > 0)

-               first = ndigits;

-            num = tmp;

-         }

-

-         if (ndigits > 0)

-         {

-            while (ndigits > 5) *ascii++ = digits[--ndigits];

-            /* The remaining digits are fractional digits, ndigits is '5' or

-             * smaller at this point.  It is certainly not zero.  Check for a

-             * non-zero fractional digit:

-             */

-            if (first <= 5)

-            {

-               unsigned int i;

-               *ascii++ = 46; /* decimal point */

-               /* ndigits may be <5 for small numbers, output leading zeros

-                * then ndigits digits to first:

-                */

-               i = 5;

-               while (ndigits < i)

-               {

-                  *ascii++ = 48; --i;

-               }

-               while (ndigits >= first) *ascii++ = digits[--ndigits];

-               /* Don't output the trailing zeros! */

-            }

-         }

-         else

-            *ascii++ = 48;

-

-         /* And null terminate the string: */

-         *ascii = 0;

-         return;

-      }

-   }

-

-   /* Here on buffer too small. */

-   png_error(png_ptr, "ASCII conversion buffer too small");

-}

-#   endif /* FIXED_POINT */

-#endif /* SCAL */

-

-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \

-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \

-   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \

-   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \

-   (defined(PNG_sCAL_SUPPORTED) && \

-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))

-png_fixed_point

-png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)

-{

-   double r = floor(100000 * fp + .5);

-

-   if (r > 2147483647. || r < -2147483648.)

-      png_fixed_error(png_ptr, text);

-

-#  ifndef PNG_ERROR_TEXT_SUPPORTED

-   PNG_UNUSED(text)

-#  endif

-

-   return (png_fixed_point)r;

-}

-#endif

-

-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\

-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)

-/* muldiv functions */

-/* This API takes signed arguments and rounds the result to the nearest

- * integer (or, for a fixed point number - the standard argument - to

- * the nearest .00001).  Overflow and divide by zero are signalled in

- * the result, a boolean - true on success, false on overflow.

- */

-#if GCC_STRICT_OVERFLOW /* from above */

-/* It is not obvious which comparison below gets optimized in such a way that

- * signed overflow would change the result; looking through the code does not

- * reveal any tests which have the form GCC complains about, so presumably the

- * optimizer is moving an add or subtract into the 'if' somewhere.

- */

-#pragma GCC diagnostic push

-#pragma GCC diagnostic warning "-Wstrict-overflow=2"

-#endif /* GCC_STRICT_OVERFLOW */

-int

-png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,

-    png_int_32 divisor)

-{

-   /* Return a * times / divisor, rounded. */

-   if (divisor != 0)

-   {

-      if (a == 0 || times == 0)

-      {

-         *res = 0;

-         return 1;

-      }

-      else

-      {

-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-         double r = a;

-         r *= times;

-         r /= divisor;

-         r = floor(r+.5);

-

-         /* A png_fixed_point is a 32-bit integer. */

-         if (r <= 2147483647. && r >= -2147483648.)

-         {

-            *res = (png_fixed_point)r;

-            return 1;

-         }

-#else

-         int negative = 0;

-         png_uint_32 A, T, D;

-         png_uint_32 s16, s32, s00;

-

-         if (a < 0)

-            negative = 1, A = -a;

-         else

-            A = a;

-

-         if (times < 0)

-            negative = !negative, T = -times;

-         else

-            T = times;

-

-         if (divisor < 0)

-            negative = !negative, D = -divisor;

-         else

-            D = divisor;

-

-         /* Following can't overflow because the arguments only

-          * have 31 bits each, however the result may be 32 bits.

-          */

-         s16 = (A >> 16) * (T & 0xffff) +

-                           (A & 0xffff) * (T >> 16);

-         /* Can't overflow because the a*times bit is only 30

-          * bits at most.

-          */

-         s32 = (A >> 16) * (T >> 16) + (s16 >> 16);

-         s00 = (A & 0xffff) * (T & 0xffff);

-

-         s16 = (s16 & 0xffff) << 16;

-         s00 += s16;

-

-         if (s00 < s16)

-            ++s32; /* carry */

-

-         if (s32 < D) /* else overflow */

-         {

-            /* s32.s00 is now the 64-bit product, do a standard

-             * division, we know that s32 < D, so the maximum

-             * required shift is 31.

-             */

-            int bitshift = 32;

-            png_fixed_point result = 0; /* NOTE: signed */

-

-            while (--bitshift >= 0)

-            {

-               png_uint_32 d32, d00;

-

-               if (bitshift > 0)

-                  d32 = D >> (32-bitshift), d00 = D << bitshift;

-

-               else

-                  d32 = 0, d00 = D;

-

-               if (s32 > d32)

-               {

-                  if (s00 < d00) --s32; /* carry */

-                  s32 -= d32, s00 -= d00, result += 1<<bitshift;

-               }

-

-               else

-                  if (s32 == d32 && s00 >= d00)

-                     s32 = 0, s00 -= d00, result += 1<<bitshift;

-            }

-

-            /* Handle the rounding. */

-            if (s00 >= (D >> 1))

-               ++result;

-

-            if (negative != 0)

-               result = -result;

-

-            /* Check for overflow. */

-            if ((negative != 0 && result <= 0) ||

-                (negative == 0 && result >= 0))

-            {

-               *res = result;

-               return 1;

-            }

-         }

-#endif

-      }

-   }

-

-   return 0;

-}

-#if GCC_STRICT_OVERFLOW

-#pragma GCC diagnostic pop

-#endif /* GCC_STRICT_OVERFLOW */

-#endif /* READ_GAMMA || INCH_CONVERSIONS */

-

-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)

-/* The following is for when the caller doesn't much care about the

- * result.

- */

-png_fixed_point

-png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,

-    png_int_32 divisor)

-{

-   png_fixed_point result;

-

-   if (png_muldiv(&result, a, times, divisor) != 0)

-      return result;

-

-   png_warning(png_ptr, "fixed point overflow ignored");

-   return 0;

-}

-#endif

-

-#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */

-/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */

-png_fixed_point

-png_reciprocal(png_fixed_point a)

-{

-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-   double r = floor(1E10/a+.5);

-

-   if (r <= 2147483647. && r >= -2147483648.)

-      return (png_fixed_point)r;

-#else

-   png_fixed_point res;

-

-   if (png_muldiv(&res, 100000, 100000, a) != 0)

-      return res;

-#endif

-

-   return 0; /* error/overflow */

-}

-

-/* This is the shared test on whether a gamma value is 'significant' - whether

- * it is worth doing gamma correction.

- */

-int /* PRIVATE */

-png_gamma_significant(png_fixed_point gamma_val)

-{

-   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||

-       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;

-}

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-#ifdef PNG_16BIT_SUPPORTED

-/* A local convenience routine. */

-static png_fixed_point

-png_product2(png_fixed_point a, png_fixed_point b)

-{

-   /* The required result is 1/a * 1/b; the following preserves accuracy. */

-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-   double r = a * 1E-5;

-   r *= b;

-   r = floor(r+.5);

-

-   if (r <= 2147483647. && r >= -2147483648.)

-      return (png_fixed_point)r;

-#else

-   png_fixed_point res;

-

-   if (png_muldiv(&res, a, b, 100000) != 0)

-      return res;

-#endif

-

-   return 0; /* overflow */

-}

-#endif /* 16BIT */

-

-/* The inverse of the above. */

-png_fixed_point

-png_reciprocal2(png_fixed_point a, png_fixed_point b)

-{

-   /* The required result is 1/a * 1/b; the following preserves accuracy. */

-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-   if (a != 0 && b != 0)

-   {

-      double r = 1E15/a;

-      r /= b;

-      r = floor(r+.5);

-

-      if (r <= 2147483647. && r >= -2147483648.)

-         return (png_fixed_point)r;

-   }

-#else

-   /* This may overflow because the range of png_fixed_point isn't symmetric,

-    * but this API is only used for the product of file and screen gamma so it

-    * doesn't matter that the smallest number it can produce is 1/21474, not

-    * 1/100000

-    */

-   png_fixed_point res = png_product2(a, b);

-

-   if (res != 0)

-      return png_reciprocal(res);

-#endif

-

-   return 0; /* overflow */

-}

-#endif /* READ_GAMMA */

-

-#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */

-#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED

-/* Fixed point gamma.

- *

- * The code to calculate the tables used below can be found in the shell script

- * contrib/tools/intgamma.sh

- *

- * To calculate gamma this code implements fast log() and exp() calls using only

- * fixed point arithmetic.  This code has sufficient precision for either 8-bit

- * or 16-bit sample values.

- *

- * The tables used here were calculated using simple 'bc' programs, but C double

- * precision floating point arithmetic would work fine.

- *

- * 8-bit log table

- *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to

- *   255, so it's the base 2 logarithm of a normalized 8-bit floating point

- *   mantissa.  The numbers are 32-bit fractions.

- */

-static const png_uint_32

-png_8bit_l2[128] =

-{

-   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,

-   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,

-   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,

-   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,

-   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,

-   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,

-   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,

-   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,

-   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,

-   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,

-   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,

-   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,

-   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,

-   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,

-   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,

-   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,

-   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,

-   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,

-   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,

-   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,

-   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,

-   24347096U, 0U

-

-#if 0

-   /* The following are the values for 16-bit tables - these work fine for the

-    * 8-bit conversions but produce very slightly larger errors in the 16-bit

-    * log (about 1.2 as opposed to 0.7 absolute error in the final value).  To

-    * use these all the shifts below must be adjusted appropriately.

-    */

-   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,

-   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,

-   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,

-   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,

-   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,

-   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,

-   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,

-   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,

-   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,

-   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,

-   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,

-   1119, 744, 372

-#endif

-};

-

-static png_int_32

-png_log8bit(unsigned int x)

-{

-   unsigned int lg2 = 0;

-   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,

-    * because the log is actually negate that means adding 1.  The final

-    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1

-    * input), return -1 for the overflow (log 0) case, - so the result is

-    * always at most 19 bits.

-    */

-   if ((x &= 0xff) == 0)

-      return -1;

-

-   if ((x & 0xf0) == 0)

-      lg2  = 4, x <<= 4;

-

-   if ((x & 0xc0) == 0)

-      lg2 += 2, x <<= 2;

-

-   if ((x & 0x80) == 0)

-      lg2 += 1, x <<= 1;

-

-   /* result is at most 19 bits, so this cast is safe: */

-   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));

-}

-

-/* The above gives exact (to 16 binary places) log2 values for 8-bit images,

- * for 16-bit images we use the most significant 8 bits of the 16-bit value to

- * get an approximation then multiply the approximation by a correction factor

- * determined by the remaining up to 8 bits.  This requires an additional step

- * in the 16-bit case.

- *

- * We want log2(value/65535), we have log2(v'/255), where:

- *

- *    value = v' * 256 + v''

- *          = v' * f

- *

- * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128

- * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less

- * than 258.  The final factor also needs to correct for the fact that our 8-bit

- * value is scaled by 255, whereas the 16-bit values must be scaled by 65535.

- *

- * This gives a final formula using a calculated value 'x' which is value/v' and

- * scaling by 65536 to match the above table:

- *

- *   log2(x/257) * 65536

- *

- * Since these numbers are so close to '1' we can use simple linear

- * interpolation between the two end values 256/257 (result -368.61) and 258/257

- * (result 367.179).  The values used below are scaled by a further 64 to give

- * 16-bit precision in the interpolation:

- *

- * Start (256): -23591

- * Zero  (257):      0

- * End   (258):  23499

- */

-#ifdef PNG_16BIT_SUPPORTED

-static png_int_32

-png_log16bit(png_uint_32 x)

-{

-   unsigned int lg2 = 0;

-

-   /* As above, but now the input has 16 bits. */

-   if ((x &= 0xffff) == 0)

-      return -1;

-

-   if ((x & 0xff00) == 0)

-      lg2  = 8, x <<= 8;

-

-   if ((x & 0xf000) == 0)

-      lg2 += 4, x <<= 4;

-

-   if ((x & 0xc000) == 0)

-      lg2 += 2, x <<= 2;

-

-   if ((x & 0x8000) == 0)

-      lg2 += 1, x <<= 1;

-

-   /* Calculate the base logarithm from the top 8 bits as a 28-bit fractional

-    * value.

-    */

-   lg2 <<= 28;

-   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;

-

-   /* Now we need to interpolate the factor, this requires a division by the top

-    * 8 bits.  Do this with maximum precision.

-    */

-   x = ((x << 16) + (x >> 9)) / (x >> 8);

-

-   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1<<24,

-    * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly

-    * 16 bits to interpolate to get the low bits of the result.  Round the

-    * answer.  Note that the end point values are scaled by 64 to retain overall

-    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust

-    * the overall scaling by 6-12.  Round at every step.

-    */

-   x -= 1U << 24;

-

-   if (x <= 65536U) /* <= '257' */

-      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);

-

-   else

-      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);

-

-   /* Safe, because the result can't have more than 20 bits: */

-   return (png_int_32)((lg2 + 2048) >> 12);

-}

-#endif /* 16BIT */

-

-/* The 'exp()' case must invert the above, taking a 20-bit fixed point

- * logarithmic value and returning a 16 or 8-bit number as appropriate.  In

- * each case only the low 16 bits are relevant - the fraction - since the

- * integer bits (the top 4) simply determine a shift.

- *

- * The worst case is the 16-bit distinction between 65535 and 65534. This

- * requires perhaps spurious accuracy in the decoding of the logarithm to

- * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance

- * of getting this accuracy in practice.

- *

- * To deal with this the following exp() function works out the exponent of the

- * fractional part of the logarithm by using an accurate 32-bit value from the

- * top four fractional bits then multiplying in the remaining bits.

- */

-static const png_uint_32

-png_32bit_exp[16] =

-{

-   /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */

-   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,

-   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,

-   2553802834U, 2445529972U, 2341847524U, 2242560872U

-};

-

-/* Adjustment table; provided to explain the numbers in the code below. */

-#if 0

-for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}

-   11 44937.64284865548751208448

-   10 45180.98734845585101160448

-    9 45303.31936980687359311872

-    8 45364.65110595323018870784

-    7 45395.35850361789624614912

-    6 45410.72259715102037508096

-    5 45418.40724413220722311168

-    4 45422.25021786898173001728

-    3 45424.17186732298419044352

-    2 45425.13273269940811464704

-    1 45425.61317555035558641664

-    0 45425.85339951654943850496

-#endif

-

-static png_uint_32

-png_exp(png_fixed_point x)

-{

-   if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */

-   {

-      /* Obtain a 4-bit approximation */

-      png_uint_32 e = png_32bit_exp[(x >> 12) & 0x0f];

-

-      /* Incorporate the low 12 bits - these decrease the returned value by

-       * multiplying by a number less than 1 if the bit is set.  The multiplier

-       * is determined by the above table and the shift. Notice that the values

-       * converge on 45426 and this is used to allow linear interpolation of the

-       * low bits.

-       */

-      if (x & 0x800)

-         e -= (((e >> 16) * 44938U) +  16U) >> 5;

-

-      if (x & 0x400)

-         e -= (((e >> 16) * 45181U) +  32U) >> 6;

-

-      if (x & 0x200)

-         e -= (((e >> 16) * 45303U) +  64U) >> 7;

-

-      if (x & 0x100)

-         e -= (((e >> 16) * 45365U) + 128U) >> 8;

-

-      if (x & 0x080)

-         e -= (((e >> 16) * 45395U) + 256U) >> 9;

-

-      if (x & 0x040)

-         e -= (((e >> 16) * 45410U) + 512U) >> 10;

-

-      /* And handle the low 6 bits in a single block. */

-      e -= (((e >> 16) * 355U * (x & 0x3fU)) + 256U) >> 9;

-

-      /* Handle the upper bits of x. */

-      e >>= x >> 16;

-      return e;

-   }

-

-   /* Check for overflow */

-   if (x <= 0)

-      return png_32bit_exp[0];

-

-   /* Else underflow */

-   return 0;

-}

-

-static png_byte

-png_exp8bit(png_fixed_point lg2)

-{

-   /* Get a 32-bit value: */

-   png_uint_32 x = png_exp(lg2);

-

-   /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the

-    * second, rounding, step can't overflow because of the first, subtraction,

-    * step.

-    */

-   x -= x >> 8;

-   return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff);

-}

-

-#ifdef PNG_16BIT_SUPPORTED

-static png_uint_16

-png_exp16bit(png_fixed_point lg2)

-{

-   /* Get a 32-bit value: */

-   png_uint_32 x = png_exp(lg2);

-

-   /* Convert the 32-bit value to 0..65535 by multiplying by 65536-1: */

-   x -= x >> 16;

-   return (png_uint_16)((x + 32767U) >> 16);

-}

-#endif /* 16BIT */

-#endif /* FLOATING_ARITHMETIC */

-

-png_byte

-png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)

-{

-   if (value > 0 && value < 255)

-   {

-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-         /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly

-          * convert this to a floating point value.  This includes values that

-          * would overflow if 'value' were to be converted to 'int'.

-          *

-          * Apparently GCC, however, does an intermediate conversion to (int)

-          * on some (ARM) but not all (x86) platforms, possibly because of

-          * hardware FP limitations.  (E.g. if the hardware conversion always

-          * assumes the integer register contains a signed value.)  This results

-          * in ANSI-C undefined behavior for large values.

-          *

-          * Other implementations on the same machine might actually be ANSI-C90

-          * conformant and therefore compile spurious extra code for the large

-          * values.

-          *

-          * We can be reasonably sure that an unsigned to float conversion

-          * won't be faster than an int to float one.  Therefore this code

-          * assumes responsibility for the undefined behavior, which it knows

-          * can't happen because of the check above.

-          *

-          * Note the argument to this routine is an (unsigned int) because, on

-          * 16-bit platforms, it is assigned a value which might be out of

-          * range for an (int); that would result in undefined behavior in the

-          * caller if the *argument* ('value') were to be declared (int).

-          */

-         double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);

-         return (png_byte)r;

-#     else

-         png_int_32 lg2 = png_log8bit(value);

-         png_fixed_point res;

-

-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)

-            return png_exp8bit(res);

-

-         /* Overflow. */

-         value = 0;

-#     endif

-   }

-

-   return (png_byte)(value & 0xff);

-}

-

-#ifdef PNG_16BIT_SUPPORTED

-png_uint_16

-png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)

-{

-   if (value > 0 && value < 65535)

-   {

-# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-      /* The same (unsigned int)->(double) constraints apply here as above,

-       * however in this case the (unsigned int) to (int) conversion can

-       * overflow on an ANSI-C90 compliant system so the cast needs to ensure

-       * that this is not possible.

-       */

-      double r = floor(65535*pow((png_int_32)value/65535.,

-          gamma_val*.00001)+.5);

-      return (png_uint_16)r;

-# else

-      png_int_32 lg2 = png_log16bit(value);

-      png_fixed_point res;

-

-      if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)

-         return png_exp16bit(res);

-

-      /* Overflow. */

-      value = 0;

-# endif

-   }

-

-   return (png_uint_16)value;

-}

-#endif /* 16BIT */

-

-/* This does the right thing based on the bit_depth field of the

- * png_struct, interpreting values as 8-bit or 16-bit.  While the result

- * is nominally a 16-bit value if bit depth is 8 then the result is

- * 8-bit (as are the arguments.)

- */

-png_uint_16 /* PRIVATE */

-png_gamma_correct(png_structrp png_ptr, unsigned int value,

-    png_fixed_point gamma_val)

-{

-   if (png_ptr->bit_depth == 8)

-      return png_gamma_8bit_correct(value, gamma_val);

-

-#ifdef PNG_16BIT_SUPPORTED

-   else

-      return png_gamma_16bit_correct(value, gamma_val);

-#else

-      /* should not reach this */

-      return 0;

-#endif /* 16BIT */

-}

-

-#ifdef PNG_16BIT_SUPPORTED

-/* Internal function to build a single 16-bit table - the table consists of

- * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount

- * to shift the input values right (or 16-number_of_signifiant_bits).

- *

- * The caller is responsible for ensuring that the table gets cleaned up on

- * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument

- * should be somewhere that will be cleaned.

- */

-static void

-png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,

-    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)

-{

-   /* Various values derived from 'shift': */

-   PNG_CONST unsigned int num = 1U << (8U - shift);

-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-   /* CSE the division and work round wacky GCC warnings (see the comments

-    * in png_gamma_8bit_correct for where these come from.)

-    */

-   PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);

-#endif

-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;

-   PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);

-   unsigned int i;

-

-   png_uint_16pp table = *ptable =

-       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));

-

-   for (i = 0; i < num; i++)

-   {

-      png_uint_16p sub_table = table[i] =

-          (png_uint_16p)png_malloc(png_ptr, 256 * (sizeof (png_uint_16)));

-

-      /* The 'threshold' test is repeated here because it can arise for one of

-       * the 16-bit tables even if the others don't hit it.

-       */

-      if (png_gamma_significant(gamma_val) != 0)

-      {

-         /* The old code would overflow at the end and this would cause the

-          * 'pow' function to return a result >1, resulting in an

-          * arithmetic error.  This code follows the spec exactly; ig is

-          * the recovered input sample, it always has 8-16 bits.

-          *

-          * We want input * 65535/max, rounded, the arithmetic fits in 32

-          * bits (unsigned) so long as max <= 32767.

-          */

-         unsigned int j;

-         for (j = 0; j < 256; j++)

-         {

-            png_uint_32 ig = (j << (8-shift)) + i;

-#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED

-               /* Inline the 'max' scaling operation: */

-               /* See png_gamma_8bit_correct for why the cast to (int) is

-                * required here.

-                */

-               double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);

-               sub_table[j] = (png_uint_16)d;

-#           else

-               if (shift != 0)

-                  ig = (ig * 65535U + max_by_2)/max;

-

-               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);

-#           endif

-         }

-      }

-      else

-      {

-         /* We must still build a table, but do it the fast way. */

-         unsigned int j;

-

-         for (j = 0; j < 256; j++)

-         {

-            png_uint_32 ig = (j << (8-shift)) + i;

-

-            if (shift != 0)

-               ig = (ig * 65535U + max_by_2)/max;

-

-            sub_table[j] = (png_uint_16)ig;

-         }

-      }

-   }

-}

-

-/* NOTE: this function expects the *inverse* of the overall gamma transformation

- * required.

- */

-static void

-png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,

-    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)

-{

-   PNG_CONST unsigned int num = 1U << (8U - shift);

-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;

-   unsigned int i;

-   png_uint_32 last;

-

-   png_uint_16pp table = *ptable =

-       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));

-

-   /* 'num' is the number of tables and also the number of low bits of low

-    * bits of the input 16-bit value used to select a table.  Each table is

-    * itself indexed by the high 8 bits of the value.

-    */

-   for (i = 0; i < num; i++)

-      table[i] = (png_uint_16p)png_malloc(png_ptr,

-          256 * (sizeof (png_uint_16)));

-

-   /* 'gamma_val' is set to the reciprocal of the value calculated above, so

-    * pow(out,g) is an *input* value.  'last' is the last input value set.

-    *

-    * In the loop 'i' is used to find output values.  Since the output is

-    * 8-bit there are only 256 possible values.  The tables are set up to

-    * select the closest possible output value for each input by finding

-    * the input value at the boundary between each pair of output values

-    * and filling the table up to that boundary with the lower output

-    * value.

-    *

-    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9-bit

-    * values the code below uses a 16-bit value in i; the values start at

-    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last

-    * entries are filled with 255).  Start i at 128 and fill all 'last'

-    * table entries <= 'max'

-    */

-   last = 0;

-   for (i = 0; i < 255; ++i) /* 8-bit output value */

-   {

-      /* Find the corresponding maximum input value */

-      png_uint_16 out = (png_uint_16)(i * 257U); /* 16-bit output value */

-

-      /* Find the boundary value in 16 bits: */

-      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);

-

-      /* Adjust (round) to (16-shift) bits: */

-      bound = (bound * max + 32768U)/65535U + 1U;

-

-      while (last < bound)

-      {

-         table[last & (0xffU >> shift)][last >> (8U - shift)] = out;

-         last++;

-      }

-   }

-

-   /* And fill in the final entries. */

-   while (last < (num << 8))

-   {

-      table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U;

-      last++;

-   }

-}

-#endif /* 16BIT */

-

-/* Build a single 8-bit table: same as the 16-bit case but much simpler (and

- * typically much faster).  Note that libpng currently does no sBIT processing

- * (apparently contrary to the spec) so a 256-entry table is always generated.

- */

-static void

-png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,

-    PNG_CONST png_fixed_point gamma_val)

-{

-   unsigned int i;

-   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);

-

-   if (png_gamma_significant(gamma_val) != 0)

-      for (i=0; i<256; i++)

-         table[i] = png_gamma_8bit_correct(i, gamma_val);

-

-   else

-      for (i=0; i<256; ++i)

-         table[i] = (png_byte)(i & 0xff);

-}

-

-/* Used from png_read_destroy and below to release the memory used by the gamma

- * tables.

- */

-void /* PRIVATE */

-png_destroy_gamma_table(png_structrp png_ptr)

-{

-   png_free(png_ptr, png_ptr->gamma_table);

-   png_ptr->gamma_table = NULL;

-

-#ifdef PNG_16BIT_SUPPORTED

-   if (png_ptr->gamma_16_table != NULL)

-   {

-      int i;

-      int istop = (1 << (8 - png_ptr->gamma_shift));

-      for (i = 0; i < istop; i++)

-      {

-         png_free(png_ptr, png_ptr->gamma_16_table[i]);

-      }

-   png_free(png_ptr, png_ptr->gamma_16_table);

-   png_ptr->gamma_16_table = NULL;

-   }

-#endif /* 16BIT */

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)

-   png_free(png_ptr, png_ptr->gamma_from_1);

-   png_ptr->gamma_from_1 = NULL;

-   png_free(png_ptr, png_ptr->gamma_to_1);

-   png_ptr->gamma_to_1 = NULL;

-

-#ifdef PNG_16BIT_SUPPORTED

-   if (png_ptr->gamma_16_from_1 != NULL)

-   {

-      int i;

-      int istop = (1 << (8 - png_ptr->gamma_shift));

-      for (i = 0; i < istop; i++)

-      {

-         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);

-      }

-   png_free(png_ptr, png_ptr->gamma_16_from_1);

-   png_ptr->gamma_16_from_1 = NULL;

-   }

-   if (png_ptr->gamma_16_to_1 != NULL)

-   {

-      int i;

-      int istop = (1 << (8 - png_ptr->gamma_shift));

-      for (i = 0; i < istop; i++)

-      {

-         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);

-      }

-   png_free(png_ptr, png_ptr->gamma_16_to_1);

-   png_ptr->gamma_16_to_1 = NULL;

-   }

-#endif /* 16BIT */

-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */

-}

-

-/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit

- * tables, we don't make a full table if we are reducing to 8-bit in

- * the future.  Note also how the gamma_16 tables are segmented so that

- * we don't need to allocate > 64K chunks for a full 16-bit table.

- */

-void /* PRIVATE */

-png_build_gamma_table(png_structrp png_ptr, int bit_depth)

-{

-   png_debug(1, "in png_build_gamma_table");

-

-   /* Remove any existing table; this copes with multiple calls to

-    * png_read_update_info. The warning is because building the gamma tables

-    * multiple times is a performance hit - it's harmless but the ability to

-    * call png_read_update_info() multiple times is new in 1.5.6 so it seems

-    * sensible to warn if the app introduces such a hit.

-    */

-   if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)

-   {

-      png_warning(png_ptr, "gamma table being rebuilt");

-      png_destroy_gamma_table(png_ptr);

-   }

-

-   if (bit_depth <= 8)

-   {

-      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,

-          png_ptr->screen_gamma > 0 ?

-          png_reciprocal2(png_ptr->colorspace.gamma,

-          png_ptr->screen_gamma) : PNG_FP_1);

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)

-      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)

-      {

-         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,

-             png_reciprocal(png_ptr->colorspace.gamma));

-

-         png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,

-             png_ptr->screen_gamma > 0 ?

-             png_reciprocal(png_ptr->screen_gamma) :

-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);

-      }

-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */

-   }

-#ifdef PNG_16BIT_SUPPORTED

-   else

-   {

-      png_byte shift, sig_bit;

-

-      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      {

-         sig_bit = png_ptr->sig_bit.red;

-

-         if (png_ptr->sig_bit.green > sig_bit)

-            sig_bit = png_ptr->sig_bit.green;

-

-         if (png_ptr->sig_bit.blue > sig_bit)

-            sig_bit = png_ptr->sig_bit.blue;

-      }

-      else

-         sig_bit = png_ptr->sig_bit.gray;

-

-      /* 16-bit gamma code uses this equation:

-       *

-       *   ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]

-       *

-       * Where 'iv' is the input color value and 'ov' is the output value -

-       * pow(iv, gamma).

-       *

-       * Thus the gamma table consists of up to 256 256-entry tables.  The table

-       * is selected by the (8-gamma_shift) most significant of the low 8 bits

-       * of the color value then indexed by the upper 8 bits:

-       *

-       *   table[low bits][high 8 bits]

-       *

-       * So the table 'n' corresponds to all those 'iv' of:

-       *

-       *   <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>

-       *

-       */

-      if (sig_bit > 0 && sig_bit < 16U)

-         /* shift == insignificant bits */

-         shift = (png_byte)((16U - sig_bit) & 0xff);

-

-      else

-         shift = 0; /* keep all 16 bits */

-

-      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)

-      {

-         /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively

-          * the significant bits in the *input* when the output will

-          * eventually be 8 bits.  By default it is 11.

-          */

-         if (shift < (16U - PNG_MAX_GAMMA_8))

-            shift = (16U - PNG_MAX_GAMMA_8);

-      }

-

-      if (shift > 8U)

-         shift = 8U; /* Guarantees at least one table! */

-

-      png_ptr->gamma_shift = shift;

-

-      /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now

-       * PNG_COMPOSE).  This effectively smashed the background calculation for

-       * 16-bit output because the 8-bit table assumes the result will be

-       * reduced to 8 bits.

-       */

-      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)

-          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,

-          png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,

-          png_ptr->screen_gamma) : PNG_FP_1);

-

-      else

-          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,

-          png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,

-          png_ptr->screen_gamma) : PNG_FP_1);

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)

-      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)

-      {

-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,

-             png_reciprocal(png_ptr->colorspace.gamma));

-

-         /* Notice that the '16 from 1' table should be full precision, however

-          * the lookup on this table still uses gamma_shift, so it can't be.

-          * TODO: fix this.

-          */

-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,

-             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :

-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);

-      }

-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */

-   }

-#endif /* 16BIT */

-}

-#endif /* READ_GAMMA */

-

-/* HARDWARE OR SOFTWARE OPTION SUPPORT */

-#ifdef PNG_SET_OPTION_SUPPORTED

-int PNGAPI

-png_set_option(png_structrp png_ptr, int option, int onoff)

-{

-   if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&

-      (option & 1) == 0)

-   {

-      png_uint_32 mask = 3U << option;

-      png_uint_32 setting = (2U + (onoff != 0)) << option;

-      png_uint_32 current = png_ptr->options;

-

-      png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff);

-

-      return (int)(current & mask) >> option;

-   }

-

-   return PNG_OPTION_INVALID;

-}

-#endif

-

-/* sRGB support */

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\

-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-/* sRGB conversion tables; these are machine generated with the code in

- * contrib/tools/makesRGB.c.  The actual sRGB transfer curve defined in the

- * specification (see the article at https://en.wikipedia.org/wiki/SRGB)

- * is used, not the gamma=1/2.2 approximation use elsewhere in libpng.

- * The sRGB to linear table is exact (to the nearest 16-bit linear fraction).

- * The inverse (linear to sRGB) table has accuracies as follows:

- *

- * For all possible (255*65535+1) input values:

- *

- *    error: -0.515566 - 0.625971, 79441 (0.475369%) of readings inexact

- *

- * For the input values corresponding to the 65536 16-bit values:

- *

- *    error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact

- *

- * In all cases the inexact readings are only off by one.

- */

-

-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED

-/* The convert-to-sRGB table is only currently required for read. */

-const png_uint_16 png_sRGB_table[256] =

-{

-   0,20,40,60,80,99,119,139,

-   159,179,199,219,241,264,288,313,

-   340,367,396,427,458,491,526,562,

-   599,637,677,718,761,805,851,898,

-   947,997,1048,1101,1156,1212,1270,1330,

-   1391,1453,1517,1583,1651,1720,1790,1863,

-   1937,2013,2090,2170,2250,2333,2418,2504,

-   2592,2681,2773,2866,2961,3058,3157,3258,

-   3360,3464,3570,3678,3788,3900,4014,4129,

-   4247,4366,4488,4611,4736,4864,4993,5124,

-   5257,5392,5530,5669,5810,5953,6099,6246,

-   6395,6547,6700,6856,7014,7174,7335,7500,

-   7666,7834,8004,8177,8352,8528,8708,8889,

-   9072,9258,9445,9635,9828,10022,10219,10417,

-   10619,10822,11028,11235,11446,11658,11873,12090,

-   12309,12530,12754,12980,13209,13440,13673,13909,

-   14146,14387,14629,14874,15122,15371,15623,15878,

-   16135,16394,16656,16920,17187,17456,17727,18001,

-   18277,18556,18837,19121,19407,19696,19987,20281,

-   20577,20876,21177,21481,21787,22096,22407,22721,

-   23038,23357,23678,24002,24329,24658,24990,25325,

-   25662,26001,26344,26688,27036,27386,27739,28094,

-   28452,28813,29176,29542,29911,30282,30656,31033,

-   31412,31794,32179,32567,32957,33350,33745,34143,

-   34544,34948,35355,35764,36176,36591,37008,37429,

-   37852,38278,38706,39138,39572,40009,40449,40891,

-   41337,41785,42236,42690,43147,43606,44069,44534,

-   45002,45473,45947,46423,46903,47385,47871,48359,

-   48850,49344,49841,50341,50844,51349,51858,52369,

-   52884,53401,53921,54445,54971,55500,56032,56567,

-   57105,57646,58190,58737,59287,59840,60396,60955,

-   61517,62082,62650,63221,63795,64372,64952,65535

-};

-#endif /* SIMPLIFIED_READ */

-

-/* The base/delta tables are required for both read and write (but currently

- * only the simplified versions.)

- */

-const png_uint_16 png_sRGB_base[512] =

-{

-   128,1782,3383,4644,5675,6564,7357,8074,

-   8732,9346,9921,10463,10977,11466,11935,12384,

-   12816,13233,13634,14024,14402,14769,15125,15473,

-   15812,16142,16466,16781,17090,17393,17690,17981,

-   18266,18546,18822,19093,19359,19621,19879,20133,

-   20383,20630,20873,21113,21349,21583,21813,22041,

-   22265,22487,22707,22923,23138,23350,23559,23767,

-   23972,24175,24376,24575,24772,24967,25160,25352,

-   25542,25730,25916,26101,26284,26465,26645,26823,

-   27000,27176,27350,27523,27695,27865,28034,28201,

-   28368,28533,28697,28860,29021,29182,29341,29500,

-   29657,29813,29969,30123,30276,30429,30580,30730,

-   30880,31028,31176,31323,31469,31614,31758,31902,

-   32045,32186,32327,32468,32607,32746,32884,33021,

-   33158,33294,33429,33564,33697,33831,33963,34095,

-   34226,34357,34486,34616,34744,34873,35000,35127,

-   35253,35379,35504,35629,35753,35876,35999,36122,

-   36244,36365,36486,36606,36726,36845,36964,37083,

-   37201,37318,37435,37551,37668,37783,37898,38013,

-   38127,38241,38354,38467,38580,38692,38803,38915,

-   39026,39136,39246,39356,39465,39574,39682,39790,

-   39898,40005,40112,40219,40325,40431,40537,40642,

-   40747,40851,40955,41059,41163,41266,41369,41471,

-   41573,41675,41777,41878,41979,42079,42179,42279,

-   42379,42478,42577,42676,42775,42873,42971,43068,

-   43165,43262,43359,43456,43552,43648,43743,43839,

-   43934,44028,44123,44217,44311,44405,44499,44592,

-   44685,44778,44870,44962,45054,45146,45238,45329,

-   45420,45511,45601,45692,45782,45872,45961,46051,

-   46140,46229,46318,46406,46494,46583,46670,46758,

-   46846,46933,47020,47107,47193,47280,47366,47452,

-   47538,47623,47709,47794,47879,47964,48048,48133,

-   48217,48301,48385,48468,48552,48635,48718,48801,

-   48884,48966,49048,49131,49213,49294,49376,49458,

-   49539,49620,49701,49782,49862,49943,50023,50103,

-   50183,50263,50342,50422,50501,50580,50659,50738,

-   50816,50895,50973,51051,51129,51207,51285,51362,

-   51439,51517,51594,51671,51747,51824,51900,51977,

-   52053,52129,52205,52280,52356,52432,52507,52582,

-   52657,52732,52807,52881,52956,53030,53104,53178,

-   53252,53326,53400,53473,53546,53620,53693,53766,

-   53839,53911,53984,54056,54129,54201,54273,54345,

-   54417,54489,54560,54632,54703,54774,54845,54916,

-   54987,55058,55129,55199,55269,55340,55410,55480,

-   55550,55620,55689,55759,55828,55898,55967,56036,

-   56105,56174,56243,56311,56380,56448,56517,56585,

-   56653,56721,56789,56857,56924,56992,57059,57127,

-   57194,57261,57328,57395,57462,57529,57595,57662,

-   57728,57795,57861,57927,57993,58059,58125,58191,

-   58256,58322,58387,58453,58518,58583,58648,58713,

-   58778,58843,58908,58972,59037,59101,59165,59230,

-   59294,59358,59422,59486,59549,59613,59677,59740,

-   59804,59867,59930,59993,60056,60119,60182,60245,

-   60308,60370,60433,60495,60558,60620,60682,60744,

-   60806,60868,60930,60992,61054,61115,61177,61238,

-   61300,61361,61422,61483,61544,61605,61666,61727,

-   61788,61848,61909,61969,62030,62090,62150,62211,

-   62271,62331,62391,62450,62510,62570,62630,62689,

-   62749,62808,62867,62927,62986,63045,63104,63163,

-   63222,63281,63340,63398,63457,63515,63574,63632,

-   63691,63749,63807,63865,63923,63981,64039,64097,

-   64155,64212,64270,64328,64385,64443,64500,64557,

-   64614,64672,64729,64786,64843,64900,64956,65013,

-   65070,65126,65183,65239,65296,65352,65409,65465

-};

-

-const png_byte png_sRGB_delta[512] =

-{

-   207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,

-   52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,

-   35,34,34,33,33,32,32,31,31,30,30,30,29,29,28,28,

-   28,27,27,27,27,26,26,26,25,25,25,25,24,24,24,24,

-   23,23,23,23,23,22,22,22,22,22,22,21,21,21,21,21,

-   21,20,20,20,20,20,20,20,20,19,19,19,19,19,19,19,

-   19,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,

-   17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,

-   16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,15,

-   15,15,15,15,14,14,14,14,14,14,14,14,14,14,14,14,

-   14,14,14,14,14,14,14,13,13,13,13,13,13,13,13,13,

-   13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,

-   12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,

-   12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,

-   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,

-   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,

-   11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,

-   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,

-   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,

-   10,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,

-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,

-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,

-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,

-   9,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,

-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,

-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,

-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,

-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,

-   8,8,8,8,8,8,8,8,8,7,7,7,7,7,7,7,

-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,

-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,

-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7

-};

-#endif /* SIMPLIFIED READ/WRITE sRGB support */

-

-/* SIMPLIFIED READ/WRITE SUPPORT */

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\

-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-static int

-png_image_free_function(png_voidp argument)

-{

-   png_imagep image = png_voidcast(png_imagep, argument);

-   png_controlp cp = image->opaque;

-   png_control c;

-

-   /* Double check that we have a png_ptr - it should be impossible to get here

-    * without one.

-    */

-   if (cp->png_ptr == NULL)

-      return 0;

-

-   /* First free any data held in the control structure. */

-#  ifdef PNG_STDIO_SUPPORTED

-      if (cp->owned_file != 0)

-      {

-         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);

-         cp->owned_file = 0;

-

-         /* Ignore errors here. */

-         if (fp != NULL)

-         {

-            cp->png_ptr->io_ptr = NULL;

-            (void)fclose(fp);

-         }

-      }

-#  endif

-

-   /* Copy the control structure so that the original, allocated, version can be

-    * safely freed.  Notice that a png_error here stops the remainder of the

-    * cleanup, but this is probably fine because that would indicate bad memory

-    * problems anyway.

-    */

-   c = *cp;

-   image->opaque = &c;

-   png_free(c.png_ptr, cp);

-

-   /* Then the structures, calling the correct API. */

-   if (c.for_write != 0)

-   {

-#     ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED

-         png_destroy_write_struct(&c.png_ptr, &c.info_ptr);

-#     else

-         png_error(c.png_ptr, "simplified write not supported");

-#     endif

-   }

-   else

-   {

-#     ifdef PNG_SIMPLIFIED_READ_SUPPORTED

-         png_destroy_read_struct(&c.png_ptr, &c.info_ptr, NULL);

-#     else

-         png_error(c.png_ptr, "simplified read not supported");

-#     endif

-   }

-

-   /* Success. */

-   return 1;

-}

-

-void PNGAPI

-png_image_free(png_imagep image)

-{

-   /* Safely call the real function, but only if doing so is safe at this point

-    * (if not inside an error handling context).  Otherwise assume

-    * png_safe_execute will call this API after the return.

-    */

-   if (image != NULL && image->opaque != NULL &&

-      image->opaque->error_buf == NULL)

-   {

-      /* Ignore errors here: */

-      (void)png_safe_execute(image, png_image_free_function, image);

-      image->opaque = NULL;

-   }

-}

-

-int /* PRIVATE */

-png_image_error(png_imagep image, png_const_charp error_message)

-{

-   /* Utility to log an error. */

-   png_safecat(image->message, (sizeof image->message), 0, error_message);

-   image->warning_or_error |= PNG_IMAGE_ERROR;

-   png_image_free(image);

-   return 0;

-}

-

-#endif /* SIMPLIFIED READ/WRITE */

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/png.h b/plugins/AdvaImg/src/LibPNG/png.h
deleted file mode 100644
index 62d27ada00..0000000000
--- a/plugins/AdvaImg/src/LibPNG/png.h
+++ /dev/null
@@ -1,3278 +0,0 @@
-

-/* png.h - header file for PNG reference library

- *

- * libpng version 1.6.34, September 29, 2017

- *

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license (See LICENSE, below)

- *

- * Authors and maintainers:

- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat

- *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger

- *   libpng versions 0.97, January 1998, through 1.6.34, September 29, 2017:

- *     Glenn Randers-Pehrson.

- *   See also "Contributing Authors", below.

- */

-

-/*

- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:

- *

- * If you modify libpng you may insert additional notices immediately following

- * this sentence.

- *

- * This code is released under the libpng license.

- *

- * libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are

- * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are

- * derived from libpng-1.0.6, and are distributed according to the same

- * disclaimer and license as libpng-1.0.6 with the following individuals

- * added to the list of Contributing Authors:

- *

- *    Simon-Pierre Cadieux

- *    Eric S. Raymond

- *    Mans Rullgard

- *    Cosmin Truta

- *    Gilles Vollant

- *    James Yu

- *    Mandar Sahastrabuddhe

- *    Google Inc.

- *    Vadim Barkov

- *

- * and with the following additions to the disclaimer:

- *

- *    There is no warranty against interference with your enjoyment of the

- *    library or against infringement.  There is no warranty that our

- *    efforts or the library will fulfill any of your particular purposes

- *    or needs.  This library is provided with all faults, and the entire

- *    risk of satisfactory quality, performance, accuracy, and effort is with

- *    the user.

- *

- * Some files in the "contrib" directory and some configure-generated

- * files that are distributed with libpng have other copyright owners and

- * are released under other open source licenses.

- *

- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are

- * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from

- * libpng-0.96, and are distributed according to the same disclaimer and

- * license as libpng-0.96, with the following individuals added to the list

- * of Contributing Authors:

- *

- *    Tom Lane

- *    Glenn Randers-Pehrson

- *    Willem van Schaik

- *

- * libpng versions 0.89, June 1996, through 0.96, May 1997, are

- * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,

- * and are distributed according to the same disclaimer and license as

- * libpng-0.88, with the following individuals added to the list of

- * Contributing Authors:

- *

- *    John Bowler

- *    Kevin Bracey

- *    Sam Bushell

- *    Magnus Holmgren

- *    Greg Roelofs

- *    Tom Tanner

- *

- * Some files in the "scripts" directory have other copyright owners

- * but are released under this license.

- *

- * libpng versions 0.5, May 1995, through 0.88, January 1996, are

- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

- *

- * For the purposes of this copyright and license, "Contributing Authors"

- * is defined as the following set of individuals:

- *

- *    Andreas Dilger

- *    Dave Martindale

- *    Guy Eric Schalnat

- *    Paul Schmidt

- *    Tim Wegner

- *

- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors

- * and Group 42, Inc. disclaim all warranties, expressed or implied,

- * including, without limitation, the warranties of merchantability and of

- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.

- * assume no liability for direct, indirect, incidental, special, exemplary,

- * or consequential damages, which may result from the use of the PNG

- * Reference Library, even if advised of the possibility of such damage.

- *

- * Permission is hereby granted to use, copy, modify, and distribute this

- * source code, or portions hereof, for any purpose, without fee, subject

- * to the following restrictions:

- *

- *   1. The origin of this source code must not be misrepresented.

- *

- *   2. Altered versions must be plainly marked as such and must not

- *      be misrepresented as being the original source.

- *

- *   3. This Copyright notice may not be removed or altered from any

- *      source or altered source distribution.

- *

- * The Contributing Authors and Group 42, Inc. specifically permit, without

- * fee, and encourage the use of this source code as a component to

- * supporting the PNG file format in commercial products.  If you use this

- * source code in a product, acknowledgment is not required but would be

- * appreciated.

- *

- * END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.

- *

- * TRADEMARK:

- *

- * The name "libpng" has not been registered by the Copyright owner

- * as a trademark in any jurisdiction.  However, because libpng has

- * been distributed and maintained world-wide, continually since 1995,

- * the Copyright owner claims "common-law trademark protection" in any

- * jurisdiction where common-law trademark is recognized.

- *

- * OSI CERTIFICATION:

- *

- * Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is

- * a certification mark of the Open Source Initiative. OSI has not addressed

- * the additional disclaimers inserted at version 1.0.7.

- *

- * EXPORT CONTROL:

- *

- * The Copyright owner believes that the Export Control Classification

- * Number (ECCN) for libpng is EAR99, which means not subject to export

- * controls or International Traffic in Arms Regulations (ITAR) because

- * it is open source, publicly available software, that does not contain

- * any encryption software.  See the EAR, paragraphs 734.3(b)(3) and

- * 734.7(b).

- */

-

-/*

- * A "png_get_copyright" function is available, for convenient use in "about"

- * boxes and the like:

- *

- *    printf("%s", png_get_copyright(NULL));

- *

- * Also, the PNG logo (in PNG format, of course) is supplied in the

- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

- */

-

-/*

- * The contributing authors would like to thank all those who helped

- * with testing, bug fixes, and patience.  This wouldn't have been

- * possible without all of you.

- *

- * Thanks to Frank J. T. Wojcik for helping with the documentation.

- */

-

-/* Note about libpng version numbers:

- *

- *    Due to various miscommunications, unforeseen code incompatibilities

- *    and occasional factors outside the authors' control, version numbering

- *    on the library has not always been consistent and straightforward.

- *    The following table summarizes matters since version 0.89c, which was

- *    the first widely used release:

- *

- *    source                 png.h  png.h  shared-lib

- *    version                string   int  version

- *    -------                ------ -----  ----------

- *    0.89c "1.0 beta 3"     0.89      89  1.0.89

- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]

- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]

- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]

- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]

- *    0.97c                  0.97      97  2.0.97

- *    0.98                   0.98      98  2.0.98

- *    0.99                   0.99      98  2.0.99

- *    0.99a-m                0.99      99  2.0.99

- *    1.00                   1.00     100  2.1.0 [100 should be 10000]

- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]

- *    1.0.1       png.h string is   10001  2.1.0

- *    1.0.1a-e    identical to the  10002  from here on, the shared library

- *    1.0.2       source version)   10002  is 2.V where V is the source code

- *    1.0.2a-b                      10003  version, except as noted.

- *    1.0.3                         10003

- *    1.0.3a-d                      10004

- *    1.0.4                         10004

- *    1.0.4a-f                      10005

- *    1.0.5 (+ 2 patches)           10005

- *    1.0.5a-d                      10006

- *    1.0.5e-r                      10100 (not source compatible)

- *    1.0.5s-v                      10006 (not binary compatible)

- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)

- *    1.0.6d-f                      10007 (still binary incompatible)

- *    1.0.6g                        10007

- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)

- *    1.0.6i                        10007  10.6i

- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)

- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)

- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)

- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)

- *    1.0.7                    1    10007  (still compatible)

- *    ...

- *    1.0.19                  10    10019  10.so.0.19[.0]

- *    ...

- *    1.2.59                  13    10257  12.so.0.59[.0]

- *    ...

- *    1.5.30                  15    10527  15.so.15.30[.0]

- *    ...

- *    1.6.34                  16    10633  16.so.16.34[.0]

- *

- *    Henceforth the source version will match the shared-library major

- *    and minor numbers; the shared-library major version number will be

- *    used for changes in backward compatibility, as it is intended.  The

- *    PNG_LIBPNG_VER macro, which is not used within libpng but is available

- *    for applications, is an unsigned integer of the form xyyzz corresponding

- *    to the source version x.y.z (leading zeros in y and z).  Beta versions

- *    were given the previous public release number plus a letter, until

- *    version 1.0.6j; from then on they were given the upcoming public

- *    release number plus "betaNN" or "rcNN".

- *

- *    Binary incompatibility exists only when applications make direct access

- *    to the info_ptr or png_ptr members through png.h, and the compiled

- *    application is loaded with a different version of the library.

- *

- *    DLLNUM will change each time there are forward or backward changes

- *    in binary compatibility (e.g., when a new feature is added).

- *

- * See libpng.txt or libpng.3 for more information.  The PNG specification

- * is available as a W3C Recommendation and as an ISO Specification,

- * <https://www.w3.org/TR/2003/REC-PNG-20031110/

- */

-

-/*

- * Y2K compliance in libpng:

- * =========================

- *

- *    September 29, 2017

- *

- *    Since the PNG Development group is an ad-hoc body, we can't make

- *    an official declaration.

- *

- *    This is your unofficial assurance that libpng from version 0.71 and

- *    upward through 1.6.34 are Y2K compliant.  It is my belief that

- *    earlier versions were also Y2K compliant.

- *

- *    Libpng only has two year fields.  One is a 2-byte unsigned integer

- *    that will hold years up to 65535.  The other, which is deprecated,

- *    holds the date in text format, and will hold years up to 9999.

- *

- *    The integer is

- *        "png_uint_16 year" in png_time_struct.

- *

- *    The string is

- *        "char time_buffer[29]" in png_struct.  This is no longer used

- *    in libpng-1.6.x and will be removed from libpng-1.7.0.

- *

- *    There are seven time-related functions:

- *        png.c: png_convert_to_rfc_1123_buffer() in png.c

- *          (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and

- *          png_convert_to_rfc_1152() in error prior to libpng-0.98)

- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c

- *        png_convert_from_time_t() in pngwrite.c

- *        png_get_tIME() in pngget.c

- *        png_handle_tIME() in pngrutil.c, called in pngread.c

- *        png_set_tIME() in pngset.c

- *        png_write_tIME() in pngwutil.c, called in pngwrite.c

- *

- *    All handle dates properly in a Y2K environment.  The

- *    png_convert_from_time_t() function calls gmtime() to convert from system

- *    clock time, which returns (year - 1900), which we properly convert to

- *    the full 4-digit year.  There is a possibility that libpng applications

- *    are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()

- *    function, or that they are incorrectly passing only a 2-digit year

- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,

- *    but this is not under our control.  The libpng documentation has always

- *    stated that it works with 4-digit years, and the APIs have been

- *    documented as such.

- *

- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned

- *    integer to hold the year, and can hold years as large as 65535.

- *

- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains

- *    no date-related code.

- *

- *       Glenn Randers-Pehrson

- *       libpng maintainer

- *       PNG Development Group

- */

-

-#ifndef PNG_H

-#define PNG_H

-

-/* This is not the place to learn how to use libpng. The file libpng-manual.txt

- * describes how to use libpng, and the file example.c summarizes it

- * with some code on which to build.  This file is useful for looking

- * at the actual function definitions and structure components.  If that

- * file has been stripped from your copy of libpng, you can find it at

- * <http://www.libpng.org/pub/png/libpng-manual.txt>

- *

- * If you just need to read a PNG file and don't want to read the documentation

- * skip to the end of this file and read the section entitled 'simplified API'.

- */

-

-/* Version information for png.h - this should match the version in png.c */

-#define PNG_LIBPNG_VER_STRING "1.6.34"

-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.34 - September 29, 2017\n"

-

-#define PNG_LIBPNG_VER_SONUM   16

-#define PNG_LIBPNG_VER_DLLNUM  16

-

-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */

-#define PNG_LIBPNG_VER_MAJOR   1

-#define PNG_LIBPNG_VER_MINOR   6

-#define PNG_LIBPNG_VER_RELEASE 34

-

-/* This should match the numeric part of the final component of

- * PNG_LIBPNG_VER_STRING, omitting any leading zero:

- */

-

-#define PNG_LIBPNG_VER_BUILD  0

-

-/* Release Status */

-#define PNG_LIBPNG_BUILD_ALPHA    1

-#define PNG_LIBPNG_BUILD_BETA     2

-#define PNG_LIBPNG_BUILD_RC       3

-#define PNG_LIBPNG_BUILD_STABLE   4

-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7

-

-/* Release-Specific Flags */

-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with

-                                       PNG_LIBPNG_BUILD_STABLE only */

-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with

-                                       PNG_LIBPNG_BUILD_SPECIAL */

-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with

-                                       PNG_LIBPNG_BUILD_PRIVATE */

-

-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE

-

-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.

- * We must not include leading zeros.

- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only

- * version 1.0.0 was mis-numbered 100 instead of 10000).  From

- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release

- */

-#define PNG_LIBPNG_VER 10634 /* 1.6.34 */

-

-/* Library configuration: these options cannot be changed after

- * the library has been built.

- */

-#ifndef PNGLCONF_H

-/* If pnglibconf.h is missing, you can

- * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h

- */

-#   include "pnglibconf.h"

-#endif

-

-#ifndef PNG_VERSION_INFO_ONLY

-/* Machine specific configuration. */

-#  include "pngconf.h"

-#endif

-

-/*

- * Added at libpng-1.2.8

- *

- * Ref MSDN: Private as priority over Special

- * VS_FF_PRIVATEBUILD File *was not* built using standard release

- * procedures. If this value is given, the StringFileInfo block must

- * contain a PrivateBuild string.

- *

- * VS_FF_SPECIALBUILD File *was* built by the original company using

- * standard release procedures but is a variation of the standard

- * file of the same version number. If this value is given, the

- * StringFileInfo block must contain a SpecialBuild string.

- */

-

-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */

-#  define PNG_LIBPNG_BUILD_TYPE \

-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)

-#else

-#  ifdef PNG_LIBPNG_SPECIALBUILD

-#    define PNG_LIBPNG_BUILD_TYPE \

-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)

-#  else

-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)

-#  endif

-#endif

-

-#ifndef PNG_VERSION_INFO_ONLY

-

-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */

-#ifdef __cplusplus

-extern "C" {

-#endif /* __cplusplus */

-

-/* Version information for C files, stored in png.c.  This had better match

- * the version above.

- */

-#define png_libpng_ver png_get_header_ver(NULL)

-

-/* This file is arranged in several sections:

- *

- * 1. [omitted]

- * 2. Any configuration options that can be specified by for the application

- *    code when it is built.  (Build time configuration is in pnglibconf.h)

- * 3. Type definitions (base types are defined in pngconf.h), structure

- *    definitions.

- * 4. Exported library functions.

- * 5. Simplified API.

- * 6. Implementation options.

- *

- * The library source code has additional files (principally pngpriv.h) that

- * allow configuration of the library.

- */

-

-/* Section 1: [omitted] */

-

-/* Section 2: run time configuration

- * See pnglibconf.h for build time configuration

- *

- * Run time configuration allows the application to choose between

- * implementations of certain arithmetic APIs.  The default is set

- * at build time and recorded in pnglibconf.h, but it is safe to

- * override these (and only these) settings.  Note that this won't

- * change what the library does, only application code, and the

- * settings can (and probably should) be made on a per-file basis

- * by setting the #defines before including png.h

- *

- * Use macros to read integers from PNG data or use the exported

- * functions?

- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that

- *     the macros evaluate their argument multiple times.

- *   PNG_NO_USE_READ_MACROS: call the relevant library function.

- *

- * Use the alternative algorithm for compositing alpha samples that

- * does not use division?

- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'

- *      algorithm.

- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.

- *

- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is

- * false?

- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error

- *      APIs to png_warning.

- * Otherwise the calls are mapped to png_error.

- */

-

-/* Section 3: type definitions, including structures and compile time

- * constants.

- * See pngconf.h for base types that vary by machine/system

- */

-

-/* This triggers a compiler error in png.c, if png.c and png.h

- * do not agree upon the version number.

- */

-typedef char* png_libpng_version_1_6_34;

-

-/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.

- *

- * png_struct is the cache of information used while reading or writing a single

- * PNG file.  One of these is always required, although the simplified API

- * (below) hides the creation and destruction of it.

- */

-typedef struct png_struct_def png_struct;

-typedef const png_struct * png_const_structp;

-typedef png_struct * png_structp;

-typedef png_struct * * png_structpp;

-

-/* png_info contains information read from or to be written to a PNG file.  One

- * or more of these must exist while reading or creating a PNG file.  The

- * information is not used by libpng during read but is used to control what

- * gets written when a PNG file is created.  "png_get_" function calls read

- * information during read and "png_set_" functions calls write information

- * when creating a PNG.

- * been moved into a separate header file that is not accessible to

- * applications.  Read libpng-manual.txt or libpng.3 for more info.

- */

-typedef struct png_info_def png_info;

-typedef png_info * png_infop;

-typedef const png_info * png_const_infop;

-typedef png_info * * png_infopp;

-

-/* Types with names ending 'p' are pointer types.  The corresponding types with

- * names ending 'rp' are identical pointer types except that the pointer is

- * marked 'restrict', which means that it is the only pointer to the object

- * passed to the function.  Applications should not use the 'restrict' types;

- * it is always valid to pass 'p' to a pointer with a function argument of the

- * corresponding 'rp' type.  Different compilers have different rules with

- * regard to type matching in the presence of 'restrict'.  For backward

- * compatibility libpng callbacks never have 'restrict' in their parameters and,

- * consequentially, writing portable application code is extremely difficult if

- * an attempt is made to use 'restrict'.

- */

-typedef png_struct * PNG_RESTRICT png_structrp;

-typedef const png_struct * PNG_RESTRICT png_const_structrp;

-typedef png_info * PNG_RESTRICT png_inforp;

-typedef const png_info * PNG_RESTRICT png_const_inforp;

-

-/* Three color definitions.  The order of the red, green, and blue, (and the

- * exact size) is not important, although the size of the fields need to

- * be png_byte or png_uint_16 (as defined below).

- */

-typedef struct png_color_struct

-{

-   png_byte red;

-   png_byte green;

-   png_byte blue;

-} png_color;

-typedef png_color * png_colorp;

-typedef const png_color * png_const_colorp;

-typedef png_color * * png_colorpp;

-

-typedef struct png_color_16_struct

-{

-   png_byte index;    /* used for palette files */

-   png_uint_16 red;   /* for use in red green blue files */

-   png_uint_16 green;

-   png_uint_16 blue;

-   png_uint_16 gray;  /* for use in grayscale files */

-} png_color_16;

-typedef png_color_16 * png_color_16p;

-typedef const png_color_16 * png_const_color_16p;

-typedef png_color_16 * * png_color_16pp;

-

-typedef struct png_color_8_struct

-{

-   png_byte red;   /* for use in red green blue files */

-   png_byte green;

-   png_byte blue;

-   png_byte gray;  /* for use in grayscale files */

-   png_byte alpha; /* for alpha channel files */

-} png_color_8;

-typedef png_color_8 * png_color_8p;

-typedef const png_color_8 * png_const_color_8p;

-typedef png_color_8 * * png_color_8pp;

-

-/*

- * The following two structures are used for the in-core representation

- * of sPLT chunks.

- */

-typedef struct png_sPLT_entry_struct

-{

-   png_uint_16 red;

-   png_uint_16 green;

-   png_uint_16 blue;

-   png_uint_16 alpha;

-   png_uint_16 frequency;

-} png_sPLT_entry;

-typedef png_sPLT_entry * png_sPLT_entryp;

-typedef const png_sPLT_entry * png_const_sPLT_entryp;

-typedef png_sPLT_entry * * png_sPLT_entrypp;

-

-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples

- *  occupy the LSB of their respective members, and the MSB of each member

- *  is zero-filled.  The frequency member always occupies the full 16 bits.

- */

-

-typedef struct png_sPLT_struct

-{

-   png_charp name;           /* palette name */

-   png_byte depth;           /* depth of palette samples */

-   png_sPLT_entryp entries;  /* palette entries */

-   png_int_32 nentries;      /* number of palette entries */

-} png_sPLT_t;

-typedef png_sPLT_t * png_sPLT_tp;

-typedef const png_sPLT_t * png_const_sPLT_tp;

-typedef png_sPLT_t * * png_sPLT_tpp;

-

-#ifdef PNG_TEXT_SUPPORTED

-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,

- * and whether that contents is compressed or not.  The "key" field

- * points to a regular zero-terminated C string.  The "text" fields can be a

- * regular C string, an empty string, or a NULL pointer.

- * However, the structure returned by png_get_text() will always contain

- * the "text" field as a regular zero-terminated C string (possibly

- * empty), never a NULL pointer, so it can be safely used in printf() and

- * other string-handling functions.  Note that the "itxt_length", "lang", and

- * "lang_key" members of the structure only exist when the library is built

- * with iTXt chunk support.  Prior to libpng-1.4.0 the library was built by

- * default without iTXt support. Also note that when iTXt *is* supported,

- * the "lang" and "lang_key" fields contain NULL pointers when the

- * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or

- * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the

- * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"

- * which is always 0 or 1, or its "compression method" which is always 0.

- */

-typedef struct png_text_struct

-{

-   int  compression;       /* compression value:

-                             -1: tEXt, none

-                              0: zTXt, deflate

-                              1: iTXt, none

-                              2: iTXt, deflate  */

-   png_charp key;          /* keyword, 1-79 character description of "text" */

-   png_charp text;         /* comment, may be an empty string (ie "")

-                              or a NULL pointer */

-   png_size_t text_length; /* length of the text string */

-   png_size_t itxt_length; /* length of the itxt string */

-   png_charp lang;         /* language code, 0-79 characters

-                              or a NULL pointer */

-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more

-                              chars or a NULL pointer */

-} png_text;

-typedef png_text * png_textp;

-typedef const png_text * png_const_textp;

-typedef png_text * * png_textpp;

-#endif

-

-/* Supported compression types for text in PNG files (tEXt, and zTXt).

- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */

-#define PNG_TEXT_COMPRESSION_NONE_WR -3

-#define PNG_TEXT_COMPRESSION_zTXt_WR -2

-#define PNG_TEXT_COMPRESSION_NONE    -1

-#define PNG_TEXT_COMPRESSION_zTXt     0

-#define PNG_ITXT_COMPRESSION_NONE     1

-#define PNG_ITXT_COMPRESSION_zTXt     2

-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */

-

-/* png_time is a way to hold the time in an machine independent way.

- * Two conversions are provided, both from time_t and struct tm.  There

- * is no portable way to convert to either of these structures, as far

- * as I know.  If you know of a portable way, send it to me.  As a side

- * note - PNG has always been Year 2000 compliant!

- */

-typedef struct png_time_struct

-{

-   png_uint_16 year; /* full year, as in, 1995 */

-   png_byte month;   /* month of year, 1 - 12 */

-   png_byte day;     /* day of month, 1 - 31 */

-   png_byte hour;    /* hour of day, 0 - 23 */

-   png_byte minute;  /* minute of hour, 0 - 59 */

-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */

-} png_time;

-typedef png_time * png_timep;

-typedef const png_time * png_const_timep;

-typedef png_time * * png_timepp;

-

-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\

-   defined(PNG_USER_CHUNKS_SUPPORTED)

-/* png_unknown_chunk is a structure to hold queued chunks for which there is

- * no specific support.  The idea is that we can use this to queue

- * up private chunks for output even though the library doesn't actually

- * know about their semantics.

- *

- * The data in the structure is set by libpng on read and used on write.

- */

-typedef struct png_unknown_chunk_t

-{

-   png_byte name[5]; /* Textual chunk name with '\0' terminator */

-   png_byte *data;   /* Data, should not be modified on read! */

-   png_size_t size;

-

-   /* On write 'location' must be set using the flag values listed below.

-    * Notice that on read it is set by libpng however the values stored have

-    * more bits set than are listed below.  Always treat the value as a

-    * bitmask.  On write set only one bit - setting multiple bits may cause the

-    * chunk to be written in multiple places.

-    */

-   png_byte location; /* mode of operation at read time */

-}

-png_unknown_chunk;

-

-typedef png_unknown_chunk * png_unknown_chunkp;

-typedef const png_unknown_chunk * png_const_unknown_chunkp;

-typedef png_unknown_chunk * * png_unknown_chunkpp;

-#endif

-

-/* Flag values for the unknown chunk location byte. */

-#define PNG_HAVE_IHDR  0x01

-#define PNG_HAVE_PLTE  0x02

-#define PNG_AFTER_IDAT 0x08

-

-/* Maximum positive integer used in PNG is (2^31)-1 */

-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)

-#define PNG_UINT_32_MAX ((png_uint_32)(-1))

-#define PNG_SIZE_MAX ((png_size_t)(-1))

-

-/* These are constants for fixed point values encoded in the

- * PNG specification manner (x100000)

- */

-#define PNG_FP_1    100000

-#define PNG_FP_HALF  50000

-#define PNG_FP_MAX  ((png_fixed_point)0x7fffffffL)

-#define PNG_FP_MIN  (-PNG_FP_MAX)

-

-/* These describe the color_type field in png_info. */

-/* color type masks */

-#define PNG_COLOR_MASK_PALETTE    1

-#define PNG_COLOR_MASK_COLOR      2

-#define PNG_COLOR_MASK_ALPHA      4

-

-/* color types.  Note that not all combinations are legal */

-#define PNG_COLOR_TYPE_GRAY 0

-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)

-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)

-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)

-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)

-/* aliases */

-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA

-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA

-

-/* This is for compression type. PNG 1.0-1.2 only define the single type. */

-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */

-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE

-

-/* This is for filter type. PNG 1.0-1.2 only define the single type. */

-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */

-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */

-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE

-

-/* These are for the interlacing type.  These values should NOT be changed. */

-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */

-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */

-#define PNG_INTERLACE_LAST        2 /* Not a valid value */

-

-/* These are for the oFFs chunk.  These values should NOT be changed. */

-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */

-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */

-#define PNG_OFFSET_LAST           2 /* Not a valid value */

-

-/* These are for the pCAL chunk.  These values should NOT be changed. */

-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */

-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */

-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */

-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */

-#define PNG_EQUATION_LAST         4 /* Not a valid value */

-

-/* These are for the sCAL chunk.  These values should NOT be changed. */

-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */

-#define PNG_SCALE_METER           1 /* meters per pixel */

-#define PNG_SCALE_RADIAN          2 /* radians per pixel */

-#define PNG_SCALE_LAST            3 /* Not a valid value */

-

-/* These are for the pHYs chunk.  These values should NOT be changed. */

-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */

-#define PNG_RESOLUTION_METER      1 /* pixels/meter */

-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */

-

-/* These are for the sRGB chunk.  These values should NOT be changed. */

-#define PNG_sRGB_INTENT_PERCEPTUAL 0

-#define PNG_sRGB_INTENT_RELATIVE   1

-#define PNG_sRGB_INTENT_SATURATION 2

-#define PNG_sRGB_INTENT_ABSOLUTE   3

-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */

-

-/* This is for text chunks */

-#define PNG_KEYWORD_MAX_LENGTH     79

-

-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */

-#define PNG_MAX_PALETTE_LENGTH    256

-

-/* These determine if an ancillary chunk's data has been successfully read

- * from the PNG header, or if the application has filled in the corresponding

- * data in the info_struct to be written into the output file.  The values

- * of the PNG_INFO_<chunk> defines should NOT be changed.

- */

-#define PNG_INFO_gAMA 0x0001U

-#define PNG_INFO_sBIT 0x0002U

-#define PNG_INFO_cHRM 0x0004U

-#define PNG_INFO_PLTE 0x0008U

-#define PNG_INFO_tRNS 0x0010U

-#define PNG_INFO_bKGD 0x0020U

-#define PNG_INFO_hIST 0x0040U

-#define PNG_INFO_pHYs 0x0080U

-#define PNG_INFO_oFFs 0x0100U

-#define PNG_INFO_tIME 0x0200U

-#define PNG_INFO_pCAL 0x0400U

-#define PNG_INFO_sRGB 0x0800U  /* GR-P, 0.96a */

-#define PNG_INFO_iCCP 0x1000U  /* ESR, 1.0.6 */

-#define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */

-#define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */

-#define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */

-#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */

-

-/* This is used for the transformation routines, as some of them

- * change these values for the row.  It also should enable using

- * the routines for other purposes.

- */

-typedef struct png_row_info_struct

-{

-   png_uint_32 width;    /* width of row */

-   png_size_t rowbytes;  /* number of bytes in row */

-   png_byte color_type;  /* color type of row */

-   png_byte bit_depth;   /* bit depth of row */

-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */

-   png_byte pixel_depth; /* bits per pixel (depth * channels) */

-} png_row_info;

-

-typedef png_row_info * png_row_infop;

-typedef png_row_info * * png_row_infopp;

-

-/* These are the function types for the I/O functions and for the functions

- * that allow the user to override the default I/O functions with his or her

- * own.  The png_error_ptr type should match that of user-supplied warning

- * and error functions, while the png_rw_ptr type should match that of the

- * user read/write data functions.  Note that the 'write' function must not

- * modify the buffer it is passed. The 'read' function, on the other hand, is

- * expected to return the read data in the buffer.

- */

-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));

-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));

-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));

-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,

-    int));

-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,

-    int));

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));

-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));

-

-/* The following callback receives png_uint_32 row_number, int pass for the

- * png_bytep data of the row.  When transforming an interlaced image the

- * row number is the row number within the sub-image of the interlace pass, so

- * the value will increase to the height of the sub-image (not the full image)

- * then reset to 0 for the next pass.

- *

- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to

- * find the output pixel (x,y) given an interlaced sub-image pixel

- * (row,col,pass).  (See below for these macros.)

- */

-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,

-    png_uint_32, int));

-#endif

-

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \

-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,

-    png_bytep));

-#endif

-

-#ifdef PNG_USER_CHUNKS_SUPPORTED

-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,

-    png_unknown_chunkp));

-#endif

-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED

-/* not used anywhere */

-/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */

-#endif

-

-#ifdef PNG_SETJMP_SUPPORTED

-/* This must match the function definition in <setjmp.h>, and the application

- * must include this before png.h to obtain the definition of jmp_buf.  The

- * function is required to be PNG_NORETURN, but this is not checked.  If the

- * function does return the application will crash via an abort() or similar

- * system level call.

- *

- * If you get a warning here while building the library you may need to make

- * changes to ensure that pnglibconf.h records the calling convention used by

- * your compiler.  This may be very difficult - try using a different compiler

- * to build the library!

- */

-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);

-#endif

-

-/* Transform masks for the high-level interface */

-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */

-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */

-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */

-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */

-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */

-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */

-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */

-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */

-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */

-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */

-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */

-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */

-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */

-/* Added to libpng-1.2.34 */

-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER

-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */

-/* Added to libpng-1.4.0 */

-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */

-/* Added to libpng-1.5.4 */

-#define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */

-#if INT_MAX >= 0x8000 /* else this might break */

-#define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */

-#endif

-

-/* Flags for MNG supported features */

-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01

-#define PNG_FLAG_MNG_FILTER_64      0x04

-#define PNG_ALL_MNG_FEATURES        0x05

-

-/* NOTE: prior to 1.5 these functions had no 'API' style declaration,

- * this allowed the zlib default functions to be used on Windows

- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and

- * ignores the first argument) should be completely compatible with the

- * following.

- */

-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,

-    png_alloc_size_t));

-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));

-

-/* Section 4: exported functions

- * Here are the function definitions most commonly used.  This is not

- * the place to find out how to use libpng.  See libpng-manual.txt for the

- * full explanation, see example.c for the summary.  This just provides

- * a simple one line description of the use of each function.

- *

- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in

- * pngconf.h and in the *.dfn files in the scripts directory.

- *

- *   PNG_EXPORT(ordinal, type, name, (args));

- *

- *       ordinal:    ordinal that is used while building

- *                   *.def files. The ordinal value is only

- *                   relevant when preprocessing png.h with

- *                   the *.dfn files for building symbol table

- *                   entries, and are removed by pngconf.h.

- *       type:       return type of the function

- *       name:       function name

- *       args:       function arguments, with types

- *

- * When we wish to append attributes to a function prototype we use

- * the PNG_EXPORTA() macro instead.

- *

- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);

- *

- *       ordinal, type, name, and args: same as in PNG_EXPORT().

- *       attributes: function attributes

- */

-

-/* Returns the version number of the library */

-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));

-

-/* Tell lib we have already handled the first <num_bytes> magic bytes.

- * Handling more than 8 bytes from the beginning of the file is an error.

- */

-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));

-

-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a

- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG

- * signature, and non-zero otherwise.  Having num_to_check == 0 or

- * start > 7 will always fail (ie return non-zero).

- */

-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,

-    png_size_t num_to_check));

-

-/* Simple signature checking function.  This is the same as calling

- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).

- */

-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))

-

-/* Allocate and initialize png_ptr struct for reading, and any other memory. */

-PNG_EXPORTA(4, png_structp, png_create_read_struct,

-    (png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn),

-    PNG_ALLOCATED);

-

-/* Allocate and initialize png_ptr struct for writing, and any other memory */

-PNG_EXPORTA(5, png_structp, png_create_write_struct,

-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,

-    png_error_ptr warn_fn),

-    PNG_ALLOCATED);

-

-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,

-    (png_const_structrp png_ptr));

-

-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,

-    png_size_t size));

-

-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp

- * match up.

- */

-#ifdef PNG_SETJMP_SUPPORTED

-/* This function returns the jmp_buf built in to *png_ptr.  It must be

- * supplied with an appropriate 'longjmp' function to use on that jmp_buf

- * unless the default error function is overridden in which case NULL is

- * acceptable.  The size of the jmp_buf is checked against the actual size

- * allocated by the library - the call will return NULL on a mismatch

- * indicating an ABI mismatch.

- */

-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,

-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));

-#  define png_jmpbuf(png_ptr) \

-      (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))

-#else

-#  define png_jmpbuf(png_ptr) \

-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)

-#endif

-/* This function should be used by libpng applications in place of

- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it

- * will use it; otherwise it will call PNG_ABORT().  This function was

- * added in libpng-1.5.0.

- */

-PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),

-    PNG_NORETURN);

-

-#ifdef PNG_READ_SUPPORTED

-/* Reset the compression stream */

-PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);

-#endif

-

-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */

-#ifdef PNG_USER_MEM_SUPPORTED

-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,

-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,

-    png_error_ptr warn_fn,

-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),

-    PNG_ALLOCATED);

-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,

-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,

-    png_error_ptr warn_fn,

-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),

-    PNG_ALLOCATED);

-#endif

-

-/* Write the PNG file signature. */

-PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));

-

-/* Write a PNG chunk - size, type, (optional) data, CRC. */

-PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep

-    chunk_name, png_const_bytep data, png_size_t length));

-

-/* Write the start of a PNG chunk - length and chunk name. */

-PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,

-    png_const_bytep chunk_name, png_uint_32 length));

-

-/* Write the data of a PNG chunk started with png_write_chunk_start(). */

-PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,

-    png_const_bytep data, png_size_t length));

-

-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */

-PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));

-

-/* Allocate and initialize the info structure */

-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),

-    PNG_ALLOCATED);

-

-/* DEPRECATED: this function allowed init structures to be created using the

- * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and

- * the API will be removed in the future.

- */

-PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,

-    png_size_t png_info_struct_size), PNG_DEPRECATED);

-

-/* Writes all the PNG information before the image. */

-PNG_EXPORT(20, void, png_write_info_before_PLTE,

-    (png_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(21, void, png_write_info,

-    (png_structrp png_ptr, png_const_inforp info_ptr));

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the information before the actual image data. */

-PNG_EXPORT(22, void, png_read_info,

-    (png_structrp png_ptr, png_inforp info_ptr));

-#endif

-

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-   /* Convert to a US string format: there is no localization support in this

-    * routine.  The original implementation used a 29 character buffer in

-    * png_struct, this will be removed in future versions.

-    */

-#if PNG_LIBPNG_VER < 10700

-/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */

-PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,

-    png_const_timep ptime),PNG_DEPRECATED);

-#endif

-PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],

-    png_const_timep ptime));

-#endif

-

-#ifdef PNG_CONVERT_tIME_SUPPORTED

-/* Convert from a struct tm to png_time */

-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,

-    const struct tm * ttime));

-

-/* Convert from time_t to png_time.  Uses gmtime() */

-PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));

-#endif /* CONVERT_tIME */

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */

-PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));

-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));

-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));

-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-/* Expand to 16-bit channels, forces conversion of palette to RGB and expansion

- * of a tRNS chunk if present.

- */

-PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)

-/* Use blue, green, red order for pixels. */

-PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-/* Expand the grayscale to 24-bit RGB if necessary. */

-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-/* Reduce RGB to grayscale. */

-#define PNG_ERROR_ACTION_NONE  1

-#define PNG_ERROR_ACTION_WARN  2

-#define PNG_ERROR_ACTION_ERROR 3

-#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/

-

-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,

-    int error_action, double red, double green))

-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,

-    int error_action, png_fixed_point red, png_fixed_point green))

-

-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp

-    png_ptr));

-#endif

-

-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED

-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,

-    png_colorp palette));

-#endif

-

-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-/* How the alpha channel is interpreted - this affects how the color channels

- * of a PNG file are returned to the calling application when an alpha channel,

- * or a tRNS chunk in a palette file, is present.

- *

- * This has no effect on the way pixels are written into a PNG output

- * datastream. The color samples in a PNG datastream are never premultiplied

- * with the alpha samples.

- *

- * The default is to return data according to the PNG specification: the alpha

- * channel is a linear measure of the contribution of the pixel to the

- * corresponding composited pixel, and the color channels are unassociated

- * (not premultiplied).  The gamma encoded color channels must be scaled

- * according to the contribution and to do this it is necessary to undo

- * the encoding, scale the color values, perform the composition and reencode

- * the values.  This is the 'PNG' mode.

- *

- * The alternative is to 'associate' the alpha with the color information by

- * storing color channel values that have been scaled by the alpha.

- * image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes

- * (the latter being the two common names for associated alpha color channels).

- *

- * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha

- * value is equal to the maximum value.

- *

- * The final choice is to gamma encode the alpha channel as well.  This is

- * broken because, in practice, no implementation that uses this choice

- * correctly undoes the encoding before handling alpha composition.  Use this

- * choice only if other serious errors in the software or hardware you use

- * mandate it; the typical serious error is for dark halos to appear around

- * opaque areas of the composited PNG image because of arithmetic overflow.

- *

- * The API function png_set_alpha_mode specifies which of these choices to use

- * with an enumerated 'mode' value and the gamma of the required output:

- */

-#define PNG_ALPHA_PNG           0 /* according to the PNG standard */

-#define PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */

-#define PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */

-#define PNG_ALPHA_PREMULTIPLIED 1 /* as above */

-#define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */

-#define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */

-

-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,

-    double output_gamma))

-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,

-    int mode, png_fixed_point output_gamma))

-#endif

-

-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-/* The output_gamma value is a screen gamma in libpng terminology: it expresses

- * how to decode the output values, not how they are encoded.

- */

-#define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */

-#define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */

-#define PNG_GAMMA_sRGB   220000   /* Television standards--matches sRGB gamma */

-#define PNG_GAMMA_LINEAR PNG_FP_1 /* Linear */

-#endif

-

-/* The following are examples of calls to png_set_alpha_mode to achieve the

- * required overall gamma correction and, where necessary, alpha

- * premultiplication.

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);

- *    This is the default libpng handling of the alpha channel - it is not

- *    pre-multiplied into the color components.  In addition the call states

- *    that the output is for a sRGB system and causes all PNG files without gAMA

- *    chunks to be assumed to be encoded using sRGB.

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);

- *    In this case the output is assumed to be something like an sRGB conformant

- *    display preceeded by a power-law lookup table of power 1.45.  This is how

- *    early Mac systems behaved.

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);

- *    This is the classic Jim Blinn approach and will work in academic

- *    environments where everything is done by the book.  It has the shortcoming

- *    of assuming that input PNG data with no gamma information is linear - this

- *    is unlikely to be correct unless the PNG files where generated locally.

- *    Most of the time the output precision will be so low as to show

- *    significant banding in dark areas of the image.

- *

- * png_set_expand_16(pp);

- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);

- *    This is a somewhat more realistic Jim Blinn inspired approach.  PNG files

- *    are assumed to have the sRGB encoding if not marked with a gamma value and

- *    the output is always 16 bits per component.  This permits accurate scaling

- *    and processing of the data.  If you know that your input PNG files were

- *    generated locally you might need to replace PNG_DEFAULT_sRGB with the

- *    correct value for your system.

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);

- *    If you just need to composite the PNG image onto an existing background

- *    and if you control the code that does this you can use the optimization

- *    setting.  In this case you just copy completely opaque pixels to the

- *    output.  For pixels that are not completely transparent (you just skip

- *    those) you do the composition math using png_composite or png_composite_16

- *    below then encode the resultant 8-bit or 16-bit values to match the output

- *    encoding.

- *

- * Other cases

- *    If neither the PNG nor the standard linear encoding work for you because

- *    of the software or hardware you use then you have a big problem.  The PNG

- *    case will probably result in halos around the image.  The linear encoding

- *    will probably result in a washed out, too bright, image (it's actually too

- *    contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably

- *    substantially reduce the halos.  Alternatively try:

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);

- *    This option will also reduce the halos, but there will be slight dark

- *    halos round the opaque parts of the image where the background is light.

- *    In the OPTIMIZED mode the halos will be light halos where the background

- *    is dark.  Take your pick - the halos are unavoidable unless you can get

- *    your hardware/software fixed!  (The OPTIMIZED approach is slightly

- *    faster.)

- *

- * When the default gamma of PNG files doesn't match the output gamma.

- *    If you have PNG files with no gamma information png_set_alpha_mode allows

- *    you to provide a default gamma, but it also sets the ouput gamma to the

- *    matching value.  If you know your PNG files have a gamma that doesn't

- *    match the output you can take advantage of the fact that

- *    png_set_alpha_mode always sets the output gamma but only sets the PNG

- *    default if it is not already set:

- *

- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);

- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);

- *    The first call sets both the default and the output gamma values, the

- *    second call overrides the output gamma without changing the default.  This

- *    is easier than achieving the same effect with png_set_gamma.  You must use

- *    PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will

- *    fire if more than one call to png_set_alpha_mode and png_set_background is

- *    made in the same read operation, however multiple calls with PNG_ALPHA_PNG

- *    are ignored.

- */

-

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \

-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)

-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \

-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)

-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)

-/* Add a filler byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */

-PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,

-    int flags));

-/* The values of the PNG_FILLER_ defines should NOT be changed */

-#  define PNG_FILLER_BEFORE 0

-#  define PNG_FILLER_AFTER 1

-/* Add an alpha byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */

-PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,

-    png_uint_32 filler, int flags));

-#endif /* READ_FILLER || WRITE_FILLER */

-

-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)

-/* Swap bytes in 16-bit depth files. */

-PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)

-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */

-PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \

-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)

-/* Swap packing order of pixels in bytes. */

-PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)

-/* Converts files to legal bit depths. */

-PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p

-    true_bits));

-#endif

-

-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \

-    defined(PNG_WRITE_INTERLACING_SUPPORTED)

-/* Have the code handle the interlacing.  Returns the number of passes.

- * MUST be called before png_read_update_info or png_start_read_image,

- * otherwise it will not have the desired effect.  Note that it is still

- * necessary to call png_read_row or png_read_rows png_get_image_height

- * times for each pass.

-*/

-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));

-#endif

-

-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)

-/* Invert monochrome files */

-PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-/* Handle alpha and tRNS by replacing with a background color.  Prior to

- * libpng-1.5.4 this API must not be called before the PNG file header has been

- * read.  Doing so will result in unexpected behavior and possible warnings or

- * errors if the PNG file contains a bKGD chunk.

- */

-PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,

-    png_const_color_16p background_color, int background_gamma_code,

-    int need_expand, double background_gamma))

-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,

-    png_const_color_16p background_color, int background_gamma_code,

-    int need_expand, png_fixed_point background_gamma))

-#endif

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0

-#  define PNG_BACKGROUND_GAMMA_SCREEN  1

-#  define PNG_BACKGROUND_GAMMA_FILE    2

-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3

-#endif

-

-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-/* Scale a 16-bit depth file down to 8-bit, accurately. */

-PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-#define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */

-/* Strip the second byte of information from a 16-bit depth file. */

-PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-/* Turn on quantizing, and reduce the palette to the number of colors

- * available.

- */

-PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,

-    png_colorp palette, int num_palette, int maximum_colors,

-    png_const_uint_16p histogram, int full_quantize));

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-/* The threshold on gamma processing is configurable but hard-wired into the

- * library.  The following is the floating point variant.

- */

-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)

-

-/* Handle gamma correction. Screen_gamma=(display_exponent).

- * NOTE: this API simply sets the screen and file gamma values. It will

- * therefore override the value for gamma in a PNG file if it is called after

- * the file header has been read - use with care  - call before reading the PNG

- * file for best results!

- *

- * These routines accept the same gamma values as png_set_alpha_mode (described

- * above).  The PNG_GAMMA_ defines and PNG_DEFAULT_sRGB can be passed to either

- * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value

- * is the inverse of a 'screen gamma' value.

- */

-PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,

-    double screen_gamma, double override_file_gamma))

-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,

-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma))

-#endif

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-/* Set how many lines between output flushes - 0 for no flushing */

-PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));

-/* Flush the current PNG output buffer */

-PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));

-#endif

-

-/* Optional update palette with requested transformations */

-PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));

-

-/* Optional call to update the users info structure */

-PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,

-    png_inforp info_ptr));

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read one or more rows of image data. */

-PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,

-    png_bytepp display_row, png_uint_32 num_rows));

-#endif

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read a row of data. */

-PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,

-    png_bytep display_row));

-#endif

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the whole image into memory at once. */

-PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));

-#endif

-

-/* Write a row of image data */

-PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,

-    png_const_bytep row));

-

-/* Write a few rows of image data: (*row) is not written; however, the type

- * is declared as writeable to maintain compatibility with previous versions

- * of libpng and to allow the 'display_row' array from read_rows to be passed

- * unchanged to write_rows.

- */

-PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,

-    png_uint_32 num_rows));

-

-/* Write the image data */

-PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));

-

-/* Write the end of the PNG file. */

-PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,

-    png_inforp info_ptr));

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the end of the PNG file. */

-PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));

-#endif

-

-/* Free any memory associated with the png_info_struct */

-PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,

-    png_infopp info_ptr_ptr));

-

-/* Free any memory associated with the png_struct and the png_info_structs */

-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,

-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));

-

-/* Free any memory associated with the png_struct and the png_info_structs */

-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,

-    png_infopp info_ptr_ptr));

-

-/* Set the libpng method of handling chunk CRC errors */

-PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,

-    int ancil_action));

-

-/* Values for png_set_crc_action() say how to handle CRC errors in

- * ancillary and critical chunks, and whether to use the data contained

- * therein.  Note that it is impossible to "discard" data in a critical

- * chunk.  For versions prior to 0.90, the action was always error/quit,

- * whereas in version 0.90 and later, the action for CRC errors in ancillary

- * chunks is warn/discard.  These values should NOT be changed.

- *

- *      value                       action:critical     action:ancillary

- */

-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */

-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */

-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */

-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */

-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */

-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */

-

-#ifdef PNG_WRITE_SUPPORTED

-/* These functions give the user control over the scan-line filtering in

- * libpng and the compression methods used by zlib.  These functions are

- * mainly useful for testing, as the defaults should work with most users.

- * Those users who are tight on memory or want faster performance at the

- * expense of compression can modify them.  See the compression library

- * header file (zlib.h) for an explination of the compression functions.

- */

-

-/* Set the filtering method(s) used by libpng.  Currently, the only valid

- * value for "method" is 0.

- */

-PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,

-    int filters));

-#endif /* WRITE */

-

-/* Flags for png_set_filter() to say which filters to use.  The flags

- * are chosen so that they don't conflict with real filter types

- * below, in case they are supplied instead of the #defined constants.

- * These values should NOT be changed.

- */

-#define PNG_NO_FILTERS     0x00

-#define PNG_FILTER_NONE    0x08

-#define PNG_FILTER_SUB     0x10

-#define PNG_FILTER_UP      0x20

-#define PNG_FILTER_AVG     0x40

-#define PNG_FILTER_PAETH   0x80

-#define PNG_FAST_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP)

-#define PNG_ALL_FILTERS (PNG_FAST_FILTERS | PNG_FILTER_AVG | PNG_FILTER_PAETH)

-

-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.

- * These defines should NOT be changed.

- */

-#define PNG_FILTER_VALUE_NONE  0

-#define PNG_FILTER_VALUE_SUB   1

-#define PNG_FILTER_VALUE_UP    2

-#define PNG_FILTER_VALUE_AVG   3

-#define PNG_FILTER_VALUE_PAETH 4

-#define PNG_FILTER_VALUE_LAST  5

-

-#ifdef PNG_WRITE_SUPPORTED

-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */

-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,

-    int heuristic_method, int num_weights, png_const_doublep filter_weights,

-    png_const_doublep filter_costs))

-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,

-    (png_structrp png_ptr, int heuristic_method, int num_weights,

-    png_const_fixed_point_p filter_weights,

-    png_const_fixed_point_p filter_costs))

-#endif /* WRITE_WEIGHTED_FILTER */

-

-/* The following are no longer used and will be removed from libpng-1.7: */

-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */

-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */

-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */

-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */

-

-/* Set the library compression level.  Currently, valid values range from

- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9

- * (0 - no compression, 9 - "maximal" compression).  Note that tests have

- * shown that zlib compression levels 3-6 usually perform as well as level 9

- * for PNG images, and do considerably fewer caclulations.  In the future,

- * these values may not correspond directly to the zlib compression levels.

- */

-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED

-PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,

-    int level));

-

-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,

-    int mem_level));

-

-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,

-    int strategy));

-

-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a

- * smaller value of window_bits if it can do so safely.

- */

-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,

-    int window_bits));

-

-PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,

-    int method));

-#endif /* WRITE_CUSTOMIZE_COMPRESSION */

-

-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-/* Also set zlib parameters for compressing non-IDAT chunks */

-PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,

-    int level));

-

-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,

-    int mem_level));

-

-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,

-    int strategy));

-

-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a

- * smaller value of window_bits if it can do so safely.

- */

-PNG_EXPORT(225, void, png_set_text_compression_window_bits,

-    (png_structrp png_ptr, int window_bits));

-

-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,

-    int method));

-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */

-#endif /* WRITE */

-

-/* These next functions are called for input/output, memory, and error

- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,

- * and call standard C I/O routines such as fread(), fwrite(), and

- * fprintf().  These functions can be made to use other I/O routines

- * at run time for those applications that need to handle I/O in a

- * different manner by calling png_set_???_fn().  See libpng-manual.txt for

- * more information.

- */

-

-#ifdef PNG_STDIO_SUPPORTED

-/* Initialize the input/output for the PNG file to the default functions. */

-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));

-#endif

-

-/* Replace the (error and abort), and warning functions with user

- * supplied functions.  If no messages are to be printed you must still

- * write and use replacement functions. The replacement error_fn should

- * still do a longjmp to the last setjmp location if you are using this

- * method of error handling.  If error_fn or warning_fn is NULL, the

- * default function will be used.

- */

-

-PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,

-    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));

-

-/* Return the user pointer associated with the error functions */

-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));

-

-/* Replace the default data output functions with a user supplied one(s).

- * If buffered output is not used, then output_flush_fn can be set to NULL.

- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time

- * output_flush_fn will be ignored (and thus can be NULL).

- * It is probably a mistake to use NULL for output_flush_fn if

- * write_data_fn is not also NULL unless you have built libpng with

- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's

- * default flush function, which uses the standard *FILE structure, will

- * be used.

- */

-PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,

-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));

-

-/* Replace the default data input function with a user supplied one. */

-PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,

-    png_rw_ptr read_data_fn));

-

-/* Return the user pointer associated with the I/O functions */

-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));

-

-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,

-    png_read_status_ptr read_row_fn));

-

-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,

-    png_write_status_ptr write_row_fn));

-

-#ifdef PNG_USER_MEM_SUPPORTED

-/* Replace the default memory allocation functions with user supplied one(s). */

-PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,

-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));

-/* Return the user pointer associated with the memory functions */

-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));

-#endif

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,

-    png_user_transform_ptr read_user_transform_fn));

-#endif

-

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,

-    png_user_transform_ptr write_user_transform_fn));

-#endif

-

-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED

-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,

-    png_voidp user_transform_ptr, int user_transform_depth,

-    int user_transform_channels));

-/* Return the user pointer associated with the user transform functions */

-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,

-    (png_const_structrp png_ptr));

-#endif

-

-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED

-/* Return information about the row currently being processed.  Note that these

- * APIs do not fail but will return unexpected results if called outside a user

- * transform callback.  Also note that when transforming an interlaced image the

- * row number is the row number within the sub-image of the interlace pass, so

- * the value will increase to the height of the sub-image (not the full image)

- * then reset to 0 for the next pass.

- *

- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to

- * find the output pixel (x,y) given an interlaced sub-image pixel

- * (row,col,pass).  (See below for these macros.)

- */

-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));

-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));

-#endif

-

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-/* This callback is called only for *unknown* chunks.  If

- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known

- * chunks to be treated as unknown, however in this case the callback must do

- * any processing required by the chunk (e.g. by calling the appropriate

- * png_set_ APIs.)

- *

- * There is no write support - on write, by default, all the chunks in the

- * 'unknown' list are written in the specified position.

- *

- * The integer return from the callback function is interpreted thus:

- *

- * negative: An error occurred; png_chunk_error will be called.

- *     zero: The chunk was not handled, the chunk will be saved. A critical

- *           chunk will cause an error at this point unless it is to be saved.

- * positive: The chunk was handled, libpng will ignore/discard it.

- *

- * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about

- * how this behavior will change in libpng 1.7

- */

-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,

-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));

-#endif

-

-#ifdef PNG_USER_CHUNKS_SUPPORTED

-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));

-#endif

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-/* Sets the function callbacks for the push reader, and a pointer to a

- * user-defined structure available to the callback functions.

- */

-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,

-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn,

-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));

-

-/* Returns the user pointer associated with the push read functions */

-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,

-    (png_const_structrp png_ptr));

-

-/* Function to be called when data becomes available */

-PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,

-    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));

-

-/* A function which may be called *only* within png_process_data to stop the

- * processing of any more data.  The function returns the number of bytes

- * remaining, excluding any that libpng has cached internally.  A subsequent

- * call to png_process_data must supply these bytes again.  If the argument

- * 'save' is set to true the routine will first save all the pending data and

- * will always return 0.

- */

-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));

-

-/* A function which may be called *only* outside (after) a call to

- * png_process_data.  It returns the number of bytes of data to skip in the

- * input.  Normally it will return 0, but if it returns a non-zero value the

- * application must skip than number of bytes of input data and pass the

- * following data to the next call to png_process_data.

- */

-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));

-

-/* Function that combines rows.  'new_row' is a flag that should come from

- * the callback and be non-NULL if anything needs to be done; the library

- * stores its own version of the new data internally and ignores the passed

- * in value.

- */

-PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,

-    png_bytep old_row, png_const_bytep new_row));

-#endif /* PROGRESSIVE_READ */

-

-PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,

-    png_alloc_size_t size), PNG_ALLOCATED);

-/* Added at libpng version 1.4.0 */

-PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,

-    png_alloc_size_t size), PNG_ALLOCATED);

-

-/* Added at libpng version 1.2.4 */

-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,

-    png_alloc_size_t size), PNG_ALLOCATED);

-

-/* Frees a pointer allocated by png_malloc() */

-PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));

-

-/* Free data that was allocated internally */

-PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 free_me, int num));

-

-/* Reassign responsibility for freeing existing data, whether allocated

- * by libpng or by the application; this works on the png_info structure passed

- * in, it does not change the state for other png_info structures.

- *

- * It is unlikely that this function works correctly as of 1.6.0 and using it

- * may result either in memory leaks or double free of allocated data.

- */

-PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int freer, png_uint_32 mask));

-

-/* Assignments for png_data_freer */

-#define PNG_DESTROY_WILL_FREE_DATA 1

-#define PNG_SET_WILL_FREE_DATA 1

-#define PNG_USER_WILL_FREE_DATA 2

-/* Flags for png_ptr->free_me and info_ptr->free_me */

-#define PNG_FREE_HIST 0x0008U

-#define PNG_FREE_ICCP 0x0010U

-#define PNG_FREE_SPLT 0x0020U

-#define PNG_FREE_ROWS 0x0040U

-#define PNG_FREE_PCAL 0x0080U

-#define PNG_FREE_SCAL 0x0100U

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-#  define PNG_FREE_UNKN 0x0200U

-#endif

-/*      PNG_FREE_LIST 0x0400U   removed in 1.6.0 because it is ignored */

-#define PNG_FREE_PLTE 0x1000U

-#define PNG_FREE_TRNS 0x2000U

-#define PNG_FREE_TEXT 0x4000U

-#define PNG_FREE_EXIF 0x8000U /* Added at libpng-1.6.31 */

-#define PNG_FREE_ALL  0xffffU

-#define PNG_FREE_MUL  0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */

-

-#ifdef PNG_USER_MEM_SUPPORTED

-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,

-    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);

-PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,

-    png_voidp ptr), PNG_DEPRECATED);

-#endif

-

-#ifdef PNG_ERROR_TEXT_SUPPORTED

-/* Fatal error in PNG image of libpng - can't continue */

-PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,

-    png_const_charp error_message), PNG_NORETURN);

-

-/* The same, but the chunk name is prepended to the error string. */

-PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,

-    png_const_charp error_message), PNG_NORETURN);

-

-#else

-/* Fatal error in PNG image of libpng - can't continue */

-PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);

-#  define png_error(s1,s2) png_err(s1)

-#  define png_chunk_error(s1,s2) png_err(s1)

-#endif

-

-#ifdef PNG_WARNINGS_SUPPORTED

-/* Non-fatal error in libpng.  Can continue, but may have a problem. */

-PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,

-    png_const_charp warning_message));

-

-/* Non-fatal error in libpng, chunk name is prepended to message. */

-PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,

-    png_const_charp warning_message));

-#else

-#  define png_warning(s1,s2) ((void)(s1))

-#  define png_chunk_warning(s1,s2) ((void)(s1))

-#endif

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-/* Benign error in libpng.  Can continue, but may have a problem.

- * User can choose whether to handle as a fatal error or as a warning. */

-PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,

-    png_const_charp warning_message));

-

-#ifdef PNG_READ_SUPPORTED

-/* Same, chunk name is prepended to message (only during read) */

-PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,

-    png_const_charp warning_message));

-#endif

-

-PNG_EXPORT(109, void, png_set_benign_errors,

-    (png_structrp png_ptr, int allowed));

-#else

-#  ifdef PNG_ALLOW_BENIGN_ERRORS

-#    define png_benign_error png_warning

-#    define png_chunk_benign_error png_chunk_warning

-#  else

-#    define png_benign_error png_error

-#    define png_chunk_benign_error png_chunk_error

-#  endif

-#endif

-

-/* The png_set_<chunk> functions are for storing values in the png_info_struct.

- * Similarly, the png_get_<chunk> calls are used to read values from the

- * png_info_struct, either storing the parameters in the passed variables, or

- * setting pointers into the png_info_struct where the data is stored.  The

- * png_get_<chunk> functions return a non-zero value if the data was available

- * in info_ptr, or return zero and do not change any of the parameters if the

- * data was not available.

- *

- * These functions should be used instead of directly accessing png_info

- * to avoid problems with future changes in the size and internal layout of

- * png_info_struct.

- */

-/* Returns "flag" if chunk data is valid in info_ptr. */

-PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, png_uint_32 flag));

-

-/* Returns number of bytes needed to hold a transformed row. */

-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-/* Returns row_pointers, which is an array of pointers to scanlines that was

- * returned from png_read_png().

- */

-PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Set row_pointers, which is an array of pointers to scanlines for use

- * by png_write_png().

- */

-PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_bytepp row_pointers));

-#endif

-

-/* Returns number of color channels in image. */

-PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-#ifdef PNG_EASY_ACCESS_SUPPORTED

-/* Returns image width in pixels. */

-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image height in pixels. */

-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image bit_depth. */

-PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image color_type. */

-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image filter_type. */

-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image interlace_type. */

-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image compression_type. */

-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-

-/* Returns image resolution in pixels per meter, from pHYs chunk data. */

-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-

-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */

-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr))

-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr))

-

-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */

-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-

-#endif /* EASY_ACCESS */

-

-#ifdef PNG_READ_SUPPORTED

-/* Returns pointer to signature string read from PNG header */

-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr));

-#endif

-

-#ifdef PNG_bKGD_SUPPORTED

-PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_color_16p *background));

-#endif

-

-#ifdef PNG_bKGD_SUPPORTED

-PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_color_16p background));

-#endif

-

-#ifdef PNG_cHRM_SUPPORTED

-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,

-    double *red_y, double *green_x, double *green_y, double *blue_x,

-    double *blue_y))

-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,

-    double *green_X, double *green_Y, double *green_Z, double *blue_X,

-    double *blue_Y, double *blue_Z))

-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *int_white_x, png_fixed_point *int_white_y,

-    png_fixed_point *int_red_x, png_fixed_point *int_red_y,

-    png_fixed_point *int_green_x, png_fixed_point *int_green_y,

-    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))

-PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,

-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,

-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,

-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,

-    png_fixed_point *int_blue_Z))

-#endif

-

-#ifdef PNG_cHRM_SUPPORTED

-PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,

-    png_inforp info_ptr,

-    double white_x, double white_y, double red_x, double red_y, double green_x,

-    double green_y, double blue_x, double blue_y))

-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,

-    png_inforp info_ptr, double red_X, double red_Y, double red_Z,

-    double green_X, double green_Y, double green_Z, double blue_X,

-    double blue_Y, double blue_Z))

-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_fixed_point int_white_x,

-    png_fixed_point int_white_y, png_fixed_point int_red_x,

-    png_fixed_point int_red_y, png_fixed_point int_green_x,

-    png_fixed_point int_green_y, png_fixed_point int_blue_x,

-    png_fixed_point int_blue_y))

-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,

-    png_fixed_point int_red_Z, png_fixed_point int_green_X,

-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,

-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,

-    png_fixed_point int_blue_Z))

-#endif

-

-#ifdef PNG_eXIf_SUPPORTED

-PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_bytep *exif));

-PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr,

-    png_inforp info_ptr, const png_bytep exif));

-

-PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));

-PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr,

-    png_inforp info_ptr, const png_uint_32 num_exif, const png_bytep exif));

-#endif

-

-#ifdef PNG_gAMA_SUPPORTED

-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, double *file_gamma))

-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *int_file_gamma))

-#endif

-

-#ifdef PNG_gAMA_SUPPORTED

-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,

-    png_inforp info_ptr, double file_gamma))

-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_fixed_point int_file_gamma))

-#endif

-

-#ifdef PNG_hIST_SUPPORTED

-PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_uint_16p *hist));

-PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_uint_16p hist));

-#endif

-

-PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,

-    int *bit_depth, int *color_type, int *interlace_method,

-    int *compression_method, int *filter_method));

-

-PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,

-    int color_type, int interlace_method, int compression_method,

-    int filter_method));

-

-#ifdef PNG_oFFs_SUPPORTED

-PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,

-   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,

-   int *unit_type));

-#endif

-

-#ifdef PNG_oFFs_SUPPORTED

-PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,

-    int unit_type));

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,

-    png_int_32 *X1, int *type, int *nparams, png_charp *units,

-    png_charpp *params));

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,

-    int type, int nparams, png_const_charp units, png_charpp params));

-#endif

-

-#ifdef PNG_pHYs_SUPPORTED

-PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,

-    int *unit_type));

-#endif

-

-#ifdef PNG_pHYs_SUPPORTED

-PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));

-#endif

-

-PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,

-   png_inforp info_ptr, png_colorp *palette, int *num_palette));

-

-PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,

-    png_inforp info_ptr, png_const_colorp palette, int num_palette));

-

-#ifdef PNG_sBIT_SUPPORTED

-PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_color_8p *sig_bit));

-#endif

-

-#ifdef PNG_sBIT_SUPPORTED

-PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_color_8p sig_bit));

-#endif

-

-#ifdef PNG_sRGB_SUPPORTED

-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, int *file_srgb_intent));

-#endif

-

-#ifdef PNG_sRGB_SUPPORTED

-PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int srgb_intent));

-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int srgb_intent));

-#endif

-

-#ifdef PNG_iCCP_SUPPORTED

-PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_charpp name, int *compression_type,

-    png_bytepp profile, png_uint_32 *proflen));

-#endif

-

-#ifdef PNG_iCCP_SUPPORTED

-PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_charp name, int compression_type,

-    png_const_bytep profile, png_uint_32 proflen));

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_sPLT_tpp entries));

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED

-/* png_get_text also returns the number of text chunks in *num_text */

-PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_textp *text_ptr, int *num_text));

-#endif

-

-/* Note while png_set_text() will accept a structure whose text,

- * language, and  translated keywords are NULL pointers, the structure

- * returned by png_get_text will always contain regular

- * zero-terminated C strings.  They might be empty strings but

- * they will never be NULL pointers.

- */

-

-#ifdef PNG_TEXT_SUPPORTED

-PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_textp text_ptr, int num_text));

-#endif

-

-#ifdef PNG_tIME_SUPPORTED

-PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_timep *mod_time));

-#endif

-

-#ifdef PNG_tIME_SUPPORTED

-PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_timep mod_time));

-#endif

-

-#ifdef PNG_tRNS_SUPPORTED

-PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,

-    png_color_16p *trans_color));

-#endif

-

-#ifdef PNG_tRNS_SUPPORTED

-PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,

-    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,

-    png_const_color_16p trans_color));

-#endif

-

-#ifdef PNG_sCAL_SUPPORTED

-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, int *unit, double *width, double *height))

-#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \

-   defined(PNG_FLOATING_POINT_SUPPORTED)

-/* NOTE: this API is currently implemented using floating point arithmetic,

- * consequently it can only be used on systems with floating point support.

- * In any case the range of values supported by png_fixed_point is small and it

- * is highly recommended that png_get_sCAL_s be used instead.

- */

-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,

-    png_fixed_point *width, png_fixed_point *height))

-#endif

-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,

-    png_charpp swidth, png_charpp sheight));

-

-PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int unit, double width, double height))

-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,

-   png_inforp info_ptr, int unit, png_fixed_point width,

-   png_fixed_point height))

-PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int unit,

-    png_const_charp swidth, png_const_charp sheight));

-#endif /* sCAL */

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-/* Provide the default handling for all unknown chunks or, optionally, for

- * specific unknown chunks.

- *

- * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was

- * ignored and the default was used, the per-chunk setting only had an effect on

- * write.  If you wish to have chunk-specific handling on read in code that must

- * work on earlier versions you must use a user chunk callback to specify the

- * desired handling (keep or discard.)

- *

- * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below.  The

- * parameter is interpreted as follows:

- *

- * READ:

- *    PNG_HANDLE_CHUNK_AS_DEFAULT:

- *       Known chunks: do normal libpng processing, do not keep the chunk (but

- *          see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)

- *       Unknown chunks: for a specific chunk use the global default, when used

- *          as the default discard the chunk data.

- *    PNG_HANDLE_CHUNK_NEVER:

- *       Discard the chunk data.

- *    PNG_HANDLE_CHUNK_IF_SAFE:

- *       Keep the chunk data if the chunk is not critical else raise a chunk

- *       error.

- *    PNG_HANDLE_CHUNK_ALWAYS:

- *       Keep the chunk data.

- *

- * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,

- * below.  Notice that specifying "AS_DEFAULT" as a global default is equivalent

- * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks

- * it simply resets the behavior to the libpng default.

- *

- * INTERACTION WTIH USER CHUNK CALLBACKS:

- * The per-chunk handling is always used when there is a png_user_chunk_ptr

- * callback and the callback returns 0; the chunk is then always stored *unless*

- * it is critical and the per-chunk setting is other than ALWAYS.  Notice that

- * the global default is *not* used in this case.  (In effect the per-chunk

- * value is incremented to at least IF_SAFE.)

- *

- * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and

- * per-chunk defaults will be honored.  If you want to preserve the current

- * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE

- * as the default - if you don't do this libpng 1.6 will issue a warning.

- *

- * If you want unhandled unknown chunks to be discarded in libpng 1.6 and

- * earlier simply return '1' (handled).

- *

- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:

- *    If this is *not* set known chunks will always be handled by libpng and

- *    will never be stored in the unknown chunk list.  Known chunks listed to

- *    png_set_keep_unknown_chunks will have no effect.  If it is set then known

- *    chunks listed with a keep other than AS_DEFAULT will *never* be processed

- *    by libpng, in addition critical chunks must either be processed by the

- *    callback or saved.

- *

- *    The IHDR and IEND chunks must not be listed.  Because this turns off the

- *    default handling for chunks that would otherwise be recognized the

- *    behavior of libpng transformations may well become incorrect!

- *

- * WRITE:

- *    When writing chunks the options only apply to the chunks specified by

- *    png_set_unknown_chunks (below), libpng will *always* write known chunks

- *    required by png_set_ calls and will always write the core critical chunks

- *    (as required for PLTE).

- *

- *    Each chunk in the png_set_unknown_chunks list is looked up in the

- *    png_set_keep_unknown_chunks list to find the keep setting, this is then

- *    interpreted as follows:

- *

- *    PNG_HANDLE_CHUNK_AS_DEFAULT:

- *       Write safe-to-copy chunks and write other chunks if the global

- *       default is set to _ALWAYS, otherwise don't write this chunk.

- *    PNG_HANDLE_CHUNK_NEVER:

- *       Do not write the chunk.

- *    PNG_HANDLE_CHUNK_IF_SAFE:

- *       Write the chunk if it is safe-to-copy, otherwise do not write it.

- *    PNG_HANDLE_CHUNK_ALWAYS:

- *       Write the chunk.

- *

- * Note that the default behavior is effectively the opposite of the read case -

- * in read unknown chunks are not stored by default, in write they are written

- * by default.  Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different

- * - on write the safe-to-copy bit is checked, on read the critical bit is

- * checked and on read if the chunk is critical an error will be raised.

- *

- * num_chunks:

- * ===========

- *    If num_chunks is positive, then the "keep" parameter specifies the manner

- *    for handling only those chunks appearing in the chunk_list array,

- *    otherwise the chunk list array is ignored.

- *

- *    If num_chunks is 0 the "keep" parameter specifies the default behavior for

- *    unknown chunks, as described above.

- *

- *    If num_chunks is negative, then the "keep" parameter specifies the manner

- *    for handling all unknown chunks plus all chunks recognized by libpng

- *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to

- *    be processed by libpng.

- */

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,

-    int keep, png_const_bytep chunk_list, int num_chunks));

-#endif /* HANDLE_AS_UNKNOWN */

-

-/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;

- * the result is therefore true (non-zero) if special handling is required,

- * false for the default handling.

- */

-PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,

-    png_const_bytep chunk_name));

-#endif /* SET_UNKNOWN_CHUNKS */

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_unknown_chunkp unknowns,

-    int num_unknowns));

-   /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added

-    * unknowns to the location currently stored in the png_struct.  This is

-    * invariably the wrong value on write.  To fix this call the following API

-    * for each chunk in the list with the correct location.  If you know your

-    * code won't be compiled on earlier versions you can rely on

-    * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing

-    * the correct thing.

-    */

-

-PNG_EXPORT(175, void, png_set_unknown_chunk_location,

-    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));

-

-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,

-    png_inforp info_ptr, png_unknown_chunkpp entries));

-#endif

-

-/* Png_free_data() will turn off the "valid" flag for anything it frees.

- * If you need to turn it off for a chunk that your application has freed,

- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);

- */

-PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,

-    png_inforp info_ptr, int mask));

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-/* The "params" pointer is currently not used and is for future expansion. */

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,

-    int transforms, png_voidp params));

-#endif

-#ifdef PNG_WRITE_SUPPORTED

-PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,

-    int transforms, png_voidp params));

-#endif

-#endif

-

-PNG_EXPORT(180, png_const_charp, png_get_copyright,

-    (png_const_structrp png_ptr));

-PNG_EXPORT(181, png_const_charp, png_get_header_ver,

-    (png_const_structrp png_ptr));

-PNG_EXPORT(182, png_const_charp, png_get_header_version,

-    (png_const_structrp png_ptr));

-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,

-    (png_const_structrp png_ptr));

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,

-    png_uint_32 mng_features_permitted));

-#endif

-

-/* For use in png_set_keep_unknown, added to version 1.2.6 */

-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0

-#define PNG_HANDLE_CHUNK_NEVER        1

-#define PNG_HANDLE_CHUNK_IF_SAFE      2

-#define PNG_HANDLE_CHUNK_ALWAYS       3

-#define PNG_HANDLE_CHUNK_LAST         4

-

-/* Strip the prepended error numbers ("#nnn ") from error and warning

- * messages before passing them to the error or warning handler.

- */

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,

-    png_uint_32 strip_mode));

-#endif

-

-/* Added in libpng-1.2.6 */

-#ifdef PNG_SET_USER_LIMITS_SUPPORTED

-PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,

-    png_uint_32 user_width_max, png_uint_32 user_height_max));

-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,

-    (png_const_structrp png_ptr));

-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,

-    (png_const_structrp png_ptr));

-/* Added in libpng-1.4.0 */

-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,

-    png_uint_32 user_chunk_cache_max));

-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,

-    (png_const_structrp png_ptr));

-/* Added in libpng-1.4.1 */

-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,

-    png_alloc_size_t user_chunk_cache_max));

-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,

-    (png_const_structrp png_ptr));

-#endif

-

-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)

-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-

-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-

-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr));

-

-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr))

-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */

-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr))

-#endif

-

-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr))

-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */

-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,

-    (png_const_structrp png_ptr, png_const_inforp info_ptr))

-#endif

-

-#  ifdef PNG_pHYs_SUPPORTED

-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,

-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,

-    int *unit_type));

-#  endif /* pHYs */

-#endif  /* INCH_CONVERSIONS */

-

-/* Added in libpng-1.4.0 */

-#ifdef PNG_IO_STATE_SUPPORTED

-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));

-

-/* Removed from libpng 1.6; use png_get_io_chunk_type. */

-PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),

-    PNG_DEPRECATED)

-

-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,

-    (png_const_structrp png_ptr));

-

-/* The flags returned by png_get_io_state() are the following: */

-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */

-#  define PNG_IO_READING     0x0001   /* currently reading */

-#  define PNG_IO_WRITING     0x0002   /* currently writing */

-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */

-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */

-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */

-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */

-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */

-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */

-#endif /* IO_STATE */

-

-/* Interlace support.  The following macros are always defined so that if

- * libpng interlace handling is turned off the macros may be used to handle

- * interlaced images within the application.

- */

-#define PNG_INTERLACE_ADAM7_PASSES 7

-

-/* Two macros to return the first row and first column of the original,

- * full, image which appears in a given pass.  'pass' is in the range 0

- * to 6 and the result is in the range 0 to 7.

- */

-#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)

-#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)

-

-/* A macro to return the offset between pixels in the output row for a pair of

- * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that

- * follows.  Note that ROW_OFFSET is the offset from one row to the next whereas

- * COL_OFFSET is from one column to the next, within a row.

- */

-#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)

-#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))

-

-/* Two macros to help evaluate the number of rows or columns in each

- * pass.  This is expressed as a shift - effectively log2 of the number or

- * rows or columns in each 8x8 tile of the original image.

- */

-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)

-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)

-

-/* Hence two macros to determine the number of rows or columns in a given

- * pass of an image given its height or width.  In fact these macros may

- * return non-zero even though the sub-image is empty, because the other

- * dimension may be empty for a small image.

- */

-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\

-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))

-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\

-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))

-

-/* For the reader row callbacks (both progressive and sequential) it is

- * necessary to find the row in the output image given a row in an interlaced

- * image, so two more macros:

- */

-#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \

-   (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))

-#define PNG_COL_FROM_PASS_COL(x_in, pass) \

-   (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))

-

-/* Two macros which return a boolean (0 or 1) saying whether the given row

- * or column is in a particular pass.  These use a common utility macro that

- * returns a mask for a given pass - the offset 'off' selects the row or

- * column version.  The mask has the appropriate bit set for each column in

- * the tile.

- */

-#define PNG_PASS_MASK(pass,off) ( \

-   ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \

-   ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))

-

-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \

-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)

-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \

-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)

-

-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED

-/* With these routines we avoid an integer divide, which will be slower on

- * most machines.  However, it does take more operations than the corresponding

- * divide method, so it may be slower on a few RISC systems.  There are two

- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.

- *

- * Note that the rounding factors are NOT supposed to be the same!  128 and

- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the

- * standard method.

- *

- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]

- */

-

- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */

-

-#  define png_composite(composite, fg, alpha, bg)        \

-   {                                                     \

-      png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \

-          * (png_uint_16)(alpha)                         \

-          + (png_uint_16)(bg)*(png_uint_16)(255          \

-          - (png_uint_16)(alpha)) + 128);                \

-      (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); \

-   }

-

-#  define png_composite_16(composite, fg, alpha, bg)     \

-   {                                                     \

-      png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \

-          * (png_uint_32)(alpha)                         \

-          + (png_uint_32)(bg)*(65535                     \

-          - (png_uint_32)(alpha)) + 32768);              \

-      (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); \

-   }

-

-#else  /* Standard method using integer division */

-

-#  define png_composite(composite, fg, alpha, bg)                      \

-   (composite) =                                                       \

-       (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) +  \

-       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \

-       127) / 255))

-

-#  define png_composite_16(composite, fg, alpha, bg)                       \

-   (composite) =                                                           \

-       (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \

-       (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +     \

-       32767) / 65535))

-#endif /* READ_COMPOSITE_NODIV */

-

-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED

-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));

-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));

-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));

-#endif

-

-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,

-    png_const_bytep buf));

-/* No png_get_int_16 -- may be added if there's a real need for it. */

-

-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */

-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED

-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));

-#endif

-#ifdef PNG_SAVE_INT_32_SUPPORTED

-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));

-#endif

-

-/* Place a 16-bit number into a buffer in PNG byte order.

- * The parameter is declared unsigned int, not png_uint_16,

- * just to avoid potential problems on pre-ANSI C compilers.

- */

-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED

-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));

-/* No png_save_int_16 -- may be added if there's a real need for it. */

-#endif

-

-#ifdef PNG_USE_READ_MACROS

-/* Inline macros to do direct reads of bytes from the input buffer.

- * The png_get_int_32() routine assumes we are using two's complement

- * format for negative values, which is almost certainly true.

- */

-#  define PNG_get_uint_32(buf) \

-   (((png_uint_32)(*(buf)) << 24) + \

-    ((png_uint_32)(*((buf) + 1)) << 16) + \

-    ((png_uint_32)(*((buf) + 2)) << 8) + \

-    ((png_uint_32)(*((buf) + 3))))

-

-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the

-    * function) incorrectly returned a value of type png_uint_32.

-    */

-#  define PNG_get_uint_16(buf) \

-   ((png_uint_16) \

-    (((unsigned int)(*(buf)) << 8) + \

-    ((unsigned int)(*((buf) + 1)))))

-

-#  define PNG_get_int_32(buf) \

-   ((png_int_32)((*(buf) & 0x80) \

-    ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \

-    : (png_int_32)png_get_uint_32(buf)))

-

-/* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,

- * but defining a macro name prefixed with PNG_PREFIX.

- */

-#  ifndef PNG_PREFIX

-#    define png_get_uint_32(buf) PNG_get_uint_32(buf)

-#    define png_get_uint_16(buf) PNG_get_uint_16(buf)

-#    define png_get_int_32(buf)  PNG_get_int_32(buf)

-#  endif

-#else

-#  ifdef PNG_PREFIX

-   /* No macros; revert to the (redefined) function */

-#    define PNG_get_uint_32 (png_get_uint_32)

-#    define PNG_get_uint_16 (png_get_uint_16)

-#    define PNG_get_int_32  (png_get_int_32)

-#  endif

-#endif

-

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

-PNG_EXPORT(242, void, png_set_check_for_invalid_index,

-    (png_structrp png_ptr, int allowed));

-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED

-PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,

-    png_const_infop info_ptr));

-#  endif

-#endif /* CHECK_FOR_INVALID_INDEX */

-

-/*******************************************************************************

- * Section 5: SIMPLIFIED API

- *******************************************************************************

- *

- * Please read the documentation in libpng-manual.txt (TODO: write said

- * documentation) if you don't understand what follows.

- *

- * The simplified API hides the details of both libpng and the PNG file format

- * itself.  It allows PNG files to be read into a very limited number of

- * in-memory bitmap formats or to be written from the same formats.  If these

- * formats do not accomodate your needs then you can, and should, use the more

- * sophisticated APIs above - these support a wide variety of in-memory formats

- * and a wide variety of sophisticated transformations to those formats as well

- * as a wide variety of APIs to manipulate ancillary information.

- *

- * To read a PNG file using the simplified API:

- *

- * 1) Declare a 'png_image' structure (see below) on the stack, set the

- *    version field to PNG_IMAGE_VERSION and the 'opaque' pointer to NULL

- *    (this is REQUIRED, your program may crash if you don't do it.)

- * 2) Call the appropriate png_image_begin_read... function.

- * 3) Set the png_image 'format' member to the required sample format.

- * 4) Allocate a buffer for the image and, if required, the color-map.

- * 5) Call png_image_finish_read to read the image and, if required, the

- *    color-map into your buffers.

- *

- * There are no restrictions on the format of the PNG input itself; all valid

- * color types, bit depths, and interlace methods are acceptable, and the

- * input image is transformed as necessary to the requested in-memory format

- * during the png_image_finish_read() step.  The only caveat is that if you

- * request a color-mapped image from a PNG that is full-color or makes

- * complex use of an alpha channel the transformation is extremely lossy and the

- * result may look terrible.

- *

- * To write a PNG file using the simplified API:

- *

- * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.

- * 2) Initialize the members of the structure that describe the image, setting

- *    the 'format' member to the format of the image samples.

- * 3) Call the appropriate png_image_write... function with a pointer to the

- *    image and, if necessary, the color-map to write the PNG data.

- *

- * png_image is a structure that describes the in-memory format of an image

- * when it is being read or defines the in-memory format of an image that you

- * need to write:

- */

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \

-    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-

-#define PNG_IMAGE_VERSION 1

-

-typedef struct png_control *png_controlp;

-typedef struct

-{

-   png_controlp opaque;    /* Initialize to NULL, free with png_image_free */

-   png_uint_32  version;   /* Set to PNG_IMAGE_VERSION */

-   png_uint_32  width;     /* Image width in pixels (columns) */

-   png_uint_32  height;    /* Image height in pixels (rows) */

-   png_uint_32  format;    /* Image format as defined below */

-   png_uint_32  flags;     /* A bit mask containing informational flags */

-   png_uint_32  colormap_entries;

-                           /* Number of entries in the color-map */

-

-   /* In the event of an error or warning the following field will be set to a

-    * non-zero value and the 'message' field will contain a '\0' terminated

-    * string with the libpng error or warning message.  If both warnings and

-    * an error were encountered, only the error is recorded.  If there

-    * are multiple warnings, only the first one is recorded.

-    *

-    * The upper 30 bits of this value are reserved, the low two bits contain

-    * a value as follows:

-    */

-#  define PNG_IMAGE_WARNING 1

-#  define PNG_IMAGE_ERROR 2

-   /*

-    * The result is a two-bit code such that a value more than 1 indicates

-    * a failure in the API just called:

-    *

-    *    0 - no warning or error

-    *    1 - warning

-    *    2 - error

-    *    3 - error preceded by warning

-    */

-#  define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)

-

-   png_uint_32  warning_or_error;

-

-   char         message[64];

-} png_image, *png_imagep;

-

-/* The samples of the image have one to four channels whose components have

- * original values in the range 0 to 1.0:

- *

- * 1: A single gray or luminance channel (G).

- * 2: A gray/luminance channel and an alpha channel (GA).

- * 3: Three red, green, blue color channels (RGB).

- * 4: Three color channels and an alpha channel (RGBA).

- *

- * The components are encoded in one of two ways:

- *

- * a) As a small integer, value 0..255, contained in a single byte.  For the

- * alpha channel the original value is simply value/255.  For the color or

- * luminance channels the value is encoded according to the sRGB specification

- * and matches the 8-bit format expected by typical display devices.

- *

- * The color/gray channels are not scaled (pre-multiplied) by the alpha

- * channel and are suitable for passing to color management software.

- *

- * b) As a value in the range 0..65535, contained in a 2-byte integer.  All

- * channels can be converted to the original value by dividing by 65535; all

- * channels are linear.  Color channels use the RGB encoding (RGB end-points) of

- * the sRGB specification.  This encoding is identified by the

- * PNG_FORMAT_FLAG_LINEAR flag below.

- *

- * When the simplified API needs to convert between sRGB and linear colorspaces,

- * the actual sRGB transfer curve defined in the sRGB specification (see the

- * article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2

- * approximation used elsewhere in libpng.

- *

- * When an alpha channel is present it is expected to denote pixel coverage

- * of the color or luminance channels and is returned as an associated alpha

- * channel: the color/gray channels are scaled (pre-multiplied) by the alpha

- * value.

- *

- * The samples are either contained directly in the image data, between 1 and 8

- * bytes per pixel according to the encoding, or are held in a color-map indexed

- * by bytes in the image data.  In the case of a color-map the color-map entries

- * are individual samples, encoded as above, and the image data has one byte per

- * pixel to select the relevant sample from the color-map.

- */

-

-/* PNG_FORMAT_*

- *

- * #defines to be used in png_image::format.  Each #define identifies a

- * particular layout of sample data and, if present, alpha values.  There are

- * separate defines for each of the two component encodings.

- *

- * A format is built up using single bit flag values.  All combinations are

- * valid.  Formats can be built up from the flag values or you can use one of

- * the predefined values below.  When testing formats always use the FORMAT_FLAG

- * macros to test for individual features - future versions of the library may

- * add new flags.

- *

- * When reading or writing color-mapped images the format should be set to the

- * format of the entries in the color-map then png_image_{read,write}_colormap

- * called to read or write the color-map and set the format correctly for the

- * image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!

- *

- * NOTE: libpng can be built with particular features disabled. If you see

- * compiler errors because the definition of one of the following flags has been

- * compiled out it is because libpng does not have the required support.  It is

- * possible, however, for the libpng configuration to enable the format on just

- * read or just write; in that case you may see an error at run time.  You can

- * guard against this by checking for the definition of the appropriate

- * "_SUPPORTED" macro, one of:

- *

- *    PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED

- */

-#define PNG_FORMAT_FLAG_ALPHA    0x01U /* format with an alpha channel */

-#define PNG_FORMAT_FLAG_COLOR    0x02U /* color format: otherwise grayscale */

-#define PNG_FORMAT_FLAG_LINEAR   0x04U /* 2-byte channels else 1-byte */

-#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */

-

-#ifdef PNG_FORMAT_BGR_SUPPORTED

-#  define PNG_FORMAT_FLAG_BGR    0x10U /* BGR colors, else order is RGB */

-#endif

-

-#ifdef PNG_FORMAT_AFIRST_SUPPORTED

-#  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */

-#endif

-

-#define PNG_FORMAT_FLAG_ASSOCIATED_ALPHA 0x40U /* alpha channel is associated */

-

-/* Commonly used formats have predefined macros.

- *

- * First the single byte (sRGB) formats:

- */

-#define PNG_FORMAT_GRAY 0

-#define PNG_FORMAT_GA   PNG_FORMAT_FLAG_ALPHA

-#define PNG_FORMAT_AG   (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)

-#define PNG_FORMAT_RGB  PNG_FORMAT_FLAG_COLOR

-#define PNG_FORMAT_BGR  (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)

-#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)

-#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)

-#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)

-#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)

-

-/* Then the linear 2-byte formats.  When naming these "Y" is used to

- * indicate a luminance (gray) channel.

- */

-#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR

-#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)

-#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)

-#define PNG_FORMAT_LINEAR_RGB_ALPHA \

-   (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)

-

-/* With color-mapped formats the image data is one byte for each pixel, the byte

- * is an index into the color-map which is formatted as above.  To obtain a

- * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP

- * to one of the above definitions, or you can use one of the definitions below.

- */

-#define PNG_FORMAT_RGB_COLORMAP  (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)

-#define PNG_FORMAT_BGR_COLORMAP  (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)

-#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)

-#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)

-#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)

-#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)

-

-/* PNG_IMAGE macros

- *

- * These are convenience macros to derive information from a png_image

- * structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the

- * actual image sample values - either the entries in the color-map or the

- * pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values

- * for the pixels and will always return 1 for color-mapped formats.  The

- * remaining macros return information about the rows in the image and the

- * complete image.

- *

- * NOTE: All the macros that take a png_image::format parameter are compile time

- * constants if the format parameter is, itself, a constant.  Therefore these

- * macros can be used in array declarations and case labels where required.

- * Similarly the macros are also pre-processor constants (sizeof is not used) so

- * they can be used in #if tests.

- *

- * First the information about the samples.

- */

-#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\

-   (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)

-   /* Return the total number of channels in a given format: 1..4 */

-

-#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\

-   ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)

-   /* Return the size in bytes of a single component of a pixel or color-map

-    * entry (as appropriate) in the image: 1 or 2.

-    */

-

-#define PNG_IMAGE_SAMPLE_SIZE(fmt)\

-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))

-   /* This is the size of the sample data for one sample.  If the image is

-    * color-mapped it is the size of one color-map entry (and image pixels are

-    * one byte in size), otherwise it is the size of one image pixel.

-    */

-

-#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\

-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)

-   /* The maximum size of the color-map required by the format expressed in a

-    * count of components.  This can be used to compile-time allocate a

-    * color-map:

-    *

-    * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];

-    *

-    * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];

-    *

-    * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the

-    * information from one of the png_image_begin_read_ APIs and dynamically

-    * allocate the required memory.

-    */

-

-/* Corresponding information about the pixels */

-#define PNG_IMAGE_PIXEL_(test,fmt)\

-   (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))

-

-#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\

-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)

-   /* The number of separate channels (components) in a pixel; 1 for a

-    * color-mapped image.

-    */

-

-#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\

-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)

-   /* The size, in bytes, of each component in a pixel; 1 for a color-mapped

-    * image.

-    */

-

-#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)

-   /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */

-

-/* Information about the whole row, or whole image */

-#define PNG_IMAGE_ROW_STRIDE(image)\

-   (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)

-   /* Return the total number of components in a single row of the image; this

-    * is the minimum 'row stride', the minimum count of components between each

-    * row.  For a color-mapped image this is the minimum number of bytes in a

-    * row.

-    *

-    * WARNING: this macro overflows for some images with more than one component

-    * and very large image widths.  libpng will refuse to process an image where

-    * this macro would overflow.

-    */

-

-#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\

-   (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))

-   /* Return the size, in bytes, of an image buffer given a png_image and a row

-    * stride - the number of components to leave space for in each row.

-    *

-    * WARNING: this macro overflows a 32-bit integer for some large PNG images,

-    * libpng will refuse to process an image where such an overflow would occur.

-    */

-

-#define PNG_IMAGE_SIZE(image)\

-   PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))

-   /* Return the size, in bytes, of the image in memory given just a png_image;

-    * the row stride is the minimum stride required for the image.

-    */

-

-#define PNG_IMAGE_COLORMAP_SIZE(image)\

-   (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)

-   /* Return the size, in bytes, of the color-map of this image.  If the image

-    * format is not a color-map format this will return a size sufficient for

-    * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if

-    * you don't want to allocate a color-map in this case.

-    */

-

-/* PNG_IMAGE_FLAG_*

- *

- * Flags containing additional information about the image are held in the

- * 'flags' field of png_image.

- */

-#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01

-   /* This indicates the the RGB values of the in-memory bitmap do not

-    * correspond to the red, green and blue end-points defined by sRGB.

-    */

-

-#define PNG_IMAGE_FLAG_FAST 0x02

-   /* On write emphasise speed over compression; the resultant PNG file will be

-    * larger but will be produced significantly faster, particular for large

-    * images.  Do not use this option for images which will be distributed, only

-    * used it when producing intermediate files that will be read back in

-    * repeatedly.  For a typical 24-bit image the option will double the read

-    * speed at the cost of increasing the image size by 25%, however for many

-    * more compressible images the PNG file can be 10 times larger with only a

-    * slight speed gain.

-    */

-

-#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04

-   /* On read if the image is a 16-bit per component image and there is no gAMA

-    * or sRGB chunk assume that the components are sRGB encoded.  Notice that

-    * images output by the simplified API always have gamma information; setting

-    * this flag only affects the interpretation of 16-bit images from an

-    * external source.  It is recommended that the application expose this flag

-    * to the user; the user can normally easily recognize the difference between

-    * linear and sRGB encoding.  This flag has no effect on write - the data

-    * passed to the write APIs must have the correct encoding (as defined

-    * above.)

-    *

-    * If the flag is not set (the default) input 16-bit per component data is

-    * assumed to be linear.

-    *

-    * NOTE: the flag can only be set after the png_image_begin_read_ call,

-    * because that call initializes the 'flags' field.

-    */

-

-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED

-/* READ APIs

- * ---------

- *

- * The png_image passed to the read APIs must have been initialized by setting

- * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)

- */

-#ifdef PNG_STDIO_SUPPORTED

-PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,

-   const char *file_name));

-   /* The named file is opened for read and the image header is filled in

-    * from the PNG header in the file.

-    */

-

-PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,

-   FILE* file));

-   /* The PNG header is read from the stdio FILE object. */

-#endif /* STDIO */

-

-PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,

-   png_const_voidp memory, png_size_t size));

-   /* The PNG header is read from the given memory buffer. */

-

-PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,

-   png_const_colorp background, void *buffer, png_int_32 row_stride,

-   void *colormap));

-   /* Finish reading the image into the supplied buffer and clean up the

-    * png_image structure.

-    *

-    * row_stride is the step, in byte or 2-byte units as appropriate,

-    * between adjacent rows.  A positive stride indicates that the top-most row

-    * is first in the buffer - the normal top-down arrangement.  A negative

-    * stride indicates that the bottom-most row is first in the buffer.

-    *

-    * background need only be supplied if an alpha channel must be removed from

-    * a png_byte format and the removal is to be done by compositing on a solid

-    * color; otherwise it may be NULL and any composition will be done directly

-    * onto the buffer.  The value is an sRGB color to use for the background,

-    * for grayscale output the green channel is used.

-    *

-    * background must be supplied when an alpha channel must be removed from a

-    * single byte color-mapped output format, in other words if:

-    *

-    * 1) The original format from png_image_begin_read_from_* had

-    *    PNG_FORMAT_FLAG_ALPHA set.

-    * 2) The format set by the application does not.

-    * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and

-    *    PNG_FORMAT_FLAG_LINEAR *not* set.

-    *

-    * For linear output removing the alpha channel is always done by compositing

-    * on black and background is ignored.

-    *

-    * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set.  It must

-    * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.

-    * image->colormap_entries will be updated to the actual number of entries

-    * written to the colormap; this may be less than the original value.

-    */

-

-PNG_EXPORT(238, void, png_image_free, (png_imagep image));

-   /* Free any data allocated by libpng in image->opaque, setting the pointer to

-    * NULL.  May be called at any time after the structure is initialized.

-    */

-#endif /* SIMPLIFIED_READ */

-

-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED

-/* WRITE APIS

- * ----------

- * For write you must initialize a png_image structure to describe the image to

- * be written.  To do this use memset to set the whole structure to 0 then

- * initialize fields describing your image.

- *

- * version: must be set to PNG_IMAGE_VERSION

- * opaque: must be initialized to NULL

- * width: image width in pixels

- * height: image height in rows

- * format: the format of the data (image and color-map) you wish to write

- * flags: set to 0 unless one of the defined flags applies; set

- *    PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB

- *    values do not correspond to the colors in sRGB.

- * colormap_entries: set to the number of entries in the color-map (0 to 256)

- */

-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED

-PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,

-   const char *file, int convert_to_8bit, const void *buffer,

-   png_int_32 row_stride, const void *colormap));

-   /* Write the image to the named file. */

-

-PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,

-   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,

-   const void *colormap));

-   /* Write the image to the given (FILE*). */

-#endif /* SIMPLIFIED_WRITE_STDIO */

-

-/* With all write APIs if image is in one of the linear formats with 16-bit

- * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG

- * gamma encoded according to the sRGB specification, otherwise a 16-bit linear

- * encoded PNG file is written.

- *

- * With color-mapped data formats the colormap parameter point to a color-map

- * with at least image->colormap_entries encoded in the specified format.  If

- * the format is linear the written PNG color-map will be converted to sRGB

- * regardless of the convert_to_8_bit flag.

- *

- * With all APIs row_stride is handled as in the read APIs - it is the spacing

- * from one row to the next in component sized units (1 or 2 bytes) and if

- * negative indicates a bottom-up row layout in the buffer.  If row_stride is

- * zero, libpng will calculate it for you from the image width and number of

- * channels.

- *

- * Note that the write API does not support interlacing, sub-8-bit pixels or

- * most ancillary chunks.  If you need to write text chunks (e.g. for copyright

- * notices) you need to use one of the other APIs.

- */

-

-PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,

-   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,

-   const void *buffer, png_int_32 row_stride, const void *colormap));

-   /* Write the image to the given memory buffer.  The function both writes the

-    * whole PNG data stream to *memory and updates *memory_bytes with the count

-    * of bytes written.

-    *

-    * 'memory' may be NULL.  In this case *memory_bytes is not read however on

-    * success the number of bytes which would have been written will still be

-    * stored in *memory_bytes.  On failure *memory_bytes will contain 0.

-    *

-    * If 'memory' is not NULL it must point to memory[*memory_bytes] of

-    * writeable memory.

-    *

-    * If the function returns success memory[*memory_bytes] (if 'memory' is not

-    * NULL) contains the written PNG data.  *memory_bytes will always be less

-    * than or equal to the original value.

-    *

-    * If the function returns false and *memory_bytes was not changed an error

-    * occured during write.  If *memory_bytes was changed, or is not 0 if

-    * 'memory' was NULL, the write would have succeeded but for the memory

-    * buffer being too small.  *memory_bytes contains the required number of

-    * bytes and will be bigger that the original value.

-    */

-

-#define png_image_write_get_memory_size(image, size, convert_to_8_bit, buffer,\

-   row_stride, colormap)\

-   png_image_write_to_memory(&(image), 0, &(size), convert_to_8_bit, buffer,\

-         row_stride, colormap)

-   /* Return the amount of memory in 'size' required to compress this image.

-    * The png_image structure 'image' must be filled in as in the above

-    * function and must not be changed before the actual write call, the buffer

-    * and all other parameters must also be identical to that in the final

-    * write call.  The 'size' variable need not be initialized.

-    *

-    * NOTE: the macro returns true/false, if false is returned 'size' will be

-    * set to zero and the write failed and probably will fail if tried again.

-    */

-

-/* You can pre-allocate the buffer by making sure it is of sufficient size

- * regardless of the amount of compression achieved.  The buffer size will

- * always be bigger than the original image and it will never be filled.  The

- * following macros are provided to assist in allocating the buffer.

- */

-#define PNG_IMAGE_DATA_SIZE(image) (PNG_IMAGE_SIZE(image)+(image).height)

-   /* The number of uncompressed bytes in the PNG byte encoding of the image;

-    * uncompressing the PNG IDAT data will give this number of bytes.

-    *

-    * NOTE: while PNG_IMAGE_SIZE cannot overflow for an image in memory this

-    * macro can because of the extra bytes used in the PNG byte encoding.  You

-    * need to avoid this macro if your image size approaches 2^30 in width or

-    * height.  The same goes for the remainder of these macros; they all produce

-    * bigger numbers than the actual in-memory image size.

-    */

-#ifndef PNG_ZLIB_MAX_SIZE

-#  define PNG_ZLIB_MAX_SIZE(b) ((b)+(((b)+7U)>>3)+(((b)+63U)>>6)+11U)

-   /* An upper bound on the number of compressed bytes given 'b' uncompressed

-    * bytes.  This is based on deflateBounds() in zlib; different

-    * implementations of zlib compression may conceivably produce more data so

-    * if your zlib implementation is not zlib itself redefine this macro

-    * appropriately.

-    */

-#endif

-

-#define PNG_IMAGE_COMPRESSED_SIZE_MAX(image)\

-   PNG_ZLIB_MAX_SIZE((png_alloc_size_t)PNG_IMAGE_DATA_SIZE(image))

-   /* An upper bound on the size of the data in the PNG IDAT chunks. */

-

-#define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\

-   ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\

-    (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\

-    12U+3U*(image).colormap_entries/*PLTE data*/+\

-    (((image).format&PNG_FORMAT_FLAG_ALPHA)?\

-    12U/*tRNS*/+(image).colormap_entries:0U):0U)+\

-    12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))

-   /* A helper for the following macro; if your compiler cannot handle the

-    * following macro use this one with the result of

-    * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most

-    * compilers should handle this just fine.)

-    */

-

-#define PNG_IMAGE_PNG_SIZE_MAX(image)\

-   PNG_IMAGE_PNG_SIZE_MAX_(image, PNG_IMAGE_COMPRESSED_SIZE_MAX(image))

-   /* An upper bound on the total length of the PNG data stream for 'image'.

-    * The result is of type png_alloc_size_t, on 32-bit systems this may

-    * overflow even though PNG_IMAGE_DATA_SIZE does not overflow; the write will

-    * run out of buffer space but return a corrected size which should work.

-    */

-#endif /* SIMPLIFIED_WRITE */

-/*******************************************************************************

- *  END OF SIMPLIFIED API

- ******************************************************************************/

-#endif /* SIMPLIFIED_{READ|WRITE} */

-

-/*******************************************************************************

- * Section 6: IMPLEMENTATION OPTIONS

- *******************************************************************************

- *

- * Support for arbitrary implementation-specific optimizations.  The API allows

- * particular options to be turned on or off.  'Option' is the number of the

- * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given

- * by the PNG_OPTION_ defines below.

- *

- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,

- *           are detected at run time, however sometimes it may be impossible

- *           to do this in user mode, in which case it is necessary to discover

- *           the capabilities in an OS specific way.  Such capabilities are

- *           listed here when libpng has support for them and must be turned

- *           ON by the application if present.

- *

- * SOFTWARE: sometimes software optimizations actually result in performance

- *           decrease on some architectures or systems, or with some sets of

- *           PNG images.  'Software' options allow such optimizations to be

- *           selected at run time.

- */

-#ifdef PNG_SET_OPTION_SUPPORTED

-#ifdef PNG_ARM_NEON_API_SUPPORTED

-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */

-#endif

-#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */

-#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */

-#ifdef PNG_MIPS_MSA_API_SUPPORTED

-#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */

-#endif

-#define PNG_IGNORE_ADLER32 8

-#ifdef PNG_POWERPC_VSX_API_SUPPORTED

-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions supported */

-#endif

-#define PNG_OPTION_NEXT  12 /* Next option - numbers must be even */

-

-/* Return values: NOTE: there are four values and 'off' is *not* zero */

-#define PNG_OPTION_UNSET   0 /* Unset - defaults to off */

-#define PNG_OPTION_INVALID 1 /* Option number out of range */

-#define PNG_OPTION_OFF     2

-#define PNG_OPTION_ON      3

-

-PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,

-   int onoff));

-#endif /* SET_OPTION */

-

-/*******************************************************************************

- *  END OF HARDWARE AND SOFTWARE OPTIONS

- ******************************************************************************/

-

-/* Maintainer: Put new public prototypes here ^, in libpng.3, in project

- * defs, and in scripts/symbols.def.

- */

-

-/* The last ordinal number (this is the *last* one already used; the next

- * one to use is one more than this.)

- */

-#ifdef PNG_EXPORT_LAST_ORDINAL

-  PNG_EXPORT_LAST_ORDINAL(249);

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* PNG_VERSION_INFO_ONLY */

-/* Do not put anything past this line */

-#endif /* PNG_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngconf.h b/plugins/AdvaImg/src/LibPNG/pngconf.h
deleted file mode 100644
index af05e17554..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngconf.h
+++ /dev/null
@@ -1,622 +0,0 @@
-

-/* pngconf.h - machine configurable file for libpng

- *

- * libpng version 1.6.34, September 29, 2017

- *

- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * Any machine specific code is near the front of this file, so if you

- * are configuring libpng for a machine, you may want to read the section

- * starting here down to where it starts to typedef png_color, png_text,

- * and png_info.

- */

-

-#ifndef PNGCONF_H

-#define PNGCONF_H

-

-#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */

-

-/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C

- * compiler for correct compilation.  The following header files are required by

- * the standard.  If your compiler doesn't provide these header files, or they

- * do not match the standard, you will need to provide/improve them.

- */

-#include <limits.h>

-#include <stddef.h>

-

-/* Library header files.  These header files are all defined by ISOC90; libpng

- * expects conformant implementations, however, an ISOC90 conformant system need

- * not provide these header files if the functionality cannot be implemented.

- * In this case it will be necessary to disable the relevant parts of libpng in

- * the build of pnglibconf.h.

- *

- * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not

- * include this unnecessary header file.

- */

-

-#ifdef PNG_STDIO_SUPPORTED

-   /* Required for the definition of FILE: */

-#  include <stdio.h>

-#endif

-

-#ifdef PNG_SETJMP_SUPPORTED

-   /* Required for the definition of jmp_buf and the declaration of longjmp: */

-#  include <setjmp.h>

-#endif

-

-#ifdef PNG_CONVERT_tIME_SUPPORTED

-   /* Required for struct tm: */

-#  include <time.h>

-#endif

-

-#endif /* PNG_BUILDING_SYMBOL_TABLE */

-

-/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using

- * PNG_NO_CONST; this is no longer supported except for data declarations which

- * apparently still cause problems in 2011 on some compilers.

- */

-#define PNG_CONST const /* backward compatibility only */

-

-/* This controls optimization of the reading of 16-bit and 32-bit values

- * from PNG files.  It can be set on a per-app-file basis - it

- * just changes whether a macro is used when the function is called.

- * The library builder sets the default; if read functions are not

- * built into the library the macro implementation is forced on.

- */

-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED

-#  define PNG_USE_READ_MACROS

-#endif

-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)

-#  if PNG_DEFAULT_READ_MACROS

-#    define PNG_USE_READ_MACROS

-#  endif

-#endif

-

-/* COMPILER SPECIFIC OPTIONS.

- *

- * These options are provided so that a variety of difficult compilers

- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE

- * below) but still have compiler specific implementations, others

- * may be changed on a per-file basis when compiling against libpng.

- */

-

-/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect

- * against legacy (pre ISOC90) compilers that did not understand function

- * prototypes.  It is not required for modern C compilers.

- */

-#ifndef PNGARG

-#  define PNGARG(arglist) arglist

-#endif

-

-/* Function calling conventions.

- * =============================

- * Normally it is not necessary to specify to the compiler how to call

- * a function - it just does it - however on x86 systems derived from

- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems

- * and some others) there are multiple ways to call a function and the

- * default can be changed on the compiler command line.  For this reason

- * libpng specifies the calling convention of every exported function and

- * every function called via a user supplied function pointer.  This is

- * done in this file by defining the following macros:

- *

- * PNGAPI    Calling convention for exported functions.

- * PNGCBAPI  Calling convention for user provided (callback) functions.

- * PNGCAPI   Calling convention used by the ANSI-C library (required

- *           for longjmp callbacks and sometimes used internally to

- *           specify the calling convention for zlib).

- *

- * These macros should never be overridden.  If it is necessary to

- * change calling convention in a private build this can be done

- * by setting PNG_API_RULE (which defaults to 0) to one of the values

- * below to select the correct 'API' variants.

- *

- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.

- *                This is correct in every known environment.

- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and

- *                the 'C' calling convention (from PNGCAPI) for

- *                callbacks (PNGCBAPI).  This is no longer required

- *                in any known environment - if it has to be used

- *                please post an explanation of the problem to the

- *                libpng mailing list.

- *

- * These cases only differ if the operating system does not use the C

- * calling convention, at present this just means the above cases

- * (x86 DOS/Windows sytems) and, even then, this does not apply to

- * Cygwin running on those systems.

- *

- * Note that the value must be defined in pnglibconf.h so that what

- * the application uses to call the library matches the conventions

- * set when building the library.

- */

-

-/* Symbol export

- * =============

- * When building a shared library it is almost always necessary to tell

- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'

- * is used to mark the symbols.  On some systems these symbols can be

- * extracted at link time and need no special processing by the compiler,

- * on other systems the symbols are flagged by the compiler and just

- * the declaration requires a special tag applied (unfortunately) in a

- * compiler dependent way.  Some systems can do either.

- *

- * A small number of older systems also require a symbol from a DLL to

- * be flagged to the program that calls it.  This is a problem because

- * we do not know in the header file included by application code that

- * the symbol will come from a shared library, as opposed to a statically

- * linked one.  For this reason the application must tell us by setting

- * the magic flag PNG_USE_DLL to turn on the special processing before

- * it includes png.h.

- *

- * Four additional macros are used to make this happen:

- *

- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from

- *            the build or imported if PNG_USE_DLL is set - compiler

- *            and system specific.

- *

- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to

- *                       'type', compiler specific.

- *

- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to

- *                make a symbol exported from the DLL.  Not used in the

- *                public header files; see pngpriv.h for how it is used

- *                in the libpng build.

- *

- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come

- *                from a DLL - used to define PNG_IMPEXP when

- *                PNG_USE_DLL is set.

- */

-

-/* System specific discovery.

- * ==========================

- * This code is used at build time to find PNG_IMPEXP, the API settings

- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL

- * import processing is possible.  On Windows systems it also sets

- * compiler-specific macros to the values required to change the calling

- * conventions of the various functions.

- */

-#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\

-    defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)

-  /* Windows system (DOS doesn't support DLLs).  Includes builds under Cygwin or

-   * MinGW on any architecture currently supported by Windows.  Also includes

-   * Watcom builds but these need special treatment because they are not

-   * compatible with GCC or Visual C because of different calling conventions.

-   */

-#  if PNG_API_RULE == 2

-   /* If this line results in an error, either because __watcall is not

-    * understood or because of a redefine just below you cannot use *this*

-    * build of the library with the compiler you are using.  *This* build was

-    * build using Watcom and applications must also be built using Watcom!

-    */

-#    define PNGCAPI __watcall

-#  endif

-

-#  if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))

-#    define PNGCAPI __cdecl

-#    if PNG_API_RULE == 1

-   /* If this line results in an error __stdcall is not understood and

-    * PNG_API_RULE should not have been set to '1'.

-    */

-#      define PNGAPI __stdcall

-#    endif

-#  else

-   /* An older compiler, or one not detected (erroneously) above,

-    * if necessary override on the command line to get the correct

-    * variants for the compiler.

-    */

-#    ifndef PNGCAPI

-#      define PNGCAPI _cdecl

-#    endif

-#    if PNG_API_RULE == 1 && !defined(PNGAPI)

-#      define PNGAPI _stdcall

-#    endif

-#  endif /* compiler/api */

-

-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */

-

-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)

-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"

-#  endif

-

-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\

-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)

-   /* older Borland and MSC

-    * compilers used '__export' and required this to be after

-    * the type.

-    */

-#    ifndef PNG_EXPORT_TYPE

-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP

-#    endif

-#    define PNG_DLL_EXPORT __export

-#  else /* newer compiler */

-#    define PNG_DLL_EXPORT __declspec(dllexport)

-#    ifndef PNG_DLL_IMPORT

-#      define PNG_DLL_IMPORT __declspec(dllimport)

-#    endif

-#  endif /* compiler */

-

-#else /* !Windows */

-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)

-#    define PNGAPI _System

-#  else /* !Windows/x86 && !OS/2 */

-   /* Use the defaults, or define PNG*API on the command line (but

-    * this will have to be done for every compile!)

-    */

-#  endif /* other system, !OS/2 */

-#endif /* !Windows/x86 */

-

-/* Now do all the defaulting . */

-#ifndef PNGCAPI

-#  define PNGCAPI

-#endif

-#ifndef PNGCBAPI

-#  define PNGCBAPI PNGCAPI

-#endif

-#ifndef PNGAPI

-#  define PNGAPI PNGCAPI

-#endif

-

-/* PNG_IMPEXP may be set on the compilation system command line or (if not set)

- * then in an internal header file when building the library, otherwise (when

- * using the library) it is set here.

- */

-#ifndef PNG_IMPEXP

-#  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)

-   /* This forces use of a DLL, disallowing static linking */

-#    define PNG_IMPEXP PNG_DLL_IMPORT

-#  endif

-

-#  ifndef PNG_IMPEXP

-#    define PNG_IMPEXP

-#  endif

-#endif

-

-/* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat

- * 'attributes' as a storage class - the attributes go at the start of the

- * function definition, and attributes are always appended regardless of the

- * compiler.  This considerably simplifies these macros but may cause problems

- * if any compilers both need function attributes and fail to handle them as

- * a storage class (this is unlikely.)

- */

-#ifndef PNG_FUNCTION

-#  define PNG_FUNCTION(type, name, args, attributes) attributes type name args

-#endif

-

-#ifndef PNG_EXPORT_TYPE

-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type

-#endif

-

-   /* The ordinal value is only relevant when preprocessing png.h for symbol

-    * table entries, so we discard it here.  See the .dfn files in the

-    * scripts directory.

-    */

-

-#ifndef PNG_EXPORTA

-#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \

-      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \

-      PNG_LINKAGE_API attributes)

-#endif

-

-/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,

- * so make something non-empty to satisfy the requirement:

- */

-#define PNG_EMPTY /*empty list*/

-

-#define PNG_EXPORT(ordinal, type, name, args) \

-   PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)

-

-/* Use PNG_REMOVED to comment out a removed interface. */

-#ifndef PNG_REMOVED

-#  define PNG_REMOVED(ordinal, type, name, args, attributes)

-#endif

-

-#ifndef PNG_CALLBACK

-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)

-#endif

-

-/* Support for compiler specific function attributes.  These are used

- * so that where compiler support is available incorrect use of API

- * functions in png.h will generate compiler warnings.

- *

- * Added at libpng-1.2.41.

- */

-

-#ifndef PNG_NO_PEDANTIC_WARNINGS

-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED

-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED

-#  endif

-#endif

-

-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED

-  /* Support for compiler specific function attributes.  These are used

-   * so that where compiler support is available, incorrect use of API

-   * functions in png.h will generate compiler warnings.  Added at libpng

-   * version 1.2.41.  Disabling these removes the warnings but may also produce

-   * less efficient code.

-   */

-#  if defined(__clang__) && defined(__has_attribute)

-   /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */

-#    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)

-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))

-#    endif

-#    if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)

-#      define PNG_NORETURN __attribute__((__noreturn__))

-#    endif

-#    if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)

-#      define PNG_ALLOCATED __attribute__((__malloc__))

-#    endif

-#    if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)

-#      define PNG_DEPRECATED __attribute__((__deprecated__))

-#    endif

-#    if !defined(PNG_PRIVATE)

-#      ifdef __has_extension

-#        if __has_extension(attribute_unavailable_with_message)

-#          define PNG_PRIVATE __attribute__((__unavailable__(\

-             "This function is not exported by libpng.")))

-#        endif

-#      endif

-#    endif

-#    ifndef PNG_RESTRICT

-#      define PNG_RESTRICT __restrict

-#    endif

-

-#  elif defined(__GNUC__)

-#    ifndef PNG_USE_RESULT

-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))

-#    endif

-#    ifndef PNG_NORETURN

-#      define PNG_NORETURN   __attribute__((__noreturn__))

-#    endif

-#    if __GNUC__ >= 3

-#      ifndef PNG_ALLOCATED

-#        define PNG_ALLOCATED  __attribute__((__malloc__))

-#      endif

-#      ifndef PNG_DEPRECATED

-#        define PNG_DEPRECATED __attribute__((__deprecated__))

-#      endif

-#      ifndef PNG_PRIVATE

-#        if 0 /* Doesn't work so we use deprecated instead*/

-#          define PNG_PRIVATE \

-            __attribute__((warning("This function is not exported by libpng.")))

-#        else

-#          define PNG_PRIVATE \

-            __attribute__((__deprecated__))

-#        endif

-#      endif

-#      if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))

-#        ifndef PNG_RESTRICT

-#          define PNG_RESTRICT __restrict

-#        endif

-#      endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */

-#    endif /* __GNUC__ >= 3 */

-

-#  elif defined(_MSC_VER)  && (_MSC_VER >= 1300)

-#    ifndef PNG_USE_RESULT

-#      define PNG_USE_RESULT /* not supported */

-#    endif

-#    ifndef PNG_NORETURN

-#      define PNG_NORETURN   __declspec(noreturn)

-#    endif

-#    ifndef PNG_ALLOCATED

-#      if (_MSC_VER >= 1400)

-#        define PNG_ALLOCATED __declspec(restrict)

-#      endif

-#    endif

-#    ifndef PNG_DEPRECATED

-#      define PNG_DEPRECATED __declspec(deprecated)

-#    endif

-#    ifndef PNG_PRIVATE

-#      define PNG_PRIVATE __declspec(deprecated)

-#    endif

-#    ifndef PNG_RESTRICT

-#      if (_MSC_VER >= 1400)

-#        define PNG_RESTRICT __restrict

-#      endif

-#    endif

-

-#  elif defined(__WATCOMC__)

-#    ifndef PNG_RESTRICT

-#      define PNG_RESTRICT __restrict

-#    endif

-#  endif

-#endif /* PNG_PEDANTIC_WARNINGS */

-

-#ifndef PNG_DEPRECATED

-#  define PNG_DEPRECATED  /* Use of this function is deprecated */

-#endif

-#ifndef PNG_USE_RESULT

-#  define PNG_USE_RESULT  /* The result of this function must be checked */

-#endif

-#ifndef PNG_NORETURN

-#  define PNG_NORETURN    /* This function does not return */

-#endif

-#ifndef PNG_ALLOCATED

-#  define PNG_ALLOCATED   /* The result of the function is new memory */

-#endif

-#ifndef PNG_PRIVATE

-#  define PNG_PRIVATE     /* This is a private libpng function */

-#endif

-#ifndef PNG_RESTRICT

-#  define PNG_RESTRICT    /* The C99 "restrict" feature */

-#endif

-

-#ifndef PNG_FP_EXPORT     /* A floating point API. */

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-#     define PNG_FP_EXPORT(ordinal, type, name, args)\

-         PNG_EXPORT(ordinal, type, name, args);

-#  else                   /* No floating point APIs */

-#     define PNG_FP_EXPORT(ordinal, type, name, args)

-#  endif

-#endif

-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\

-         PNG_EXPORT(ordinal, type, name, args);

-#  else                   /* No fixed point APIs */

-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)

-#  endif

-#endif

-

-#ifndef PNG_BUILDING_SYMBOL_TABLE

-/* Some typedefs to get us started.  These should be safe on most of the common

- * platforms.

- *

- * png_uint_32 and png_int_32 may, currently, be larger than required to hold a

- * 32-bit value however this is not normally advisable.

- *

- * png_uint_16 and png_int_16 should always be two bytes in size - this is

- * verified at library build time.

- *

- * png_byte must always be one byte in size.

- *

- * The checks below use constants from limits.h, as defined by the ISOC90

- * standard.

- */

-#if CHAR_BIT == 8 && UCHAR_MAX == 255

-   typedef unsigned char png_byte;

-#else

-#  error "libpng requires 8-bit bytes"

-#endif

-

-#if INT_MIN == -32768 && INT_MAX == 32767

-   typedef int png_int_16;

-#elif SHRT_MIN == -32768 && SHRT_MAX == 32767

-   typedef short png_int_16;

-#else

-#  error "libpng requires a signed 16-bit type"

-#endif

-

-#if UINT_MAX == 65535

-   typedef unsigned int png_uint_16;

-#elif USHRT_MAX == 65535

-   typedef unsigned short png_uint_16;

-#else

-#  error "libpng requires an unsigned 16-bit type"

-#endif

-

-#if INT_MIN < -2147483646 && INT_MAX > 2147483646

-   typedef int png_int_32;

-#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646

-   typedef long int png_int_32;

-#else

-#  error "libpng requires a signed 32-bit (or more) type"

-#endif

-

-#if UINT_MAX > 4294967294U

-   typedef unsigned int png_uint_32;

-#elif ULONG_MAX > 4294967294U

-   typedef unsigned long int png_uint_32;

-#else

-#  error "libpng requires an unsigned 32-bit (or more) type"

-#endif

-

-/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,

- * requires an ISOC90 compiler and relies on consistent behavior of sizeof.

- */

-typedef size_t png_size_t;

-typedef ptrdiff_t png_ptrdiff_t;

-

-/* libpng needs to know the maximum value of 'size_t' and this controls the

- * definition of png_alloc_size_t, below.  This maximum value of size_t limits

- * but does not control the maximum allocations the library makes - there is

- * direct application control of this through png_set_user_limits().

- */

-#ifndef PNG_SMALL_SIZE_T

-   /* Compiler specific tests for systems where size_t is known to be less than

-    * 32 bits (some of these systems may no longer work because of the lack of

-    * 'far' support; see above.)

-    */

-#  if (defined(__TURBOC__) && !defined(__FLAT__)) ||\

-   (defined(_MSC_VER) && defined(MAXSEG_64K))

-#     define PNG_SMALL_SIZE_T

-#  endif

-#endif

-

-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no

- * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to

- * png_alloc_size_t are not necessary; in fact, it is recommended not to use

- * them at all so that the compiler can complain when something turns out to be

- * problematic.

- *

- * Casts in the other direction (from png_alloc_size_t to png_size_t or

- * png_uint_32) should be explicitly applied; however, we do not expect to

- * encounter practical situations that require such conversions.

- *

- * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than

- * 4294967295 - i.e. less than the maximum value of png_uint_32.

- */

-#ifdef PNG_SMALL_SIZE_T

-   typedef png_uint_32 png_alloc_size_t;

-#else

-   typedef png_size_t png_alloc_size_t;

-#endif

-

-/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler

- * implementations of Intel CPU specific support of user-mode segmented address

- * spaces, where 16-bit pointers address more than 65536 bytes of memory using

- * separate 'segment' registers.  The implementation requires two different

- * types of pointer (only one of which includes the segment value.)

- *

- * If required this support is available in version 1.2 of libpng and may be

- * available in versions through 1.5, although the correctness of the code has

- * not been verified recently.

- */

-

-/* Typedef for floating-point numbers that are converted to fixed-point with a

- * multiple of 100,000, e.g., gamma

- */

-typedef png_int_32 png_fixed_point;

-

-/* Add typedefs for pointers */

-typedef void                  * png_voidp;

-typedef const void            * png_const_voidp;

-typedef png_byte              * png_bytep;

-typedef const png_byte        * png_const_bytep;

-typedef png_uint_32           * png_uint_32p;

-typedef const png_uint_32     * png_const_uint_32p;

-typedef png_int_32            * png_int_32p;

-typedef const png_int_32      * png_const_int_32p;

-typedef png_uint_16           * png_uint_16p;

-typedef const png_uint_16     * png_const_uint_16p;

-typedef png_int_16            * png_int_16p;

-typedef const png_int_16      * png_const_int_16p;

-typedef char                  * png_charp;

-typedef const char            * png_const_charp;

-typedef png_fixed_point       * png_fixed_point_p;

-typedef const png_fixed_point * png_const_fixed_point_p;

-typedef png_size_t            * png_size_tp;

-typedef const png_size_t      * png_const_size_tp;

-

-#ifdef PNG_STDIO_SUPPORTED

-typedef FILE            * png_FILE_p;

-#endif

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-typedef double       * png_doublep;

-typedef const double * png_const_doublep;

-#endif

-

-/* Pointers to pointers; i.e. arrays */

-typedef png_byte        * * png_bytepp;

-typedef png_uint_32     * * png_uint_32pp;

-typedef png_int_32      * * png_int_32pp;

-typedef png_uint_16     * * png_uint_16pp;

-typedef png_int_16      * * png_int_16pp;

-typedef const char      * * png_const_charpp;

-typedef char            * * png_charpp;

-typedef png_fixed_point * * png_fixed_point_pp;

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-typedef double          * * png_doublepp;

-#endif

-

-/* Pointers to pointers to pointers; i.e., pointer to array */

-typedef char            * * * png_charppp;

-

-#endif /* PNG_BUILDING_SYMBOL_TABLE */

-

-#endif /* PNGCONF_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngdebug.h b/plugins/AdvaImg/src/LibPNG/pngdebug.h
deleted file mode 100644
index 3d1e78c16e..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngdebug.h
+++ /dev/null
@@ -1,153 +0,0 @@
-

-/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c

- *

- * Last changed in libpng 1.6.8 [December 19, 2013]

- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-/* Define PNG_DEBUG at compile time for debugging information.  Higher

- * numbers for PNG_DEBUG mean more debugging information.  This has

- * only been added since version 0.95 so it is not implemented throughout

- * libpng yet, but more support will be added as needed.

- *

- * png_debug[1-2]?(level, message ,arg{0-2})

- *   Expands to a statement (either a simple expression or a compound

- *   do..while(0) statement) that outputs a message with parameter

- *   substitution if PNG_DEBUG is defined to 2 or more.  If PNG_DEBUG

- *   is undefined, 0 or 1 every png_debug expands to a simple expression

- *   (actually ((void)0)).

- *

- *   level: level of detail of message, starting at 0.  A level 'n'

- *          message is preceded by 'n' 3-space indentations (not implemented

- *          on Microsoft compilers unless PNG_DEBUG_FILE is also

- *          defined, to allow debug DLL compilation with no standard IO).

- *   message: a printf(3) style text string.  A trailing '\n' is added

- *            to the message.

- *   arg: 0 to 2 arguments for printf(3) style substitution in message.

- */

-#ifndef PNGDEBUG_H

-#define PNGDEBUG_H

-/* These settings control the formatting of messages in png.c and pngerror.c */

-/* Moved to pngdebug.h at 1.5.0 */

-#  ifndef PNG_LITERAL_SHARP

-#    define PNG_LITERAL_SHARP 0x23

-#  endif

-#  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET

-#    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b

-#  endif

-#  ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET

-#    define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d

-#  endif

-#  ifndef PNG_STRING_NEWLINE

-#    define PNG_STRING_NEWLINE "\n"

-#  endif

-

-#ifdef PNG_DEBUG

-#  if (PNG_DEBUG > 0)

-#    if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)

-#      include <crtdbg.h>

-#      if (PNG_DEBUG > 1)

-#        ifndef _DEBUG

-#          define _DEBUG

-#        endif

-#        ifndef png_debug

-#          define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)

-#        endif

-#        ifndef png_debug1

-#          define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)

-#        endif

-#        ifndef png_debug2

-#          define png_debug2(l,m,p1,p2) \

-             _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)

-#        endif

-#      endif

-#    else /* PNG_DEBUG_FILE || !_MSC_VER */

-#      ifndef PNG_STDIO_SUPPORTED

-#        include <stdio.h> /* not included yet */

-#      endif

-#      ifndef PNG_DEBUG_FILE

-#        define PNG_DEBUG_FILE stderr

-#      endif /* PNG_DEBUG_FILE */

-

-#      if (PNG_DEBUG > 1)

-#        ifdef __STDC__

-#          ifndef png_debug

-#            define png_debug(l,m) \

-       do { \

-       int num_tabs=l; \

-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \

-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : "")))); \

-       } while (0)

-#          endif

-#          ifndef png_debug1

-#            define png_debug1(l,m,p1) \

-       do { \

-       int num_tabs=l; \

-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \

-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1); \

-       } while (0)

-#          endif

-#          ifndef png_debug2

-#            define png_debug2(l,m,p1,p2) \

-       do { \

-       int num_tabs=l; \

-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \

-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1,p2);\

-       } while (0)

-#          endif

-#        else /* __STDC __ */

-#          ifndef png_debug

-#            define png_debug(l,m) \

-       do { \

-       int num_tabs=l; \

-       char format[256]; \

-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \

-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \

-         m,PNG_STRING_NEWLINE); \

-       fprintf(PNG_DEBUG_FILE,format); \

-       } while (0)

-#          endif

-#          ifndef png_debug1

-#            define png_debug1(l,m,p1) \

-       do { \

-       int num_tabs=l; \

-       char format[256]; \

-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \

-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \

-         m,PNG_STRING_NEWLINE); \

-       fprintf(PNG_DEBUG_FILE,format,p1); \

-       } while (0)

-#          endif

-#          ifndef png_debug2

-#            define png_debug2(l,m,p1,p2) \

-       do { \

-       int num_tabs=l; \

-       char format[256]; \

-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \

-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \

-         m,PNG_STRING_NEWLINE); \

-       fprintf(PNG_DEBUG_FILE,format,p1,p2); \

-       } while (0)

-#          endif

-#        endif /* __STDC __ */

-#      endif /* (PNG_DEBUG > 1) */

-

-#    endif /* _MSC_VER */

-#  endif /* (PNG_DEBUG > 0) */

-#endif /* PNG_DEBUG */

-#ifndef png_debug

-#  define png_debug(l, m) ((void)0)

-#endif

-#ifndef png_debug1

-#  define png_debug1(l, m, p1) ((void)0)

-#endif

-#ifndef png_debug2

-#  define png_debug2(l, m, p1, p2) ((void)0)

-#endif

-#endif /* PNGDEBUG_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngerror.c b/plugins/AdvaImg/src/LibPNG/pngerror.c
deleted file mode 100644
index bf6edd6db0..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngerror.c
+++ /dev/null
@@ -1,963 +0,0 @@
-

-/* pngerror.c - stub functions for i/o and memory allocation

- *

- * Last changed in libpng 1.6.31 [July 27, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file provides a location for all error handling.  Users who

- * need special error handling are expected to write replacement functions

- * and use png_set_error_fn() to use those functions.  See the instructions

- * at each function.

- */

-

-#include "pngpriv.h"

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-

-static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,

-    png_const_charp error_message)),PNG_NORETURN);

-

-#ifdef PNG_WARNINGS_SUPPORTED

-static void /* PRIVATE */

-png_default_warning PNGARG((png_const_structrp png_ptr,

-    png_const_charp warning_message));

-#endif /* WARNINGS */

-

-/* This function is called whenever there is a fatal error.  This function

- * should not be changed.  If there is a need to handle errors differently,

- * you should supply a replacement error function and use png_set_error_fn()

- * to replace the error function at run-time.

- */

-#ifdef PNG_ERROR_TEXT_SUPPORTED

-PNG_FUNCTION(void,PNGAPI

-png_error,(png_const_structrp png_ptr, png_const_charp error_message),

-    PNG_NORETURN)

-{

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-   char msg[16];

-   if (png_ptr != NULL)

-   {

-      if ((png_ptr->flags &

-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)

-      {

-         if (*error_message == PNG_LITERAL_SHARP)

-         {

-            /* Strip "#nnnn " from beginning of error message. */

-            int offset;

-            for (offset = 1; offset<15; offset++)

-               if (error_message[offset] == ' ')

-                  break;

-

-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)

-            {

-               int i;

-               for (i = 0; i < offset - 1; i++)

-                  msg[i] = error_message[i + 1];

-               msg[i - 1] = '\0';

-               error_message = msg;

-            }

-

-            else

-               error_message += offset;

-         }

-

-         else

-         {

-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)

-            {

-               msg[0] = '0';

-               msg[1] = '\0';

-               error_message = msg;

-            }

-         }

-      }

-   }

-#endif

-   if (png_ptr != NULL && png_ptr->error_fn != NULL)

-      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),

-          error_message);

-

-   /* If the custom handler doesn't exist, or if it returns,

-      use the default handler, which will not return. */

-   png_default_error(png_ptr, error_message);

-}

-#else

-PNG_FUNCTION(void,PNGAPI

-png_err,(png_const_structrp png_ptr),PNG_NORETURN)

-{

-   /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed

-    * erroneously as '\0', instead of the empty string "".  This was

-    * apparently an error, introduced in libpng-1.2.20, and png_default_error

-    * will crash in this case.

-    */

-   if (png_ptr != NULL && png_ptr->error_fn != NULL)

-      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr), "");

-

-   /* If the custom handler doesn't exist, or if it returns,

-      use the default handler, which will not return. */

-   png_default_error(png_ptr, "");

-}

-#endif /* ERROR_TEXT */

-

-/* Utility to safely appends strings to a buffer.  This never errors out so

- * error checking is not required in the caller.

- */

-size_t

-png_safecat(png_charp buffer, size_t bufsize, size_t pos,

-    png_const_charp string)

-{

-   if (buffer != NULL && pos < bufsize)

-   {

-      if (string != NULL)

-         while (*string != '\0' && pos < bufsize-1)

-           buffer[pos++] = *string++;

-

-      buffer[pos] = '\0';

-   }

-

-   return pos;

-}

-

-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)

-/* Utility to dump an unsigned value into a buffer, given a start pointer and

- * and end pointer (which should point just *beyond* the end of the buffer!)

- * Returns the pointer to the start of the formatted string.

- */

-png_charp

-png_format_number(png_const_charp start, png_charp end, int format,

-    png_alloc_size_t number)

-{

-   int count = 0;    /* number of digits output */

-   int mincount = 1; /* minimum number required */

-   int output = 0;   /* digit output (for the fixed point format) */

-

-   *--end = '\0';

-

-   /* This is written so that the loop always runs at least once, even with

-    * number zero.

-    */

-   while (end > start && (number != 0 || count < mincount))

-   {

-

-      static const char digits[] = "0123456789ABCDEF";

-

-      switch (format)

-      {

-         case PNG_NUMBER_FORMAT_fixed:

-            /* Needs five digits (the fraction) */

-            mincount = 5;

-            if (output != 0 || number % 10 != 0)

-            {

-               *--end = digits[number % 10];

-               output = 1;

-            }

-            number /= 10;

-            break;

-

-         case PNG_NUMBER_FORMAT_02u:

-            /* Expects at least 2 digits. */

-            mincount = 2;

-            /* FALLTHROUGH */

-

-         case PNG_NUMBER_FORMAT_u:

-            *--end = digits[number % 10];

-            number /= 10;

-            break;

-

-         case PNG_NUMBER_FORMAT_02x:

-            /* This format expects at least two digits */

-            mincount = 2;

-            /* FALLTHROUGH */

-

-         case PNG_NUMBER_FORMAT_x:

-            *--end = digits[number & 0xf];

-            number >>= 4;

-            break;

-

-         default: /* an error */

-            number = 0;

-            break;

-      }

-

-      /* Keep track of the number of digits added */

-      ++count;

-

-      /* Float a fixed number here: */

-      if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))

-      {

-         /* End of the fraction, but maybe nothing was output?  In that case

-          * drop the decimal point.  If the number is a true zero handle that

-          * here.

-          */

-         if (output != 0)

-            *--end = '.';

-         else if (number == 0) /* and !output */

-            *--end = '0';

-      }

-   }

-

-   return end;

-}

-#endif

-

-#ifdef PNG_WARNINGS_SUPPORTED

-/* This function is called whenever there is a non-fatal error.  This function

- * should not be changed.  If there is a need to handle warnings differently,

- * you should supply a replacement warning function and use

- * png_set_error_fn() to replace the warning function at run-time.

- */

-void PNGAPI

-png_warning(png_const_structrp png_ptr, png_const_charp warning_message)

-{

-   int offset = 0;

-   if (png_ptr != NULL)

-   {

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-   if ((png_ptr->flags &

-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)

-#endif

-      {

-         if (*warning_message == PNG_LITERAL_SHARP)

-         {

-            for (offset = 1; offset < 15; offset++)

-               if (warning_message[offset] == ' ')

-                  break;

-         }

-      }

-   }

-   if (png_ptr != NULL && png_ptr->warning_fn != NULL)

-      (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),

-          warning_message + offset);

-   else

-      png_default_warning(png_ptr, warning_message + offset);

-}

-

-/* These functions support 'formatted' warning messages with up to

- * PNG_WARNING_PARAMETER_COUNT parameters.  In the format string the parameter

- * is introduced by @<number>, where 'number' starts at 1.  This follows the

- * standard established by X/Open for internationalizable error messages.

- */

-void

-png_warning_parameter(png_warning_parameters p, int number,

-    png_const_charp string)

-{

-   if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)

-      (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);

-}

-

-void

-png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,

-    png_alloc_size_t value)

-{

-   char buffer[PNG_NUMBER_BUFFER_SIZE];

-   png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));

-}

-

-void

-png_warning_parameter_signed(png_warning_parameters p, int number, int format,

-    png_int_32 value)

-{

-   png_alloc_size_t u;

-   png_charp str;

-   char buffer[PNG_NUMBER_BUFFER_SIZE];

-

-   /* Avoid overflow by doing the negate in a png_alloc_size_t: */

-   u = (png_alloc_size_t)value;

-   if (value < 0)

-      u = ~u + 1;

-

-   str = PNG_FORMAT_NUMBER(buffer, format, u);

-

-   if (value < 0 && str > buffer)

-      *--str = '-';

-

-   png_warning_parameter(p, number, str);

-}

-

-void

-png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,

-    png_const_charp message)

-{

-   /* The internal buffer is just 192 bytes - enough for all our messages,

-    * overflow doesn't happen because this code checks!  If someone figures

-    * out how to send us a message longer than 192 bytes, all that will

-    * happen is that the message will be truncated appropriately.

-    */

-   size_t i = 0; /* Index in the msg[] buffer: */

-   char msg[192];

-

-   /* Each iteration through the following loop writes at most one character

-    * to msg[i++] then returns here to validate that there is still space for

-    * the trailing '\0'.  It may (in the case of a parameter) read more than

-    * one character from message[]; it must check for '\0' and continue to the

-    * test if it finds the end of string.

-    */

-   while (i<(sizeof msg)-1 && *message != '\0')

-   {

-      /* '@' at end of string is now just printed (previously it was skipped);

-       * it is an error in the calling code to terminate the string with @.

-       */

-      if (p != NULL && *message == '@' && message[1] != '\0')

-      {

-         int parameter_char = *++message; /* Consume the '@' */

-         static const char valid_parameters[] = "123456789";

-         int parameter = 0;

-

-         /* Search for the parameter digit, the index in the string is the

-          * parameter to use.

-          */

-         while (valid_parameters[parameter] != parameter_char &&

-            valid_parameters[parameter] != '\0')

-            ++parameter;

-

-         /* If the parameter digit is out of range it will just get printed. */

-         if (parameter < PNG_WARNING_PARAMETER_COUNT)

-         {

-            /* Append this parameter */

-            png_const_charp parm = p[parameter];

-            png_const_charp pend = p[parameter] + (sizeof p[parameter]);

-

-            /* No need to copy the trailing '\0' here, but there is no guarantee

-             * that parm[] has been initialized, so there is no guarantee of a

-             * trailing '\0':

-             */

-            while (i<(sizeof msg)-1 && *parm != '\0' && parm < pend)

-               msg[i++] = *parm++;

-

-            /* Consume the parameter digit too: */

-            ++message;

-            continue;

-         }

-

-         /* else not a parameter and there is a character after the @ sign; just

-          * copy that.  This is known not to be '\0' because of the test above.

-          */

-      }

-

-      /* At this point *message can't be '\0', even in the bad parameter case

-       * above where there is a lone '@' at the end of the message string.

-       */

-      msg[i++] = *message++;

-   }

-

-   /* i is always less than (sizeof msg), so: */

-   msg[i] = '\0';

-

-   /* And this is the formatted message. It may be larger than

-    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these

-    * are not (currently) formatted.

-    */

-   png_warning(png_ptr, msg);

-}

-#endif /* WARNINGS */

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-void PNGAPI

-png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)

-{

-   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)

-   {

-#     ifdef PNG_READ_SUPPORTED

-         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&

-            png_ptr->chunk_name != 0)

-            png_chunk_warning(png_ptr, error_message);

-         else

-#     endif

-      png_warning(png_ptr, error_message);

-   }

-

-   else

-   {

-#     ifdef PNG_READ_SUPPORTED

-         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&

-            png_ptr->chunk_name != 0)

-            png_chunk_error(png_ptr, error_message);

-         else

-#     endif

-      png_error(png_ptr, error_message);

-   }

-

-#  ifndef PNG_ERROR_TEXT_SUPPORTED

-      PNG_UNUSED(error_message)

-#  endif

-}

-

-void /* PRIVATE */

-png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)

-{

-   if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)

-      png_warning(png_ptr, error_message);

-   else

-      png_error(png_ptr, error_message);

-

-#  ifndef PNG_ERROR_TEXT_SUPPORTED

-      PNG_UNUSED(error_message)

-#  endif

-}

-

-void /* PRIVATE */

-png_app_error(png_const_structrp png_ptr, png_const_charp error_message)

-{

-   if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)

-      png_warning(png_ptr, error_message);

-   else

-      png_error(png_ptr, error_message);

-

-#  ifndef PNG_ERROR_TEXT_SUPPORTED

-      PNG_UNUSED(error_message)

-#  endif

-}

-#endif /* BENIGN_ERRORS */

-

-#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */

-#if defined(PNG_WARNINGS_SUPPORTED) || \

-   (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED))

-/* These utilities are used internally to build an error message that relates

- * to the current chunk.  The chunk name comes from png_ptr->chunk_name,

- * which is used to prefix the message.  The message is limited in length

- * to 63 bytes. The name characters are output as hex digits wrapped in []

- * if the character is invalid.

- */

-#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))

-static PNG_CONST char png_digit[16] = {

-   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',

-   'A', 'B', 'C', 'D', 'E', 'F'

-};

-

-static void /* PRIVATE */

-png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp

-    error_message)

-{

-   png_uint_32 chunk_name = png_ptr->chunk_name;

-   int iout = 0, ishift = 24;

-

-   while (ishift >= 0)

-   {

-      int c = (int)(chunk_name >> ishift) & 0xff;

-

-      ishift -= 8;

-      if (isnonalpha(c) != 0)

-      {

-         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;

-         buffer[iout++] = png_digit[(c & 0xf0) >> 4];

-         buffer[iout++] = png_digit[c & 0x0f];

-         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;

-      }

-

-      else

-      {

-         buffer[iout++] = (char)c;

-      }

-   }

-

-   if (error_message == NULL)

-      buffer[iout] = '\0';

-

-   else

-   {

-      int iin = 0;

-

-      buffer[iout++] = ':';

-      buffer[iout++] = ' ';

-

-      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')

-         buffer[iout++] = error_message[iin++];

-

-      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */

-      buffer[iout] = '\0';

-   }

-}

-#endif /* WARNINGS || ERROR_TEXT */

-

-#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)

-PNG_FUNCTION(void,PNGAPI

-png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),

-    PNG_NORETURN)

-{

-   char msg[18+PNG_MAX_ERROR_TEXT];

-   if (png_ptr == NULL)

-      png_error(png_ptr, error_message);

-

-   else

-   {

-      png_format_buffer(png_ptr, msg, error_message);

-      png_error(png_ptr, msg);

-   }

-}

-#endif /* READ && ERROR_TEXT */

-

-#ifdef PNG_WARNINGS_SUPPORTED

-void PNGAPI

-png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)

-{

-   char msg[18+PNG_MAX_ERROR_TEXT];

-   if (png_ptr == NULL)

-      png_warning(png_ptr, warning_message);

-

-   else

-   {

-      png_format_buffer(png_ptr, msg, warning_message);

-      png_warning(png_ptr, msg);

-   }

-}

-#endif /* WARNINGS */

-

-#ifdef PNG_READ_SUPPORTED

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-void PNGAPI

-png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp

-    error_message)

-{

-   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)

-      png_chunk_warning(png_ptr, error_message);

-

-   else

-      png_chunk_error(png_ptr, error_message);

-

-#  ifndef PNG_ERROR_TEXT_SUPPORTED

-      PNG_UNUSED(error_message)

-#  endif

-}

-#endif

-#endif /* READ */

-

-void /* PRIVATE */

-png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)

-{

-#  ifndef PNG_WARNINGS_SUPPORTED

-      PNG_UNUSED(message)

-#  endif

-

-   /* This is always supported, but for just read or just write it

-    * unconditionally does the right thing.

-    */

-#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)

-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)

-#  endif

-

-#  ifdef PNG_READ_SUPPORTED

-      {

-         if (error < PNG_CHUNK_ERROR)

-            png_chunk_warning(png_ptr, message);

-

-         else

-            png_chunk_benign_error(png_ptr, message);

-      }

-#  endif

-

-#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)

-      else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)

-#  endif

-

-#  ifdef PNG_WRITE_SUPPORTED

-      {

-         if (error < PNG_CHUNK_WRITE_ERROR)

-            png_app_warning(png_ptr, message);

-

-         else

-            png_app_error(png_ptr, message);

-      }

-#  endif

-}

-

-#ifdef PNG_ERROR_TEXT_SUPPORTED

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-PNG_FUNCTION(void,

-png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)

-{

-#  define fixed_message "fixed point overflow in "

-#  define fixed_message_ln ((sizeof fixed_message)-1)

-   unsigned int  iin;

-   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];

-   memcpy(msg, fixed_message, fixed_message_ln);

-   iin = 0;

-   if (name != NULL)

-      while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)

-      {

-         msg[fixed_message_ln + iin] = name[iin];

-         ++iin;

-      }

-   msg[fixed_message_ln + iin] = 0;

-   png_error(png_ptr, msg);

-}

-#endif

-#endif

-

-#ifdef PNG_SETJMP_SUPPORTED

-/* This API only exists if ANSI-C style error handling is used,

- * otherwise it is necessary for png_default_error to be overridden.

- */

-jmp_buf* PNGAPI

-png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,

-    size_t jmp_buf_size)

-{

-   /* From libpng 1.6.0 the app gets one chance to set a 'jmpbuf_size' value

-    * and it must not change after that.  Libpng doesn't care how big the

-    * buffer is, just that it doesn't change.

-    *

-    * If the buffer size is no *larger* than the size of jmp_buf when libpng is

-    * compiled a built in jmp_buf is returned; this preserves the pre-1.6.0

-    * semantics that this call will not fail.  If the size is larger, however,

-    * the buffer is allocated and this may fail, causing the function to return

-    * NULL.

-    */

-   if (png_ptr == NULL)

-      return NULL;

-

-   if (png_ptr->jmp_buf_ptr == NULL)

-   {

-      png_ptr->jmp_buf_size = 0; /* not allocated */

-

-      if (jmp_buf_size <= (sizeof png_ptr->jmp_buf_local))

-         png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local;

-

-      else

-      {

-         png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,

-             png_malloc_warn(png_ptr, jmp_buf_size));

-

-         if (png_ptr->jmp_buf_ptr == NULL)

-            return NULL; /* new NULL return on OOM */

-

-         png_ptr->jmp_buf_size = jmp_buf_size;

-      }

-   }

-

-   else /* Already allocated: check the size */

-   {

-      size_t size = png_ptr->jmp_buf_size;

-

-      if (size == 0)

-      {

-         size = (sizeof png_ptr->jmp_buf_local);

-         if (png_ptr->jmp_buf_ptr != &png_ptr->jmp_buf_local)

-         {

-            /* This is an internal error in libpng: somehow we have been left

-             * with a stack allocated jmp_buf when the application regained

-             * control.  It's always possible to fix this up, but for the moment

-             * this is a png_error because that makes it easy to detect.

-             */

-            png_error(png_ptr, "Libpng jmp_buf still allocated");

-            /* png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local; */

-         }

-      }

-

-      if (size != jmp_buf_size)

-      {

-         png_warning(png_ptr, "Application jmp_buf size changed");

-         return NULL; /* caller will probably crash: no choice here */

-      }

-   }

-

-   /* Finally fill in the function, now we have a satisfactory buffer. It is

-    * valid to change the function on every call.

-    */

-   png_ptr->longjmp_fn = longjmp_fn;

-   return png_ptr->jmp_buf_ptr;

-}

-

-void /* PRIVATE */

-png_free_jmpbuf(png_structrp png_ptr)

-{

-   if (png_ptr != NULL)

-   {

-      jmp_buf *jb = png_ptr->jmp_buf_ptr;

-

-      /* A size of 0 is used to indicate a local, stack, allocation of the

-       * pointer; used here and in png.c

-       */

-      if (jb != NULL && png_ptr->jmp_buf_size > 0)

-      {

-

-         /* This stuff is so that a failure to free the error control structure

-          * does not leave libpng in a state with no valid error handling: the

-          * free always succeeds, if there is an error it gets ignored.

-          */

-         if (jb != &png_ptr->jmp_buf_local)

-         {

-            /* Make an internal, libpng, jmp_buf to return here */

-            jmp_buf free_jmp_buf;

-

-            if (!setjmp(free_jmp_buf))

-            {

-               png_ptr->jmp_buf_ptr = &free_jmp_buf; /* come back here */

-               png_ptr->jmp_buf_size = 0; /* stack allocation */

-               png_ptr->longjmp_fn = longjmp;

-               png_free(png_ptr, jb); /* Return to setjmp on error */

-            }

-         }

-      }

-

-      /* *Always* cancel everything out: */

-      png_ptr->jmp_buf_size = 0;

-      png_ptr->jmp_buf_ptr = NULL;

-      png_ptr->longjmp_fn = 0;

-   }

-}

-#endif

-

-/* This is the default error handling function.  Note that replacements for

- * this function MUST NOT RETURN, or the program will likely crash.  This

- * function is used by default, or if the program supplies NULL for the

- * error function pointer in png_set_error_fn().

- */

-static PNG_FUNCTION(void /* PRIVATE */,

-png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),

-    PNG_NORETURN)

-{

-#ifdef PNG_CONSOLE_IO_SUPPORTED

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-   /* Check on NULL only added in 1.5.4 */

-   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)

-   {

-      /* Strip "#nnnn " from beginning of error message. */

-      int offset;

-      char error_number[16];

-      for (offset = 0; offset<15; offset++)

-      {

-         error_number[offset] = error_message[offset + 1];

-         if (error_message[offset] == ' ')

-            break;

-      }

-

-      if ((offset > 1) && (offset < 15))

-      {

-         error_number[offset - 1] = '\0';

-         fprintf(stderr, "libpng error no. %s: %s",

-             error_number, error_message + offset + 1);

-         fprintf(stderr, PNG_STRING_NEWLINE);

-      }

-

-      else

-      {

-         fprintf(stderr, "libpng error: %s, offset=%d",

-             error_message, offset);

-         fprintf(stderr, PNG_STRING_NEWLINE);

-      }

-   }

-   else

-#endif

-   {

-      fprintf(stderr, "libpng error: %s", error_message ? error_message :

-         "undefined");

-      fprintf(stderr, PNG_STRING_NEWLINE);

-   }

-#else

-   PNG_UNUSED(error_message) /* Make compiler happy */

-#endif

-   png_longjmp(png_ptr, 1);

-}

-

-PNG_FUNCTION(void,PNGAPI

-png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)

-{

-#ifdef PNG_SETJMP_SUPPORTED

-   if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&

-       png_ptr->jmp_buf_ptr != NULL)

-      png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(val)

-#endif

-

-   /* If control reaches this point, png_longjmp() must not return. The only

-    * choice is to terminate the whole process (or maybe the thread); to do

-    * this the ANSI-C abort() function is used unless a different method is

-    * implemented by overriding the default configuration setting for

-    * PNG_ABORT().

-    */

-   PNG_ABORT();

-}

-

-#ifdef PNG_WARNINGS_SUPPORTED

-/* This function is called when there is a warning, but the library thinks

- * it can continue anyway.  Replacement functions don't have to do anything

- * here if you don't want them to.  In the default configuration, png_ptr is

- * not used, but it is passed in case it may be useful.

- */

-static void /* PRIVATE */

-png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)

-{

-#ifdef PNG_CONSOLE_IO_SUPPORTED

-#  ifdef PNG_ERROR_NUMBERS_SUPPORTED

-   if (*warning_message == PNG_LITERAL_SHARP)

-   {

-      int offset;

-      char warning_number[16];

-      for (offset = 0; offset < 15; offset++)

-      {

-         warning_number[offset] = warning_message[offset + 1];

-         if (warning_message[offset] == ' ')

-            break;

-      }

-

-      if ((offset > 1) && (offset < 15))

-      {

-         warning_number[offset + 1] = '\0';

-         fprintf(stderr, "libpng warning no. %s: %s",

-             warning_number, warning_message + offset);

-         fprintf(stderr, PNG_STRING_NEWLINE);

-      }

-

-      else

-      {

-         fprintf(stderr, "libpng warning: %s",

-             warning_message);

-         fprintf(stderr, PNG_STRING_NEWLINE);

-      }

-   }

-   else

-#  endif

-

-   {

-      fprintf(stderr, "libpng warning: %s", warning_message);

-      fprintf(stderr, PNG_STRING_NEWLINE);

-   }

-#else

-   PNG_UNUSED(warning_message) /* Make compiler happy */

-#endif

-   PNG_UNUSED(png_ptr) /* Make compiler happy */

-}

-#endif /* WARNINGS */

-

-/* This function is called when the application wants to use another method

- * of handling errors and warnings.  Note that the error function MUST NOT

- * return to the calling routine or serious problems will occur.  The return

- * method used in the default routine calls longjmp(png_ptr->jmp_buf_ptr, 1)

- */

-void PNGAPI

-png_set_error_fn(png_structrp png_ptr, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warning_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->error_ptr = error_ptr;

-   png_ptr->error_fn = error_fn;

-#ifdef PNG_WARNINGS_SUPPORTED

-   png_ptr->warning_fn = warning_fn;

-#else

-   PNG_UNUSED(warning_fn)

-#endif

-}

-

-

-/* This function returns a pointer to the error_ptr associated with the user

- * functions.  The application should free any memory associated with this

- * pointer before png_write_destroy and png_read_destroy are called.

- */

-png_voidp PNGAPI

-png_get_error_ptr(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return NULL;

-

-   return ((png_voidp)png_ptr->error_ptr);

-}

-

-

-#ifdef PNG_ERROR_NUMBERS_SUPPORTED

-void PNGAPI

-png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)

-{

-   if (png_ptr != NULL)

-   {

-      png_ptr->flags &=

-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |

-         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);

-   }

-}

-#endif

-

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\

-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-   /* Currently the above both depend on SETJMP_SUPPORTED, however it would be

-    * possible to implement without setjmp support just so long as there is some

-    * way to handle the error return here:

-    */

-PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI

-png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),

-    PNG_NORETURN)

-{

-   const png_const_structrp png_ptr = png_nonconst_ptr;

-   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);

-

-   /* An error is always logged here, overwriting anything (typically a warning)

-    * that is already there:

-    */

-   if (image != NULL)

-   {

-      png_safecat(image->message, (sizeof image->message), 0, error_message);

-      image->warning_or_error |= PNG_IMAGE_ERROR;

-

-      /* Retrieve the jmp_buf from within the png_control, making this work for

-       * C++ compilation too is pretty tricky: C++ wants a pointer to the first

-       * element of a jmp_buf, but C doesn't tell us the type of that.

-       */

-      if (image->opaque != NULL && image->opaque->error_buf != NULL)

-         longjmp(png_control_jmp_buf(image->opaque), 1);

-

-      /* Missing longjmp buffer, the following is to help debugging: */

-      {

-         size_t pos = png_safecat(image->message, (sizeof image->message), 0,

-             "bad longjmp: ");

-         png_safecat(image->message, (sizeof image->message), pos,

-             error_message);

-      }

-   }

-

-   /* Here on an internal programming error. */

-   abort();

-}

-

-#ifdef PNG_WARNINGS_SUPPORTED

-void /* PRIVATE */ PNGCBAPI

-png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)

-{

-   const png_const_structrp png_ptr = png_nonconst_ptr;

-   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);

-

-   /* A warning is only logged if there is no prior warning or error. */

-   if (image->warning_or_error == 0)

-   {

-      png_safecat(image->message, (sizeof image->message), 0, warning_message);

-      image->warning_or_error |= PNG_IMAGE_WARNING;

-   }

-}

-#endif

-

-int /* PRIVATE */

-png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)

-{

-   volatile png_imagep image = image_in;

-   volatile int result;

-   volatile png_voidp saved_error_buf;

-   jmp_buf safe_jmpbuf;

-

-   /* Safely execute function(arg) with png_error returning to this function. */

-   saved_error_buf = image->opaque->error_buf;

-   result = setjmp(safe_jmpbuf) == 0;

-

-   if (result != 0)

-   {

-

-      image->opaque->error_buf = safe_jmpbuf;

-      result = function(arg);

-   }

-

-   image->opaque->error_buf = saved_error_buf;

-

-   /* And do the cleanup prior to any failure return. */

-   if (result == 0)

-      png_image_free(image);

-

-   return result;

-}

-#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngget.c b/plugins/AdvaImg/src/LibPNG/pngget.c
deleted file mode 100644
index c4a558b188..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngget.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-

-/* pngget.c - retrieval of values from info struct

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- */

-

-#include "pngpriv.h"

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-

-png_uint_32 PNGAPI

-png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_uint_32 flag)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return(info_ptr->valid & flag);

-

-   return(0);

-}

-

-png_size_t PNGAPI

-png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return(info_ptr->rowbytes);

-

-   return(0);

-}

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-png_bytepp PNGAPI

-png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return(info_ptr->row_pointers);

-

-   return(0);

-}

-#endif

-

-#ifdef PNG_EASY_ACCESS_SUPPORTED

-/* Easy access to info, added in libpng-0.99 */

-png_uint_32 PNGAPI

-png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->width;

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->height;

-

-   return (0);

-}

-

-png_byte PNGAPI

-png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->bit_depth;

-

-   return (0);

-}

-

-png_byte PNGAPI

-png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->color_type;

-

-   return (0);

-}

-

-png_byte PNGAPI

-png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->filter_type;

-

-   return (0);

-}

-

-png_byte PNGAPI

-png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->interlace_type;

-

-   return (0);

-}

-

-png_byte PNGAPI

-png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return info_ptr->compression_type;

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp

-   info_ptr)

-{

-#ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-      {

-         png_debug1(1, "in %s retrieval function",

-             "png_get_x_pixels_per_meter");

-

-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)

-            return (info_ptr->x_pixels_per_unit);

-      }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp

-    info_ptr)

-{

-#ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function",

-          "png_get_y_pixels_per_meter");

-

-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)

-         return (info_ptr->y_pixels_per_unit);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-#ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");

-

-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&

-          info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)

-         return (info_ptr->x_pixels_per_unit);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-float PNGAPI

-png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp

-   info_ptr)

-{

-#ifdef PNG_READ_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");

-

-      if (info_ptr->x_pixels_per_unit != 0)

-         return ((float)((float)info_ptr->y_pixels_per_unit

-             /(float)info_ptr->x_pixels_per_unit));

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return ((float)0.0);

-}

-#endif

-

-#ifdef PNG_FIXED_POINT_SUPPORTED

-png_fixed_point PNGAPI

-png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,

-    png_const_inforp info_ptr)

-{

-#ifdef PNG_READ_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0 &&

-       info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&

-       info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&

-       info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)

-   {

-      png_fixed_point res;

-

-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");

-

-      /* The following casts work because a PNG 4 byte integer only has a valid

-       * range of 0..2^31-1; otherwise the cast might overflow.

-       */

-      if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,

-          (png_int_32)info_ptr->x_pixels_per_unit) != 0)

-         return res;

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return 0;

-}

-#endif

-

-png_int_32 PNGAPI

-png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-#ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_oFFs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");

-

-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)

-         return (info_ptr->x_offset);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-png_int_32 PNGAPI

-png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-#ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_oFFs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");

-

-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)

-         return (info_ptr->y_offset);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-png_int_32 PNGAPI

-png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-#ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_oFFs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");

-

-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)

-         return (info_ptr->x_offset);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-png_int_32 PNGAPI

-png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-#ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_oFFs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");

-

-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)

-         return (info_ptr->y_offset);

-   }

-#else

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(info_ptr)

-#endif

-

-   return (0);

-}

-

-#ifdef PNG_INCH_CONVERSIONS_SUPPORTED

-static png_uint_32

-ppi_from_ppm(png_uint_32 ppm)

-{

-#if 0

-   /* The conversion is *(2.54/100), in binary (32 digits):

-    * .00000110100000001001110101001001

-    */

-   png_uint_32 t1001, t1101;

-   ppm >>= 1;                  /* .1 */

-   t1001 = ppm + (ppm >> 3);   /* .1001 */

-   t1101 = t1001 + (ppm >> 1); /* .1101 */

-   ppm >>= 20;                 /* .000000000000000000001 */

-   t1101 += t1101 >> 15;       /* .1101000000000001101 */

-   t1001 >>= 11;               /* .000000000001001 */

-   t1001 += t1001 >> 12;       /* .000000000001001000000001001 */

-   ppm += t1001;               /* .000000000001001000001001001 */

-   ppm += t1101;               /* .110100000001001110101001001 */

-   return (ppm + 16) >> 5;/* .00000110100000001001110101001001 */

-#else

-   /* The argument is a PNG unsigned integer, so it is not permitted

-    * to be bigger than 2^31.

-    */

-   png_fixed_point result;

-   if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,

-       5000) != 0)

-      return (png_uint_32)result;

-

-   /* Overflow. */

-   return 0;

-#endif

-}

-

-png_uint_32 PNGAPI

-png_get_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));

-}

-

-png_uint_32 PNGAPI

-png_get_x_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));

-}

-

-png_uint_32 PNGAPI

-png_get_y_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));

-}

-

-#ifdef PNG_FIXED_POINT_SUPPORTED

-static png_fixed_point

-png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)

-{

-   /* Convert from metres * 1,000,000 to inches * 100,000, meters to

-    * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.

-    * Notice that this can overflow - a warning is output and 0 is

-    * returned.

-    */

-   return png_muldiv_warn(png_ptr, microns, 500, 127);

-}

-

-png_fixed_point PNGAPI

-png_get_x_offset_inches_fixed(png_const_structrp png_ptr,

-    png_const_inforp info_ptr)

-{

-   return png_fixed_inches_from_microns(png_ptr,

-       png_get_x_offset_microns(png_ptr, info_ptr));

-}

-#endif

-

-#ifdef PNG_FIXED_POINT_SUPPORTED

-png_fixed_point PNGAPI

-png_get_y_offset_inches_fixed(png_const_structrp png_ptr,

-    png_const_inforp info_ptr)

-{

-   return png_fixed_inches_from_microns(png_ptr,

-       png_get_y_offset_microns(png_ptr, info_ptr));

-}

-#endif

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-float PNGAPI

-png_get_x_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   /* To avoid the overflow do the conversion directly in floating

-    * point.

-    */

-   return (float)(png_get_x_offset_microns(png_ptr, info_ptr) * .00003937);

-}

-#endif

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-float PNGAPI

-png_get_y_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   /* To avoid the overflow do the conversion directly in floating

-    * point.

-    */

-   return (float)(png_get_y_offset_microns(png_ptr, info_ptr) * .00003937);

-}

-#endif

-

-#ifdef PNG_pHYs_SUPPORTED

-png_uint_32 PNGAPI

-png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)

-{

-   png_uint_32 retval = 0;

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "pHYs");

-

-      if (res_x != NULL)

-      {

-         *res_x = info_ptr->x_pixels_per_unit;

-         retval |= PNG_INFO_pHYs;

-      }

-

-      if (res_y != NULL)

-      {

-         *res_y = info_ptr->y_pixels_per_unit;

-         retval |= PNG_INFO_pHYs;

-      }

-

-      if (unit_type != NULL)

-      {

-         *unit_type = (int)info_ptr->phys_unit_type;

-         retval |= PNG_INFO_pHYs;

-

-         if (*unit_type == 1)

-         {

-            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);

-            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);

-         }

-      }

-   }

-

-   return (retval);

-}

-#endif /* pHYs */

-#endif /* INCH_CONVERSIONS */

-

-/* png_get_channels really belongs in here, too, but it's been around longer */

-

-#endif /* EASY_ACCESS */

-

-

-png_byte PNGAPI

-png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return(info_ptr->channels);

-

-   return (0);

-}

-

-#ifdef PNG_READ_SUPPORTED

-png_const_bytep PNGAPI

-png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return(info_ptr->signature);

-

-   return (NULL);

-}

-#endif

-

-#ifdef PNG_bKGD_SUPPORTED

-png_uint_32 PNGAPI

-png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_color_16p *background)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_bKGD) != 0 &&

-       background != NULL)

-   {

-      png_debug1(1, "in %s retrieval function", "bKGD");

-

-      *background = &(info_ptr->background);

-      return (PNG_INFO_bKGD);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_cHRM_SUPPORTED

-/* The XYZ APIs were added in 1.5.5 to take advantage of the code added at the

- * same time to correct the rgb grayscale coefficient defaults obtained from the

- * cHRM chunk in 1.5.4

- */

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    double *white_x, double *white_y, double *red_x, double *red_y,

-    double *green_x, double *green_y, double *blue_x, double *blue_y)

-{

-   /* Quiet API change: this code used to only return the end points if a cHRM

-    * chunk was present, but the end points can also come from iCCP or sRGB

-    * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and

-    * the png_set_ APIs merely check that set end points are mutually

-    * consistent.

-    */

-   if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "cHRM");

-

-      if (white_x != NULL)

-         *white_x = png_float(png_ptr,

-             info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");

-      if (white_y != NULL)

-         *white_y = png_float(png_ptr,

-             info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");

-      if (red_x != NULL)

-         *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,

-             "cHRM red X");

-      if (red_y != NULL)

-         *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,

-             "cHRM red Y");

-      if (green_x != NULL)

-         *green_x = png_float(png_ptr,

-             info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");

-      if (green_y != NULL)

-         *green_y = png_float(png_ptr,

-             info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");

-      if (blue_x != NULL)

-         *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,

-             "cHRM blue X");

-      if (blue_y != NULL)

-         *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,

-             "cHRM blue Y");

-      return (PNG_INFO_cHRM);

-   }

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    double *red_X, double *red_Y, double *red_Z, double *green_X,

-    double *green_Y, double *green_Z, double *blue_X, double *blue_Y,

-    double *blue_Z)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");

-

-      if (red_X != NULL)

-         *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,

-             "cHRM red X");

-      if (red_Y != NULL)

-         *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,

-             "cHRM red Y");

-      if (red_Z != NULL)

-         *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,

-             "cHRM red Z");

-      if (green_X != NULL)

-         *green_X = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");

-      if (green_Y != NULL)

-         *green_Y = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");

-      if (green_Z != NULL)

-         *green_Z = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");

-      if (blue_X != NULL)

-         *blue_X = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");

-      if (blue_Y != NULL)

-         *blue_Y = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");

-      if (blue_Z != NULL)

-         *blue_Z = png_float(png_ptr,

-             info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");

-      return (PNG_INFO_cHRM);

-   }

-

-   return (0);

-}

-#  endif

-

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,

-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,

-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,

-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,

-    png_fixed_point *int_blue_Z)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");

-

-      if (int_red_X != NULL)

-         *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;

-      if (int_red_Y != NULL)

-         *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;

-      if (int_red_Z != NULL)

-         *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;

-      if (int_green_X != NULL)

-         *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;

-      if (int_green_Y != NULL)

-         *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;

-      if (int_green_Z != NULL)

-         *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;

-      if (int_blue_X != NULL)

-         *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;

-      if (int_blue_Y != NULL)

-         *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;

-      if (int_blue_Z != NULL)

-         *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;

-      return (PNG_INFO_cHRM);

-   }

-

-   return (0);

-}

-

-png_uint_32 PNGAPI

-png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,

-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,

-    png_fixed_point *blue_x, png_fixed_point *blue_y)

-{

-   png_debug1(1, "in %s retrieval function", "cHRM");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

-   {

-      if (white_x != NULL)

-         *white_x = info_ptr->colorspace.end_points_xy.whitex;

-      if (white_y != NULL)

-         *white_y = info_ptr->colorspace.end_points_xy.whitey;

-      if (red_x != NULL)

-         *red_x = info_ptr->colorspace.end_points_xy.redx;

-      if (red_y != NULL)

-         *red_y = info_ptr->colorspace.end_points_xy.redy;

-      if (green_x != NULL)

-         *green_x = info_ptr->colorspace.end_points_xy.greenx;

-      if (green_y != NULL)

-         *green_y = info_ptr->colorspace.end_points_xy.greeny;

-      if (blue_x != NULL)

-         *blue_x = info_ptr->colorspace.end_points_xy.bluex;

-      if (blue_y != NULL)

-         *blue_y = info_ptr->colorspace.end_points_xy.bluey;

-      return (PNG_INFO_cHRM);

-   }

-

-   return (0);

-}

-#  endif

-#endif

-

-#ifdef PNG_gAMA_SUPPORTED

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_fixed_point *file_gamma)

-{

-   png_debug1(1, "in %s retrieval function", "gAMA");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&

-       file_gamma != NULL)

-   {

-      *file_gamma = info_ptr->colorspace.gamma;

-      return (PNG_INFO_gAMA);

-   }

-

-   return (0);

-}

-#  endif

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    double *file_gamma)

-{

-   png_debug1(1, "in %s retrieval function", "gAMA(float)");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&

-      file_gamma != NULL)

-   {

-      *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,

-          "png_get_gAMA");

-      return (PNG_INFO_gAMA);

-   }

-

-   return (0);

-}

-#  endif

-#endif

-

-#ifdef PNG_sRGB_SUPPORTED

-png_uint_32 PNGAPI

-png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    int *file_srgb_intent)

-{

-   png_debug1(1, "in %s retrieval function", "sRGB");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)

-   {

-      *file_srgb_intent = info_ptr->colorspace.rendering_intent;

-      return (PNG_INFO_sRGB);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_iCCP_SUPPORTED

-png_uint_32 PNGAPI

-png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_charpp name, int *compression_type,

-    png_bytepp profile, png_uint_32 *proflen)

-{

-   png_debug1(1, "in %s retrieval function", "iCCP");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_iCCP) != 0 &&

-       name != NULL && compression_type != NULL && profile != NULL &&

-           proflen != NULL)

-   {

-      *name = info_ptr->iccp_name;

-      *profile = info_ptr->iccp_profile;

-      *proflen = png_get_uint_32(info_ptr->iccp_profile);

-      /* This is somewhat irrelevant since the profile data returned has

-       * actually been uncompressed.

-       */

-      *compression_type = PNG_COMPRESSION_TYPE_BASE;

-      return (PNG_INFO_iCCP);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-int PNGAPI

-png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_sPLT_tpp spalettes)

-{

-   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)

-   {

-      *spalettes = info_ptr->splt_palettes;

-      return info_ptr->splt_palettes_num;

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_eXIf_SUPPORTED

-png_uint_32 PNGAPI

-png_get_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_bytep *exif)

-{

-  png_warning(png_ptr, "png_get_eXIf does not work; use png_get_eXIf_1");

-  PNG_UNUSED(info_ptr)

-  PNG_UNUSED(exif)

-  return 0;

-}

-

-png_uint_32 PNGAPI

-png_get_eXIf_1(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_uint_32 *num_exif, png_bytep *exif)

-{

-   png_debug1(1, "in %s retrieval function", "eXIf");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_eXIf) != 0 && exif != NULL)

-   {

-      *num_exif = info_ptr->num_exif;

-      *exif = info_ptr->exif;

-      return (PNG_INFO_eXIf);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_hIST_SUPPORTED

-png_uint_32 PNGAPI

-png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_uint_16p *hist)

-{

-   png_debug1(1, "in %s retrieval function", "hIST");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)

-   {

-      *hist = info_ptr->hist;

-      return (PNG_INFO_hIST);

-   }

-

-   return (0);

-}

-#endif

-

-png_uint_32 PNGAPI

-png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_uint_32 *width, png_uint_32 *height, int *bit_depth,

-    int *color_type, int *interlace_type, int *compression_type,

-    int *filter_type)

-{

-   png_debug1(1, "in %s retrieval function", "IHDR");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return (0);

-

-   if (width != NULL)

-       *width = info_ptr->width;

-

-   if (height != NULL)

-       *height = info_ptr->height;

-

-   if (bit_depth != NULL)

-       *bit_depth = info_ptr->bit_depth;

-

-   if (color_type != NULL)

-       *color_type = info_ptr->color_type;

-

-   if (compression_type != NULL)

-      *compression_type = info_ptr->compression_type;

-

-   if (filter_type != NULL)

-      *filter_type = info_ptr->filter_type;

-

-   if (interlace_type != NULL)

-      *interlace_type = info_ptr->interlace_type;

-

-   /* This is redundant if we can be sure that the info_ptr values were all

-    * assigned in png_set_IHDR().  We do the check anyhow in case an

-    * application has ignored our advice not to mess with the members

-    * of info_ptr directly.

-    */

-   png_check_IHDR(png_ptr, info_ptr->width, info_ptr->height,

-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,

-       info_ptr->compression_type, info_ptr->filter_type);

-

-   return (1);

-}

-

-#ifdef PNG_oFFs_SUPPORTED

-png_uint_32 PNGAPI

-png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)

-{

-   png_debug1(1, "in %s retrieval function", "oFFs");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_oFFs) != 0 &&

-       offset_x != NULL && offset_y != NULL && unit_type != NULL)

-   {

-      *offset_x = info_ptr->x_offset;

-      *offset_y = info_ptr->y_offset;

-      *unit_type = (int)info_ptr->offset_unit_type;

-      return (PNG_INFO_oFFs);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-png_uint_32 PNGAPI

-png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,

-    png_charp *units, png_charpp *params)

-{

-   png_debug1(1, "in %s retrieval function", "pCAL");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pCAL) != 0 &&

-       purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&

-       nparams != NULL && units != NULL && params != NULL)

-   {

-      *purpose = info_ptr->pcal_purpose;

-      *X0 = info_ptr->pcal_X0;

-      *X1 = info_ptr->pcal_X1;

-      *type = (int)info_ptr->pcal_type;

-      *nparams = (int)info_ptr->pcal_nparams;

-      *units = info_ptr->pcal_units;

-      *params = info_ptr->pcal_params;

-      return (PNG_INFO_pCAL);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_sCAL_SUPPORTED

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-#    if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \

-         defined(PNG_FLOATING_POINT_SUPPORTED)

-png_uint_32 PNGAPI

-png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    int *unit, png_fixed_point *width, png_fixed_point *height)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL) != 0)

-   {

-      *unit = info_ptr->scal_unit;

-      /*TODO: make this work without FP support; the API is currently eliminated

-       * if neither floating point APIs nor internal floating point arithmetic

-       * are enabled.

-       */

-      *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");

-      *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),

-          "sCAL height");

-      return (PNG_INFO_sCAL);

-   }

-

-   return(0);

-}

-#    endif /* FLOATING_ARITHMETIC */

-#  endif /* FIXED_POINT */

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    int *unit, double *width, double *height)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL) != 0)

-   {

-      *unit = info_ptr->scal_unit;

-      *width = atof(info_ptr->scal_s_width);

-      *height = atof(info_ptr->scal_s_height);

-      return (PNG_INFO_sCAL);

-   }

-

-   return(0);

-}

-#  endif /* FLOATING POINT */

-png_uint_32 PNGAPI

-png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    int *unit, png_charpp width, png_charpp height)

-{

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL) != 0)

-   {

-      *unit = info_ptr->scal_unit;

-      *width = info_ptr->scal_s_width;

-      *height = info_ptr->scal_s_height;

-      return (PNG_INFO_sCAL);

-   }

-

-   return(0);

-}

-#endif /* sCAL */

-

-#ifdef PNG_pHYs_SUPPORTED

-png_uint_32 PNGAPI

-png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,

-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)

-{

-   png_uint_32 retval = 0;

-

-   png_debug1(1, "in %s retrieval function", "pHYs");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      if (res_x != NULL)

-      {

-         *res_x = info_ptr->x_pixels_per_unit;

-         retval |= PNG_INFO_pHYs;

-      }

-

-      if (res_y != NULL)

-      {

-         *res_y = info_ptr->y_pixels_per_unit;

-         retval |= PNG_INFO_pHYs;

-      }

-

-      if (unit_type != NULL)

-      {

-         *unit_type = (int)info_ptr->phys_unit_type;

-         retval |= PNG_INFO_pHYs;

-      }

-   }

-

-   return (retval);

-}

-#endif /* pHYs */

-

-png_uint_32 PNGAPI

-png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_colorp *palette, int *num_palette)

-{

-   png_debug1(1, "in %s retrieval function", "PLTE");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)

-   {

-      *palette = info_ptr->palette;

-      *num_palette = info_ptr->num_palette;

-      png_debug1(3, "num_palette = %d", *num_palette);

-      return (PNG_INFO_PLTE);

-   }

-

-   return (0);

-}

-

-#ifdef PNG_sBIT_SUPPORTED

-png_uint_32 PNGAPI

-png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_color_8p *sig_bit)

-{

-   png_debug1(1, "in %s retrieval function", "sBIT");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)

-   {

-      *sig_bit = &(info_ptr->sig_bit);

-      return (PNG_INFO_sBIT);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED

-int PNGAPI

-png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_textp *text_ptr, int *num_text)

-{

-   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)

-   {

-      png_debug1(1, "in 0x%lx retrieval function",

-         (unsigned long)png_ptr->chunk_name);

-

-      if (text_ptr != NULL)

-         *text_ptr = info_ptr->text;

-

-      if (num_text != NULL)

-         *num_text = info_ptr->num_text;

-

-      return info_ptr->num_text;

-   }

-

-   if (num_text != NULL)

-      *num_text = 0;

-

-   return(0);

-}

-#endif

-

-#ifdef PNG_tIME_SUPPORTED

-png_uint_32 PNGAPI

-png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_timep *mod_time)

-{

-   png_debug1(1, "in %s retrieval function", "tIME");

-

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)

-   {

-      *mod_time = &(info_ptr->mod_time);

-      return (PNG_INFO_tIME);

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_tRNS_SUPPORTED

-png_uint_32 PNGAPI

-png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)

-{

-   png_uint_32 retval = 0;

-   if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_tRNS) != 0)

-   {

-      png_debug1(1, "in %s retrieval function", "tRNS");

-

-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         if (trans_alpha != NULL)

-         {

-            *trans_alpha = info_ptr->trans_alpha;

-            retval |= PNG_INFO_tRNS;

-         }

-

-         if (trans_color != NULL)

-            *trans_color = &(info_ptr->trans_color);

-      }

-

-      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */

-      {

-         if (trans_color != NULL)

-         {

-            *trans_color = &(info_ptr->trans_color);

-            retval |= PNG_INFO_tRNS;

-         }

-

-         if (trans_alpha != NULL)

-            *trans_alpha = NULL;

-      }

-

-      if (num_trans != NULL)

-      {

-         *num_trans = info_ptr->num_trans;

-         retval |= PNG_INFO_tRNS;

-      }

-   }

-

-   return (retval);

-}

-#endif

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-int PNGAPI

-png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_unknown_chunkpp unknowns)

-{

-   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)

-   {

-      *unknowns = info_ptr->unknown_chunks;

-      return info_ptr->unknown_chunks_num;

-   }

-

-   return (0);

-}

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-png_byte PNGAPI

-png_get_rgb_to_gray_status (png_const_structrp png_ptr)

-{

-   return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);

-}

-#endif

-

-#ifdef PNG_USER_CHUNKS_SUPPORTED

-png_voidp PNGAPI

-png_get_user_chunk_ptr(png_const_structrp png_ptr)

-{

-   return (png_ptr ? png_ptr->user_chunk_ptr : NULL);

-}

-#endif

-

-png_size_t PNGAPI

-png_get_compression_buffer_size(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return 0;

-

-#ifdef PNG_WRITE_SUPPORTED

-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)

-#endif

-   {

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-      return png_ptr->IDAT_read_size;

-#else

-      return PNG_IDAT_READ_SIZE;

-#endif

-   }

-

-#ifdef PNG_WRITE_SUPPORTED

-   else

-      return png_ptr->zbuffer_size;

-#endif

-}

-

-#ifdef PNG_SET_USER_LIMITS_SUPPORTED

-/* These functions were added to libpng 1.2.6 and were enabled

- * by default in libpng-1.4.0 */

-png_uint_32 PNGAPI

-png_get_user_width_max (png_const_structrp png_ptr)

-{

-   return (png_ptr ? png_ptr->user_width_max : 0);

-}

-

-png_uint_32 PNGAPI

-png_get_user_height_max (png_const_structrp png_ptr)

-{

-   return (png_ptr ? png_ptr->user_height_max : 0);

-}

-

-/* This function was added to libpng 1.4.0 */

-png_uint_32 PNGAPI

-png_get_chunk_cache_max (png_const_structrp png_ptr)

-{

-   return (png_ptr ? png_ptr->user_chunk_cache_max : 0);

-}

-

-/* This function was added to libpng 1.4.1 */

-png_alloc_size_t PNGAPI

-png_get_chunk_malloc_max (png_const_structrp png_ptr)

-{

-   return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);

-}

-#endif /* SET_USER_LIMITS */

-

-/* These functions were added to libpng 1.4.0 */

-#ifdef PNG_IO_STATE_SUPPORTED

-png_uint_32 PNGAPI

-png_get_io_state (png_const_structrp png_ptr)

-{

-   return png_ptr->io_state;

-}

-

-png_uint_32 PNGAPI

-png_get_io_chunk_type (png_const_structrp png_ptr)

-{

-   return png_ptr->chunk_name;

-}

-#endif /* IO_STATE */

-

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED

-int PNGAPI

-png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      return png_ptr->num_palette_max;

-

-   return (-1);

-}

-#  endif

-#endif

-

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pnginfo.h b/plugins/AdvaImg/src/LibPNG/pnginfo.h
deleted file mode 100644
index 366a16df64..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pnginfo.h
+++ /dev/null
@@ -1,267 +0,0 @@
-

-/* pnginfo.h - header file for PNG reference library

- *

- * Last changed in libpng 1.6.1 [March 28, 2013]

- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

- /* png_info is a structure that holds the information in a PNG file so

- * that the application can find out the characteristics of the image.

- * If you are reading the file, this structure will tell you what is

- * in the PNG file.  If you are writing the file, fill in the information

- * you want to put into the PNG file, using png_set_*() functions, then

- * call png_write_info().

- *

- * The names chosen should be very close to the PNG specification, so

- * consult that document for information about the meaning of each field.

- *

- * With libpng < 0.95, it was only possible to directly set and read the

- * the values in the png_info_struct, which meant that the contents and

- * order of the values had to remain fixed.  With libpng 0.95 and later,

- * however, there are now functions that abstract the contents of

- * png_info_struct from the application, so this makes it easier to use

- * libpng with dynamic libraries, and even makes it possible to use

- * libraries that don't have all of the libpng ancillary chunk-handing

- * functionality.  In libpng-1.5.0 this was moved into a separate private

- * file that is not visible to applications.

- *

- * The following members may have allocated storage attached that should be

- * cleaned up before the structure is discarded: palette, trans, text,

- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,

- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these

- * are automatically freed when the info structure is deallocated, if they were

- * allocated internally by libpng.  This behavior can be changed by means

- * of the png_data_freer() function.

- *

- * More allocation details: all the chunk-reading functions that

- * change these members go through the corresponding png_set_*

- * functions.  A function to clear these members is available: see

- * png_free_data().  The png_set_* functions do not depend on being

- * able to point info structure members to any of the storage they are

- * passed (they make their own copies), EXCEPT that the png_set_text

- * functions use the same storage passed to them in the text_ptr or

- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns

- * functions do not make their own copies.

- */

-#ifndef PNGINFO_H

-#define PNGINFO_H

-

-struct png_info_def

-{

-   /* The following are necessary for every PNG file */

-   png_uint_32 width;  /* width of image in pixels (from IHDR) */

-   png_uint_32 height; /* height of image in pixels (from IHDR) */

-   png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */

-   png_size_t rowbytes; /* bytes needed to hold an untransformed row */

-   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */

-   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */

-   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */

-   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */

-   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */

-   /* The following three should have been named *_method not *_type */

-   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */

-   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */

-   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */

-

-   /* The following are set by png_set_IHDR, called from the application on

-    * write, but the are never actually used by the write code.

-    */

-   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */

-   png_byte pixel_depth;    /* number of bits per pixel */

-   png_byte spare_byte;     /* to align the data, and for future use */

-

-#ifdef PNG_READ_SUPPORTED

-   /* This is never set during write */

-   png_byte signature[8];   /* magic bytes read by libpng from start of file */

-#endif

-

-   /* The rest of the data is optional.  If you are reading, check the

-    * valid field to see if the information in these are valid.  If you

-    * are writing, set the valid field to those chunks you want written,

-    * and initialize the appropriate fields below.

-    */

-

-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)

-   /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are

-    * defined.  When COLORSPACE is switched on all the colorspace-defining

-    * chunks should be enabled, when GAMMA is switched on all the gamma-defining

-    * chunks should be enabled.  If this is not done it becomes possible to read

-    * inconsistent PNG files and assign a probably incorrect interpretation to

-    * the information.  (In other words, by carefully choosing which chunks to

-    * recognize the system configuration can select an interpretation for PNG

-    * files containing ambiguous data and this will result in inconsistent

-    * behavior between different libpng builds!)

-    */

-   png_colorspace colorspace;

-#endif

-

-#ifdef PNG_iCCP_SUPPORTED

-   /* iCCP chunk data. */

-   png_charp iccp_name;     /* profile name */

-   png_bytep iccp_profile;  /* International Color Consortium profile data */

-   png_uint_32 iccp_proflen;  /* ICC profile data length */

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED

-   /* The tEXt, and zTXt chunks contain human-readable textual data in

-    * uncompressed, compressed, and optionally compressed forms, respectively.

-    * The data in "text" is an array of pointers to uncompressed,

-    * null-terminated C strings. Each chunk has a keyword that describes the

-    * textual data contained in that chunk.  Keywords are not required to be

-    * unique, and the text string may be empty.  Any number of text chunks may

-    * be in an image.

-    */

-   int num_text; /* number of comments read or comments to write */

-   int max_text; /* current size of text array */

-   png_textp text; /* array of comments read or comments to write */

-#endif /* TEXT */

-

-#ifdef PNG_tIME_SUPPORTED

-   /* The tIME chunk holds the last time the displayed image data was

-    * modified.  See the png_time struct for the contents of this struct.

-    */

-   png_time mod_time;

-#endif

-

-#ifdef PNG_sBIT_SUPPORTED

-   /* The sBIT chunk specifies the number of significant high-order bits

-    * in the pixel data.  Values are in the range [1, bit_depth], and are

-    * only specified for the channels in the pixel data.  The contents of

-    * the low-order bits is not specified.  Data is valid if

-    * (valid & PNG_INFO_sBIT) is non-zero.

-    */

-   png_color_8 sig_bit; /* significant bits in color channels */

-#endif

-

-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \

-defined(PNG_READ_BACKGROUND_SUPPORTED)

-   /* The tRNS chunk supplies transparency data for paletted images and

-    * other image types that don't need a full alpha channel.  There are

-    * "num_trans" transparency values for a paletted image, stored in the

-    * same order as the palette colors, starting from index 0.  Values

-    * for the data are in the range [0, 255], ranging from fully transparent

-    * to fully opaque, respectively.  For non-paletted images, there is a

-    * single color specified that should be treated as fully transparent.

-    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.

-    */

-   png_bytep trans_alpha;    /* alpha values for paletted image */

-   png_color_16 trans_color; /* transparent color for non-palette image */

-#endif

-

-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)

-   /* The bKGD chunk gives the suggested image background color if the

-    * display program does not have its own background color and the image

-    * is needs to composited onto a background before display.  The colors

-    * in "background" are normally in the same color space/depth as the

-    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.

-    */

-   png_color_16 background;

-#endif

-

-#ifdef PNG_oFFs_SUPPORTED

-   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards

-    * and downwards from the top-left corner of the display, page, or other

-    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines

-    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.

-    */

-   png_int_32 x_offset; /* x offset on page */

-   png_int_32 y_offset; /* y offset on page */

-   png_byte offset_unit_type; /* offset units type */

-#endif

-

-#ifdef PNG_pHYs_SUPPORTED

-   /* The pHYs chunk gives the physical pixel density of the image for

-    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_

-    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.

-    */

-   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */

-   png_uint_32 y_pixels_per_unit; /* vertical pixel density */

-   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */

-#endif

-

-#ifdef PNG_eXIf_SUPPORTED

-   int num_exif;  /* Added at libpng-1.6.31 */

-   png_bytep exif;

-# ifdef PNG_READ_eXIf_SUPPORTED

-   png_bytep eXIf_buf;  /* Added at libpng-1.6.32 */

-# endif

-#endif

-

-#ifdef PNG_hIST_SUPPORTED

-   /* The hIST chunk contains the relative frequency or importance of the

-    * various palette entries, so that a viewer can intelligently select a

-    * reduced-color palette, if required.  Data is an array of "num_palette"

-    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)

-    * is non-zero.

-    */

-   png_uint_16p hist;

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-   /* The pCAL chunk describes a transformation between the stored pixel

-    * values and original physical data values used to create the image.

-    * The integer range [0, 2^bit_depth - 1] maps to the floating-point

-    * range given by [pcal_X0, pcal_X1], and are further transformed by a

-    * (possibly non-linear) transformation function given by "pcal_type"

-    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_

-    * defines below, and the PNG-Group's PNG extensions document for a

-    * complete description of the transformations and how they should be

-    * implemented, and for a description of the ASCII parameter strings.

-    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.

-    */

-   png_charp pcal_purpose;  /* pCAL chunk description string */

-   png_int_32 pcal_X0;      /* minimum value */

-   png_int_32 pcal_X1;      /* maximum value */

-   png_charp pcal_units;    /* Latin-1 string giving physical units */

-   png_charpp pcal_params;  /* ASCII strings containing parameter values */

-   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */

-   png_byte pcal_nparams;   /* number of parameters given in pcal_params */

-#endif

-

-/* New members added in libpng-1.0.6 */

-   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-   /* Storage for unknown chunks that the library doesn't recognize. */

-   png_unknown_chunkp unknown_chunks;

-

-   /* The type of this field is limited by the type of

-    * png_struct::user_chunk_cache_max, else overflow can occur.

-    */

-   int                unknown_chunks_num;

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-   /* Data on sPLT chunks (there may be more than one). */

-   png_sPLT_tp splt_palettes;

-   int         splt_palettes_num; /* Match type returned by png_get API */

-#endif

-

-#ifdef PNG_sCAL_SUPPORTED

-   /* The sCAL chunk describes the actual physical dimensions of the

-    * subject matter of the graphic.  The chunk contains a unit specification

-    * a byte value, and two ASCII strings representing floating-point

-    * values.  The values are width and height corresponsing to one pixel

-    * in the image.  Data values are valid if (valid & PNG_INFO_sCAL) is

-    * non-zero.

-    */

-   png_byte scal_unit;         /* unit of physical scale */

-   png_charp scal_s_width;     /* string containing height */

-   png_charp scal_s_height;    /* string containing width */

-#endif

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS)

-      non-zero */

-   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */

-   png_bytepp row_pointers;        /* the image bits */

-#endif

-

-};

-#endif /* PNGINFO_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pnglibconf.h b/plugins/AdvaImg/src/LibPNG/pnglibconf.h
deleted file mode 100644
index a9893acb40..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pnglibconf.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* libpng 1.6.34 STANDARD API DEFINITION */

-

-/* pnglibconf.h - library build configuration */

-

-/* Libpng version 1.6.34 - September 29, 2017 */

-

-/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */

-

-/* This code is released under the libpng license. */

-/* For conditions of distribution and use, see the disclaimer */

-/* and license in png.h */

-

-/* pnglibconf.h */

-/* Machine generated file: DO NOT EDIT */

-/* Derived from: scripts/pnglibconf.dfa */

-#ifndef PNGLCONF_H

-#define PNGLCONF_H

-/* options */

-#define PNG_16BIT_SUPPORTED

-#define PNG_ALIGNED_MEMORY_SUPPORTED

-/*#undef PNG_ARM_NEON_API_SUPPORTED*/

-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/

-/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/

-/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/

-#define PNG_BENIGN_ERRORS_SUPPORTED

-#define PNG_BENIGN_READ_ERRORS_SUPPORTED

-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/

-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED

-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

-#define PNG_COLORSPACE_SUPPORTED

-#define PNG_CONSOLE_IO_SUPPORTED

-#define PNG_CONVERT_tIME_SUPPORTED

-#define PNG_EASY_ACCESS_SUPPORTED

-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/

-#define PNG_ERROR_TEXT_SUPPORTED

-#define PNG_FIXED_POINT_SUPPORTED

-#define PNG_FLOATING_ARITHMETIC_SUPPORTED

-#define PNG_FLOATING_POINT_SUPPORTED

-#define PNG_FORMAT_AFIRST_SUPPORTED

-#define PNG_FORMAT_BGR_SUPPORTED

-#define PNG_GAMMA_SUPPORTED

-#define PNG_GET_PALETTE_MAX_SUPPORTED

-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-#define PNG_INCH_CONVERSIONS_SUPPORTED

-#define PNG_INFO_IMAGE_SUPPORTED

-#define PNG_IO_STATE_SUPPORTED

-#define PNG_MNG_FEATURES_SUPPORTED

-#define PNG_POINTER_INDEXING_SUPPORTED

-#define PNG_PROGRESSIVE_READ_SUPPORTED

-#define PNG_READ_16BIT_SUPPORTED

-#define PNG_READ_ALPHA_MODE_SUPPORTED

-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED

-#define PNG_READ_BACKGROUND_SUPPORTED

-#define PNG_READ_BGR_SUPPORTED

-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED

-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED

-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED

-#define PNG_READ_EXPAND_16_SUPPORTED

-#define PNG_READ_EXPAND_SUPPORTED

-#define PNG_READ_FILLER_SUPPORTED

-#define PNG_READ_GAMMA_SUPPORTED

-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED

-#define PNG_READ_GRAY_TO_RGB_SUPPORTED

-#define PNG_READ_INTERLACING_SUPPORTED

-#define PNG_READ_INT_FUNCTIONS_SUPPORTED

-#define PNG_READ_INVERT_ALPHA_SUPPORTED

-#define PNG_READ_INVERT_SUPPORTED

-#define PNG_READ_OPT_PLTE_SUPPORTED

-#define PNG_READ_PACKSWAP_SUPPORTED

-#define PNG_READ_PACK_SUPPORTED

-#define PNG_READ_QUANTIZE_SUPPORTED

-#define PNG_READ_RGB_TO_GRAY_SUPPORTED

-#define PNG_READ_SCALE_16_TO_8_SUPPORTED

-#define PNG_READ_SHIFT_SUPPORTED

-#define PNG_READ_STRIP_16_TO_8_SUPPORTED

-#define PNG_READ_STRIP_ALPHA_SUPPORTED

-#define PNG_READ_SUPPORTED

-#define PNG_READ_SWAP_ALPHA_SUPPORTED

-#define PNG_READ_SWAP_SUPPORTED

-#define PNG_READ_TEXT_SUPPORTED

-#define PNG_READ_TRANSFORMS_SUPPORTED

-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_READ_USER_CHUNKS_SUPPORTED

-#define PNG_READ_USER_TRANSFORM_SUPPORTED

-#define PNG_READ_bKGD_SUPPORTED

-#define PNG_READ_cHRM_SUPPORTED

-#define PNG_READ_eXIf_SUPPORTED

-#define PNG_READ_gAMA_SUPPORTED

-#define PNG_READ_hIST_SUPPORTED

-#define PNG_READ_iCCP_SUPPORTED

-#define PNG_READ_iTXt_SUPPORTED

-#define PNG_READ_oFFs_SUPPORTED

-#define PNG_READ_pCAL_SUPPORTED

-#define PNG_READ_pHYs_SUPPORTED

-#define PNG_READ_sBIT_SUPPORTED

-#define PNG_READ_sCAL_SUPPORTED

-#define PNG_READ_sPLT_SUPPORTED

-#define PNG_READ_sRGB_SUPPORTED

-#define PNG_READ_tEXt_SUPPORTED

-#define PNG_READ_tIME_SUPPORTED

-#define PNG_READ_tRNS_SUPPORTED

-#define PNG_READ_zTXt_SUPPORTED

-#define PNG_SAVE_INT_32_SUPPORTED

-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_SEQUENTIAL_READ_SUPPORTED

-#define PNG_SETJMP_SUPPORTED

-#define PNG_SET_OPTION_SUPPORTED

-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_SET_USER_LIMITS_SUPPORTED

-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED

-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED

-#define PNG_SIMPLIFIED_READ_SUPPORTED

-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED

-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED

-#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED

-#define PNG_SIMPLIFIED_WRITE_SUPPORTED

-#define PNG_STDIO_SUPPORTED

-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_TEXT_SUPPORTED

-#define PNG_TIME_RFC1123_SUPPORTED

-#define PNG_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_USER_CHUNKS_SUPPORTED

-#define PNG_USER_LIMITS_SUPPORTED

-#define PNG_USER_MEM_SUPPORTED

-#define PNG_USER_TRANSFORM_INFO_SUPPORTED

-#define PNG_USER_TRANSFORM_PTR_SUPPORTED

-#define PNG_WARNINGS_SUPPORTED

-#define PNG_WRITE_16BIT_SUPPORTED

-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED

-#define PNG_WRITE_BGR_SUPPORTED

-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED

-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED

-#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED

-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-#define PNG_WRITE_FILLER_SUPPORTED

-#define PNG_WRITE_FILTER_SUPPORTED

-#define PNG_WRITE_FLUSH_SUPPORTED

-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED

-#define PNG_WRITE_INTERLACING_SUPPORTED

-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED

-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED

-#define PNG_WRITE_INVERT_SUPPORTED

-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

-#define PNG_WRITE_PACKSWAP_SUPPORTED

-#define PNG_WRITE_PACK_SUPPORTED

-#define PNG_WRITE_SHIFT_SUPPORTED

-#define PNG_WRITE_SUPPORTED

-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED

-#define PNG_WRITE_SWAP_SUPPORTED

-#define PNG_WRITE_TEXT_SUPPORTED

-#define PNG_WRITE_TRANSFORMS_SUPPORTED

-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED

-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED

-#define PNG_WRITE_bKGD_SUPPORTED

-#define PNG_WRITE_cHRM_SUPPORTED

-#define PNG_WRITE_eXIf_SUPPORTED

-#define PNG_WRITE_gAMA_SUPPORTED

-#define PNG_WRITE_hIST_SUPPORTED

-#define PNG_WRITE_iCCP_SUPPORTED

-#define PNG_WRITE_iTXt_SUPPORTED

-#define PNG_WRITE_oFFs_SUPPORTED

-#define PNG_WRITE_pCAL_SUPPORTED

-#define PNG_WRITE_pHYs_SUPPORTED

-#define PNG_WRITE_sBIT_SUPPORTED

-#define PNG_WRITE_sCAL_SUPPORTED

-#define PNG_WRITE_sPLT_SUPPORTED

-#define PNG_WRITE_sRGB_SUPPORTED

-#define PNG_WRITE_tEXt_SUPPORTED

-#define PNG_WRITE_tIME_SUPPORTED

-#define PNG_WRITE_tRNS_SUPPORTED

-#define PNG_WRITE_zTXt_SUPPORTED

-#define PNG_bKGD_SUPPORTED

-#define PNG_cHRM_SUPPORTED

-#define PNG_eXIf_SUPPORTED

-#define PNG_gAMA_SUPPORTED

-#define PNG_hIST_SUPPORTED

-#define PNG_iCCP_SUPPORTED

-#define PNG_iTXt_SUPPORTED

-#define PNG_oFFs_SUPPORTED

-#define PNG_pCAL_SUPPORTED

-#define PNG_pHYs_SUPPORTED

-#define PNG_sBIT_SUPPORTED

-#define PNG_sCAL_SUPPORTED

-#define PNG_sPLT_SUPPORTED

-#define PNG_sRGB_SUPPORTED

-#define PNG_tEXt_SUPPORTED

-#define PNG_tIME_SUPPORTED

-#define PNG_tRNS_SUPPORTED

-#define PNG_zTXt_SUPPORTED

-/* end of options */

-/* settings */

-#define PNG_API_RULE 0

-#define PNG_DEFAULT_READ_MACROS 1

-#define PNG_GAMMA_THRESHOLD_FIXED 5000

-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE

-#define PNG_INFLATE_BUF_SIZE 1024

-#define PNG_LINKAGE_API extern

-#define PNG_LINKAGE_CALLBACK extern

-#define PNG_LINKAGE_DATA extern

-#define PNG_LINKAGE_FUNCTION extern

-#define PNG_MAX_GAMMA_8 11

-#define PNG_QUANTIZE_BLUE_BITS 5

-#define PNG_QUANTIZE_GREEN_BITS 5

-#define PNG_QUANTIZE_RED_BITS 5

-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)

-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0

-#define PNG_USER_CHUNK_CACHE_MAX 1000

-#define PNG_USER_CHUNK_MALLOC_MAX 8000000

-#define PNG_USER_HEIGHT_MAX 1000000

-#define PNG_USER_WIDTH_MAX 1000000

-#define PNG_ZBUF_SIZE 8192

-#define PNG_ZLIB_VERNUM 0 /* unknown */

-#define PNG_Z_DEFAULT_COMPRESSION (-1)

-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0

-#define PNG_Z_DEFAULT_STRATEGY 1

-#define PNG_sCAL_PRECISION 5

-#define PNG_sRGB_PROFILE_CHECKS 2

-/* end of settings */

-#endif /* PNGLCONF_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngmem.c b/plugins/AdvaImg/src/LibPNG/pngmem.c
deleted file mode 100644
index 1a32adbca4..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngmem.c
+++ /dev/null
@@ -1,284 +0,0 @@
-

-/* pngmem.c - stub functions for memory allocation

- *

- * Last changed in libpng 1.6.26 [October 20, 2016]

- * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file provides a location for all memory allocation.  Users who

- * need special memory handling are expected to supply replacement

- * functions for png_malloc() and png_free(), and to use

- * png_create_read_struct_2() and png_create_write_struct_2() to

- * identify the replacement functions.

- */

-

-#include "pngpriv.h"

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-/* Free a png_struct */

-void /* PRIVATE */

-png_destroy_png_struct(png_structrp png_ptr)

-{

-   if (png_ptr != NULL)

-   {

-      /* png_free might call png_error and may certainly call

-       * png_get_mem_ptr, so fake a temporary png_struct to support this.

-       */

-      png_struct dummy_struct = *png_ptr;

-      memset(png_ptr, 0, (sizeof *png_ptr));

-      png_free(&dummy_struct, png_ptr);

-

-#     ifdef PNG_SETJMP_SUPPORTED

-         /* We may have a jmp_buf left to deallocate. */

-         png_free_jmpbuf(&dummy_struct);

-#     endif

-   }

-}

-

-/* Allocate memory.  For reasonable files, size should never exceed

- * 64K.  However, zlib may allocate more than 64K if you don't tell

- * it not to.  See zconf.h and png.h for more information.  zlib does

- * need to allocate exactly 64K, so whatever you call here must

- * have the ability to do that.

- */

-PNG_FUNCTION(png_voidp,PNGAPI

-png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)

-{

-   png_voidp ret;

-

-   ret = png_malloc(png_ptr, size);

-

-   if (ret != NULL)

-      memset(ret, 0, size);

-

-   return ret;

-}

-

-/* png_malloc_base, an internal function added at libpng 1.6.0, does the work of

- * allocating memory, taking into account limits and PNG_USER_MEM_SUPPORTED.

- * Checking and error handling must happen outside this routine; it returns NULL

- * if the allocation cannot be done (for any reason.)

- */

-PNG_FUNCTION(png_voidp /* PRIVATE */,

-png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),

-    PNG_ALLOCATED)

-{

-   /* Moved to png_malloc_base from png_malloc_default in 1.6.0; the DOS

-    * allocators have also been removed in 1.6.0, so any 16-bit system now has

-    * to implement a user memory handler.  This checks to be sure it isn't

-    * called with big numbers.

-    */

-#ifndef PNG_USER_MEM_SUPPORTED

-   PNG_UNUSED(png_ptr)

-#endif

-

-   /* Some compilers complain that this is always true.  However, it

-    * can be false when integer overflow happens.

-    */

-   if (size > 0 && size <= PNG_SIZE_MAX

-#     ifdef PNG_MAX_MALLOC_64K

-         && size <= 65536U

-#     endif

-      )

-   {

-#ifdef PNG_USER_MEM_SUPPORTED

-      if (png_ptr != NULL && png_ptr->malloc_fn != NULL)

-         return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);

-

-      else

-#endif

-         return malloc((size_t)size); /* checked for truncation above */

-   }

-

-   else

-      return NULL;

-}

-

-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\

-   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)

-/* This is really here only to work round a spurious warning in GCC 4.6 and 4.7

- * that arises because of the checks in png_realloc_array that are repeated in

- * png_malloc_array.

- */

-static png_voidp

-png_malloc_array_checked(png_const_structrp png_ptr, int nelements,

-    size_t element_size)

-{

-   png_alloc_size_t req = (png_alloc_size_t)nelements; /* known to be > 0 */

-

-   if (req <= PNG_SIZE_MAX/element_size)

-      return png_malloc_base(png_ptr, req * element_size);

-

-   /* The failure case when the request is too large */

-   return NULL;

-}

-

-PNG_FUNCTION(png_voidp /* PRIVATE */,

-png_malloc_array,(png_const_structrp png_ptr, int nelements,

-    size_t element_size),PNG_ALLOCATED)

-{

-   if (nelements <= 0 || element_size == 0)

-      png_error(png_ptr, "internal error: array alloc");

-

-   return png_malloc_array_checked(png_ptr, nelements, element_size);

-}

-

-PNG_FUNCTION(png_voidp /* PRIVATE */,

-png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,

-    int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)

-{

-   /* These are internal errors: */

-   if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||

-      (old_array == NULL && old_elements > 0))

-      png_error(png_ptr, "internal error: array realloc");

-

-   /* Check for overflow on the elements count (so the caller does not have to

-    * check.)

-    */

-   if (add_elements <= INT_MAX - old_elements)

-   {

-      png_voidp new_array = png_malloc_array_checked(png_ptr,

-          old_elements+add_elements, element_size);

-

-      if (new_array != NULL)

-      {

-         /* Because png_malloc_array worked the size calculations below cannot

-          * overflow.

-          */

-         if (old_elements > 0)

-            memcpy(new_array, old_array, element_size*(unsigned)old_elements);

-

-         memset((char*)new_array + element_size*(unsigned)old_elements, 0,

-             element_size*(unsigned)add_elements);

-

-         return new_array;

-      }

-   }

-

-   return NULL; /* error */

-}

-#endif /* TEXT || sPLT || STORE_UNKNOWN_CHUNKS */

-

-/* Various functions that have different error handling are derived from this.

- * png_malloc always exists, but if PNG_USER_MEM_SUPPORTED is defined a separate

- * function png_malloc_default is also provided.

- */

-PNG_FUNCTION(png_voidp,PNGAPI

-png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)

-{

-   png_voidp ret;

-

-   if (png_ptr == NULL)

-      return NULL;

-

-   ret = png_malloc_base(png_ptr, size);

-

-   if (ret == NULL)

-       png_error(png_ptr, "Out of memory"); /* 'm' means png_malloc */

-

-   return ret;

-}

-

-#ifdef PNG_USER_MEM_SUPPORTED

-PNG_FUNCTION(png_voidp,PNGAPI

-png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),

-    PNG_ALLOCATED PNG_DEPRECATED)

-{

-   png_voidp ret;

-

-   if (png_ptr == NULL)

-      return NULL;

-

-   /* Passing 'NULL' here bypasses the application provided memory handler. */

-   ret = png_malloc_base(NULL/*use malloc*/, size);

-

-   if (ret == NULL)

-      png_error(png_ptr, "Out of Memory"); /* 'M' means png_malloc_default */

-

-   return ret;

-}

-#endif /* USER_MEM */

-

-/* This function was added at libpng version 1.2.3.  The png_malloc_warn()

- * function will issue a png_warning and return NULL instead of issuing a

- * png_error, if it fails to allocate the requested memory.

- */

-PNG_FUNCTION(png_voidp,PNGAPI

-png_malloc_warn,(png_const_structrp png_ptr, png_alloc_size_t size),

-    PNG_ALLOCATED)

-{

-   if (png_ptr != NULL)

-   {

-      png_voidp ret = png_malloc_base(png_ptr, size);

-

-      if (ret != NULL)

-         return ret;

-

-      png_warning(png_ptr, "Out of memory");

-   }

-

-   return NULL;

-}

-

-/* Free a pointer allocated by png_malloc().  If ptr is NULL, return

- * without taking any action.

- */

-void PNGAPI

-png_free(png_const_structrp png_ptr, png_voidp ptr)

-{

-   if (png_ptr == NULL || ptr == NULL)

-      return;

-

-#ifdef PNG_USER_MEM_SUPPORTED

-   if (png_ptr->free_fn != NULL)

-      png_ptr->free_fn(png_constcast(png_structrp,png_ptr), ptr);

-

-   else

-      png_free_default(png_ptr, ptr);

-}

-

-PNG_FUNCTION(void,PNGAPI

-png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)

-{

-   if (png_ptr == NULL || ptr == NULL)

-      return;

-#endif /* USER_MEM */

-

-   free(ptr);

-}

-

-#ifdef PNG_USER_MEM_SUPPORTED

-/* This function is called when the application wants to use another method

- * of allocating and freeing memory.

- */

-void PNGAPI

-png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr, png_malloc_ptr

-  malloc_fn, png_free_ptr free_fn)

-{

-   if (png_ptr != NULL)

-   {

-      png_ptr->mem_ptr = mem_ptr;

-      png_ptr->malloc_fn = malloc_fn;

-      png_ptr->free_fn = free_fn;

-   }

-}

-

-/* This function returns a pointer to the mem_ptr associated with the user

- * functions.  The application should free any memory associated with this

- * pointer before png_write_destroy and png_read_destroy are called.

- */

-png_voidp PNGAPI

-png_get_mem_ptr(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return NULL;

-

-   return png_ptr->mem_ptr;

-}

-#endif /* USER_MEM */

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngpread.c b/plugins/AdvaImg/src/LibPNG/pngpread.c
deleted file mode 100644
index 705b61376c..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngpread.c
+++ /dev/null
@@ -1,1096 +0,0 @@
-

-/* pngpread.c - read a png file in push mode

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-

-/* Push model modes */

-#define PNG_READ_SIG_MODE   0

-#define PNG_READ_CHUNK_MODE 1

-#define PNG_READ_IDAT_MODE  2

-#define PNG_READ_tEXt_MODE  4

-#define PNG_READ_zTXt_MODE  5

-#define PNG_READ_DONE_MODE  6

-#define PNG_READ_iTXt_MODE  7

-#define PNG_ERROR_MODE      8

-

-#define PNG_PUSH_SAVE_BUFFER_IF_FULL \

-if (png_ptr->push_length + 4 > png_ptr->buffer_size) \

-   { png_push_save_buffer(png_ptr); return; }

-#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \

-if (png_ptr->buffer_size < N) \

-   { png_push_save_buffer(png_ptr); return; }

-

-void PNGAPI

-png_process_data(png_structrp png_ptr, png_inforp info_ptr,

-    png_bytep buffer, png_size_t buffer_size)

-{

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   png_push_restore_buffer(png_ptr, buffer, buffer_size);

-

-   while (png_ptr->buffer_size)

-   {

-      png_process_some_data(png_ptr, info_ptr);

-   }

-}

-

-png_size_t PNGAPI

-png_process_data_pause(png_structrp png_ptr, int save)

-{

-   if (png_ptr != NULL)

-   {

-      /* It's easiest for the caller if we do the save; then the caller doesn't

-       * have to supply the same data again:

-       */

-      if (save != 0)

-         png_push_save_buffer(png_ptr);

-      else

-      {

-         /* This includes any pending saved bytes: */

-         png_size_t remaining = png_ptr->buffer_size;

-         png_ptr->buffer_size = 0;

-

-         /* So subtract the saved buffer size, unless all the data

-          * is actually 'saved', in which case we just return 0

-          */

-         if (png_ptr->save_buffer_size < remaining)

-            return remaining - png_ptr->save_buffer_size;

-      }

-   }

-

-   return 0;

-}

-

-png_uint_32 PNGAPI

-png_process_data_skip(png_structrp png_ptr)

-{

-/* TODO: Deprecate and remove this API.

- * Somewhere the implementation of this seems to have been lost,

- * or abandoned.  It was only to support some internal back-door access

- * to png_struct) in libpng-1.4.x.

- */

-   png_app_warning(png_ptr,

-"png_process_data_skip is not implemented in any current version of libpng");

-   return 0;

-}

-

-/* What we do with the incoming data depends on what we were previously

- * doing before we ran out of data...

- */

-void /* PRIVATE */

-png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)

-{

-   if (png_ptr == NULL)

-      return;

-

-   switch (png_ptr->process_mode)

-   {

-      case PNG_READ_SIG_MODE:

-      {

-         png_push_read_sig(png_ptr, info_ptr);

-         break;

-      }

-

-      case PNG_READ_CHUNK_MODE:

-      {

-         png_push_read_chunk(png_ptr, info_ptr);

-         break;

-      }

-

-      case PNG_READ_IDAT_MODE:

-      {

-         png_push_read_IDAT(png_ptr);

-         break;

-      }

-

-      default:

-      {

-         png_ptr->buffer_size = 0;

-         break;

-      }

-   }

-}

-

-/* Read any remaining signature bytes from the stream and compare them with

- * the correct PNG signature.  It is possible that this routine is called

- * with bytes already read from the signature, either because they have been

- * checked by the calling application, or because of multiple calls to this

- * routine.

- */

-void /* PRIVATE */

-png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */

-       num_to_check = 8 - num_checked;

-

-   if (png_ptr->buffer_size < num_to_check)

-   {

-      num_to_check = png_ptr->buffer_size;

-   }

-

-   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),

-       num_to_check);

-   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);

-

-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))

-   {

-      if (num_checked < 4 &&

-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))

-         png_error(png_ptr, "Not a PNG file");

-

-      else

-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");

-   }

-   else

-   {

-      if (png_ptr->sig_bytes >= 8)

-      {

-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;

-      }

-   }

-}

-

-void /* PRIVATE */

-png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_uint_32 chunk_name;

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-   int keep; /* unknown handling method */

-#endif

-

-   /* First we make sure we have enough data for the 4-byte chunk name

-    * and the 4-byte chunk length before proceeding with decoding the

-    * chunk data.  To fully decode each of these chunks, we also make

-    * sure we have enough data in the buffer for the 4-byte CRC at the

-    * end of every chunk (except IDAT, which is handled separately).

-    */

-   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)

-   {

-      png_byte chunk_length[4];

-      png_byte chunk_tag[4];

-

-      PNG_PUSH_SAVE_BUFFER_IF_LT(8)

-      png_push_fill_buffer(png_ptr, chunk_length, 4);

-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);

-      png_reset_crc(png_ptr);

-      png_crc_read(png_ptr, chunk_tag, 4);

-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);

-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);

-      png_check_chunk_length(png_ptr, png_ptr->push_length);

-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;

-   }

-

-   chunk_name = png_ptr->chunk_name;

-

-   if (chunk_name == png_IDAT)

-   {

-      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)

-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;

-

-      /* If we reach an IDAT chunk, this means we have read all of the

-       * header chunks, and we can start reading the image (or if this

-       * is called after the image has been read - we have an error).

-       */

-      if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-         png_error(png_ptr, "Missing IHDR before IDAT");

-

-      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

-          (png_ptr->mode & PNG_HAVE_PLTE) == 0)

-         png_error(png_ptr, "Missing PLTE before IDAT");

-

-      png_ptr->process_mode = PNG_READ_IDAT_MODE;

-

-      if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-         if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)

-            if (png_ptr->push_length == 0)

-               return;

-

-      png_ptr->mode |= PNG_HAVE_IDAT;

-

-      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)

-         png_benign_error(png_ptr, "Too many IDATs found");

-   }

-

-   if (chunk_name == png_IHDR)

-   {

-      if (png_ptr->push_length != 13)

-         png_error(png_ptr, "Invalid IHDR length");

-

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-   else if (chunk_name == png_IEND)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);

-

-      png_ptr->process_mode = PNG_READ_DONE_MODE;

-      png_push_have_end(png_ptr, info_ptr);

-   }

-

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-   else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep);

-

-      if (chunk_name == png_PLTE)

-         png_ptr->mode |= PNG_HAVE_PLTE;

-   }

-#endif

-

-   else if (chunk_name == png_PLTE)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-   else if (chunk_name == png_IDAT)

-   {

-      png_ptr->idat_size = png_ptr->push_length;

-      png_ptr->process_mode = PNG_READ_IDAT_MODE;

-      png_push_have_info(png_ptr, info_ptr);

-      png_ptr->zstream.avail_out =

-          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,

-          png_ptr->iwidth) + 1;

-      png_ptr->zstream.next_out = png_ptr->row_buf;

-      return;

-   }

-

-#ifdef PNG_READ_gAMA_SUPPORTED

-   else if (png_ptr->chunk_name == png_gAMA)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_sBIT_SUPPORTED

-   else if (png_ptr->chunk_name == png_sBIT)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_cHRM_SUPPORTED

-   else if (png_ptr->chunk_name == png_cHRM)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_sRGB_SUPPORTED

-   else if (chunk_name == png_sRGB)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_iCCP_SUPPORTED

-   else if (png_ptr->chunk_name == png_iCCP)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_sPLT_SUPPORTED

-   else if (chunk_name == png_sPLT)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_tRNS_SUPPORTED

-   else if (chunk_name == png_tRNS)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_bKGD_SUPPORTED

-   else if (chunk_name == png_bKGD)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_hIST_SUPPORTED

-   else if (chunk_name == png_hIST)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_pHYs_SUPPORTED

-   else if (chunk_name == png_pHYs)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_oFFs_SUPPORTED

-   else if (chunk_name == png_oFFs)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);

-   }

-#endif

-

-#ifdef PNG_READ_pCAL_SUPPORTED

-   else if (chunk_name == png_pCAL)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_sCAL_SUPPORTED

-   else if (chunk_name == png_sCAL)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_tIME_SUPPORTED

-   else if (chunk_name == png_tIME)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_tEXt_SUPPORTED

-   else if (chunk_name == png_tEXt)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_zTXt_SUPPORTED

-   else if (chunk_name == png_zTXt)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);

-   }

-

-#endif

-#ifdef PNG_READ_iTXt_SUPPORTED

-   else if (chunk_name == png_iTXt)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);

-   }

-#endif

-

-   else

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_FULL

-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,

-          PNG_HANDLE_CHUNK_AS_DEFAULT);

-   }

-

-   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;

-}

-

-void PNGCBAPI

-png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)

-{

-   png_bytep ptr;

-

-   if (png_ptr == NULL)

-      return;

-

-   ptr = buffer;

-   if (png_ptr->save_buffer_size != 0)

-   {

-      png_size_t save_size;

-

-      if (length < png_ptr->save_buffer_size)

-         save_size = length;

-

-      else

-         save_size = png_ptr->save_buffer_size;

-

-      memcpy(ptr, png_ptr->save_buffer_ptr, save_size);

-      length -= save_size;

-      ptr += save_size;

-      png_ptr->buffer_size -= save_size;

-      png_ptr->save_buffer_size -= save_size;

-      png_ptr->save_buffer_ptr += save_size;

-   }

-   if (length != 0 && png_ptr->current_buffer_size != 0)

-   {

-      png_size_t save_size;

-

-      if (length < png_ptr->current_buffer_size)

-         save_size = length;

-

-      else

-         save_size = png_ptr->current_buffer_size;

-

-      memcpy(ptr, png_ptr->current_buffer_ptr, save_size);

-      png_ptr->buffer_size -= save_size;

-      png_ptr->current_buffer_size -= save_size;

-      png_ptr->current_buffer_ptr += save_size;

-   }

-}

-

-void /* PRIVATE */

-png_push_save_buffer(png_structrp png_ptr)

-{

-   if (png_ptr->save_buffer_size != 0)

-   {

-      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)

-      {

-         png_size_t i, istop;

-         png_bytep sp;

-         png_bytep dp;

-

-         istop = png_ptr->save_buffer_size;

-         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;

-             i < istop; i++, sp++, dp++)

-         {

-            *dp = *sp;

-         }

-      }

-   }

-   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >

-       png_ptr->save_buffer_max)

-   {

-      png_size_t new_max;

-      png_bytep old_buffer;

-

-      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -

-          (png_ptr->current_buffer_size + 256))

-      {

-         png_error(png_ptr, "Potential overflow of save_buffer");

-      }

-

-      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;

-      old_buffer = png_ptr->save_buffer;

-      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,

-          (png_size_t)new_max);

-

-      if (png_ptr->save_buffer == NULL)

-      {

-         png_free(png_ptr, old_buffer);

-         png_error(png_ptr, "Insufficient memory for save_buffer");

-      }

-

-      if (old_buffer)

-         memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);

-      else if (png_ptr->save_buffer_size)

-         png_error(png_ptr, "save_buffer error");

-      png_free(png_ptr, old_buffer);

-      png_ptr->save_buffer_max = new_max;

-   }

-   if (png_ptr->current_buffer_size)

-   {

-      memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,

-         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);

-      png_ptr->save_buffer_size += png_ptr->current_buffer_size;

-      png_ptr->current_buffer_size = 0;

-   }

-   png_ptr->save_buffer_ptr = png_ptr->save_buffer;

-   png_ptr->buffer_size = 0;

-}

-

-void /* PRIVATE */

-png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,

-    png_size_t buffer_length)

-{

-   png_ptr->current_buffer = buffer;

-   png_ptr->current_buffer_size = buffer_length;

-   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;

-   png_ptr->current_buffer_ptr = png_ptr->current_buffer;

-}

-

-void /* PRIVATE */

-png_push_read_IDAT(png_structrp png_ptr)

-{

-   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)

-   {

-      png_byte chunk_length[4];

-      png_byte chunk_tag[4];

-

-      /* TODO: this code can be commoned up with the same code in push_read */

-      PNG_PUSH_SAVE_BUFFER_IF_LT(8)

-      png_push_fill_buffer(png_ptr, chunk_length, 4);

-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);

-      png_reset_crc(png_ptr);

-      png_crc_read(png_ptr, chunk_tag, 4);

-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);

-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;

-

-      if (png_ptr->chunk_name != png_IDAT)

-      {

-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;

-

-         if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)

-            png_error(png_ptr, "Not enough compressed data");

-

-         return;

-      }

-

-      png_ptr->idat_size = png_ptr->push_length;

-   }

-

-   if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)

-   {

-      png_size_t save_size = png_ptr->save_buffer_size;

-      png_uint_32 idat_size = png_ptr->idat_size;

-

-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they

-       * are of different types and we don't know which variable has the fewest

-       * bits.  Carefully select the smaller and cast it to the type of the

-       * larger - this cannot overflow.  Do not cast in the following test - it

-       * will break on either 16-bit or 64-bit platforms.

-       */

-      if (idat_size < save_size)

-         save_size = (png_size_t)idat_size;

-

-      else

-         idat_size = (png_uint_32)save_size;

-

-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);

-

-      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);

-

-      png_ptr->idat_size -= idat_size;

-      png_ptr->buffer_size -= save_size;

-      png_ptr->save_buffer_size -= save_size;

-      png_ptr->save_buffer_ptr += save_size;

-   }

-

-   if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)

-   {

-      png_size_t save_size = png_ptr->current_buffer_size;

-      png_uint_32 idat_size = png_ptr->idat_size;

-

-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they

-       * are of different types and we don't know which variable has the fewest

-       * bits.  Carefully select the smaller and cast it to the type of the

-       * larger - this cannot overflow.

-       */

-      if (idat_size < save_size)

-         save_size = (png_size_t)idat_size;

-

-      else

-         idat_size = (png_uint_32)save_size;

-

-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);

-

-      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);

-

-      png_ptr->idat_size -= idat_size;

-      png_ptr->buffer_size -= save_size;

-      png_ptr->current_buffer_size -= save_size;

-      png_ptr->current_buffer_ptr += save_size;

-   }

-

-   if (png_ptr->idat_size == 0)

-   {

-      PNG_PUSH_SAVE_BUFFER_IF_LT(4)

-      png_crc_finish(png_ptr, 0);

-      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;

-      png_ptr->mode |= PNG_AFTER_IDAT;

-      png_ptr->zowner = 0;

-   }

-}

-

-void /* PRIVATE */

-png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,

-    png_size_t buffer_length)

-{

-   /* The caller checks for a non-zero buffer length. */

-   if (!(buffer_length > 0) || buffer == NULL)

-      png_error(png_ptr, "No IDAT data (internal error)");

-

-   /* This routine must process all the data it has been given

-    * before returning, calling the row callback as required to

-    * handle the uncompressed results.

-    */

-   png_ptr->zstream.next_in = buffer;

-   /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */

-   png_ptr->zstream.avail_in = (uInt)buffer_length;

-

-   /* Keep going until the decompressed data is all processed

-    * or the stream marked as finished.

-    */

-   while (png_ptr->zstream.avail_in > 0 &&

-      (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)

-   {

-      int ret;

-

-      /* We have data for zlib, but we must check that zlib

-       * has someplace to put the results.  It doesn't matter

-       * if we don't expect any results -- it may be the input

-       * data is just the LZ end code.

-       */

-      if (!(png_ptr->zstream.avail_out > 0))

-      {

-         /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */

-         png_ptr->zstream.avail_out = (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,

-             png_ptr->iwidth) + 1);

-

-         png_ptr->zstream.next_out = png_ptr->row_buf;

-      }

-

-      /* Using Z_SYNC_FLUSH here means that an unterminated

-       * LZ stream (a stream with a missing end code) can still

-       * be handled, otherwise (Z_NO_FLUSH) a future zlib

-       * implementation might defer output and therefore

-       * change the current behavior (see comments in inflate.c

-       * for why this doesn't happen at present with zlib 1.2.5).

-       */

-      ret = PNG_INFLATE(png_ptr, Z_SYNC_FLUSH);

-

-      /* Check for any failure before proceeding. */

-      if (ret != Z_OK && ret != Z_STREAM_END)

-      {

-         /* Terminate the decompression. */

-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;

-         png_ptr->zowner = 0;

-

-         /* This may be a truncated stream (missing or

-          * damaged end code).  Treat that as a warning.

-          */

-         if (png_ptr->row_number >= png_ptr->num_rows ||

-             png_ptr->pass > 6)

-            png_warning(png_ptr, "Truncated compressed data in IDAT");

-

-         else

-         {

-            if (ret == Z_DATA_ERROR)

-               png_benign_error(png_ptr, "IDAT: ADLER32 checksum mismatch");

-            else

-               png_error(png_ptr, "Decompression error in IDAT");

-         }

-

-         /* Skip the check on unprocessed input */

-         return;

-      }

-

-      /* Did inflate output any data? */

-      if (png_ptr->zstream.next_out != png_ptr->row_buf)

-      {

-         /* Is this unexpected data after the last row?

-          * If it is, artificially terminate the LZ output

-          * here.

-          */

-         if (png_ptr->row_number >= png_ptr->num_rows ||

-             png_ptr->pass > 6)

-         {

-            /* Extra data. */

-            png_warning(png_ptr, "Extra compressed data in IDAT");

-            png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;

-            png_ptr->zowner = 0;

-

-            /* Do no more processing; skip the unprocessed

-             * input check below.

-             */

-            return;

-         }

-

-         /* Do we have a complete row? */

-         if (png_ptr->zstream.avail_out == 0)

-            png_push_process_row(png_ptr);

-      }

-

-      /* And check for the end of the stream. */

-      if (ret == Z_STREAM_END)

-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;

-   }

-

-   /* All the data should have been processed, if anything

-    * is left at this point we have bytes of IDAT data

-    * after the zlib end code.

-    */

-   if (png_ptr->zstream.avail_in > 0)

-      png_warning(png_ptr, "Extra compression data in IDAT");

-}

-

-void /* PRIVATE */

-png_push_process_row(png_structrp png_ptr)

-{

-   /* 1.5.6: row_info moved out of png_struct to a local here. */

-   png_row_info row_info;

-

-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */

-   row_info.color_type = png_ptr->color_type;

-   row_info.bit_depth = png_ptr->bit_depth;

-   row_info.channels = png_ptr->channels;

-   row_info.pixel_depth = png_ptr->pixel_depth;

-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);

-

-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)

-   {

-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)

-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,

-            png_ptr->prev_row + 1, png_ptr->row_buf[0]);

-      else

-         png_error(png_ptr, "bad adaptive filter value");

-   }

-

-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before

-    * 1.5.6, while the buffer really is this big in current versions of libpng

-    * it may not be in the future, so this was changed just to copy the

-    * interlaced row count:

-    */

-   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-   if (png_ptr->transformations != 0)

-      png_do_read_transformations(png_ptr, &row_info);

-#endif

-

-   /* The transformed pixel depth should match the depth now in row_info. */

-   if (png_ptr->transformed_pixel_depth == 0)

-   {

-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;

-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)

-         png_error(png_ptr, "progressive row overflow");

-   }

-

-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)

-      png_error(png_ptr, "internal progressive row size calculation error");

-

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   /* Expand interlaced rows to full size */

-   if (png_ptr->interlaced != 0 &&

-       (png_ptr->transformations & PNG_INTERLACE) != 0)

-   {

-      if (png_ptr->pass < 6)

-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,

-             png_ptr->transformations);

-

-      switch (png_ptr->pass)

-      {

-         case 0:

-         {

-            int i;

-            for (i = 0; i < 8 && png_ptr->pass == 0; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */

-            }

-

-            if (png_ptr->pass == 2) /* Pass 1 might be empty */

-            {

-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)

-               {

-                  png_push_have_row(png_ptr, NULL);

-                  png_read_push_finish_row(png_ptr);

-               }

-            }

-

-            if (png_ptr->pass == 4 && png_ptr->height <= 4)

-            {

-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)

-               {

-                  png_push_have_row(png_ptr, NULL);

-                  png_read_push_finish_row(png_ptr);

-               }

-            }

-

-            if (png_ptr->pass == 6 && png_ptr->height <= 4)

-            {

-                png_push_have_row(png_ptr, NULL);

-                png_read_push_finish_row(png_ptr);

-            }

-

-            break;

-         }

-

-         case 1:

-         {

-            int i;

-            for (i = 0; i < 8 && png_ptr->pass == 1; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            if (png_ptr->pass == 2) /* Skip top 4 generated rows */

-            {

-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)

-               {

-                  png_push_have_row(png_ptr, NULL);

-                  png_read_push_finish_row(png_ptr);

-               }

-            }

-

-            break;

-         }

-

-         case 2:

-         {

-            int i;

-

-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)

-            {

-               png_push_have_row(png_ptr, NULL);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            if (png_ptr->pass == 4) /* Pass 3 might be empty */

-            {

-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)

-               {

-                  png_push_have_row(png_ptr, NULL);

-                  png_read_push_finish_row(png_ptr);

-               }

-            }

-

-            break;

-         }

-

-         case 3:

-         {

-            int i;

-

-            for (i = 0; i < 4 && png_ptr->pass == 3; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            if (png_ptr->pass == 4) /* Skip top two generated rows */

-            {

-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)

-               {

-                  png_push_have_row(png_ptr, NULL);

-                  png_read_push_finish_row(png_ptr);

-               }

-            }

-

-            break;

-         }

-

-         case 4:

-         {

-            int i;

-

-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)

-            {

-               png_push_have_row(png_ptr, NULL);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            if (png_ptr->pass == 6) /* Pass 5 might be empty */

-            {

-               png_push_have_row(png_ptr, NULL);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            break;

-         }

-

-         case 5:

-         {

-            int i;

-

-            for (i = 0; i < 2 && png_ptr->pass == 5; i++)

-            {

-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            if (png_ptr->pass == 6) /* Skip top generated row */

-            {

-               png_push_have_row(png_ptr, NULL);

-               png_read_push_finish_row(png_ptr);

-            }

-

-            break;

-         }

-

-         default:

-         case 6:

-         {

-            png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-            png_read_push_finish_row(png_ptr);

-

-            if (png_ptr->pass != 6)

-               break;

-

-            png_push_have_row(png_ptr, NULL);

-            png_read_push_finish_row(png_ptr);

-         }

-      }

-   }

-   else

-#endif

-   {

-      png_push_have_row(png_ptr, png_ptr->row_buf + 1);

-      png_read_push_finish_row(png_ptr);

-   }

-}

-

-void /* PRIVATE */

-png_read_push_finish_row(png_structrp png_ptr)

-{

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};

-

-   /* Start of interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};

-

-   /* Offset to next interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};

-

-   /* Height of interlace block.  This is not currently used - if you need

-    * it, uncomment it here and in png.h

-   static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};

-   */

-#endif

-

-   png_ptr->row_number++;

-   if (png_ptr->row_number < png_ptr->num_rows)

-      return;

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   if (png_ptr->interlaced != 0)

-   {

-      png_ptr->row_number = 0;

-      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);

-

-      do

-      {

-         png_ptr->pass++;

-         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||

-             (png_ptr->pass == 3 && png_ptr->width < 3) ||

-             (png_ptr->pass == 5 && png_ptr->width < 2))

-            png_ptr->pass++;

-

-         if (png_ptr->pass > 7)

-            png_ptr->pass--;

-

-         if (png_ptr->pass >= 7)

-            break;

-

-         png_ptr->iwidth = (png_ptr->width +

-             png_pass_inc[png_ptr->pass] - 1 -

-             png_pass_start[png_ptr->pass]) /

-             png_pass_inc[png_ptr->pass];

-

-         if ((png_ptr->transformations & PNG_INTERLACE) != 0)

-            break;

-

-         png_ptr->num_rows = (png_ptr->height +

-             png_pass_yinc[png_ptr->pass] - 1 -

-             png_pass_ystart[png_ptr->pass]) /

-             png_pass_yinc[png_ptr->pass];

-

-      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);

-   }

-#endif /* READ_INTERLACING */

-}

-

-void /* PRIVATE */

-png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)

-{

-   if (png_ptr->info_fn != NULL)

-      (*(png_ptr->info_fn))(png_ptr, info_ptr);

-}

-

-void /* PRIVATE */

-png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)

-{

-   if (png_ptr->end_fn != NULL)

-      (*(png_ptr->end_fn))(png_ptr, info_ptr);

-}

-

-void /* PRIVATE */

-png_push_have_row(png_structrp png_ptr, png_bytep row)

-{

-   if (png_ptr->row_fn != NULL)

-      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,

-          (int)png_ptr->pass);

-}

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-void PNGAPI

-png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,

-    png_const_bytep new_row)

-{

-   if (png_ptr == NULL)

-      return;

-

-   /* new_row is a flag here - if it is NULL then the app callback was called

-    * from an empty row (see the calls to png_struct::row_fn below), otherwise

-    * it must be png_ptr->row_buf+1

-    */

-   if (new_row != NULL)

-      png_combine_row(png_ptr, old_row, 1/*blocky display*/);

-}

-#endif /* READ_INTERLACING */

-

-void PNGAPI

-png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,

-    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,

-    png_progressive_end_ptr end_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->info_fn = info_fn;

-   png_ptr->row_fn = row_fn;

-   png_ptr->end_fn = end_fn;

-

-   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);

-}

-

-png_voidp PNGAPI

-png_get_progressive_ptr(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return (NULL);

-

-   return png_ptr->io_ptr;

-}

-#endif /* PROGRESSIVE_READ */

diff --git a/plugins/AdvaImg/src/LibPNG/pngpriv.h b/plugins/AdvaImg/src/LibPNG/pngpriv.h
deleted file mode 100644
index 10d1fd69fc..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngpriv.h
+++ /dev/null
@@ -1,2120 +0,0 @@
-

-/* pngpriv.h - private declarations for use inside libpng

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-/* The symbols declared in this file (including the functions declared

- * as extern) are PRIVATE.  They are not part of the libpng public

- * interface, and are not recommended for use by regular applications.

- * Some of them may become public in the future; others may stay private,

- * change in an incompatible way, or even disappear.

- * Although the libpng users are not forbidden to include this header,

- * they should be well aware of the issues that may arise from doing so.

- */

-

-#ifndef PNGPRIV_H

-#define PNGPRIV_H

-

-/* Feature Test Macros.  The following are defined here to ensure that correctly

- * implemented libraries reveal the APIs libpng needs to build and hide those

- * that are not needed and potentially damaging to the compilation.

- *

- * Feature Test Macros must be defined before any system header is included (see

- * POSIX 1003.1 2.8.2 "POSIX Symbols."

- *

- * These macros only have an effect if the operating system supports either

- * POSIX 1003.1 or C99, or both.  On other operating systems (particularly

- * Windows/Visual Studio) there is no effect; the OS specific tests below are

- * still required (as of 2011-05-02.)

- */

-#ifndef _POSIX_SOURCE

-# define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */

-#endif

-

-#ifndef PNG_VERSION_INFO_ONLY

-/* Standard library headers not required by png.h: */

-#  include <stdlib.h>

-#  include <string.h>

-#endif

-

-#define PNGLIB_BUILD /*libpng is being built, not used*/

-

-/* If HAVE_CONFIG_H is defined during the build then the build system must

- * provide an appropriate "config.h" file on the include path.  The header file

- * must provide definitions as required below (search for "HAVE_CONFIG_H");

- * see configure.ac for more details of the requirements.  The macro

- * "PNG_NO_CONFIG_H" is provided for maintainers to test for dependencies on

- * 'configure'; define this macro to prevent the configure build including the

- * configure generated config.h.  Libpng is expected to compile without *any*

- * special build system support on a reasonably ANSI-C compliant system.

- */

-#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)

-#  include <config.h>

-

-   /* Pick up the definition of 'restrict' from config.h if it was read: */

-#  define PNG_RESTRICT restrict

-#endif

-

-/* To support symbol prefixing it is necessary to know *before* including png.h

- * whether the fixed point (and maybe other) APIs are exported, because if they

- * are not internal definitions may be required.  This is handled below just

- * before png.h is included, but load the configuration now if it is available.

- */

-#ifndef PNGLCONF_H

-#  include "pnglibconf.h"

-#endif

-

-/* Local renames may change non-exported API functions from png.h */

-#if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)

-#  include "pngprefix.h"

-#endif

-

-#ifdef PNG_USER_CONFIG

-#  include "pngusr.h"

-   /* These should have been defined in pngusr.h */

-#  ifndef PNG_USER_PRIVATEBUILD

-#    define PNG_USER_PRIVATEBUILD "Custom libpng build"

-#  endif

-#  ifndef PNG_USER_DLLFNAME_POSTFIX

-#    define PNG_USER_DLLFNAME_POSTFIX "Cb"

-#  endif

-#endif

-

-/* Compile time options.

- * =====================

- * In a multi-arch build the compiler may compile the code several times for the

- * same object module, producing different binaries for different architectures.

- * When this happens configure-time setting of the target host options cannot be

- * done and this interferes with the handling of the ARM NEON optimizations, and

- * possibly other similar optimizations.  Put additional tests here; in general

- * this is needed when the same option can be changed at both compile time and

- * run time depending on the target OS (i.e. iOS vs Android.)

- *

- * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because

- * this is not possible with certain compilers (Oracle SUN OS CC), as a result

- * it is necessary to ensure that all extern functions that *might* be used

- * regardless of $(CFLAGS) get declared in this file.  The test on __ARM_NEON__

- * below is one example of this behavior because it is controlled by the

- * presence or not of -mfpu=neon on the GCC command line, it is possible to do

- * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely

- * do this.

- */

-#ifndef PNG_ARM_NEON_OPT

-   /* ARM NEON optimizations are being controlled by the compiler settings,

-    * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon

-    * with GCC) then the compiler will define __ARM_NEON__ and we can rely

-    * unconditionally on NEON instructions not crashing, otherwise we must

-    * disable use of NEON instructions.

-    *

-    * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they

-    * can only be turned on automatically if that is supported too.  If

-    * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail

-    * to compile with an appropriate #error if ALIGNED_MEMORY has been turned

-    * off.

-    *

-    * Note that gcc-4.9 defines __ARM_NEON instead of the deprecated

-    * __ARM_NEON__, so we check both variants.

-    *

-    * To disable ARM_NEON optimizations entirely, and skip compiling the

-    * associated assembler code, pass --enable-arm-neon=no to configure

-    * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.

-    */

-#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \

-   defined(PNG_ALIGNED_MEMORY_SUPPORTED)

-#     define PNG_ARM_NEON_OPT 2

-#  else

-#     define PNG_ARM_NEON_OPT 0

-#  endif

-#endif

-

-#if PNG_ARM_NEON_OPT > 0

-   /* NEON optimizations are to be at least considered by libpng, so enable the

-    * callbacks to do this.

-    */

-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon

-

-   /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used

-    * if possible - if __ARM_NEON__ is set and the compiler version is not known

-    * to be broken.  This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can

-    * be:

-    *

-    *    1  The intrinsics code (the default with __ARM_NEON__)

-    *    2  The hand coded assembler (the default without __ARM_NEON__)

-    *

-    * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however

-    * this is *NOT* supported and may cease to work even after a minor revision

-    * to libpng.  It *is* valid to do this for testing purposes, e.g. speed

-    * testing or a new compiler, but the results should be communicated to the

-    * libpng implementation list for incorporation in the next minor release.

-    */

-#  ifndef PNG_ARM_NEON_IMPLEMENTATION

-#     if defined(__ARM_NEON__) || defined(__ARM_NEON)

-#        if defined(__clang__)

-            /* At present it is unknown by the libpng developers which versions

-             * of clang support the intrinsics, however some or perhaps all

-             * versions do not work with the assembler so this may be

-             * irrelevant, so just use the default (do nothing here.)

-             */

-#        elif defined(__GNUC__)

-            /* GCC 4.5.4 NEON support is known to be broken.  4.6.3 is known to

-             * work, so if this *is* GCC, or G++, look for a version >4.5

-             */

-#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)

-#              define PNG_ARM_NEON_IMPLEMENTATION 2

-#           endif /* no GNUC support */

-#        endif /* __GNUC__ */

-#     else /* !defined __ARM_NEON__ */

-         /* The 'intrinsics' code simply won't compile without this -mfpu=neon:

-          */

-#        define PNG_ARM_NEON_IMPLEMENTATION 2

-#     endif /* __ARM_NEON__ */

-#  endif /* !PNG_ARM_NEON_IMPLEMENTATION */

-

-#  ifndef PNG_ARM_NEON_IMPLEMENTATION

-      /* Use the intrinsics code by default. */

-#     define PNG_ARM_NEON_IMPLEMENTATION 1

-#  endif

-#endif /* PNG_ARM_NEON_OPT > 0 */

-

-#ifndef PNG_MIPS_MSA_OPT

-#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)

-#     define PNG_MIPS_MSA_OPT 2

-#  else

-#     define PNG_MIPS_MSA_OPT 0

-#  endif

-#endif

-

-#ifndef PNG_POWERPC_VSX_OPT

-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)

-#     define PNG_POWERPC_VSX_OPT 2

-#  else

-#     define PNG_POWERPC_VSX_OPT 0

-#  endif

-#endif

-

-#ifndef PNG_INTEL_SSE_OPT

-#   ifdef PNG_INTEL_SSE

-      /* Only check for SSE if the build configuration has been modified to

-       * enable SSE optimizations.  This means that these optimizations will

-       * be off by default.  See contrib/intel for more details.

-       */

-#     if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \

-       defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \

-       (defined(_M_IX86_FP) && _M_IX86_FP >= 2)

-#         define PNG_INTEL_SSE_OPT 1

-#      endif

-#   endif

-#endif

-

-#if PNG_INTEL_SSE_OPT > 0

-#   ifndef PNG_INTEL_SSE_IMPLEMENTATION

-#      if defined(__SSE4_1__) || defined(__AVX__)

-          /* We are not actually using AVX, but checking for AVX is the best

-             way we can detect SSE4.1 and SSSE3 on MSVC.

-          */

-#         define PNG_INTEL_SSE_IMPLEMENTATION 3

-#      elif defined(__SSSE3__)

-#         define PNG_INTEL_SSE_IMPLEMENTATION 2

-#      elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \

-       (defined(_M_IX86_FP) && _M_IX86_FP >= 2)

-#         define PNG_INTEL_SSE_IMPLEMENTATION 1

-#      else

-#         define PNG_INTEL_SSE_IMPLEMENTATION 0

-#      endif

-#   endif

-

-#   if PNG_INTEL_SSE_IMPLEMENTATION > 0

-#      define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2

-#   endif

-#endif

-

-#if PNG_MIPS_MSA_OPT > 0

-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa

-#  ifndef PNG_MIPS_MSA_IMPLEMENTATION

-#     if defined(__mips_msa)

-#        if defined(__clang__)

-#        elif defined(__GNUC__)

-#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)

-#              define PNG_MIPS_MSA_IMPLEMENTATION 2

-#           endif /* no GNUC support */

-#        endif /* __GNUC__ */

-#     else /* !defined __mips_msa */

-#        define PNG_MIPS_MSA_IMPLEMENTATION 2

-#     endif /* __mips_msa */

-#  endif /* !PNG_MIPS_MSA_IMPLEMENTATION */

-

-#  ifndef PNG_MIPS_MSA_IMPLEMENTATION

-#     define PNG_MIPS_MSA_IMPLEMENTATION 1

-#  endif

-#endif /* PNG_MIPS_MSA_OPT > 0 */

-

-#if PNG_POWERPC_VSX_OPT > 0

-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx

-#  define PNG_POWERPC_VSX_IMPLEMENTATION 1

-#endif

-

-

-/* Is this a build of a DLL where compilation of the object modules requires

- * different preprocessor settings to those required for a simple library?  If

- * so PNG_BUILD_DLL must be set.

- *

- * If libpng is used inside a DLL but that DLL does not export the libpng APIs

- * PNG_BUILD_DLL must not be set.  To avoid the code below kicking in build a

- * static library of libpng then link the DLL against that.

- */

-#ifndef PNG_BUILD_DLL

-#  ifdef DLL_EXPORT

-      /* This is set by libtool when files are compiled for a DLL; libtool

-       * always compiles twice, even on systems where it isn't necessary.  Set

-       * PNG_BUILD_DLL in case it is necessary:

-       */

-#     define PNG_BUILD_DLL

-#  else

-#     ifdef _WINDLL

-         /* This is set by the Microsoft Visual Studio IDE in projects that

-          * build a DLL.  It can't easily be removed from those projects (it

-          * isn't visible in the Visual Studio UI) so it is a fairly reliable

-          * indication that PNG_IMPEXP needs to be set to the DLL export

-          * attributes.

-          */

-#        define PNG_BUILD_DLL

-#     else

-#        ifdef __DLL__

-            /* This is set by the Borland C system when compiling for a DLL

-             * (as above.)

-             */

-#           define PNG_BUILD_DLL

-#        else

-            /* Add additional compiler cases here. */

-#        endif

-#     endif

-#  endif

-#endif /* Setting PNG_BUILD_DLL if required */

-

-/* See pngconf.h for more details: the builder of the library may set this on

- * the command line to the right thing for the specific compilation system or it

- * may be automagically set above (at present we know of no system where it does

- * need to be set on the command line.)

- *

- * PNG_IMPEXP must be set here when building the library to prevent pngconf.h

- * setting it to the "import" setting for a DLL build.

- */

-#ifndef PNG_IMPEXP

-#  ifdef PNG_BUILD_DLL

-#     define PNG_IMPEXP PNG_DLL_EXPORT

-#  else

-      /* Not building a DLL, or the DLL doesn't require specific export

-       * definitions.

-       */

-#     define PNG_IMPEXP

-#  endif

-#endif

-

-/* No warnings for private or deprecated functions in the build: */

-#ifndef PNG_DEPRECATED

-#  define PNG_DEPRECATED

-#endif

-#ifndef PNG_PRIVATE

-#  define PNG_PRIVATE

-#endif

-

-/* Symbol preprocessing support.

- *

- * To enable listing global, but internal, symbols the following macros should

- * always be used to declare an extern data or function object in this file.

- */

-#ifndef PNG_INTERNAL_DATA

-#  define PNG_INTERNAL_DATA(type, name, array) PNG_LINKAGE_DATA type name array

-#endif

-

-#ifndef PNG_INTERNAL_FUNCTION

-#  define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\

-      PNG_LINKAGE_FUNCTION PNG_FUNCTION(type, name, args, PNG_EMPTY attributes)

-#endif

-

-#ifndef PNG_INTERNAL_CALLBACK

-#  define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\

-      PNG_LINKAGE_CALLBACK PNG_FUNCTION(type, (PNGCBAPI name), args,\

-         PNG_EMPTY attributes)

-#endif

-

-/* If floating or fixed point APIs are disabled they may still be compiled

- * internally.  To handle this make sure they are declared as the appropriate

- * internal extern function (otherwise the symbol prefixing stuff won't work and

- * the functions will be used without definitions.)

- *

- * NOTE: although all the API functions are declared here they are not all

- * actually built!  Because the declarations are still made it is necessary to

- * fake out types that they depend on.

- */

-#ifndef PNG_FP_EXPORT

-#  ifndef PNG_FLOATING_POINT_SUPPORTED

-#     define PNG_FP_EXPORT(ordinal, type, name, args)\

-         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);

-#     ifndef PNG_VERSION_INFO_ONLY

-         typedef struct png_incomplete png_double;

-         typedef png_double*           png_doublep;

-         typedef const png_double*     png_const_doublep;

-         typedef png_double**          png_doublepp;

-#     endif

-#  endif

-#endif

-#ifndef PNG_FIXED_EXPORT

-#  ifndef PNG_FIXED_POINT_SUPPORTED

-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\

-         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);

-#  endif

-#endif

-

-#include "png.h"

-

-/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */

-#ifndef PNG_DLL_EXPORT

-#  define PNG_DLL_EXPORT

-#endif

-

-/* This is a global switch to set the compilation for an installed system

- * (a release build).  It can be set for testing debug builds to ensure that

- * they will compile when the build type is switched to RC or STABLE, the

- * default is just to use PNG_LIBPNG_BUILD_BASE_TYPE.  Set this in CPPFLAGS

- * with either:

- *

- *   -DPNG_RELEASE_BUILD Turns on the release compile path

- *   -DPNG_RELEASE_BUILD=0 Turns it off

- * or in your pngusr.h with

- *   #define PNG_RELEASE_BUILD=1 Turns on the release compile path

- *   #define PNG_RELEASE_BUILD=0 Turns it off

- */

-#ifndef PNG_RELEASE_BUILD

-#  define PNG_RELEASE_BUILD (PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC)

-#endif

-

-/* SECURITY and SAFETY:

- *

- * libpng is built with support for internal limits on image dimensions and

- * memory usage.  These are documented in scripts/pnglibconf.dfa of the

- * source and recorded in the machine generated header file pnglibconf.h.

- */

-

-/* If you are running on a machine where you cannot allocate more

- * than 64K of memory at once, uncomment this.  While libpng will not

- * normally need that much memory in a chunk (unless you load up a very

- * large file), zlib needs to know how big of a chunk it can use, and

- * libpng thus makes sure to check any memory allocation to verify it

- * will fit into memory.

- *

- * zlib provides 'MAXSEG_64K' which, if defined, indicates the

- * same limit and pngconf.h (already included) sets the limit

- * if certain operating systems are detected.

- */

-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)

-#  define PNG_MAX_MALLOC_64K

-#endif

-

-#ifndef PNG_UNUSED

-/* Unused formal parameter warnings are silenced using the following macro

- * which is expected to have no bad effects on performance (optimizing

- * compilers will probably remove it entirely).  Note that if you replace

- * it with something other than whitespace, you must include the terminating

- * semicolon.

- */

-#  define PNG_UNUSED(param) (void)param;

-#endif

-

-/* Just a little check that someone hasn't tried to define something

- * contradictory.

- */

-#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)

-#  undef PNG_ZBUF_SIZE

-#  define PNG_ZBUF_SIZE 65536L

-#endif

-

-/* If warnings or errors are turned off the code is disabled or redirected here.

- * From 1.5.4 functions have been added to allow very limited formatting of

- * error and warning messages - this code will also be disabled here.

- */

-#ifdef PNG_WARNINGS_SUPPORTED

-#  define PNG_WARNING_PARAMETERS(p) png_warning_parameters p;

-#else

-#  define png_warning_parameter(p,number,string) ((void)0)

-#  define png_warning_parameter_unsigned(p,number,format,value) ((void)0)

-#  define png_warning_parameter_signed(p,number,format,value) ((void)0)

-#  define png_formatted_warning(pp,p,message) ((void)(pp))

-#  define PNG_WARNING_PARAMETERS(p)

-#endif

-#ifndef PNG_ERROR_TEXT_SUPPORTED

-#  define png_fixed_error(s1,s2) png_err(s1)

-#endif

-

-/* Some fixed point APIs are still required even if not exported because

- * they get used by the corresponding floating point APIs.  This magic

- * deals with this:

- */

-#ifdef PNG_FIXED_POINT_SUPPORTED

-#  define PNGFAPI PNGAPI

-#else

-#  define PNGFAPI /* PRIVATE */

-#endif

-

-#ifndef PNG_VERSION_INFO_ONLY

-/* Other defines specific to compilers can go here.  Try to keep

- * them inside an appropriate ifdef/endif pair for portability.

- */

-

-/* C allows up-casts from (void*) to any pointer and (const void*) to any

- * pointer to a const object.  C++ regards this as a type error and requires an

- * explicit, static, cast and provides the static_cast<> rune to ensure that

- * const is not cast away.

- */

-#ifdef __cplusplus

-#  define png_voidcast(type, value) static_cast<type>(value)

-#  define png_constcast(type, value) const_cast<type>(value)

-#  define png_aligncast(type, value) \

-   static_cast<type>(static_cast<void*>(value))

-#  define png_aligncastconst(type, value) \

-   static_cast<type>(static_cast<const void*>(value))

-#else

-#  define png_voidcast(type, value) (value)

-#  ifdef _WIN64

-#     ifdef __GNUC__

-         typedef unsigned long long png_ptruint;

-#     else

-         typedef unsigned __int64 png_ptruint;

-#     endif

-#  else

-      typedef unsigned long png_ptruint;

-#  endif

-#  define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))

-#  define png_aligncast(type, value) ((void*)(value))

-#  define png_aligncastconst(type, value) ((const void*)(value))

-#endif /* __cplusplus */

-

-#if defined(PNG_FLOATING_POINT_SUPPORTED) ||\

-    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)

-   /* png.c requires the following ANSI-C constants if the conversion of

-    * floating point to ASCII is implemented therein:

-    *

-    *  DBL_DIG  Maximum number of decimal digits (can be set to any constant)

-    *  DBL_MIN  Smallest normalized fp number (can be set to an arbitrary value)

-    *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)

-    */

-#  include <float.h>

-

-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \

-    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)

-   /* We need to check that <math.h> hasn't already been included earlier

-    * as it seems it doesn't agree with <fp.h>, yet we should really use

-    * <fp.h> if possible.

-    */

-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)

-#      include <fp.h>

-#    endif

-#  else

-#    include <math.h>

-#  endif

-#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)

-   /* Amiga SAS/C: We must include builtin FPU functions when compiling using

-    * MATH=68881

-    */

-#    include <m68881.h>

-#  endif

-#endif

-

-/* This provides the non-ANSI (far) memory allocation routines. */

-#if defined(__TURBOC__) && defined(__MSDOS__)

-#  include <mem.h>

-#  include <alloc.h>

-#endif

-

-#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \

-    defined(_WIN32) || defined(__WIN32__)

-#  include <windows.h>  /* defines _WINDOWS_ macro */

-#endif

-#endif /* PNG_VERSION_INFO_ONLY */

-

-/* Moved here around 1.5.0beta36 from pngconf.h */

-/* Users may want to use these so they are not private.  Any library

- * functions that are passed far data must be model-independent.

- */

-

-/* Memory model/platform independent fns */

-#ifndef PNG_ABORT

-#  ifdef _WINDOWS_

-#    define PNG_ABORT() ExitProcess(0)

-#  else

-#    define PNG_ABORT() abort()

-#  endif

-#endif

-

-/* These macros may need to be architecture dependent. */

-#define PNG_ALIGN_NONE   0 /* do not use data alignment */

-#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */

-#ifdef offsetof

-#  define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */

-#else

-#  define PNG_ALIGN_OFFSET -1 /* prevent the use of this */

-#endif

-#define PNG_ALIGN_SIZE   3 /* use sizeof to determine alignment */

-

-#ifndef PNG_ALIGN_TYPE

-   /* Default to using aligned access optimizations and requiring alignment to a

-    * multiple of the data type size.  Override in a compiler specific fashion

-    * if necessary by inserting tests here:

-    */

-#  define PNG_ALIGN_TYPE PNG_ALIGN_SIZE

-#endif

-

-#if PNG_ALIGN_TYPE == PNG_ALIGN_SIZE

-   /* This is used because in some compiler implementations non-aligned

-    * structure members are supported, so the offsetof approach below fails.

-    * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access

-    * is good for performance.  Do not do this unless you have tested the result

-    * and understand it.

-    */

-#  define png_alignof(type) (sizeof (type))

-#else

-#  if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET

-#     define png_alignof(type) offsetof(struct{char c; type t;}, t)

-#  else

-#     if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS

-#        define png_alignof(type) (1)

-#     endif

-      /* Else leave png_alignof undefined to prevent use thereof */

-#  endif

-#endif

-

-/* This implicitly assumes alignment is always to a power of 2. */

-#ifdef png_alignof

-#  define png_isaligned(ptr, type)\

-   (((type)((const char*)ptr-(const char*)0) & \

-   (type)(png_alignof(type)-1)) == 0)

-#else

-#  define png_isaligned(ptr, type) 0

-#endif

-

-/* End of memory model/platform independent support */

-/* End of 1.5.0beta36 move from pngconf.h */

-

-/* CONSTANTS and UTILITY MACROS

- * These are used internally by libpng and not exposed in the API

- */

-

-/* Various modes of operation.  Note that after an init, mode is set to

- * zero automatically when the structure is created.  Three of these

- * are defined in png.h because they need to be visible to applications

- * that call png_set_unknown_chunk().

- */

-/* #define PNG_HAVE_IHDR            0x01U (defined in png.h) */

-/* #define PNG_HAVE_PLTE            0x02U (defined in png.h) */

-#define PNG_HAVE_IDAT               0x04U

-/* #define PNG_AFTER_IDAT           0x08U (defined in png.h) */

-#define PNG_HAVE_IEND               0x10U

-                   /*               0x20U (unused) */

-                   /*               0x40U (unused) */

-                   /*               0x80U (unused) */

-#define PNG_HAVE_CHUNK_HEADER      0x100U

-#define PNG_WROTE_tIME             0x200U

-#define PNG_WROTE_INFO_BEFORE_PLTE 0x400U

-#define PNG_BACKGROUND_IS_GRAY     0x800U

-#define PNG_HAVE_PNG_SIGNATURE    0x1000U

-#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */

-                   /*             0x4000U (unused) */

-#define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */

-

-/* Flags for the transformations the PNG library does on the image data */

-#define PNG_BGR                 0x0001U

-#define PNG_INTERLACE           0x0002U

-#define PNG_PACK                0x0004U

-#define PNG_SHIFT               0x0008U

-#define PNG_SWAP_BYTES          0x0010U

-#define PNG_INVERT_MONO         0x0020U

-#define PNG_QUANTIZE            0x0040U

-#define PNG_COMPOSE             0x0080U    /* Was PNG_BACKGROUND */

-#define PNG_BACKGROUND_EXPAND   0x0100U

-#define PNG_EXPAND_16           0x0200U    /* Added to libpng 1.5.2 */

-#define PNG_16_TO_8             0x0400U    /* Becomes 'chop' in 1.5.4 */

-#define PNG_RGBA                0x0800U

-#define PNG_EXPAND              0x1000U

-#define PNG_GAMMA               0x2000U

-#define PNG_GRAY_TO_RGB         0x4000U

-#define PNG_FILLER              0x8000U

-#define PNG_PACKSWAP           0x10000U

-#define PNG_SWAP_ALPHA         0x20000U

-#define PNG_STRIP_ALPHA        0x40000U

-#define PNG_INVERT_ALPHA       0x80000U

-#define PNG_USER_TRANSFORM    0x100000U

-#define PNG_RGB_TO_GRAY_ERR   0x200000U

-#define PNG_RGB_TO_GRAY_WARN  0x400000U

-#define PNG_RGB_TO_GRAY       0x600000U /* two bits, RGB_TO_GRAY_ERR|WARN */

-#define PNG_ENCODE_ALPHA      0x800000U /* Added to libpng-1.5.4 */

-#define PNG_ADD_ALPHA        0x1000000U /* Added to libpng-1.2.7 */

-#define PNG_EXPAND_tRNS      0x2000000U /* Added to libpng-1.2.9 */

-#define PNG_SCALE_16_TO_8    0x4000000U /* Added to libpng-1.5.4 */

-                       /*    0x8000000U unused */

-                       /*   0x10000000U unused */

-                       /*   0x20000000U unused */

-                       /*   0x40000000U unused */

-/* Flags for png_create_struct */

-#define PNG_STRUCT_PNG   0x0001U

-#define PNG_STRUCT_INFO  0x0002U

-

-/* Flags for the png_ptr->flags rather than declaring a byte for each one */

-#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001U

-#define PNG_FLAG_ZSTREAM_INITIALIZED      0x0002U /* Added to libpng-1.6.0 */

-                                  /*      0x0004U    unused */

-#define PNG_FLAG_ZSTREAM_ENDED            0x0008U /* Added to libpng-1.6.0 */

-                                  /*      0x0010U    unused */

-                                  /*      0x0020U    unused */

-#define PNG_FLAG_ROW_INIT                 0x0040U

-#define PNG_FLAG_FILLER_AFTER             0x0080U

-#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100U

-#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200U

-#define PNG_FLAG_CRC_CRITICAL_USE         0x0400U

-#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800U

-#define PNG_FLAG_ASSUME_sRGB              0x1000U /* Added to libpng-1.5.4 */

-#define PNG_FLAG_OPTIMIZE_ALPHA           0x2000U /* Added to libpng-1.5.4 */

-#define PNG_FLAG_DETECT_UNINITIALIZED     0x4000U /* Added to libpng-1.5.4 */

-/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */

-/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS      0x10000U */

-#define PNG_FLAG_LIBRARY_MISMATCH        0x20000U

-#define PNG_FLAG_STRIP_ERROR_NUMBERS     0x40000U

-#define PNG_FLAG_STRIP_ERROR_TEXT        0x80000U

-#define PNG_FLAG_BENIGN_ERRORS_WARN     0x100000U /* Added to libpng-1.4.0 */

-#define PNG_FLAG_APP_WARNINGS_WARN      0x200000U /* Added to libpng-1.6.0 */

-#define PNG_FLAG_APP_ERRORS_WARN        0x400000U /* Added to libpng-1.6.0 */

-                                  /*    0x800000U    unused */

-                                  /*   0x1000000U    unused */

-                                  /*   0x2000000U    unused */

-                                  /*   0x4000000U    unused */

-                                  /*   0x8000000U    unused */

-                                  /*  0x10000000U    unused */

-                                  /*  0x20000000U    unused */

-                                  /*  0x40000000U    unused */

-

-#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \

-                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)

-

-#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \

-                                     PNG_FLAG_CRC_CRITICAL_IGNORE)

-

-#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \

-                                     PNG_FLAG_CRC_CRITICAL_MASK)

-

-/* Save typing and make code easier to understand */

-

-#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \

-   abs((int)((c1).green) - (int)((c2).green)) + \

-   abs((int)((c1).blue) - (int)((c2).blue)))

-

-/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255

- * by dividing by 257 *with rounding*.  This macro is exact for the given range.

- * See the discourse in pngrtran.c png_do_scale_16_to_8.  The values in the

- * macro were established by experiment (modifying the added value).  The macro

- * has a second variant that takes a value already scaled by 255 and divides by

- * 65535 - this has a maximum error of .502.  Over the range 0..65535*65535 it

- * only gives off-by-one errors and only for 0.5% (1 in 200) of the values.

- */

-#define PNG_DIV65535(v24) (((v24) + 32895) >> 16)

-#define PNG_DIV257(v16) PNG_DIV65535((png_uint_32)(v16) * 255)

-

-/* Added to libpng-1.2.6 JB */

-#define PNG_ROWBYTES(pixel_bits, width) \

-    ((pixel_bits) >= 8 ? \

-    ((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \

-    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )

-

-/* This returns the number of trailing bits in the last byte of a row, 0 if the

- * last byte is completely full of pixels.  It is, in principle, (pixel_bits x

- * width) % 8, but that would overflow for large 'width'.  The second macro is

- * the same except that it returns the number of unused bits in the last byte;

- * (8-TRAILBITS), but 0 when TRAILBITS is 0.

- *

- * NOTE: these macros are intended to be self-evidently correct and never

- * overflow on the assumption that pixel_bits is in the range 0..255.  The

- * arguments are evaluated only once and they can be signed (e.g. as a result of

- * the integral promotions).  The result of the expression always has type

- * (png_uint_32), however the compiler always knows it is in the range 0..7.

- */

-#define PNG_TRAILBITS(pixel_bits, width) \

-    (((pixel_bits) * ((width) % (png_uint_32)8)) % 8)

-

-#define PNG_PADBITS(pixel_bits, width) \

-    ((8 - PNG_TRAILBITS(pixel_bits, width)) % 8)

-

-/* PNG_OUT_OF_RANGE returns true if value is outside the range

- * ideal-delta..ideal+delta.  Each argument is evaluated twice.

- * "ideal" and "delta" should be constants, normally simple

- * integers, "value" a variable. Added to libpng-1.2.6 JB

- */

-#define PNG_OUT_OF_RANGE(value, ideal, delta) \

-   ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )

-

-/* Conversions between fixed and floating point, only defined if

- * required (to make sure the code doesn't accidentally use float

- * when it is supposedly disabled.)

- */

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-/* The floating point conversion can't overflow, though it can and

- * does lose accuracy relative to the original fixed point value.

- * In practice this doesn't matter because png_fixed_point only

- * stores numbers with very low precision.  The png_ptr and s

- * arguments are unused by default but are there in case error

- * checking becomes a requirement.

- */

-#define png_float(png_ptr, fixed, s) (.00001 * (fixed))

-

-/* The fixed point conversion performs range checking and evaluates

- * its argument multiple times, so must be used with care.  The

- * range checking uses the PNG specification values for a signed

- * 32-bit fixed point value except that the values are deliberately

- * rounded-to-zero to an integral value - 21474 (21474.83 is roughly

- * (2^31-1) * 100000). 's' is a string that describes the value being

- * converted.

- *

- * NOTE: this macro will raise a png_error if the range check fails,

- * therefore it is normally only appropriate to use this on values

- * that come from API calls or other sources where an out of range

- * error indicates a programming error, not a data error!

- *

- * NOTE: by default this is off - the macro is not used - because the

- * function call saves a lot of code.

- */

-#ifdef PNG_FIXED_POINT_MACRO_SUPPORTED

-#define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\

-    ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))

-#endif

-/* else the corresponding function is defined below, inside the scope of the

- * cplusplus test.

- */

-#endif

-

-/* Constants for known chunk types.  If you need to add a chunk, define the name

- * here.  For historical reasons these constants have the form png_<name>; i.e.

- * the prefix is lower case.  Please use decimal values as the parameters to

- * match the ISO PNG specification and to avoid relying on the C locale

- * interpretation of character values.

- *

- * Prior to 1.5.6 these constants were strings, as of 1.5.6 png_uint_32 values

- * are computed and a new macro (PNG_STRING_FROM_CHUNK) added to allow a string

- * to be generated if required.

- *

- * PNG_32b correctly produces a value shifted by up to 24 bits, even on

- * architectures where (int) is only 16 bits.

- */

-#define PNG_32b(b,s) ((png_uint_32)(b) << (s))

-#define PNG_U32(b1,b2,b3,b4) \

-   (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))

-

-/* Constants for known chunk types.

- *

- * MAINTAINERS: If you need to add a chunk, define the name here.

- * For historical reasons these constants have the form png_<name>; i.e.

- * the prefix is lower case.  Please use decimal values as the parameters to

- * match the ISO PNG specification and to avoid relying on the C locale

- * interpretation of character values.  Please keep the list sorted.

- *

- * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk

- * type.  In fact the specification does not express chunk types this way,

- * however using a 32-bit value means that the chunk type can be read from the

- * stream using exactly the same code as used for a 32-bit unsigned value and

- * can be examined far more efficiently (using one arithmetic compare).

- *

- * Prior to 1.5.6 the chunk type constants were expressed as C strings.  The

- * libpng API still uses strings for 'unknown' chunks and a macro,

- * PNG_STRING_FROM_CHUNK, allows a string to be generated if required.  Notice

- * that for portable code numeric values must still be used; the string "IHDR"

- * is not portable and neither is PNG_U32('I', 'H', 'D', 'R').

- *

- * In 1.7.0 the definitions will be made public in png.h to avoid having to

- * duplicate the same definitions in application code.

- */

-#define png_IDAT PNG_U32( 73,  68,  65,  84)

-#define png_IEND PNG_U32( 73,  69,  78,  68)

-#define png_IHDR PNG_U32( 73,  72,  68,  82)

-#define png_PLTE PNG_U32( 80,  76,  84,  69)

-#define png_bKGD PNG_U32( 98,  75,  71,  68)

-#define png_cHRM PNG_U32( 99,  72,  82,  77)

-#define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */

-#define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */

-#define png_gAMA PNG_U32(103,  65,  77,  65)

-#define png_gIFg PNG_U32(103,  73,  70, 103)

-#define png_gIFt PNG_U32(103,  73,  70, 116) /* deprecated */

-#define png_gIFx PNG_U32(103,  73,  70, 120)

-#define png_hIST PNG_U32(104,  73,  83,  84)

-#define png_iCCP PNG_U32(105,  67,  67,  80)

-#define png_iTXt PNG_U32(105,  84,  88, 116)

-#define png_oFFs PNG_U32(111,  70,  70, 115)

-#define png_pCAL PNG_U32(112,  67,  65,  76)

-#define png_pHYs PNG_U32(112,  72,  89, 115)

-#define png_sBIT PNG_U32(115,  66,  73,  84)

-#define png_sCAL PNG_U32(115,  67,  65,  76)

-#define png_sPLT PNG_U32(115,  80,  76,  84)

-#define png_sRGB PNG_U32(115,  82,  71,  66)

-#define png_sTER PNG_U32(115,  84,  69,  82)

-#define png_tEXt PNG_U32(116,  69,  88, 116)

-#define png_tIME PNG_U32(116,  73,  77,  69)

-#define png_tRNS PNG_U32(116,  82,  78,  83)

-#define png_zTXt PNG_U32(122,  84,  88, 116)

-

-/* The following will work on (signed char*) strings, whereas the get_uint_32

- * macro will fail on top-bit-set values because of the sign extension.

- */

-#define PNG_CHUNK_FROM_STRING(s)\

-   PNG_U32(0xff & (s)[0], 0xff & (s)[1], 0xff & (s)[2], 0xff & (s)[3])

-

-/* This uses (char), not (png_byte) to avoid warnings on systems where (char) is

- * signed and the argument is a (char[])  This macro will fail miserably on

- * systems where (char) is more than 8 bits.

- */

-#define PNG_STRING_FROM_CHUNK(s,c)\

-   (void)(((char*)(s))[0]=(char)(((c)>>24) & 0xff), \

-   ((char*)(s))[1]=(char)(((c)>>16) & 0xff),\

-   ((char*)(s))[2]=(char)(((c)>>8) & 0xff), \

-   ((char*)(s))[3]=(char)((c & 0xff)))

-

-/* Do the same but terminate with a null character. */

-#define PNG_CSTRING_FROM_CHUNK(s,c)\

-   (void)(PNG_STRING_FROM_CHUNK(s,c), ((char*)(s))[4] = 0)

-

-/* Test on flag values as defined in the spec (section 5.4): */

-#define PNG_CHUNK_ANCILLARY(c)   (1 & ((c) >> 29))

-#define PNG_CHUNK_CRITICAL(c)     (!PNG_CHUNK_ANCILLARY(c))

-#define PNG_CHUNK_PRIVATE(c)      (1 & ((c) >> 21))

-#define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))

-#define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))

-

-/* Gamma values (new at libpng-1.5.4): */

-#define PNG_GAMMA_MAC_OLD 151724  /* Assume '1.8' is really 2.2/1.45! */

-#define PNG_GAMMA_MAC_INVERSE 65909

-#define PNG_GAMMA_sRGB_INVERSE 45455

-

-/* Almost everything below is C specific; the #defines above can be used in

- * non-C code (so long as it is C-preprocessed) the rest of this stuff cannot.

- */

-#ifndef PNG_VERSION_INFO_ONLY

-

-#include "pngstruct.h"

-#include "pnginfo.h"

-

-/* Validate the include paths - the include path used to generate pnglibconf.h

- * must match that used in the build, or we must be using pnglibconf.h.prebuilt:

- */

-#if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM

-#  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \

-      "-I (include path) error: see the notes in pngpriv.h"

-   /* This means that when pnglibconf.h was built the copy of zlib.h that it

-    * used is not the same as the one being used here.  Because the build of

-    * libpng makes decisions to use inflateInit2 and inflateReset2 based on the

-    * zlib version number and because this affects handling of certain broken

-    * PNG files the -I directives must match.

-    *

-    * The most likely explanation is that you passed a -I in CFLAGS. This will

-    * not work; all the preprocessor directories and in particular all the -I

-    * directives must be in CPPFLAGS.

-    */

-#endif

-

-/* This is used for 16-bit gamma tables -- only the top level pointers are

- * const; this could be changed:

- */

-typedef const png_uint_16p * png_const_uint_16pp;

-

-/* Added to libpng-1.5.7: sRGB conversion tables */

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\

-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED

-PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);

-   /* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,

-    * 0..65535.  This table gives the closest 16-bit answers (no errors).

-    */

-#endif

-

-PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_base, [512]);

-PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);

-

-#define PNG_sRGB_FROM_LINEAR(linear) \

-  ((png_byte)(0xff & ((png_sRGB_base[(linear)>>15] \

-   + ((((linear) & 0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8)))

-   /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB

-    * encoded value with maximum error 0.646365.  Note that the input is not a

-    * 16-bit value; it has been multiplied by 255! */

-#endif /* SIMPLIFIED_READ/WRITE */

-

-

-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */

-#ifdef __cplusplus

-extern "C" {

-#endif /* __cplusplus */

-

-/* Internal functions; these are not exported from a DLL however because they

- * are used within several of the C source files they have to be C extern.

- *

- * All of these functions must be declared with PNG_INTERNAL_FUNCTION.

- */

-

-/* Zlib support */

-#define PNG_UNEXPECTED_ZLIB_RETURN (-7)

-PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),

-   PNG_EMPTY);

-   /* Used by the zlib handling functions to ensure that z_stream::msg is always

-    * set before they return.

-    */

-

-#ifdef PNG_WRITE_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,

-   png_compression_bufferp *list),PNG_EMPTY);

-   /* Free the buffer list used by the compressed write code. */

-#endif

-

-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \

-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \

-   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \

-   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \

-   (defined(PNG_sCAL_SUPPORTED) && \

-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))

-PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,

-   double fp, png_const_charp text),PNG_EMPTY);

-#endif

-

-/* Check the user version string for compatibility, returns false if the version

- * numbers aren't compatible.

- */

-PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,

-   png_const_charp user_png_ver),PNG_EMPTY);

-

-/* Internal base allocator - no messages, NULL on failure to allocate.  This

- * does, however, call the application provided allocator and that could call

- * png_error (although that would be a bug in the application implementation.)

- */

-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr,

-   png_alloc_size_t size),PNG_ALLOCATED);

-

-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\

-   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)

-/* Internal array allocator, outputs no error or warning messages on failure,

- * just returns NULL.

- */

-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr,

-   int nelements, size_t element_size),PNG_ALLOCATED);

-

-/* The same but an existing array is extended by add_elements.  This function

- * also memsets the new elements to 0 and copies the old elements.  The old

- * array is not freed or altered.

- */

-PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,

-   png_const_voidp array, int old_elements, int add_elements,

-   size_t element_size),PNG_ALLOCATED);

-#endif /* text, sPLT or unknown chunks */

-

-/* Magic to create a struct when there is no struct to call the user supplied

- * memory allocators.  Because error handling has not been set up the memory

- * handlers can't safely call png_error, but this is an obscure and undocumented

- * restriction so libpng has to assume that the 'free' handler, at least, might

- * call png_error.

- */

-PNG_INTERNAL_FUNCTION(png_structp,png_create_png_struct,

-   (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,

-    png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,

-    png_free_ptr free_fn),PNG_ALLOCATED);

-

-/* Free memory from internal libpng struct */

-PNG_INTERNAL_FUNCTION(void,png_destroy_png_struct,(png_structrp png_ptr),

-   PNG_EMPTY);

-

-/* Free an allocated jmp_buf (always succeeds) */

-PNG_INTERNAL_FUNCTION(void,png_free_jmpbuf,(png_structrp png_ptr),PNG_EMPTY);

-

-/* Function to allocate memory for zlib.  PNGAPI is disallowed. */

-PNG_INTERNAL_FUNCTION(voidpf,png_zalloc,(voidpf png_ptr, uInt items, uInt size),

-   PNG_ALLOCATED);

-

-/* Function to free memory for zlib.  PNGAPI is disallowed. */

-PNG_INTERNAL_FUNCTION(void,png_zfree,(voidpf png_ptr, voidpf ptr),PNG_EMPTY);

-

-/* Next four functions are used internally as callbacks.  PNGCBAPI is required

- * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to

- * PNGCBAPI at 1.5.0

- */

-

-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,

-    png_bytep data, png_size_t length),PNG_EMPTY);

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,

-    png_bytep buffer, png_size_t length),PNG_EMPTY);

-#endif

-

-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,

-    png_bytep data, png_size_t length),PNG_EMPTY);

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-#  ifdef PNG_STDIO_SUPPORTED

-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_flush,(png_structp png_ptr),

-   PNG_EMPTY);

-#  endif

-#endif

-

-/* Reset the CRC variable */

-PNG_INTERNAL_FUNCTION(void,png_reset_crc,(png_structrp png_ptr),PNG_EMPTY);

-

-/* Write the "data" buffer to whatever output you are using */

-PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,

-    png_const_bytep data, png_size_t length),PNG_EMPTY);

-

-/* Read and check the PNG file signature */

-PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,

-   png_inforp info_ptr),PNG_EMPTY);

-

-/* Read the chunk header (length + type name) */

-PNG_INTERNAL_FUNCTION(png_uint_32,png_read_chunk_header,(png_structrp png_ptr),

-   PNG_EMPTY);

-

-/* Read data from whatever input you are using into the "data" buffer */

-PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,

-    png_size_t length),PNG_EMPTY);

-

-/* Read bytes into buf, and update png_ptr->crc */

-PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,

-    png_uint_32 length),PNG_EMPTY);

-

-/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */

-PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,

-   png_uint_32 skip),PNG_EMPTY);

-

-/* Read the CRC from the file and compare it to the libpng calculated CRC */

-PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);

-

-/* Calculate the CRC over a section of data.  Note that we are only

- * passing a maximum of 64K on systems that have this as a memory limit,

- * since this is the maximum buffer size we can specify.

- */

-PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,

-   png_const_bytep ptr, png_size_t length),PNG_EMPTY);

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);

-#endif

-

-/* Write various chunks */

-

-/* Write the IHDR chunk, and update the png_struct with the necessary

- * information.

- */

-PNG_INTERNAL_FUNCTION(void,png_write_IHDR,(png_structrp png_ptr,

-   png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,

-   int compression_method, int filter_method, int interlace_method),PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_write_PLTE,(png_structrp png_ptr,

-   png_const_colorp palette, png_uint_32 num_pal),PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_compress_IDAT,(png_structrp png_ptr,

-   png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),

-   PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_write_IEND,(png_structrp png_ptr),PNG_EMPTY);

-

-#ifdef PNG_WRITE_gAMA_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_gAMA_fixed,(png_structrp png_ptr,

-    png_fixed_point file_gamma),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_sBIT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_sBIT,(png_structrp png_ptr,

-    png_const_color_8p sbit, int color_type),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_cHRM_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,

-    const png_xy *xy), PNG_EMPTY);

-   /* The xy value must have been previously validated */

-#endif

-

-#ifdef PNG_WRITE_sRGB_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,

-    int intent),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_eXIf_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_eXIf,(png_structrp png_ptr,

-    png_bytep exif, int num_exif),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_iCCP_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,

-   png_const_charp name, png_const_bytep profile), PNG_EMPTY);

-   /* The profile must have been previously validated for correctness, the

-    * length comes from the first four bytes.  Only the base, deflate,

-    * compression is supported.

-    */

-#endif

-

-#ifdef PNG_WRITE_sPLT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_sPLT,(png_structrp png_ptr,

-    png_const_sPLT_tp palette),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_tRNS_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_tRNS,(png_structrp png_ptr,

-    png_const_bytep trans, png_const_color_16p values, int number,

-    int color_type),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_bKGD_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_bKGD,(png_structrp png_ptr,

-    png_const_color_16p values, int color_type),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_hIST_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_hIST,(png_structrp png_ptr,

-    png_const_uint_16p hist, int num_hist),PNG_EMPTY);

-#endif

-

-/* Chunks that have keywords */

-#ifdef PNG_WRITE_tEXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,

-   png_const_charp key, png_const_charp text, png_size_t text_len),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_zTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp

-    key, png_const_charp text, int compression),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_iTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_iTXt,(png_structrp png_ptr,

-    int compression, png_const_charp key, png_const_charp lang,

-    png_const_charp lang_key, png_const_charp text),PNG_EMPTY);

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */

-PNG_INTERNAL_FUNCTION(int,png_set_text_2,(png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_textp text_ptr, int num_text),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_oFFs_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_oFFs,(png_structrp png_ptr,

-    png_int_32 x_offset, png_int_32 y_offset, int unit_type),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_pCAL_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_pCAL,(png_structrp png_ptr,

-    png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,

-    png_const_charp units, png_charpp params),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_pHYs_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_pHYs,(png_structrp png_ptr,

-    png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,

-    int unit_type),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_tIME_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_tIME,(png_structrp png_ptr,

-    png_const_timep mod_time),PNG_EMPTY);

-#endif

-

-#ifdef PNG_WRITE_sCAL_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_write_sCAL_s,(png_structrp png_ptr,

-    int unit, png_const_charp width, png_const_charp height),PNG_EMPTY);

-#endif

-

-/* Called when finished processing a row of data */

-PNG_INTERNAL_FUNCTION(void,png_write_finish_row,(png_structrp png_ptr),

-    PNG_EMPTY);

-

-/* Internal use only.   Called before first row of data */

-PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),

-    PNG_EMPTY);

-

-/* Combine a row of data, dealing with alpha, etc. if requested.  'row' is an

- * array of png_ptr->width pixels.  If the image is not interlaced or this

- * is the final pass this just does a memcpy, otherwise the "display" flag

- * is used to determine whether to copy pixels that are not in the current pass.

- *

- * Because 'png_do_read_interlace' (below) replicates pixels this allows this

- * function to achieve the documented 'blocky' appearance during interlaced read

- * if display is 1 and the 'sparkle' appearance, where existing pixels in 'row'

- * are not changed if they are not in the current pass, when display is 0.

- *

- * 'display' must be 0 or 1, otherwise the memcpy will be done regardless.

- *

- * The API always reads from the png_struct row buffer and always assumes that

- * it is full width (png_do_read_interlace has already been called.)

- *

- * This function is only ever used to write to row buffers provided by the

- * caller of the relevant libpng API and the row must have already been

- * transformed by the read transformations.

- *

- * The PNG_USE_COMPILE_TIME_MASKS option causes generation of pre-computed

- * bitmasks for use within the code, otherwise runtime generated masks are used.

- * The default is compile time masks.

- */

-#ifndef PNG_USE_COMPILE_TIME_MASKS

-#  define PNG_USE_COMPILE_TIME_MASKS 1

-#endif

-PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,

-    png_bytep row, int display),PNG_EMPTY);

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-/* Expand an interlaced row: the 'row_info' describes the pass data that has

- * been read in and must correspond to the pixels in 'row', the pixels are

- * expanded (moved apart) in 'row' to match the final layout, when doing this

- * the pixels are *replicated* to the intervening space.  This is essential for

- * the correct operation of png_combine_row, above.

- */

-PNG_INTERNAL_FUNCTION(void,png_do_read_interlace,(png_row_infop row_info,

-    png_bytep row, int pass, png_uint_32 transformations),PNG_EMPTY);

-#endif

-

-/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-/* Grab pixels out of a row for an interlaced pass */

-PNG_INTERNAL_FUNCTION(void,png_do_write_interlace,(png_row_infop row_info,

-    png_bytep row, int pass),PNG_EMPTY);

-#endif

-

-/* Unfilter a row: check the filter value before calling this, there is no point

- * calling it for PNG_FILTER_VALUE_NONE.

- */

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);

-

-#if PNG_ARM_NEON_OPT > 0

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,

-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-#endif

-

-#if PNG_MIPS_MSA_OPT > 0

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,

-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-#endif

-

-#if PNG_POWERPC_VSX_OPT > 0

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info,

-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_vsx,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-#endif

-

-#if PNG_INTEL_SSE_IMPLEMENTATION > 0

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop

-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);

-#endif

-

-/* Choose the best filter to use and filter the row data */

-PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,

-    png_row_infop row_info),PNG_EMPTY);

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,

-   png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);

-   /* Read 'avail_out' bytes of data from the IDAT stream.  If the output buffer

-    * is NULL the function checks, instead, for the end of the stream.  In this

-    * case a benign error will be issued if the stream end is not found or if

-    * extra data has to be consumed.

-    */

-PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),

-   PNG_EMPTY);

-   /* This cleans up when the IDAT LZ stream does not end when the last image

-    * byte is read; there is still some pending input.

-    */

-

-PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),

-   PNG_EMPTY);

-   /* Finish a row while reading, dealing with interlacing passes, etc. */

-#endif /* SEQUENTIAL_READ */

-

-/* Initialize the row buffers, etc. */

-PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);

-

-#if ZLIB_VERNUM >= 0x1240

-PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),

-      PNG_EMPTY);

-#  define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)

-#else /* Zlib < 1.2.4 */

-#  define PNG_INFLATE(pp, flush) inflate(&(pp)->zstream, flush)

-#endif /* Zlib < 1.2.4 */

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-/* Optional call to update the users info structure */

-PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-#endif

-

-/* Shared transform functions, defined in pngtran.c */

-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \

-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info,

-    png_bytep row, int at_start),PNG_EMPTY);

-#endif

-

-#ifdef PNG_16BIT_SUPPORTED

-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_swap,(png_row_infop row_info,

-    png_bytep row),PNG_EMPTY);

-#endif

-#endif

-

-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \

-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info,

-    png_bytep row),PNG_EMPTY);

-#endif

-

-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info,

-    png_bytep row),PNG_EMPTY);

-#endif

-

-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,

-    png_bytep row),PNG_EMPTY);

-#endif

-

-/* The following decodes the appropriate chunks, and does error correction,

- * then calls the appropriate callback for the chunk if it is valid.

- */

-

-/* Decode the IHDR chunk */

-PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-

-#ifdef PNG_READ_bKGD_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_cHRM_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_eXIf_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_eXIf,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_gAMA_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_hIST_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif /* READ_iCCP */

-

-#ifdef PNG_READ_iTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_oFFs_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_pCAL_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_pHYs_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_sBIT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_sCAL_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_sPLT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif /* READ_sPLT */

-

-#ifdef PNG_READ_sRGB_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_tEXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_tIME_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_tRNS_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_zTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-#endif

-

-PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,

-    const png_uint_32 chunk_name),PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,

-    const png_uint_32 chunk_length),PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);

-   /* This is the function that gets called for unknown chunks.  The 'keep'

-    * argument is either non-zero for a known chunk that has been set to be

-    * handled as unknown or zero for an unknown chunk.  By default the function

-    * just skips the chunk or errors out if it is critical.

-    */

-

-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\

-    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)

-PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,

-    (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);

-   /* Exactly as the API png_handle_as_unknown() except that the argument is a

-    * 32-bit chunk name, not a string.

-    */

-#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */

-

-/* Handle the transformations for reading and writing */

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_do_read_transformations,(png_structrp png_ptr,

-   png_row_infop row_info),PNG_EMPTY);

-#endif

-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_do_write_transformations,(png_structrp png_ptr,

-   png_row_infop row_info),PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_init_read_transformations,(png_structrp png_ptr),

-    PNG_EMPTY);

-#endif

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_push_read_chunk,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_sig,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_check_crc,(png_structrp png_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),

-    PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,

-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,

-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),

-    PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,

-   png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,

-   png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,

-   png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,

-    png_bytep row),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),

-    PNG_EMPTY);

-#  ifdef PNG_READ_tEXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-#  endif

-#  ifdef PNG_READ_zTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-#  endif

-#  ifdef PNG_READ_iTXt_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,

-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,

-    png_inforp info_ptr),PNG_EMPTY);

-#  endif

-

-#endif /* PROGRESSIVE_READ */

-

-/* Added at libpng version 1.6.0 */

-#ifdef PNG_GAMMA_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,

-    png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);

-   /* Set the colorspace gamma with a value provided by the application or by

-    * the gAMA chunk on read.  The value will override anything set by an ICC

-    * profile.

-    */

-

-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,

-    png_inforp info_ptr), PNG_EMPTY);

-   /* Synchronize the info 'valid' flags with the colorspace */

-

-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,

-    png_inforp info_ptr), PNG_EMPTY);

-   /* Copy the png_struct colorspace to the info_struct and call the above to

-    * synchronize the flags.  Checks for NULL info_ptr and does nothing.

-    */

-#endif

-

-/* Added at libpng version 1.4.0 */

-#ifdef PNG_COLORSPACE_SUPPORTED

-/* These internal functions are for maintaining the colorspace structure within

- * a png_info or png_struct (or, indeed, both).

- */

-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,

-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,

-    int preferred), PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,

-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,

-    int preferred), PNG_EMPTY);

-

-#ifdef PNG_sRGB_SUPPORTED

-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,

-   png_colorspacerp colorspace, int intent), PNG_EMPTY);

-   /* This does set the colorspace gAMA and cHRM values too, but doesn't set the

-    * flags to write them, if it returns false there was a problem and an error

-    * message has already been output (but the colorspace may still need to be

-    * synced to record the invalid flag).

-    */

-#endif /* sRGB */

-

-#ifdef PNG_iCCP_SUPPORTED

-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,

-   png_colorspacerp colorspace, png_const_charp name,

-   png_uint_32 profile_length, png_const_bytep profile, int color_type),

-   PNG_EMPTY);

-   /* The 'name' is used for information only */

-

-/* Routines for checking parts of an ICC profile. */

-#ifdef PNG_READ_iCCP_SUPPORTED

-PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,

-   png_colorspacerp colorspace, png_const_charp name,

-   png_uint_32 profile_length), PNG_EMPTY);

-#endif /* READ_iCCP */

-PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,

-   png_colorspacerp colorspace, png_const_charp name,

-   png_uint_32 profile_length,

-   png_const_bytep profile /* first 132 bytes only */, int color_type),

-   PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,

-   png_colorspacerp colorspace, png_const_charp name,

-   png_uint_32 profile_length,

-   png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);

-#ifdef PNG_sRGB_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(

-   png_const_structrp png_ptr, png_colorspacerp colorspace,

-   png_const_bytep profile, uLong adler), PNG_EMPTY);

-   /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may

-    * be zero to indicate that it is not available.  It is used, if provided,

-    * as a fast check on the profile when checking to see if it is sRGB.

-    */

-#endif

-#endif /* iCCP */

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,

-   (png_structrp png_ptr), PNG_EMPTY);

-   /* Set the rgb_to_gray coefficients from the colorspace Y values */

-#endif /* READ_RGB_TO_GRAY */

-#endif /* COLORSPACE */

-

-/* Added at libpng version 1.4.0 */

-PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,

-    png_uint_32 width, png_uint_32 height, int bit_depth,

-    int color_type, int interlace_type, int compression_type,

-    int filter_type),PNG_EMPTY);

-

-/* Added at libpng version 1.5.10 */

-#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \

-    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_do_check_palette_indexes,

-   (png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY);

-#endif

-

-#if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)

-PNG_INTERNAL_FUNCTION(void,png_fixed_error,(png_const_structrp png_ptr,

-   png_const_charp name),PNG_NORETURN);

-#endif

-

-/* Puts 'string' into 'buffer' at buffer[pos], taking care never to overwrite

- * the end.  Always leaves the buffer nul terminated.  Never errors out (and

- * there is no error code.)

- */

-PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,

-   size_t pos, png_const_charp string),PNG_EMPTY);

-

-/* Various internal functions to handle formatted warning messages, currently

- * only implemented for warnings.

- */

-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)

-/* Utility to dump an unsigned value into a buffer, given a start pointer and

- * and end pointer (which should point just *beyond* the end of the buffer!)

- * Returns the pointer to the start of the formatted string.  This utility only

- * does unsigned values.

- */

-PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,

-   png_charp end, int format, png_alloc_size_t number),PNG_EMPTY);

-

-/* Convenience macro that takes an array: */

-#define PNG_FORMAT_NUMBER(buffer,format,number) \

-   png_format_number(buffer, buffer + (sizeof buffer), format, number)

-

-/* Suggested size for a number buffer (enough for 64 bits and a sign!) */

-#define PNG_NUMBER_BUFFER_SIZE 24

-

-/* These are the integer formats currently supported, the name is formed from

- * the standard printf(3) format string.

- */

-#define PNG_NUMBER_FORMAT_u     1 /* chose unsigned API! */

-#define PNG_NUMBER_FORMAT_02u   2

-#define PNG_NUMBER_FORMAT_d     1 /* chose signed API! */

-#define PNG_NUMBER_FORMAT_02d   2

-#define PNG_NUMBER_FORMAT_x     3

-#define PNG_NUMBER_FORMAT_02x   4

-#define PNG_NUMBER_FORMAT_fixed 5 /* choose the signed API */

-#endif

-

-#ifdef PNG_WARNINGS_SUPPORTED

-/* New defines and members adding in libpng-1.5.4 */

-#  define PNG_WARNING_PARAMETER_SIZE 32

-#  define PNG_WARNING_PARAMETER_COUNT 8 /* Maximum 9; see pngerror.c */

-

-/* An l-value of this type has to be passed to the APIs below to cache the

- * values of the parameters to a formatted warning message.

- */

-typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][

-   PNG_WARNING_PARAMETER_SIZE];

-

-PNG_INTERNAL_FUNCTION(void,png_warning_parameter,(png_warning_parameters p,

-   int number, png_const_charp string),PNG_EMPTY);

-   /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,

-    * including the trailing '\0'.

-    */

-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_unsigned,

-   (png_warning_parameters p, int number, int format, png_alloc_size_t value),

-   PNG_EMPTY);

-   /* Use png_alloc_size_t because it is an unsigned type as big as any we

-    * need to output.  Use the following for a signed value.

-    */

-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_signed,

-   (png_warning_parameters p, int number, int format, png_int_32 value),

-   PNG_EMPTY);

-

-PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,

-   png_warning_parameters p, png_const_charp message),PNG_EMPTY);

-   /* 'message' follows the X/Open approach of using @1, @2 to insert

-    * parameters previously supplied using the above functions.  Errors in

-    * specifying the parameters will simply result in garbage substitutions.

-    */

-#endif

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-/* Application errors (new in 1.6); use these functions (declared below) for

- * errors in the parameters or order of API function calls on read.  The

- * 'warning' should be used for an error that can be handled completely; the

- * 'error' for one which can be handled safely but which may lose application

- * information or settings.

- *

- * By default these both result in a png_error call prior to release, while in a

- * released version the 'warning' is just a warning.  However if the application

- * explicitly disables benign errors (explicitly permitting the code to lose

- * information) they both turn into warnings.

- *

- * If benign errors aren't supported they end up as the corresponding base call

- * (png_warning or png_error.)

- */

-PNG_INTERNAL_FUNCTION(void,png_app_warning,(png_const_structrp png_ptr,

-   png_const_charp message),PNG_EMPTY);

-   /* The application provided invalid parameters to an API function or called

-    * an API function at the wrong time, libpng can completely recover.

-    */

-

-PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,

-   png_const_charp message),PNG_EMPTY);

-   /* As above but libpng will ignore the call, or attempt some other partial

-    * recovery from the error.

-    */

-#else

-#  define png_app_warning(pp,s) png_warning(pp,s)

-#  define png_app_error(pp,s) png_error(pp,s)

-#endif

-

-PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,

-   png_const_charp message, int error),PNG_EMPTY);

-   /* Report a recoverable issue in chunk data.  On read this is used to report

-    * a problem found while reading a particular chunk and the

-    * png_chunk_benign_error or png_chunk_warning function is used as

-    * appropriate.  On write this is used to report an error that comes from

-    * data set via an application call to a png_set_ API and png_app_error or

-    * png_app_warning is used as appropriate.

-    *

-    * The 'error' parameter must have one of the following values:

-    */

-#define PNG_CHUNK_WARNING     0 /* never an error */

-#define PNG_CHUNK_WRITE_ERROR 1 /* an error only on write */

-#define PNG_CHUNK_ERROR       2 /* always an error */

-

-/* ASCII to FP interfaces, currently only implemented if sCAL

- * support is required.

- */

-#if defined(PNG_sCAL_SUPPORTED)

-/* MAX_DIGITS is actually the maximum number of characters in an sCAL

- * width or height, derived from the precision (number of significant

- * digits - a build time settable option) and assumptions about the

- * maximum ridiculous exponent.

- */

-#define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,

-   png_charp ascii, png_size_t size, double fp, unsigned int precision),

-   PNG_EMPTY);

-#endif /* FLOATING_POINT */

-

-#ifdef PNG_FIXED_POINT_SUPPORTED

-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,

-   png_charp ascii, png_size_t size, png_fixed_point fp),PNG_EMPTY);

-#endif /* FIXED_POINT */

-#endif /* sCAL */

-

-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)

-/* An internal API to validate the format of a floating point number.

- * The result is the index of the next character.  If the number is

- * not valid it will be the index of a character in the supposed number.

- *

- * The format of a number is defined in the PNG extensions specification

- * and this API is strictly conformant to that spec, not anyone elses!

- *

- * The format as a regular expression is:

- *

- * [+-]?[0-9]+.?([Ee][+-]?[0-9]+)?

- *

- * or:

- *

- * [+-]?.[0-9]+(.[0-9]+)?([Ee][+-]?[0-9]+)?

- *

- * The complexity is that either integer or fraction must be present and the

- * fraction is permitted to have no digits only if the integer is present.

- *

- * NOTE: The dangling E problem.

- *   There is a PNG valid floating point number in the following:

- *

- *       PNG floating point numbers are not greedy.

- *

- *   Working this out requires *TWO* character lookahead (because of the

- *   sign), the parser does not do this - it will fail at the 'r' - this

- *   doesn't matter for PNG sCAL chunk values, but it requires more care

- *   if the value were ever to be embedded in something more complex.  Use

- *   ANSI-C strtod if you need the lookahead.

- */

-/* State table for the parser. */

-#define PNG_FP_INTEGER    0  /* before or in integer */

-#define PNG_FP_FRACTION   1  /* before or in fraction */

-#define PNG_FP_EXPONENT   2  /* before or in exponent */

-#define PNG_FP_STATE      3  /* mask for the above */

-#define PNG_FP_SAW_SIGN   4  /* Saw +/- in current state */

-#define PNG_FP_SAW_DIGIT  8  /* Saw a digit in current state */

-#define PNG_FP_SAW_DOT   16  /* Saw a dot in current state */

-#define PNG_FP_SAW_E     32  /* Saw an E (or e) in current state */

-#define PNG_FP_SAW_ANY   60  /* Saw any of the above 4 */

-

-/* These three values don't affect the parser.  They are set but not used.

- */

-#define PNG_FP_WAS_VALID 64  /* Preceding substring is a valid fp number */

-#define PNG_FP_NEGATIVE 128  /* A negative number, including "-0" */

-#define PNG_FP_NONZERO  256  /* A non-zero value */

-#define PNG_FP_STICKY   448  /* The above three flags */

-

-/* This is available for the caller to store in 'state' if required.  Do not

- * call the parser after setting it (the parser sometimes clears it.)

- */

-#define PNG_FP_INVALID  512  /* Available for callers as a distinct value */

-

-/* Result codes for the parser (boolean - true meants ok, false means

- * not ok yet.)

- */

-#define PNG_FP_MAYBE      0  /* The number may be valid in the future */

-#define PNG_FP_OK         1  /* The number is valid */

-

-/* Tests on the sticky non-zero and negative flags.  To pass these checks

- * the state must also indicate that the whole number is valid - this is

- * achieved by testing PNG_FP_SAW_DIGIT (see the implementation for why this

- * is equivalent to PNG_FP_OK above.)

- */

-#define PNG_FP_NZ_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NEGATIVE | PNG_FP_NONZERO)

-   /* NZ_MASK: the string is valid and a non-zero negative value */

-#define PNG_FP_Z_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NONZERO)

-   /* Z MASK: the string is valid and a non-zero value. */

-   /* PNG_FP_SAW_DIGIT: the string is valid. */

-#define PNG_FP_IS_ZERO(state) (((state) & PNG_FP_Z_MASK) == PNG_FP_SAW_DIGIT)

-#define PNG_FP_IS_POSITIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_Z_MASK)

-#define PNG_FP_IS_NEGATIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_NZ_MASK)

-

-/* The actual parser.  This can be called repeatedly. It updates

- * the index into the string and the state variable (which must

- * be initialized to 0).  It returns a result code, as above.  There

- * is no point calling the parser any more if it fails to advance to

- * the end of the string - it is stuck on an invalid character (or

- * terminated by '\0').

- *

- * Note that the pointer will consume an E or even an E+ and then leave

- * a 'maybe' state even though a preceding integer.fraction is valid.

- * The PNG_FP_WAS_VALID flag indicates that a preceding substring was

- * a valid number.  It's possible to recover from this by calling

- * the parser again (from the start, with state 0) but with a string

- * that omits the last character (i.e. set the size to the index of

- * the problem character.)  This has not been tested within libpng.

- */

-PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,

-   png_size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);

-

-/* This is the same but it checks a complete string and returns true

- * only if it just contains a floating point number.  As of 1.5.4 this

- * function also returns the state at the end of parsing the number if

- * it was valid (otherwise it returns 0.)  This can be used for testing

- * for negative or zero values using the sticky flag.

- */

-PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,

-   png_size_t size),PNG_EMPTY);

-#endif /* pCAL || sCAL */

-

-#if defined(PNG_GAMMA_SUPPORTED) ||\

-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)

-/* Added at libpng version 1.5.0 */

-/* This is a utility to provide a*times/div (rounded) and indicate

- * if there is an overflow.  The result is a boolean - false (0)

- * for overflow, true (1) if no overflow, in which case *res

- * holds the result.

- */

-PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,

-   png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);

-#endif

-

-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)

-/* Same deal, but issue a warning on overflow and return 0. */

-PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,

-   (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,

-   png_int_32 divided_by),PNG_EMPTY);

-#endif

-

-#ifdef PNG_GAMMA_SUPPORTED

-/* Calculate a reciprocal - used for gamma values.  This returns

- * 0 if the argument is 0 in order to maintain an undefined value;

- * there are no warnings.

- */

-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),

-   PNG_EMPTY);

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-/* The same but gives a reciprocal of the product of two fixed point

- * values.  Accuracy is suitable for gamma calculations but this is

- * not exact - use png_muldiv for that.  Only required at present on read.

- */

-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,

-   png_fixed_point b),PNG_EMPTY);

-#endif

-

-/* Return true if the gamma value is significantly different from 1.0 */

-PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),

-   PNG_EMPTY);

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-/* Internal fixed point gamma correction.  These APIs are called as

- * required to convert single values - they don't need to be fast,

- * they are not used when processing image pixel values.

- *

- * While the input is an 'unsigned' value it must actually be the

- * correct bit value - 0..255 or 0..65535 as required.

- */

-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_correct,(png_structrp png_ptr,

-   unsigned int value, png_fixed_point gamma_value),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_16bit_correct,(unsigned int value,

-   png_fixed_point gamma_value),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(png_byte,png_gamma_8bit_correct,(unsigned int value,

-   png_fixed_point gamma_value),PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),

-   PNG_EMPTY);

-PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,

-   int bit_depth),PNG_EMPTY);

-#endif

-

-/* SIMPLIFIED READ/WRITE SUPPORT */

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\

-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

-/* The internal structure that png_image::opaque points to. */

-typedef struct png_control

-{

-   png_structp png_ptr;

-   png_infop   info_ptr;

-   png_voidp   error_buf;           /* Always a jmp_buf at present. */

-

-   png_const_bytep memory;          /* Memory buffer. */

-   png_size_t      size;            /* Size of the memory buffer. */

-

-   unsigned int for_write       :1; /* Otherwise it is a read structure */

-   unsigned int owned_file      :1; /* We own the file in io_ptr */

-} png_control;

-

-/* Return the pointer to the jmp_buf from a png_control: necessary because C

- * does not reveal the type of the elements of jmp_buf.

- */

-#ifdef __cplusplus

-#  define png_control_jmp_buf(pc) (((jmp_buf*)((pc)->error_buf))[0])

-#else

-#  define png_control_jmp_buf(pc) ((pc)->error_buf)

-#endif

-

-/* Utility to safely execute a piece of libpng code catching and logging any

- * errors that might occur.  Returns true on success, false on failure (either

- * of the function or as a result of a png_error.)

- */

-PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr,

-   png_const_charp error_message),PNG_NORETURN);

-

-#ifdef PNG_WARNINGS_SUPPORTED

-PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr,

-   png_const_charp warning_message),PNG_EMPTY);

-#else

-#  define png_safe_warning 0/*dummy argument*/

-#endif

-

-PNG_INTERNAL_FUNCTION(int,png_safe_execute,(png_imagep image,

-   int (*function)(png_voidp), png_voidp arg),PNG_EMPTY);

-

-/* Utility to log an error; this also cleans up the png_image; the function

- * always returns 0 (false).

- */

-PNG_INTERNAL_FUNCTION(int,png_image_error,(png_imagep image,

-   png_const_charp error_message),PNG_EMPTY);

-

-#ifndef PNG_SIMPLIFIED_READ_SUPPORTED

-/* png_image_free is used by the write code but not exported */

-PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);

-#endif /* !SIMPLIFIED_READ */

-

-#endif /* SIMPLIFIED READ/WRITE */

-

-/* These are initialization functions for hardware specific PNG filter

- * optimizations; list these here then select the appropriate one at compile

- * time using the macro PNG_FILTER_OPTIMIZATIONS.  If the macro is not defined

- * the generic code is used.

- */

-#ifdef PNG_FILTER_OPTIMIZATIONS

-PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,

-   unsigned int bpp), PNG_EMPTY);

-   /* Just declare the optimization that will be used */

-#else

-   /* List *all* the possible optimizations here - this branch is required if

-    * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in

-    * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.

-    */

-#  if PNG_ARM_NEON_OPT > 0

-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,

-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);

-#endif

-

-#if PNG_MIPS_MSA_OPT > 0

-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,

-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);

-#endif

-

-#  if PNG_INTEL_SSE_IMPLEMENTATION > 0

-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,

-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);

-#  endif

-#endif

-

-PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,

-   png_const_charp key, png_bytep new_key), PNG_EMPTY);

-

-/* Maintainer: Put new private prototypes here ^ */

-

-#include "pngdebug.h"

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* PNG_VERSION_INFO_ONLY */

-#endif /* PNGPRIV_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngread.c b/plugins/AdvaImg/src/LibPNG/pngread.c
deleted file mode 100644
index 96e90d7104..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngread.c
+++ /dev/null
@@ -1,4219 +0,0 @@
-

-/* pngread.c - read a PNG file

- *

- * Last changed in libpng 1.6.33 [September 28, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file contains routines that an application calls directly to

- * read a PNG file or stream.

- */

-

-#include "pngpriv.h"

-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)

-#  include <errno.h>

-#endif

-

-#ifdef PNG_READ_SUPPORTED

-

-/* Create a PNG structure for reading, and allocate any memory needed. */

-PNG_FUNCTION(png_structp,PNGAPI

-png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)

-{

-#ifndef PNG_USER_MEM_SUPPORTED

-   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,

-        error_fn, warn_fn, NULL, NULL, NULL);

-#else

-   return png_create_read_struct_2(user_png_ver, error_ptr, error_fn,

-        warn_fn, NULL, NULL, NULL);

-}

-

-/* Alternate create PNG structure for reading, and allocate any memory

- * needed.

- */

-PNG_FUNCTION(png_structp,PNGAPI

-png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,

-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)

-{

-   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,

-       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);

-#endif /* USER_MEM */

-

-   if (png_ptr != NULL)

-   {

-      png_ptr->mode = PNG_IS_READ_STRUCT;

-

-      /* Added in libpng-1.6.0; this can be used to detect a read structure if

-       * required (it will be zero in a write structure.)

-       */

-#     ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-         png_ptr->IDAT_read_size = PNG_IDAT_READ_SIZE;

-#     endif

-

-#     ifdef PNG_BENIGN_READ_ERRORS_SUPPORTED

-         png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;

-

-         /* In stable builds only warn if an application error can be completely

-          * handled.

-          */

-#        if PNG_RELEASE_BUILD

-            png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;

-#        endif

-#     endif

-

-      /* TODO: delay this, it can be done in png_init_io (if the app doesn't

-       * do it itself) avoiding setting the default function if it is not

-       * required.

-       */

-      png_set_read_fn(png_ptr, NULL, NULL);

-   }

-

-   return png_ptr;

-}

-

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the information before the actual image data.  This has been

- * changed in v0.90 to allow reading a file that already has the magic

- * bytes read from the stream.  You can tell libpng how many bytes have

- * been read from the beginning of the stream (up to the maximum of 8)

- * via png_set_sig_bytes(), and we will only check the remaining bytes

- * here.  The application can then have access to the signature bytes we

- * read if it is determined that this isn't a valid PNG file.

- */

-void PNGAPI

-png_read_info(png_structrp png_ptr, png_inforp info_ptr)

-{

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-   int keep;

-#endif

-

-   png_debug(1, "in png_read_info");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   /* Read and check the PNG file signature. */

-   png_read_sig(png_ptr, info_ptr);

-

-   for (;;)

-   {

-      png_uint_32 length = png_read_chunk_header(png_ptr);

-      png_uint_32 chunk_name = png_ptr->chunk_name;

-

-      /* IDAT logic needs to happen here to simplify getting the two flags

-       * right.

-       */

-      if (chunk_name == png_IDAT)

-      {

-         if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-            png_chunk_error(png_ptr, "Missing IHDR before IDAT");

-

-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

-             (png_ptr->mode & PNG_HAVE_PLTE) == 0)

-            png_chunk_error(png_ptr, "Missing PLTE before IDAT");

-

-         else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)

-            png_chunk_benign_error(png_ptr, "Too many IDATs found");

-

-         png_ptr->mode |= PNG_HAVE_IDAT;

-      }

-

-      else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-      {

-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;

-         png_ptr->mode |= PNG_AFTER_IDAT;

-      }

-

-      /* This should be a binary subdivision search or a hash for

-       * matching the chunk name rather than a linear search.

-       */

-      if (chunk_name == png_IHDR)

-         png_handle_IHDR(png_ptr, info_ptr, length);

-

-      else if (chunk_name == png_IEND)

-         png_handle_IEND(png_ptr, info_ptr, length);

-

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)

-      {

-         png_handle_unknown(png_ptr, info_ptr, length, keep);

-

-         if (chunk_name == png_PLTE)

-            png_ptr->mode |= PNG_HAVE_PLTE;

-

-         else if (chunk_name == png_IDAT)

-         {

-            png_ptr->idat_size = 0; /* It has been consumed */

-            break;

-         }

-      }

-#endif

-      else if (chunk_name == png_PLTE)

-         png_handle_PLTE(png_ptr, info_ptr, length);

-

-      else if (chunk_name == png_IDAT)

-      {

-         png_ptr->idat_size = length;

-         break;

-      }

-

-#ifdef PNG_READ_bKGD_SUPPORTED

-      else if (chunk_name == png_bKGD)

-         png_handle_bKGD(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_cHRM_SUPPORTED

-      else if (chunk_name == png_cHRM)

-         png_handle_cHRM(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_eXIf_SUPPORTED

-      else if (chunk_name == png_eXIf)

-         png_handle_eXIf(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_gAMA_SUPPORTED

-      else if (chunk_name == png_gAMA)

-         png_handle_gAMA(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_hIST_SUPPORTED

-      else if (chunk_name == png_hIST)

-         png_handle_hIST(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_oFFs_SUPPORTED

-      else if (chunk_name == png_oFFs)

-         png_handle_oFFs(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_pCAL_SUPPORTED

-      else if (chunk_name == png_pCAL)

-         png_handle_pCAL(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sCAL_SUPPORTED

-      else if (chunk_name == png_sCAL)

-         png_handle_sCAL(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_pHYs_SUPPORTED

-      else if (chunk_name == png_pHYs)

-         png_handle_pHYs(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sBIT_SUPPORTED

-      else if (chunk_name == png_sBIT)

-         png_handle_sBIT(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sRGB_SUPPORTED

-      else if (chunk_name == png_sRGB)

-         png_handle_sRGB(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-      else if (chunk_name == png_iCCP)

-         png_handle_iCCP(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sPLT_SUPPORTED

-      else if (chunk_name == png_sPLT)

-         png_handle_sPLT(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tEXt_SUPPORTED

-      else if (chunk_name == png_tEXt)

-         png_handle_tEXt(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tIME_SUPPORTED

-      else if (chunk_name == png_tIME)

-         png_handle_tIME(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tRNS_SUPPORTED

-      else if (chunk_name == png_tRNS)

-         png_handle_tRNS(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_zTXt_SUPPORTED

-      else if (chunk_name == png_zTXt)

-         png_handle_zTXt(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_iTXt_SUPPORTED

-      else if (chunk_name == png_iTXt)

-         png_handle_iTXt(png_ptr, info_ptr, length);

-#endif

-

-      else

-         png_handle_unknown(png_ptr, info_ptr, length,

-             PNG_HANDLE_CHUNK_AS_DEFAULT);

-   }

-}

-#endif /* SEQUENTIAL_READ */

-

-/* Optional call to update the users info_ptr structure */

-void PNGAPI

-png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_debug(1, "in png_read_update_info");

-

-   if (png_ptr != NULL)

-   {

-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)

-      {

-         png_read_start_row(png_ptr);

-

-#        ifdef PNG_READ_TRANSFORMS_SUPPORTED

-            png_read_transform_info(png_ptr, info_ptr);

-#        else

-            PNG_UNUSED(info_ptr)

-#        endif

-      }

-

-      /* New in 1.6.0 this avoids the bug of doing the initializations twice */

-      else

-         png_app_error(png_ptr,

-             "png_read_update_info/png_start_read_image: duplicate call");

-   }

-}

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Initialize palette, background, etc, after transformations

- * are set, but before any reading takes place.  This allows

- * the user to obtain a gamma-corrected palette, for example.

- * If the user doesn't call this, we will do it ourselves.

- */

-void PNGAPI

-png_start_read_image(png_structrp png_ptr)

-{

-   png_debug(1, "in png_start_read_image");

-

-   if (png_ptr != NULL)

-   {

-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)

-         png_read_start_row(png_ptr);

-

-      /* New in 1.6.0 this avoids the bug of doing the initializations twice */

-      else

-         png_app_error(png_ptr,

-             "png_start_read_image/png_read_update_info: duplicate call");

-   }

-}

-#endif /* SEQUENTIAL_READ */

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-/* Undoes intrapixel differencing,

- * NOTE: this is apparently only supported in the 'sequential' reader.

- */

-static void

-png_do_read_intrapixel(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_read_intrapixel");

-

-   if (

-       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      int bytes_per_pixel;

-      png_uint_32 row_width = row_info->width;

-

-      if (row_info->bit_depth == 8)

-      {

-         png_bytep rp;

-         png_uint_32 i;

-

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-            bytes_per_pixel = 3;

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-            bytes_per_pixel = 4;

-

-         else

-            return;

-

-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)

-         {

-            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);

-            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);

-         }

-      }

-      else if (row_info->bit_depth == 16)

-      {

-         png_bytep rp;

-         png_uint_32 i;

-

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-            bytes_per_pixel = 6;

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-            bytes_per_pixel = 8;

-

-         else

-            return;

-

-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)

-         {

-            png_uint_32 s0   = (png_uint_32)(*(rp    ) << 8) | *(rp + 1);

-            png_uint_32 s1   = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);

-            png_uint_32 s2   = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);

-            png_uint_32 red  = (s0 + s1 + 65536) & 0xffff;

-            png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;

-            *(rp    ) = (png_byte)((red >> 8) & 0xff);

-            *(rp + 1) = (png_byte)(red & 0xff);

-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);

-            *(rp + 5) = (png_byte)(blue & 0xff);

-         }

-      }

-   }

-}

-#endif /* MNG_FEATURES */

-

-void PNGAPI

-png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)

-{

-   png_row_info row_info;

-

-   if (png_ptr == NULL)

-      return;

-

-   png_debug2(1, "in png_read_row (row %lu, pass %d)",

-       (unsigned long)png_ptr->row_number, png_ptr->pass);

-

-   /* png_read_start_row sets the information (in particular iwidth) for this

-    * interlace pass.

-    */

-   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)

-      png_read_start_row(png_ptr);

-

-   /* 1.5.6: row_info moved out of png_struct to a local here. */

-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */

-   row_info.color_type = png_ptr->color_type;

-   row_info.bit_depth = png_ptr->bit_depth;

-   row_info.channels = png_ptr->channels;

-   row_info.pixel_depth = png_ptr->pixel_depth;

-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);

-

-#ifdef PNG_WARNINGS_SUPPORTED

-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)

-   {

-   /* Check for transforms that have been set but were defined out */

-#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)

-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)

-      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)

-   if ((png_ptr->transformations & PNG_FILLER) != 0)

-      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \

-    !defined(PNG_READ_PACKSWAP_SUPPORTED)

-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)

-   if ((png_ptr->transformations & PNG_PACK) != 0)

-      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)

-   if ((png_ptr->transformations & PNG_SHIFT) != 0)

-      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)

-   if ((png_ptr->transformations & PNG_BGR) != 0)

-      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");

-#endif

-

-#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)

-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)

-      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");

-#endif

-   }

-#endif /* WARNINGS */

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   /* If interlaced and we do not need a new row, combine row and return.

-    * Notice that the pixels we have from previous rows have been transformed

-    * already; we can only combine like with like (transformed or

-    * untransformed) and, because of the libpng API for interlaced images, this

-    * means we must transform before de-interlacing.

-    */

-   if (png_ptr->interlaced != 0 &&

-       (png_ptr->transformations & PNG_INTERLACE) != 0)

-   {

-      switch (png_ptr->pass)

-      {

-         case 0:

-            if (png_ptr->row_number & 0x07)

-            {

-               if (dsp_row != NULL)

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 1:

-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)

-            {

-               if (dsp_row != NULL)

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 2:

-            if ((png_ptr->row_number & 0x07) != 4)

-            {

-               if (dsp_row != NULL && (png_ptr->row_number & 4))

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 3:

-            if ((png_ptr->row_number & 3) || png_ptr->width < 3)

-            {

-               if (dsp_row != NULL)

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 4:

-            if ((png_ptr->row_number & 3) != 2)

-            {

-               if (dsp_row != NULL && (png_ptr->row_number & 2))

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 5:

-            if ((png_ptr->row_number & 1) || png_ptr->width < 2)

-            {

-               if (dsp_row != NULL)

-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         default:

-         case 6:

-            if ((png_ptr->row_number & 1) == 0)

-            {

-               png_read_finish_row(png_ptr);

-               return;

-            }

-            break;

-      }

-   }

-#endif

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)

-      png_error(png_ptr, "Invalid attempt to read row data");

-

-   /* Fill the row with IDAT data: */

-   png_ptr->row_buf[0]=255; /* to force error if no data was found */

-   png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);

-

-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)

-   {

-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)

-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,

-             png_ptr->prev_row + 1, png_ptr->row_buf[0]);

-      else

-         png_error(png_ptr, "bad adaptive filter value");

-   }

-

-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before

-    * 1.5.6, while the buffer really is this big in current versions of libpng

-    * it may not be in the future, so this was changed just to copy the

-    * interlaced count:

-    */

-   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&

-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))

-   {

-      /* Intrapixel differencing */

-      png_do_read_intrapixel(&row_info, png_ptr->row_buf + 1);

-   }

-#endif

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-   if (png_ptr->transformations)

-      png_do_read_transformations(png_ptr, &row_info);

-#endif

-

-   /* The transformed pixel depth should match the depth now in row_info. */

-   if (png_ptr->transformed_pixel_depth == 0)

-   {

-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;

-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)

-         png_error(png_ptr, "sequential row overflow");

-   }

-

-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)

-      png_error(png_ptr, "internal sequential row size calculation error");

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   /* Expand interlaced rows to full size */

-   if (png_ptr->interlaced != 0 &&

-      (png_ptr->transformations & PNG_INTERLACE) != 0)

-   {

-      if (png_ptr->pass < 6)

-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,

-             png_ptr->transformations);

-

-      if (dsp_row != NULL)

-         png_combine_row(png_ptr, dsp_row, 1/*display*/);

-

-      if (row != NULL)

-         png_combine_row(png_ptr, row, 0/*row*/);

-   }

-

-   else

-#endif

-   {

-      if (row != NULL)

-         png_combine_row(png_ptr, row, -1/*ignored*/);

-

-      if (dsp_row != NULL)

-         png_combine_row(png_ptr, dsp_row, -1/*ignored*/);

-   }

-   png_read_finish_row(png_ptr);

-

-   if (png_ptr->read_row_fn != NULL)

-      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);

-

-}

-#endif /* SEQUENTIAL_READ */

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read one or more rows of image data.  If the image is interlaced,

- * and png_set_interlace_handling() has been called, the rows need to

- * contain the contents of the rows from the previous pass.  If the

- * image has alpha or transparency, and png_handle_alpha()[*] has been

- * called, the rows contents must be initialized to the contents of the

- * screen.

- *

- * "row" holds the actual image, and pixels are placed in it

- * as they arrive.  If the image is displayed after each pass, it will

- * appear to "sparkle" in.  "display_row" can be used to display a

- * "chunky" progressive image, with finer detail added as it becomes

- * available.  If you do not want this "chunky" display, you may pass

- * NULL for display_row.  If you do not want the sparkle display, and

- * you have not called png_handle_alpha(), you may pass NULL for rows.

- * If you have called png_handle_alpha(), and the image has either an

- * alpha channel or a transparency chunk, you must provide a buffer for

- * rows.  In this case, you do not have to provide a display_row buffer

- * also, but you may.  If the image is not interlaced, or if you have

- * not called png_set_interlace_handling(), the display_row buffer will

- * be ignored, so pass NULL to it.

- *

- * [*] png_handle_alpha() does not exist yet, as of this version of libpng

- */

-

-void PNGAPI

-png_read_rows(png_structrp png_ptr, png_bytepp row,

-    png_bytepp display_row, png_uint_32 num_rows)

-{

-   png_uint_32 i;

-   png_bytepp rp;

-   png_bytepp dp;

-

-   png_debug(1, "in png_read_rows");

-

-   if (png_ptr == NULL)

-      return;

-

-   rp = row;

-   dp = display_row;

-   if (rp != NULL && dp != NULL)

-      for (i = 0; i < num_rows; i++)

-      {

-         png_bytep rptr = *rp++;

-         png_bytep dptr = *dp++;

-

-         png_read_row(png_ptr, rptr, dptr);

-      }

-

-   else if (rp != NULL)

-      for (i = 0; i < num_rows; i++)

-      {

-         png_bytep rptr = *rp;

-         png_read_row(png_ptr, rptr, NULL);

-         rp++;

-      }

-

-   else if (dp != NULL)

-      for (i = 0; i < num_rows; i++)

-      {

-         png_bytep dptr = *dp;

-         png_read_row(png_ptr, NULL, dptr);

-         dp++;

-      }

-}

-#endif /* SEQUENTIAL_READ */

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the entire image.  If the image has an alpha channel or a tRNS

- * chunk, and you have called png_handle_alpha()[*], you will need to

- * initialize the image to the current image that PNG will be overlaying.

- * We set the num_rows again here, in case it was incorrectly set in

- * png_read_start_row() by a call to png_read_update_info() or

- * png_start_read_image() if png_set_interlace_handling() wasn't called

- * prior to either of these functions like it should have been.  You can

- * only call this function once.  If you desire to have an image for

- * each pass of a interlaced image, use png_read_rows() instead.

- *

- * [*] png_handle_alpha() does not exist yet, as of this version of libpng

- */

-void PNGAPI

-png_read_image(png_structrp png_ptr, png_bytepp image)

-{

-   png_uint_32 i, image_height;

-   int pass, j;

-   png_bytepp rp;

-

-   png_debug(1, "in png_read_image");

-

-   if (png_ptr == NULL)

-      return;

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)

-   {

-      pass = png_set_interlace_handling(png_ptr);

-      /* And make sure transforms are initialized. */

-      png_start_read_image(png_ptr);

-   }

-   else

-   {

-      if (png_ptr->interlaced != 0 &&

-          (png_ptr->transformations & PNG_INTERLACE) == 0)

-      {

-         /* Caller called png_start_read_image or png_read_update_info without

-          * first turning on the PNG_INTERLACE transform.  We can fix this here,

-          * but the caller should do it!

-          */

-         png_warning(png_ptr, "Interlace handling should be turned on when "

-             "using png_read_image");

-         /* Make sure this is set correctly */

-         png_ptr->num_rows = png_ptr->height;

-      }

-

-      /* Obtain the pass number, which also turns on the PNG_INTERLACE flag in

-       * the above error case.

-       */

-      pass = png_set_interlace_handling(png_ptr);

-   }

-#else

-   if (png_ptr->interlaced)

-      png_error(png_ptr,

-          "Cannot read interlaced image -- interlace handler disabled");

-

-   pass = 1;

-#endif

-

-   image_height=png_ptr->height;

-

-   for (j = 0; j < pass; j++)

-   {

-      rp = image;

-      for (i = 0; i < image_height; i++)

-      {

-         png_read_row(png_ptr, *rp, NULL);

-         rp++;

-      }

-   }

-}

-#endif /* SEQUENTIAL_READ */

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-/* Read the end of the PNG file.  Will not read past the end of the

- * file, will verify the end is accurate, and will read any comments

- * or time information at the end of the file, if info is not NULL.

- */

-void PNGAPI

-png_read_end(png_structrp png_ptr, png_inforp info_ptr)

-{

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-   int keep;

-#endif

-

-   png_debug(1, "in png_read_end");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* If png_read_end is called in the middle of reading the rows there may

-    * still be pending IDAT data and an owned zstream.  Deal with this here.

-    */

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-   if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0)

-#endif

-      png_read_finish_IDAT(png_ptr);

-

-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   /* Report invalid palette index; added at libng-1.5.10 */

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

-       png_ptr->num_palette_max > png_ptr->num_palette)

-      png_benign_error(png_ptr, "Read palette index exceeding num_palette");

-#endif

-

-   do

-   {

-      png_uint_32 length = png_read_chunk_header(png_ptr);

-      png_uint_32 chunk_name = png_ptr->chunk_name;

-

-      if (chunk_name != png_IDAT)

-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;

-

-      if (chunk_name == png_IEND)

-         png_handle_IEND(png_ptr, info_ptr, length);

-

-      else if (chunk_name == png_IHDR)

-         png_handle_IHDR(png_ptr, info_ptr, length);

-

-      else if (info_ptr == NULL)

-         png_crc_finish(png_ptr, length);

-

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)

-      {

-         if (chunk_name == png_IDAT)

-         {

-            if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))

-                || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)

-               png_benign_error(png_ptr, ".Too many IDATs found");

-         }

-         png_handle_unknown(png_ptr, info_ptr, length, keep);

-         if (chunk_name == png_PLTE)

-            png_ptr->mode |= PNG_HAVE_PLTE;

-      }

-#endif

-

-      else if (chunk_name == png_IDAT)

-      {

-         /* Zero length IDATs are legal after the last IDAT has been

-          * read, but not after other chunks have been read.  1.6 does not

-          * always read all the deflate data; specifically it cannot be relied

-          * upon to read the Adler32 at the end.  If it doesn't ignore IDAT

-          * chunks which are longer than zero as well:

-          */

-         if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))

-             || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)

-            png_benign_error(png_ptr, "..Too many IDATs found");

-

-         png_crc_finish(png_ptr, length);

-      }

-      else if (chunk_name == png_PLTE)

-         png_handle_PLTE(png_ptr, info_ptr, length);

-

-#ifdef PNG_READ_bKGD_SUPPORTED

-      else if (chunk_name == png_bKGD)

-         png_handle_bKGD(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_cHRM_SUPPORTED

-      else if (chunk_name == png_cHRM)

-         png_handle_cHRM(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_eXIf_SUPPORTED

-      else if (chunk_name == png_eXIf)

-         png_handle_eXIf(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_gAMA_SUPPORTED

-      else if (chunk_name == png_gAMA)

-         png_handle_gAMA(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_hIST_SUPPORTED

-      else if (chunk_name == png_hIST)

-         png_handle_hIST(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_oFFs_SUPPORTED

-      else if (chunk_name == png_oFFs)

-         png_handle_oFFs(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_pCAL_SUPPORTED

-      else if (chunk_name == png_pCAL)

-         png_handle_pCAL(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sCAL_SUPPORTED

-      else if (chunk_name == png_sCAL)

-         png_handle_sCAL(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_pHYs_SUPPORTED

-      else if (chunk_name == png_pHYs)

-         png_handle_pHYs(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sBIT_SUPPORTED

-      else if (chunk_name == png_sBIT)

-         png_handle_sBIT(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sRGB_SUPPORTED

-      else if (chunk_name == png_sRGB)

-         png_handle_sRGB(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-      else if (chunk_name == png_iCCP)

-         png_handle_iCCP(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_sPLT_SUPPORTED

-      else if (chunk_name == png_sPLT)

-         png_handle_sPLT(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tEXt_SUPPORTED

-      else if (chunk_name == png_tEXt)

-         png_handle_tEXt(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tIME_SUPPORTED

-      else if (chunk_name == png_tIME)

-         png_handle_tIME(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_tRNS_SUPPORTED

-      else if (chunk_name == png_tRNS)

-         png_handle_tRNS(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_zTXt_SUPPORTED

-      else if (chunk_name == png_zTXt)

-         png_handle_zTXt(png_ptr, info_ptr, length);

-#endif

-

-#ifdef PNG_READ_iTXt_SUPPORTED

-      else if (chunk_name == png_iTXt)

-         png_handle_iTXt(png_ptr, info_ptr, length);

-#endif

-

-      else

-         png_handle_unknown(png_ptr, info_ptr, length,

-             PNG_HANDLE_CHUNK_AS_DEFAULT);

-   } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);

-}

-#endif /* SEQUENTIAL_READ */

-

-/* Free all memory used in the read struct */

-static void

-png_read_destroy(png_structrp png_ptr)

-{

-   png_debug(1, "in png_read_destroy");

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   png_destroy_gamma_table(png_ptr);

-#endif

-

-   png_free(png_ptr, png_ptr->big_row_buf);

-   png_ptr->big_row_buf = NULL;

-   png_free(png_ptr, png_ptr->big_prev_row);

-   png_ptr->big_prev_row = NULL;

-   png_free(png_ptr, png_ptr->read_buffer);

-   png_ptr->read_buffer = NULL;

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-   png_free(png_ptr, png_ptr->palette_lookup);

-   png_ptr->palette_lookup = NULL;

-   png_free(png_ptr, png_ptr->quantize_index);

-   png_ptr->quantize_index = NULL;

-#endif

-

-   if ((png_ptr->free_me & PNG_FREE_PLTE) != 0)

-   {

-      png_zfree(png_ptr, png_ptr->palette);

-      png_ptr->palette = NULL;

-   }

-   png_ptr->free_me &= ~PNG_FREE_PLTE;

-

-#if defined(PNG_tRNS_SUPPORTED) || \

-    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)

-   if ((png_ptr->free_me & PNG_FREE_TRNS) != 0)

-   {

-      png_free(png_ptr, png_ptr->trans_alpha);

-      png_ptr->trans_alpha = NULL;

-   }

-   png_ptr->free_me &= ~PNG_FREE_TRNS;

-#endif

-

-   inflateEnd(&png_ptr->zstream);

-

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-   png_free(png_ptr, png_ptr->save_buffer);

-   png_ptr->save_buffer = NULL;

-#endif

-

-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \

-   defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)

-   png_free(png_ptr, png_ptr->unknown_chunk.data);

-   png_ptr->unknown_chunk.data = NULL;

-#endif

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-   png_free(png_ptr, png_ptr->chunk_list);

-   png_ptr->chunk_list = NULL;

-#endif

-

-   /* NOTE: the 'setjmp' buffer may still be allocated and the memory and error

-    * callbacks are still set at this point.  They are required to complete the

-    * destruction of the png_struct itself.

-    */

-}

-

-/* Free all memory used by the read */

-void PNGAPI

-png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,

-    png_infopp end_info_ptr_ptr)

-{

-   png_structrp png_ptr = NULL;

-

-   png_debug(1, "in png_destroy_read_struct");

-

-   if (png_ptr_ptr != NULL)

-      png_ptr = *png_ptr_ptr;

-

-   if (png_ptr == NULL)

-      return;

-

-   /* libpng 1.6.0: use the API to destroy info structs to ensure consistent

-    * behavior.  Prior to 1.6.0 libpng did extra 'info' destruction in this API.

-    * The extra was, apparently, unnecessary yet this hides memory leak bugs.

-    */

-   png_destroy_info_struct(png_ptr, end_info_ptr_ptr);

-   png_destroy_info_struct(png_ptr, info_ptr_ptr);

-

-   *png_ptr_ptr = NULL;

-   png_read_destroy(png_ptr);

-   png_destroy_png_struct(png_ptr);

-}

-

-void PNGAPI

-png_set_read_status_fn(png_structrp png_ptr, png_read_status_ptr read_row_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->read_row_fn = read_row_fn;

-}

-

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-void PNGAPI

-png_read_png(png_structrp png_ptr, png_inforp info_ptr,

-    int transforms, voidp params)

-{

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   /* png_read_info() gives us all of the information from the

-    * PNG file before the first IDAT (image data chunk).

-    */

-   png_read_info(png_ptr, info_ptr);

-   if (info_ptr->height > PNG_UINT_32_MAX/(sizeof (png_bytep)))

-      png_error(png_ptr, "Image is too high to process with png_read_png()");

-

-   /* -------------- image transformations start here ------------------- */

-   /* libpng 1.6.10: add code to cause a png_app_error if a selected TRANSFORM

-    * is not implemented.  This will only happen in de-configured (non-default)

-    * libpng builds.  The results can be unexpected - png_read_png may return

-    * short or mal-formed rows because the transform is skipped.

-    */

-

-   /* Tell libpng to strip 16-bit/color files down to 8 bits per color.

-    */

-   if ((transforms & PNG_TRANSFORM_SCALE_16) != 0)

-      /* Added at libpng-1.5.4. "strip_16" produces the same result that it

-       * did in earlier versions, while "scale_16" is now more accurate.

-       */

-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-      png_set_scale_16(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SCALE_16 not supported");

-#endif

-

-   /* If both SCALE and STRIP are required pngrtran will effectively cancel the

-    * latter by doing SCALE first.  This is ok and allows apps not to check for

-    * which is supported to get the right answer.

-    */

-   if ((transforms & PNG_TRANSFORM_STRIP_16) != 0)

-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-      png_set_strip_16(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_16 not supported");

-#endif

-

-   /* Strip alpha bytes from the input data without combining with

-    * the background (not recommended).

-    */

-   if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0)

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-      png_set_strip_alpha(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_ALPHA not supported");

-#endif

-

-   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single

-    * byte into separate bytes (useful for paletted and grayscale images).

-    */

-   if ((transforms & PNG_TRANSFORM_PACKING) != 0)

-#ifdef PNG_READ_PACK_SUPPORTED

-      png_set_packing(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");

-#endif

-

-   /* Change the order of packed pixels to least significant bit first

-    * (not useful if you are using png_set_packing).

-    */

-   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)

-#ifdef PNG_READ_PACKSWAP_SUPPORTED

-      png_set_packswap(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");

-#endif

-

-   /* Expand paletted colors into true RGB triplets

-    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel

-    * Expand paletted or RGB images with transparency to full alpha

-    * channels so the data will be available as RGBA quartets.

-    */

-   if ((transforms & PNG_TRANSFORM_EXPAND) != 0)

-#ifdef PNG_READ_EXPAND_SUPPORTED

-      png_set_expand(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND not supported");

-#endif

-

-   /* We don't handle background color or gamma transformation or quantizing.

-    */

-

-   /* Invert monochrome files to have 0 as white and 1 as black

-    */

-   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)

-#ifdef PNG_READ_INVERT_SUPPORTED

-      png_set_invert_mono(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");

-#endif

-

-   /* If you want to shift the pixel values from the range [0,255] or

-    * [0,65535] to the original [0,7] or [0,31], or whatever range the

-    * colors were originally in:

-    */

-   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)

-#ifdef PNG_READ_SHIFT_SUPPORTED

-      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)

-         png_set_shift(png_ptr, &info_ptr->sig_bit);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");

-#endif

-

-   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */

-   if ((transforms & PNG_TRANSFORM_BGR) != 0)

-#ifdef PNG_READ_BGR_SUPPORTED

-      png_set_bgr(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");

-#endif

-

-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */

-   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)

-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED

-      png_set_swap_alpha(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");

-#endif

-

-   /* Swap bytes of 16-bit files to least significant byte first */

-   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)

-#ifdef PNG_READ_SWAP_SUPPORTED

-      png_set_swap(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");

-#endif

-

-/* Added at libpng-1.2.41 */

-   /* Invert the alpha channel from opacity to transparency */

-   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)

-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED

-      png_set_invert_alpha(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");

-#endif

-

-/* Added at libpng-1.2.41 */

-   /* Expand grayscale image to RGB */

-   if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0)

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-      png_set_gray_to_rgb(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_GRAY_TO_RGB not supported");

-#endif

-

-/* Added at libpng-1.5.4 */

-   if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0)

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-      png_set_expand_16(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND_16 not supported");

-#endif

-

-   /* We don't handle adding filler bytes */

-

-   /* We use png_read_image and rely on that for interlace handling, but we also

-    * call png_read_update_info therefore must turn on interlace handling now:

-    */

-   (void)png_set_interlace_handling(png_ptr);

-

-   /* Optional call to gamma correct and add the background to the palette

-    * and update info structure.  REQUIRED if you are expecting libpng to

-    * update the palette for you (i.e., you selected such a transform above).

-    */

-   png_read_update_info(png_ptr, info_ptr);

-

-   /* -------------- image transformations end here ------------------- */

-

-   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);

-   if (info_ptr->row_pointers == NULL)

-   {

-      png_uint_32 iptr;

-

-      info_ptr->row_pointers = png_voidcast(png_bytepp, png_malloc(png_ptr,

-          info_ptr->height * (sizeof (png_bytep))));

-

-      for (iptr=0; iptr<info_ptr->height; iptr++)

-         info_ptr->row_pointers[iptr] = NULL;

-

-      info_ptr->free_me |= PNG_FREE_ROWS;

-

-      for (iptr = 0; iptr < info_ptr->height; iptr++)

-         info_ptr->row_pointers[iptr] = png_voidcast(png_bytep,

-             png_malloc(png_ptr, info_ptr->rowbytes));

-   }

-

-   png_read_image(png_ptr, info_ptr->row_pointers);

-   info_ptr->valid |= PNG_INFO_IDAT;

-

-   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */

-   png_read_end(png_ptr, info_ptr);

-

-   PNG_UNUSED(params)

-}

-#endif /* INFO_IMAGE */

-#endif /* SEQUENTIAL_READ */

-

-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED

-/* SIMPLIFIED READ

- *

- * This code currently relies on the sequential reader, though it could easily

- * be made to work with the progressive one.

- */

-/* Arguments to png_image_finish_read: */

-

-/* Encoding of PNG data (used by the color-map code) */

-#  define P_NOTSET  0 /* File encoding not yet known */

-#  define P_sRGB    1 /* 8-bit encoded to sRGB gamma */

-#  define P_LINEAR  2 /* 16-bit linear: not encoded, NOT pre-multiplied! */

-#  define P_FILE    3 /* 8-bit encoded to file gamma, not sRGB or linear */

-#  define P_LINEAR8 4 /* 8-bit linear: only from a file value */

-

-/* Color-map processing: after libpng has run on the PNG image further

- * processing may be needed to convert the data to color-map indices.

- */

-#define PNG_CMAP_NONE      0

-#define PNG_CMAP_GA        1 /* Process GA data to a color-map with alpha */

-#define PNG_CMAP_TRANS     2 /* Process GA data to a background index */

-#define PNG_CMAP_RGB       3 /* Process RGB data */

-#define PNG_CMAP_RGB_ALPHA 4 /* Process RGBA data */

-

-/* The following document where the background is for each processing case. */

-#define PNG_CMAP_NONE_BACKGROUND      256

-#define PNG_CMAP_GA_BACKGROUND        231

-#define PNG_CMAP_TRANS_BACKGROUND     254

-#define PNG_CMAP_RGB_BACKGROUND       256

-#define PNG_CMAP_RGB_ALPHA_BACKGROUND 216

-

-typedef struct

-{

-   /* Arguments: */

-   png_imagep image;

-   png_voidp  buffer;

-   png_int_32 row_stride;

-   png_voidp  colormap;

-   png_const_colorp background;

-   /* Local variables: */

-   png_voidp       local_row;

-   png_voidp       first_row;

-   ptrdiff_t       row_bytes;           /* step between rows */

-   int             file_encoding;       /* E_ values above */

-   png_fixed_point gamma_to_linear;     /* For P_FILE, reciprocal of gamma */

-   int             colormap_processing; /* PNG_CMAP_ values above */

-} png_image_read_control;

-

-/* Do all the *safe* initialization - 'safe' means that png_error won't be

- * called, so setting up the jmp_buf is not required.  This means that anything

- * called from here must *not* call png_malloc - it has to call png_malloc_warn

- * instead so that control is returned safely back to this routine.

- */

-static int

-png_image_read_init(png_imagep image)

-{

-   if (image->opaque == NULL)

-   {

-      png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, image,

-          png_safe_error, png_safe_warning);

-

-      /* And set the rest of the structure to NULL to ensure that the various

-       * fields are consistent.

-       */

-      memset(image, 0, (sizeof *image));

-      image->version = PNG_IMAGE_VERSION;

-

-      if (png_ptr != NULL)

-      {

-         png_infop info_ptr = png_create_info_struct(png_ptr);

-

-         if (info_ptr != NULL)

-         {

-            png_controlp control = png_voidcast(png_controlp,

-                png_malloc_warn(png_ptr, (sizeof *control)));

-

-            if (control != NULL)

-            {

-               memset(control, 0, (sizeof *control));

-

-               control->png_ptr = png_ptr;

-               control->info_ptr = info_ptr;

-               control->for_write = 0;

-

-               image->opaque = control;

-               return 1;

-            }

-

-            /* Error clean up */

-            png_destroy_info_struct(png_ptr, &info_ptr);

-         }

-

-         png_destroy_read_struct(&png_ptr, NULL, NULL);

-      }

-

-      return png_image_error(image, "png_image_read: out of memory");

-   }

-

-   return png_image_error(image, "png_image_read: opaque pointer not NULL");

-}

-

-/* Utility to find the base format of a PNG file from a png_struct. */

-static png_uint_32

-png_image_format(png_structrp png_ptr)

-{

-   png_uint_32 format = 0;

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      format |= PNG_FORMAT_FLAG_COLOR;

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      format |= PNG_FORMAT_FLAG_ALPHA;

-

-   /* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS

-    * sets the png_struct fields; that's all we are interested in here.  The

-    * precise interaction with an app call to png_set_tRNS and PNG file reading

-    * is unclear.

-    */

-   else if (png_ptr->num_trans > 0)

-      format |= PNG_FORMAT_FLAG_ALPHA;

-

-   if (png_ptr->bit_depth == 16)

-      format |= PNG_FORMAT_FLAG_LINEAR;

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0)

-      format |= PNG_FORMAT_FLAG_COLORMAP;

-

-   return format;

-}

-

-/* Is the given gamma significantly different from sRGB?  The test is the same

- * one used in pngrtran.c when deciding whether to do gamma correction.  The

- * arithmetic optimizes the division by using the fact that the inverse of the

- * file sRGB gamma is 2.2

- */

-static int

-png_gamma_not_sRGB(png_fixed_point g)

-{

-   if (g < PNG_FP_1)

-   {

-      /* An uninitialized gamma is assumed to be sRGB for the simplified API. */

-      if (g == 0)

-         return 0;

-

-      return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);

-   }

-

-   return 1;

-}

-

-/* Do the main body of a 'png_image_begin_read' function; read the PNG file

- * header and fill in all the information.  This is executed in a safe context,

- * unlike the init routine above.

- */

-static int

-png_image_read_header(png_voidp argument)

-{

-   png_imagep image = png_voidcast(png_imagep, argument);

-   png_structrp png_ptr = image->opaque->png_ptr;

-   png_inforp info_ptr = image->opaque->info_ptr;

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-   png_set_benign_errors(png_ptr, 1/*warn*/);

-#endif

-   png_read_info(png_ptr, info_ptr);

-

-   /* Do this the fast way; just read directly out of png_struct. */

-   image->width = png_ptr->width;

-   image->height = png_ptr->height;

-

-   {

-      png_uint_32 format = png_image_format(png_ptr);

-

-      image->format = format;

-

-#ifdef PNG_COLORSPACE_SUPPORTED

-      /* Does the colorspace match sRGB?  If there is no color endpoint

-       * (colorant) information assume yes, otherwise require the

-       * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set.  If the

-       * colorspace has been determined to be invalid ignore it.

-       */

-      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags

-         & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|

-            PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))

-         image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;

-#endif

-   }

-

-   /* We need the maximum number of entries regardless of the format the

-    * application sets here.

-    */

-   {

-      png_uint_32 cmap_entries;

-

-      switch (png_ptr->color_type)

-      {

-         case PNG_COLOR_TYPE_GRAY:

-            cmap_entries = 1U << png_ptr->bit_depth;

-            break;

-

-         case PNG_COLOR_TYPE_PALETTE:

-            cmap_entries = (png_uint_32)png_ptr->num_palette;

-            break;

-

-         default:

-            cmap_entries = 256;

-            break;

-      }

-

-      if (cmap_entries > 256)

-         cmap_entries = 256;

-

-      image->colormap_entries = cmap_entries;

-   }

-

-   return 1;

-}

-

-#ifdef PNG_STDIO_SUPPORTED

-int PNGAPI

-png_image_begin_read_from_stdio(png_imagep image, FILE* file)

-{

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (file != NULL)

-      {

-         if (png_image_read_init(image) != 0)

-         {

-            /* This is slightly evil, but png_init_io doesn't do anything other

-             * than this and we haven't changed the standard IO functions so

-             * this saves a 'safe' function.

-             */

-            image->opaque->png_ptr->io_ptr = file;

-            return png_safe_execute(image, png_image_read_header, image);

-         }

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_begin_read_from_stdio: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");

-

-   return 0;

-}

-

-int PNGAPI

-png_image_begin_read_from_file(png_imagep image, const char *file_name)

-{

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (file_name != NULL)

-      {

-         FILE *fp = fopen(file_name, "rb");

-

-         if (fp != NULL)

-         {

-            if (png_image_read_init(image) != 0)

-            {

-               image->opaque->png_ptr->io_ptr = fp;

-               image->opaque->owned_file = 1;

-               return png_safe_execute(image, png_image_read_header, image);

-            }

-

-            /* Clean up: just the opened file. */

-            (void)fclose(fp);

-         }

-

-         else

-            return png_image_error(image, strerror(errno));

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_begin_read_from_file: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");

-

-   return 0;

-}

-#endif /* STDIO */

-

-static void PNGCBAPI

-png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)

-{

-   if (png_ptr != NULL)

-   {

-      png_imagep image = png_voidcast(png_imagep, png_ptr->io_ptr);

-      if (image != NULL)

-      {

-         png_controlp cp = image->opaque;

-         if (cp != NULL)

-         {

-            png_const_bytep memory = cp->memory;

-            png_size_t size = cp->size;

-

-            if (memory != NULL && size >= need)

-            {

-               memcpy(out, memory, need);

-               cp->memory = memory + need;

-               cp->size = size - need;

-               return;

-            }

-

-            png_error(png_ptr, "read beyond end of data");

-         }

-      }

-

-      png_error(png_ptr, "invalid memory read");

-   }

-}

-

-int PNGAPI png_image_begin_read_from_memory(png_imagep image,

-    png_const_voidp memory, png_size_t size)

-{

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (memory != NULL && size > 0)

-      {

-         if (png_image_read_init(image) != 0)

-         {

-            /* Now set the IO functions to read from the memory buffer and

-             * store it into io_ptr.  Again do this in-place to avoid calling a

-             * libpng function that requires error handling.

-             */

-            image->opaque->memory = png_voidcast(png_const_bytep, memory);

-            image->opaque->size = size;

-            image->opaque->png_ptr->io_ptr = image;

-            image->opaque->png_ptr->read_data_fn = png_image_memory_read;

-

-            return png_safe_execute(image, png_image_read_header, image);

-         }

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_begin_read_from_memory: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");

-

-   return 0;

-}

-

-/* Utility function to skip chunks that are not used by the simplified image

- * read functions and an appropriate macro to call it.

- */

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-static void

-png_image_skip_unused_chunks(png_structrp png_ptr)

-{

-   /* Prepare the reader to ignore all recognized chunks whose data will not

-    * be used, i.e., all chunks recognized by libpng except for those

-    * involved in basic image reading:

-    *

-    *    IHDR, PLTE, IDAT, IEND

-    *

-    * Or image data handling:

-    *

-    *    tRNS, bKGD, gAMA, cHRM, sRGB, [iCCP] and sBIT.

-    *

-    * This provides a small performance improvement and eliminates any

-    * potential vulnerability to security problems in the unused chunks.

-    *

-    * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored

-    * too.  This allows the simplified API to be compiled without iCCP support,

-    * however if the support is there the chunk is still checked to detect

-    * errors (which are unfortunately quite common.)

-    */

-   {

-         static PNG_CONST png_byte chunks_to_process[] = {

-            98,  75,  71,  68, '\0',  /* bKGD */

-            99,  72,  82,  77, '\0',  /* cHRM */

-           103,  65,  77,  65, '\0',  /* gAMA */

-#        ifdef PNG_READ_iCCP_SUPPORTED

-           105,  67,  67,  80, '\0',  /* iCCP */

-#        endif

-           115,  66,  73,  84, '\0',  /* sBIT */

-           115,  82,  71,  66, '\0',  /* sRGB */

-           };

-

-       /* Ignore unknown chunks and all other chunks except for the

-        * IHDR, PLTE, tRNS, IDAT, and IEND chunks.

-        */

-       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_NEVER,

-           NULL, -1);

-

-       /* But do not ignore image data handling chunks */

-       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,

-           chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);

-   }

-}

-

-#  define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)

-#else

-#  define PNG_SKIP_CHUNKS(p) ((void)0)

-#endif /* HANDLE_AS_UNKNOWN */

-

-/* The following macro gives the exact rounded answer for all values in the

- * range 0..255 (it actually divides by 51.2, but the rounding still generates

- * the correct numbers 0..5

- */

-#define PNG_DIV51(v8) (((v8) * 5 + 130) >> 8)

-

-/* Utility functions to make particular color-maps */

-static void

-set_file_encoding(png_image_read_control *display)

-{

-   png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;

-   if (png_gamma_significant(g) != 0)

-   {

-      if (png_gamma_not_sRGB(g) != 0)

-      {

-         display->file_encoding = P_FILE;

-         display->gamma_to_linear = png_reciprocal(g);

-      }

-

-      else

-         display->file_encoding = P_sRGB;

-   }

-

-   else

-      display->file_encoding = P_LINEAR8;

-}

-

-static unsigned int

-decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding)

-{

-   if (encoding == P_FILE) /* double check */

-      encoding = display->file_encoding;

-

-   if (encoding == P_NOTSET) /* must be the file encoding */

-   {

-      set_file_encoding(display);

-      encoding = display->file_encoding;

-   }

-

-   switch (encoding)

-   {

-      case P_FILE:

-         value = png_gamma_16bit_correct(value*257, display->gamma_to_linear);

-         break;

-

-      case P_sRGB:

-         value = png_sRGB_table[value];

-         break;

-

-      case P_LINEAR:

-         break;

-

-      case P_LINEAR8:

-         value *= 257;

-         break;

-

-#ifdef __GNUC__

-      default:

-         png_error(display->image->opaque->png_ptr,

-             "unexpected encoding (internal error)");

-#endif

-   }

-

-   return value;

-}

-

-static png_uint_32

-png_colormap_compose(png_image_read_control *display,

-    png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,

-    png_uint_32 background, int encoding)

-{

-   /* The file value is composed on the background, the background has the given

-    * encoding and so does the result, the file is encoded with P_FILE and the

-    * file and alpha are 8-bit values.  The (output) encoding will always be

-    * P_LINEAR or P_sRGB.

-    */

-   png_uint_32 f = decode_gamma(display, foreground, foreground_encoding);

-   png_uint_32 b = decode_gamma(display, background, encoding);

-

-   /* The alpha is always an 8-bit value (it comes from the palette), the value

-    * scaled by 255 is what PNG_sRGB_FROM_LINEAR requires.

-    */

-   f = f * alpha + b * (255-alpha);

-

-   if (encoding == P_LINEAR)

-   {

-      /* Scale to 65535; divide by 255, approximately (in fact this is extremely

-       * accurate, it divides by 255.00000005937181414556, with no overflow.)

-       */

-      f *= 257; /* Now scaled by 65535 */

-      f += f >> 16;

-      f = (f+32768) >> 16;

-   }

-

-   else /* P_sRGB */

-      f = PNG_sRGB_FROM_LINEAR(f);

-

-   return f;

-}

-

-/* NOTE: P_LINEAR values to this routine must be 16-bit, but P_FILE values must

- * be 8-bit.

- */

-static void

-png_create_colormap_entry(png_image_read_control *display,

-    png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,

-    png_uint_32 alpha, int encoding)

-{

-   png_imagep image = display->image;

-   const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?

-       P_LINEAR : P_sRGB;

-   const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&

-       (red != green || green != blue);

-

-   if (ip > 255)

-      png_error(image->opaque->png_ptr, "color-map index out of range");

-

-   /* Update the cache with whether the file gamma is significantly different

-    * from sRGB.

-    */

-   if (encoding == P_FILE)

-   {

-      if (display->file_encoding == P_NOTSET)

-         set_file_encoding(display);

-

-      /* Note that the cached value may be P_FILE too, but if it is then the

-       * gamma_to_linear member has been set.

-       */

-      encoding = display->file_encoding;

-   }

-

-   if (encoding == P_FILE)

-   {

-      png_fixed_point g = display->gamma_to_linear;

-

-      red = png_gamma_16bit_correct(red*257, g);

-      green = png_gamma_16bit_correct(green*257, g);

-      blue = png_gamma_16bit_correct(blue*257, g);

-

-      if (convert_to_Y != 0 || output_encoding == P_LINEAR)

-      {

-         alpha *= 257;

-         encoding = P_LINEAR;

-      }

-

-      else

-      {

-         red = PNG_sRGB_FROM_LINEAR(red * 255);

-         green = PNG_sRGB_FROM_LINEAR(green * 255);

-         blue = PNG_sRGB_FROM_LINEAR(blue * 255);

-         encoding = P_sRGB;

-      }

-   }

-

-   else if (encoding == P_LINEAR8)

-   {

-      /* This encoding occurs quite frequently in test cases because PngSuite

-       * includes a gAMA 1.0 chunk with most images.

-       */

-      red *= 257;

-      green *= 257;

-      blue *= 257;

-      alpha *= 257;

-      encoding = P_LINEAR;

-   }

-

-   else if (encoding == P_sRGB &&

-       (convert_to_Y  != 0 || output_encoding == P_LINEAR))

-   {

-      /* The values are 8-bit sRGB values, but must be converted to 16-bit

-       * linear.

-       */

-      red = png_sRGB_table[red];

-      green = png_sRGB_table[green];

-      blue = png_sRGB_table[blue];

-      alpha *= 257;

-      encoding = P_LINEAR;

-   }

-

-   /* This is set if the color isn't gray but the output is. */

-   if (encoding == P_LINEAR)

-   {

-      if (convert_to_Y != 0)

-      {

-         /* NOTE: these values are copied from png_do_rgb_to_gray */

-         png_uint_32 y = (png_uint_32)6968 * red  + (png_uint_32)23434 * green +

-            (png_uint_32)2366 * blue;

-

-         if (output_encoding == P_LINEAR)

-            y = (y + 16384) >> 15;

-

-         else

-         {

-            /* y is scaled by 32768, we need it scaled by 255: */

-            y = (y + 128) >> 8;

-            y *= 255;

-            y = PNG_sRGB_FROM_LINEAR((y + 64) >> 7);

-            alpha = PNG_DIV257(alpha);

-            encoding = P_sRGB;

-         }

-

-         blue = red = green = y;

-      }

-

-      else if (output_encoding == P_sRGB)

-      {

-         red = PNG_sRGB_FROM_LINEAR(red * 255);

-         green = PNG_sRGB_FROM_LINEAR(green * 255);

-         blue = PNG_sRGB_FROM_LINEAR(blue * 255);

-         alpha = PNG_DIV257(alpha);

-         encoding = P_sRGB;

-      }

-   }

-

-   if (encoding != output_encoding)

-      png_error(image->opaque->png_ptr, "bad encoding (internal error)");

-

-   /* Store the value. */

-   {

-#     ifdef PNG_FORMAT_AFIRST_SUPPORTED

-         const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&

-            (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;

-#     else

-#        define afirst 0

-#     endif

-#     ifdef PNG_FORMAT_BGR_SUPPORTED

-         const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;

-#     else

-#        define bgr 0

-#     endif

-

-      if (output_encoding == P_LINEAR)

-      {

-         png_uint_16p entry = png_voidcast(png_uint_16p, display->colormap);

-

-         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);

-

-         /* The linear 16-bit values must be pre-multiplied by the alpha channel

-          * value, if less than 65535 (this is, effectively, composite on black

-          * if the alpha channel is removed.)

-          */

-         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))

-         {

-            case 4:

-               entry[afirst ? 0 : 3] = (png_uint_16)alpha;

-               /* FALLTHROUGH */

-

-            case 3:

-               if (alpha < 65535)

-               {

-                  if (alpha > 0)

-                  {

-                     blue = (blue * alpha + 32767U)/65535U;

-                     green = (green * alpha + 32767U)/65535U;

-                     red = (red * alpha + 32767U)/65535U;

-                  }

-

-                  else

-                     red = green = blue = 0;

-               }

-               entry[afirst + (2 ^ bgr)] = (png_uint_16)blue;

-               entry[afirst + 1] = (png_uint_16)green;

-               entry[afirst + bgr] = (png_uint_16)red;

-               break;

-

-            case 2:

-               entry[1 ^ afirst] = (png_uint_16)alpha;

-               /* FALLTHROUGH */

-

-            case 1:

-               if (alpha < 65535)

-               {

-                  if (alpha > 0)

-                     green = (green * alpha + 32767U)/65535U;

-

-                  else

-                     green = 0;

-               }

-               entry[afirst] = (png_uint_16)green;

-               break;

-

-            default:

-               break;

-         }

-      }

-

-      else /* output encoding is P_sRGB */

-      {

-         png_bytep entry = png_voidcast(png_bytep, display->colormap);

-

-         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);

-

-         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))

-         {

-            case 4:

-               entry[afirst ? 0 : 3] = (png_byte)alpha;

-               /* FALLTHROUGH */

-            case 3:

-               entry[afirst + (2 ^ bgr)] = (png_byte)blue;

-               entry[afirst + 1] = (png_byte)green;

-               entry[afirst + bgr] = (png_byte)red;

-               break;

-

-            case 2:

-               entry[1 ^ afirst] = (png_byte)alpha;

-               /* FALLTHROUGH */

-            case 1:

-               entry[afirst] = (png_byte)green;

-               break;

-

-            default:

-               break;

-         }

-      }

-

-#     ifdef afirst

-#        undef afirst

-#     endif

-#     ifdef bgr

-#        undef bgr

-#     endif

-   }

-}

-

-static int

-make_gray_file_colormap(png_image_read_control *display)

-{

-   unsigned int i;

-

-   for (i=0; i<256; ++i)

-      png_create_colormap_entry(display, i, i, i, i, 255, P_FILE);

-

-   return (int)i;

-}

-

-static int

-make_gray_colormap(png_image_read_control *display)

-{

-   unsigned int i;

-

-   for (i=0; i<256; ++i)

-      png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB);

-

-   return (int)i;

-}

-#define PNG_GRAY_COLORMAP_ENTRIES 256

-

-static int

-make_ga_colormap(png_image_read_control *display)

-{

-   unsigned int i, a;

-

-   /* Alpha is retained, the output will be a color-map with entries

-    * selected by six levels of alpha.  One transparent entry, 6 gray

-    * levels for all the intermediate alpha values, leaving 230 entries

-    * for the opaque grays.  The color-map entries are the six values

-    * [0..5]*51, the GA processing uses PNG_DIV51(value) to find the

-    * relevant entry.

-    *

-    * if (alpha > 229) // opaque

-    * {

-    *    // The 231 entries are selected to make the math below work:

-    *    base = 0;

-    *    entry = (231 * gray + 128) >> 8;

-    * }

-    * else if (alpha < 26) // transparent

-    * {

-    *    base = 231;

-    *    entry = 0;

-    * }

-    * else // partially opaque

-    * {

-    *    base = 226 + 6 * PNG_DIV51(alpha);

-    *    entry = PNG_DIV51(gray);

-    * }

-    */

-   i = 0;

-   while (i < 231)

-   {

-      unsigned int gray = (i * 256 + 115) / 231;

-      png_create_colormap_entry(display, i++, gray, gray, gray, 255, P_sRGB);

-   }

-

-   /* 255 is used here for the component values for consistency with the code

-    * that undoes premultiplication in pngwrite.c.

-    */

-   png_create_colormap_entry(display, i++, 255, 255, 255, 0, P_sRGB);

-

-   for (a=1; a<5; ++a)

-   {

-      unsigned int g;

-

-      for (g=0; g<6; ++g)

-         png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51,

-             P_sRGB);

-   }

-

-   return (int)i;

-}

-

-#define PNG_GA_COLORMAP_ENTRIES 256

-

-static int

-make_rgb_colormap(png_image_read_control *display)

-{

-   unsigned int i, r;

-

-   /* Build a 6x6x6 opaque RGB cube */

-   for (i=r=0; r<6; ++r)

-   {

-      unsigned int g;

-

-      for (g=0; g<6; ++g)

-      {

-         unsigned int b;

-

-         for (b=0; b<6; ++b)

-            png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255,

-                P_sRGB);

-      }

-   }

-

-   return (int)i;

-}

-

-#define PNG_RGB_COLORMAP_ENTRIES 216

-

-/* Return a palette index to the above palette given three 8-bit sRGB values. */

-#define PNG_RGB_INDEX(r,g,b) \

-   ((png_byte)(6 * (6 * PNG_DIV51(r) + PNG_DIV51(g)) + PNG_DIV51(b)))

-

-static int

-png_image_read_colormap(png_voidp argument)

-{

-   png_image_read_control *display =

-      png_voidcast(png_image_read_control*, argument);

-   const png_imagep image = display->image;

-

-   const png_structrp png_ptr = image->opaque->png_ptr;

-   const png_uint_32 output_format = image->format;

-   const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?

-      P_LINEAR : P_sRGB;

-

-   unsigned int cmap_entries;

-   unsigned int output_processing;        /* Output processing option */

-   unsigned int data_encoding = P_NOTSET; /* Encoding libpng must produce */

-

-   /* Background information; the background color and the index of this color

-    * in the color-map if it exists (else 256).

-    */

-   unsigned int background_index = 256;

-   png_uint_32 back_r, back_g, back_b;

-

-   /* Flags to accumulate things that need to be done to the input. */

-   int expand_tRNS = 0;

-

-   /* Exclude the NYI feature of compositing onto a color-mapped buffer; it is

-    * very difficult to do, the results look awful, and it is difficult to see

-    * what possible use it is because the application can't control the

-    * color-map.

-    */

-   if (((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0 ||

-         png_ptr->num_trans > 0) /* alpha in input */ &&

-      ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) /* no alpha in output */)

-   {

-      if (output_encoding == P_LINEAR) /* compose on black */

-         back_b = back_g = back_r = 0;

-

-      else if (display->background == NULL /* no way to remove it */)

-         png_error(png_ptr,

-             "background color must be supplied to remove alpha/transparency");

-

-      /* Get a copy of the background color (this avoids repeating the checks

-       * below.)  The encoding is 8-bit sRGB or 16-bit linear, depending on the

-       * output format.

-       */

-      else

-      {

-         back_g = display->background->green;

-         if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0)

-         {

-            back_r = display->background->red;

-            back_b = display->background->blue;

-         }

-         else

-            back_b = back_r = back_g;

-      }

-   }

-

-   else if (output_encoding == P_LINEAR)

-      back_b = back_r = back_g = 65535;

-

-   else

-      back_b = back_r = back_g = 255;

-

-   /* Default the input file gamma if required - this is necessary because

-    * libpng assumes that if no gamma information is present the data is in the

-    * output format, but the simplified API deduces the gamma from the input

-    * format.

-    */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)

-   {

-      /* Do this directly, not using the png_colorspace functions, to ensure

-       * that it happens even if the colorspace is invalid (though probably if

-       * it is the setting will be ignored)  Note that the same thing can be

-       * achieved at the application interface with png_set_gAMA.

-       */

-      if (png_ptr->bit_depth == 16 &&

-         (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)

-         png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;

-

-      else

-         png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;

-

-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;

-   }

-

-   /* Decide what to do based on the PNG color type of the input data.  The

-    * utility function png_create_colormap_entry deals with most aspects of the

-    * output transformations; this code works out how to produce bytes of

-    * color-map entries from the original format.

-    */

-   switch (png_ptr->color_type)

-   {

-      case PNG_COLOR_TYPE_GRAY:

-         if (png_ptr->bit_depth <= 8)

-         {

-            /* There at most 256 colors in the output, regardless of

-             * transparency.

-             */

-            unsigned int step, i, val, trans = 256/*ignore*/, back_alpha = 0;

-

-            cmap_entries = 1U << png_ptr->bit_depth;

-            if (cmap_entries > image->colormap_entries)

-               png_error(png_ptr, "gray[8] color-map: too few entries");

-

-            step = 255 / (cmap_entries - 1);

-            output_processing = PNG_CMAP_NONE;

-

-            /* If there is a tRNS chunk then this either selects a transparent

-             * value or, if the output has no alpha, the background color.

-             */

-            if (png_ptr->num_trans > 0)

-            {

-               trans = png_ptr->trans_color.gray;

-

-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0)

-                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;

-            }

-

-            /* png_create_colormap_entry just takes an RGBA and writes the

-             * corresponding color-map entry using the format from 'image',

-             * including the required conversion to sRGB or linear as

-             * appropriate.  The input values are always either sRGB (if the

-             * gamma correction flag is 0) or 0..255 scaled file encoded values

-             * (if the function must gamma correct them).

-             */

-            for (i=val=0; i<cmap_entries; ++i, val += step)

-            {

-               /* 'i' is a file value.  While this will result in duplicated

-                * entries for 8-bit non-sRGB encoded files it is necessary to

-                * have non-gamma corrected values to do tRNS handling.

-                */

-               if (i != trans)

-                  png_create_colormap_entry(display, i, val, val, val, 255,

-                      P_FILE/*8-bit with file gamma*/);

-

-               /* Else this entry is transparent.  The colors don't matter if

-                * there is an alpha channel (back_alpha == 0), but it does no

-                * harm to pass them in; the values are not set above so this

-                * passes in white.

-                *

-                * NOTE: this preserves the full precision of the application

-                * supplied background color when it is used.

-                */

-               else

-                  png_create_colormap_entry(display, i, back_r, back_g, back_b,

-                      back_alpha, output_encoding);

-            }

-

-            /* We need libpng to preserve the original encoding. */

-            data_encoding = P_FILE;

-

-            /* The rows from libpng, while technically gray values, are now also

-             * color-map indices; however, they may need to be expanded to 1

-             * byte per pixel.  This is what png_set_packing does (i.e., it

-             * unpacks the bit values into bytes.)

-             */

-            if (png_ptr->bit_depth < 8)

-               png_set_packing(png_ptr);

-         }

-

-         else /* bit depth is 16 */

-         {

-            /* The 16-bit input values can be converted directly to 8-bit gamma

-             * encoded values; however, if a tRNS chunk is present 257 color-map

-             * entries are required.  This means that the extra entry requires

-             * special processing; add an alpha channel, sacrifice gray level

-             * 254 and convert transparent (alpha==0) entries to that.

-             *

-             * Use libpng to chop the data to 8 bits.  Convert it to sRGB at the

-             * same time to minimize quality loss.  If a tRNS chunk is present

-             * this means libpng must handle it too; otherwise it is impossible

-             * to do the exact match on the 16-bit value.

-             *

-             * If the output has no alpha channel *and* the background color is

-             * gray then it is possible to let libpng handle the substitution by

-             * ensuring that the corresponding gray level matches the background

-             * color exactly.

-             */

-            data_encoding = P_sRGB;

-

-            if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)

-               png_error(png_ptr, "gray[16] color-map: too few entries");

-

-            cmap_entries = (unsigned int)make_gray_colormap(display);

-

-            if (png_ptr->num_trans > 0)

-            {

-               unsigned int back_alpha;

-

-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-                  back_alpha = 0;

-

-               else

-               {

-                  if (back_r == back_g && back_g == back_b)

-                  {

-                     /* Background is gray; no special processing will be

-                      * required.

-                      */

-                     png_color_16 c;

-                     png_uint_32 gray = back_g;

-

-                     if (output_encoding == P_LINEAR)

-                     {

-                        gray = PNG_sRGB_FROM_LINEAR(gray * 255);

-

-                        /* And make sure the corresponding palette entry

-                         * matches.

-                         */

-                        png_create_colormap_entry(display, gray, back_g, back_g,

-                            back_g, 65535, P_LINEAR);

-                     }

-

-                     /* The background passed to libpng, however, must be the

-                      * sRGB value.

-                      */

-                     c.index = 0; /*unused*/

-                     c.gray = c.red = c.green = c.blue = (png_uint_16)gray;

-

-                     /* NOTE: does this work without expanding tRNS to alpha?

-                      * It should be the color->gray case below apparently

-                      * doesn't.

-                      */

-                     png_set_background_fixed(png_ptr, &c,

-                         PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,

-                         0/*gamma: not used*/);

-

-                     output_processing = PNG_CMAP_NONE;

-                     break;

-                  }

-#ifdef __COVERITY__

-                 /* Coverity claims that output_encoding cannot be 2 (P_LINEAR)

-                  * here.

-                  */

-                  back_alpha = 255;

-#else

-                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;

-#endif

-               }

-

-               /* output_processing means that the libpng-processed row will be

-                * 8-bit GA and it has to be processing to single byte color-map

-                * values.  Entry 254 is replaced by either a completely

-                * transparent entry or by the background color at full

-                * precision (and the background color is not a simple gray

-                * level in this case.)

-                */

-               expand_tRNS = 1;

-               output_processing = PNG_CMAP_TRANS;

-               background_index = 254;

-

-               /* And set (overwrite) color-map entry 254 to the actual

-                * background color at full precision.

-                */

-               png_create_colormap_entry(display, 254, back_r, back_g, back_b,

-                   back_alpha, output_encoding);

-            }

-

-            else

-               output_processing = PNG_CMAP_NONE;

-         }

-         break;

-

-      case PNG_COLOR_TYPE_GRAY_ALPHA:

-         /* 8-bit or 16-bit PNG with two channels - gray and alpha.  A minimum

-          * of 65536 combinations.  If, however, the alpha channel is to be

-          * removed there are only 256 possibilities if the background is gray.

-          * (Otherwise there is a subset of the 65536 possibilities defined by

-          * the triangle between black, white and the background color.)

-          *

-          * Reduce 16-bit files to 8-bit and sRGB encode the result.  No need to

-          * worry about tRNS matching - tRNS is ignored if there is an alpha

-          * channel.

-          */

-         data_encoding = P_sRGB;

-

-         if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-         {

-            if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)

-               png_error(png_ptr, "gray+alpha color-map: too few entries");

-

-            cmap_entries = (unsigned int)make_ga_colormap(display);

-

-            background_index = PNG_CMAP_GA_BACKGROUND;

-            output_processing = PNG_CMAP_GA;

-         }

-

-         else /* alpha is removed */

-         {

-            /* Alpha must be removed as the PNG data is processed when the

-             * background is a color because the G and A channels are

-             * independent and the vector addition (non-parallel vectors) is a

-             * 2-D problem.

-             *

-             * This can be reduced to the same algorithm as above by making a

-             * colormap containing gray levels (for the opaque grays), a

-             * background entry (for a transparent pixel) and a set of four six

-             * level color values, one set for each intermediate alpha value.

-             * See the comments in make_ga_colormap for how this works in the

-             * per-pixel processing.

-             *

-             * If the background is gray, however, we only need a 256 entry gray

-             * level color map.  It is sufficient to make the entry generated

-             * for the background color be exactly the color specified.

-             */

-            if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0 ||

-               (back_r == back_g && back_g == back_b))

-            {

-               /* Background is gray; no special processing will be required. */

-               png_color_16 c;

-               png_uint_32 gray = back_g;

-

-               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)

-                  png_error(png_ptr, "gray-alpha color-map: too few entries");

-

-               cmap_entries = (unsigned int)make_gray_colormap(display);

-

-               if (output_encoding == P_LINEAR)

-               {

-                  gray = PNG_sRGB_FROM_LINEAR(gray * 255);

-

-                  /* And make sure the corresponding palette entry matches. */

-                  png_create_colormap_entry(display, gray, back_g, back_g,

-                      back_g, 65535, P_LINEAR);

-               }

-

-               /* The background passed to libpng, however, must be the sRGB

-                * value.

-                */

-               c.index = 0; /*unused*/

-               c.gray = c.red = c.green = c.blue = (png_uint_16)gray;

-

-               png_set_background_fixed(png_ptr, &c,

-                   PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,

-                   0/*gamma: not used*/);

-

-               output_processing = PNG_CMAP_NONE;

-            }

-

-            else

-            {

-               png_uint_32 i, a;

-

-               /* This is the same as png_make_ga_colormap, above, except that

-                * the entries are all opaque.

-                */

-               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)

-                  png_error(png_ptr, "ga-alpha color-map: too few entries");

-

-               i = 0;

-               while (i < 231)

-               {

-                  png_uint_32 gray = (i * 256 + 115) / 231;

-                  png_create_colormap_entry(display, i++, gray, gray, gray,

-                      255, P_sRGB);

-               }

-

-               /* NOTE: this preserves the full precision of the application

-                * background color.

-                */

-               background_index = i;

-               png_create_colormap_entry(display, i++, back_r, back_g, back_b,

-#ifdef __COVERITY__

-                   /* Coverity claims that output_encoding

-                    * cannot be 2 (P_LINEAR) here.

-                    */ 255U,

-#else

-                    output_encoding == P_LINEAR ? 65535U : 255U,

-#endif

-                    output_encoding);

-

-               /* For non-opaque input composite on the sRGB background - this

-                * requires inverting the encoding for each component.  The input

-                * is still converted to the sRGB encoding because this is a

-                * reasonable approximate to the logarithmic curve of human

-                * visual sensitivity, at least over the narrow range which PNG

-                * represents.  Consequently 'G' is always sRGB encoded, while

-                * 'A' is linear.  We need the linear background colors.

-                */

-               if (output_encoding == P_sRGB) /* else already linear */

-               {

-                  /* This may produce a value not exactly matching the

-                   * background, but that's ok because these numbers are only

-                   * used when alpha != 0

-                   */

-                  back_r = png_sRGB_table[back_r];

-                  back_g = png_sRGB_table[back_g];

-                  back_b = png_sRGB_table[back_b];

-               }

-

-               for (a=1; a<5; ++a)

-               {

-                  unsigned int g;

-

-                  /* PNG_sRGB_FROM_LINEAR expects a 16-bit linear value scaled

-                   * by an 8-bit alpha value (0..255).

-                   */

-                  png_uint_32 alpha = 51 * a;

-                  png_uint_32 back_rx = (255-alpha) * back_r;

-                  png_uint_32 back_gx = (255-alpha) * back_g;

-                  png_uint_32 back_bx = (255-alpha) * back_b;

-

-                  for (g=0; g<6; ++g)

-                  {

-                     png_uint_32 gray = png_sRGB_table[g*51] * alpha;

-

-                     png_create_colormap_entry(display, i++,

-                         PNG_sRGB_FROM_LINEAR(gray + back_rx),

-                         PNG_sRGB_FROM_LINEAR(gray + back_gx),

-                         PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);

-                  }

-               }

-

-               cmap_entries = i;

-               output_processing = PNG_CMAP_GA;

-            }

-         }

-         break;

-

-      case PNG_COLOR_TYPE_RGB:

-      case PNG_COLOR_TYPE_RGB_ALPHA:

-         /* Exclude the case where the output is gray; we can always handle this

-          * with the cases above.

-          */

-         if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0)

-         {

-            /* The color-map will be grayscale, so we may as well convert the

-             * input RGB values to a simple grayscale and use the grayscale

-             * code above.

-             *

-             * NOTE: calling this apparently damages the recognition of the

-             * transparent color in background color handling; call

-             * png_set_tRNS_to_alpha before png_set_background_fixed.

-             */

-            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1,

-                -1);

-            data_encoding = P_sRGB;

-

-            /* The output will now be one or two 8-bit gray or gray+alpha

-             * channels.  The more complex case arises when the input has alpha.

-             */

-            if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-               png_ptr->num_trans > 0) &&

-               (output_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-            {

-               /* Both input and output have an alpha channel, so no background

-                * processing is required; just map the GA bytes to the right

-                * color-map entry.

-                */

-               expand_tRNS = 1;

-

-               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)

-                  png_error(png_ptr, "rgb[ga] color-map: too few entries");

-

-               cmap_entries = (unsigned int)make_ga_colormap(display);

-               background_index = PNG_CMAP_GA_BACKGROUND;

-               output_processing = PNG_CMAP_GA;

-            }

-

-            else

-            {

-               /* Either the input or the output has no alpha channel, so there

-                * will be no non-opaque pixels in the color-map; it will just be

-                * grayscale.

-                */

-               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)

-                  png_error(png_ptr, "rgb[gray] color-map: too few entries");

-

-               /* Ideally this code would use libpng to do the gamma correction,

-                * but if an input alpha channel is to be removed we will hit the

-                * libpng bug in gamma+compose+rgb-to-gray (the double gamma

-                * correction bug).  Fix this by dropping the gamma correction in

-                * this case and doing it in the palette; this will result in

-                * duplicate palette entries, but that's better than the

-                * alternative of double gamma correction.

-                */

-               if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-                  png_ptr->num_trans > 0) &&

-                  png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)

-               {

-                  cmap_entries = (unsigned int)make_gray_file_colormap(display);

-                  data_encoding = P_FILE;

-               }

-

-               else

-                  cmap_entries = (unsigned int)make_gray_colormap(display);

-

-               /* But if the input has alpha or transparency it must be removed

-                */

-               if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-                  png_ptr->num_trans > 0)

-               {

-                  png_color_16 c;

-                  png_uint_32 gray = back_g;

-

-                  /* We need to ensure that the application background exists in

-                   * the colormap and that completely transparent pixels map to

-                   * it.  Achieve this simply by ensuring that the entry

-                   * selected for the background really is the background color.

-                   */

-                  if (data_encoding == P_FILE) /* from the fixup above */

-                  {

-                     /* The app supplied a gray which is in output_encoding, we

-                      * need to convert it to a value of the input (P_FILE)

-                      * encoding then set this palette entry to the required

-                      * output encoding.

-                      */

-                     if (output_encoding == P_sRGB)

-                        gray = png_sRGB_table[gray]; /* now P_LINEAR */

-

-                     gray = PNG_DIV257(png_gamma_16bit_correct(gray,

-                         png_ptr->colorspace.gamma)); /* now P_FILE */

-

-                     /* And make sure the corresponding palette entry contains

-                      * exactly the required sRGB value.

-                      */

-                     png_create_colormap_entry(display, gray, back_g, back_g,

-                         back_g, 0/*unused*/, output_encoding);

-                  }

-

-                  else if (output_encoding == P_LINEAR)

-                  {

-                     gray = PNG_sRGB_FROM_LINEAR(gray * 255);

-

-                     /* And make sure the corresponding palette entry matches.

-                      */

-                     png_create_colormap_entry(display, gray, back_g, back_g,

-                        back_g, 0/*unused*/, P_LINEAR);

-                  }

-

-                  /* The background passed to libpng, however, must be the

-                   * output (normally sRGB) value.

-                   */

-                  c.index = 0; /*unused*/

-                  c.gray = c.red = c.green = c.blue = (png_uint_16)gray;

-

-                  /* NOTE: the following is apparently a bug in libpng. Without

-                   * it the transparent color recognition in

-                   * png_set_background_fixed seems to go wrong.

-                   */

-                  expand_tRNS = 1;

-                  png_set_background_fixed(png_ptr, &c,

-                      PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,

-                      0/*gamma: not used*/);

-               }

-

-               output_processing = PNG_CMAP_NONE;

-            }

-         }

-

-         else /* output is color */

-         {

-            /* We could use png_quantize here so long as there is no transparent

-             * color or alpha; png_quantize ignores alpha.  Easier overall just

-             * to do it once and using PNG_DIV51 on the 6x6x6 reduced RGB cube.

-             * Consequently we always want libpng to produce sRGB data.

-             */

-            data_encoding = P_sRGB;

-

-            /* Is there any transparency or alpha? */

-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-               png_ptr->num_trans > 0)

-            {

-               /* Is there alpha in the output too?  If so all four channels are

-                * processed into a special RGB cube with alpha support.

-                */

-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-               {

-                  png_uint_32 r;

-

-                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)

-                     png_error(png_ptr, "rgb+alpha color-map: too few entries");

-

-                  cmap_entries = (unsigned int)make_rgb_colormap(display);

-

-                  /* Add a transparent entry. */

-                  png_create_colormap_entry(display, cmap_entries, 255, 255,

-                      255, 0, P_sRGB);

-

-                  /* This is stored as the background index for the processing

-                   * algorithm.

-                   */

-                  background_index = cmap_entries++;

-

-                  /* Add 27 r,g,b entries each with alpha 0.5. */

-                  for (r=0; r<256; r = (r << 1) | 0x7f)

-                  {

-                     png_uint_32 g;

-

-                     for (g=0; g<256; g = (g << 1) | 0x7f)

-                     {

-                        png_uint_32 b;

-

-                        /* This generates components with the values 0, 127 and

-                         * 255

-                         */

-                        for (b=0; b<256; b = (b << 1) | 0x7f)

-                           png_create_colormap_entry(display, cmap_entries++,

-                               r, g, b, 128, P_sRGB);

-                     }

-                  }

-

-                  expand_tRNS = 1;

-                  output_processing = PNG_CMAP_RGB_ALPHA;

-               }

-

-               else

-               {

-                  /* Alpha/transparency must be removed.  The background must

-                   * exist in the color map (achieved by setting adding it after

-                   * the 666 color-map).  If the standard processing code will

-                   * pick up this entry automatically that's all that is

-                   * required; libpng can be called to do the background

-                   * processing.

-                   */

-                  unsigned int sample_size =

-                     PNG_IMAGE_SAMPLE_SIZE(output_format);

-                  png_uint_32 r, g, b; /* sRGB background */

-

-                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)

-                     png_error(png_ptr, "rgb-alpha color-map: too few entries");

-

-                  cmap_entries = (unsigned int)make_rgb_colormap(display);

-

-                  png_create_colormap_entry(display, cmap_entries, back_r,

-                      back_g, back_b, 0/*unused*/, output_encoding);

-

-                  if (output_encoding == P_LINEAR)

-                  {

-                     r = PNG_sRGB_FROM_LINEAR(back_r * 255);

-                     g = PNG_sRGB_FROM_LINEAR(back_g * 255);

-                     b = PNG_sRGB_FROM_LINEAR(back_b * 255);

-                  }

-

-                  else

-                  {

-                     r = back_r;

-                     g = back_g;

-                     b = back_g;

-                  }

-

-                  /* Compare the newly-created color-map entry with the one the

-                   * PNG_CMAP_RGB algorithm will use.  If the two entries don't

-                   * match, add the new one and set this as the background

-                   * index.

-                   */

-                  if (memcmp((png_const_bytep)display->colormap +

-                      sample_size * cmap_entries,

-                      (png_const_bytep)display->colormap +

-                          sample_size * PNG_RGB_INDEX(r,g,b),

-                     sample_size) != 0)

-                  {

-                     /* The background color must be added. */

-                     background_index = cmap_entries++;

-

-                     /* Add 27 r,g,b entries each with created by composing with

-                      * the background at alpha 0.5.

-                      */

-                     for (r=0; r<256; r = (r << 1) | 0x7f)

-                     {

-                        for (g=0; g<256; g = (g << 1) | 0x7f)

-                        {

-                           /* This generates components with the values 0, 127

-                            * and 255

-                            */

-                           for (b=0; b<256; b = (b << 1) | 0x7f)

-                              png_create_colormap_entry(display, cmap_entries++,

-                                  png_colormap_compose(display, r, P_sRGB, 128,

-                                      back_r, output_encoding),

-                                  png_colormap_compose(display, g, P_sRGB, 128,

-                                      back_g, output_encoding),

-                                  png_colormap_compose(display, b, P_sRGB, 128,

-                                      back_b, output_encoding),

-                                  0/*unused*/, output_encoding);

-                        }

-                     }

-

-                     expand_tRNS = 1;

-                     output_processing = PNG_CMAP_RGB_ALPHA;

-                  }

-

-                  else /* background color is in the standard color-map */

-                  {

-                     png_color_16 c;

-

-                     c.index = 0; /*unused*/

-                     c.red = (png_uint_16)back_r;

-                     c.gray = c.green = (png_uint_16)back_g;

-                     c.blue = (png_uint_16)back_b;

-

-                     png_set_background_fixed(png_ptr, &c,

-                         PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,

-                         0/*gamma: not used*/);

-

-                     output_processing = PNG_CMAP_RGB;

-                  }

-               }

-            }

-

-            else /* no alpha or transparency in the input */

-            {

-               /* Alpha in the output is irrelevant, simply map the opaque input

-                * pixels to the 6x6x6 color-map.

-                */

-               if (PNG_RGB_COLORMAP_ENTRIES > image->colormap_entries)

-                  png_error(png_ptr, "rgb color-map: too few entries");

-

-               cmap_entries = (unsigned int)make_rgb_colormap(display);

-               output_processing = PNG_CMAP_RGB;

-            }

-         }

-         break;

-

-      case PNG_COLOR_TYPE_PALETTE:

-         /* It's already got a color-map.  It may be necessary to eliminate the

-          * tRNS entries though.

-          */

-         {

-            unsigned int num_trans = png_ptr->num_trans;

-            png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL;

-            png_const_colorp colormap = png_ptr->palette;

-            const int do_background = trans != NULL &&

-               (output_format & PNG_FORMAT_FLAG_ALPHA) == 0;

-            unsigned int i;

-

-            /* Just in case: */

-            if (trans == NULL)

-               num_trans = 0;

-

-            output_processing = PNG_CMAP_NONE;

-            data_encoding = P_FILE; /* Don't change from color-map indices */

-            cmap_entries = (unsigned int)png_ptr->num_palette;

-            if (cmap_entries > 256)

-               cmap_entries = 256;

-

-            if (cmap_entries > (unsigned int)image->colormap_entries)

-               png_error(png_ptr, "palette color-map: too few entries");

-

-            for (i=0; i < cmap_entries; ++i)

-            {

-               if (do_background != 0 && i < num_trans && trans[i] < 255)

-               {

-                  if (trans[i] == 0)

-                     png_create_colormap_entry(display, i, back_r, back_g,

-                         back_b, 0, output_encoding);

-

-                  else

-                  {

-                     /* Must compose the PNG file color in the color-map entry

-                      * on the sRGB color in 'back'.

-                      */

-                     png_create_colormap_entry(display, i,

-                         png_colormap_compose(display, colormap[i].red,

-                             P_FILE, trans[i], back_r, output_encoding),

-                         png_colormap_compose(display, colormap[i].green,

-                             P_FILE, trans[i], back_g, output_encoding),

-                         png_colormap_compose(display, colormap[i].blue,

-                             P_FILE, trans[i], back_b, output_encoding),

-                         output_encoding == P_LINEAR ? trans[i] * 257U :

-                             trans[i],

-                         output_encoding);

-                  }

-               }

-

-               else

-                  png_create_colormap_entry(display, i, colormap[i].red,

-                      colormap[i].green, colormap[i].blue,

-                      i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);

-            }

-

-            /* The PNG data may have indices packed in fewer than 8 bits, it

-             * must be expanded if so.

-             */

-            if (png_ptr->bit_depth < 8)

-               png_set_packing(png_ptr);

-         }

-         break;

-

-      default:

-         png_error(png_ptr, "invalid PNG color type");

-         /*NOT REACHED*/

-   }

-

-   /* Now deal with the output processing */

-   if (expand_tRNS != 0 && png_ptr->num_trans > 0 &&

-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)

-      png_set_tRNS_to_alpha(png_ptr);

-

-   switch (data_encoding)

-   {

-      case P_sRGB:

-         /* Change to 8-bit sRGB */

-         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, PNG_GAMMA_sRGB);

-         /* FALLTHROUGH */

-

-      case P_FILE:

-         if (png_ptr->bit_depth > 8)

-            png_set_scale_16(png_ptr);

-         break;

-

-#ifdef __GNUC__

-      default:

-         png_error(png_ptr, "bad data option (internal error)");

-#endif

-   }

-

-   if (cmap_entries > 256 || cmap_entries > image->colormap_entries)

-      png_error(png_ptr, "color map overflow (BAD internal error)");

-

-   image->colormap_entries = cmap_entries;

-

-   /* Double check using the recorded background index */

-   switch (output_processing)

-   {

-      case PNG_CMAP_NONE:

-         if (background_index != PNG_CMAP_NONE_BACKGROUND)

-            goto bad_background;

-         break;

-

-      case PNG_CMAP_GA:

-         if (background_index != PNG_CMAP_GA_BACKGROUND)

-            goto bad_background;

-         break;

-

-      case PNG_CMAP_TRANS:

-         if (background_index >= cmap_entries ||

-            background_index != PNG_CMAP_TRANS_BACKGROUND)

-            goto bad_background;

-         break;

-

-      case PNG_CMAP_RGB:

-         if (background_index != PNG_CMAP_RGB_BACKGROUND)

-            goto bad_background;

-         break;

-

-      case PNG_CMAP_RGB_ALPHA:

-         if (background_index != PNG_CMAP_RGB_ALPHA_BACKGROUND)

-            goto bad_background;

-         break;

-

-      default:

-         png_error(png_ptr, "bad processing option (internal error)");

-

-      bad_background:

-         png_error(png_ptr, "bad background index (internal error)");

-   }

-

-   display->colormap_processing = (int)output_processing;

-

-   return 1/*ok*/;

-}

-

-/* The final part of the color-map read called from png_image_finish_read. */

-static int

-png_image_read_and_map(png_voidp argument)

-{

-   png_image_read_control *display = png_voidcast(png_image_read_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-   int passes;

-

-   /* Called when the libpng data must be transformed into the color-mapped

-    * form.  There is a local row buffer in display->local and this routine must

-    * do the interlace handling.

-    */

-   switch (png_ptr->interlaced)

-   {

-      case PNG_INTERLACE_NONE:

-         passes = 1;

-         break;

-

-      case PNG_INTERLACE_ADAM7:

-         passes = PNG_INTERLACE_ADAM7_PASSES;

-         break;

-

-      default:

-         png_error(png_ptr, "unknown interlace type");

-   }

-

-   {

-      png_uint_32  height = image->height;

-      png_uint_32  width = image->width;

-      int          proc = display->colormap_processing;

-      png_bytep    first_row = png_voidcast(png_bytep, display->first_row);

-      ptrdiff_t    step_row = display->row_bytes;

-      int pass;

-

-      for (pass = 0; pass < passes; ++pass)

-      {

-         unsigned int     startx, stepx, stepy;

-         png_uint_32      y;

-

-         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)

-         {

-            /* The row may be empty for a short image: */

-            if (PNG_PASS_COLS(width, pass) == 0)

-               continue;

-

-            startx = PNG_PASS_START_COL(pass);

-            stepx = PNG_PASS_COL_OFFSET(pass);

-            y = PNG_PASS_START_ROW(pass);

-            stepy = PNG_PASS_ROW_OFFSET(pass);

-         }

-

-         else

-         {

-            y = 0;

-            startx = 0;

-            stepx = stepy = 1;

-         }

-

-         for (; y<height; y += stepy)

-         {

-            png_bytep inrow = png_voidcast(png_bytep, display->local_row);

-            png_bytep outrow = first_row + y * step_row;

-            png_const_bytep end_row = outrow + width;

-

-            /* Read read the libpng data into the temporary buffer. */

-            png_read_row(png_ptr, inrow, NULL);

-

-            /* Now process the row according to the processing option, note

-             * that the caller verifies that the format of the libpng output

-             * data is as required.

-             */

-            outrow += startx;

-            switch (proc)

-            {

-               case PNG_CMAP_GA:

-                  for (; outrow < end_row; outrow += stepx)

-                  {

-                     /* The data is always in the PNG order */

-                     unsigned int gray = *inrow++;

-                     unsigned int alpha = *inrow++;

-                     unsigned int entry;

-

-                     /* NOTE: this code is copied as a comment in

-                      * make_ga_colormap above.  Please update the

-                      * comment if you change this code!

-                      */

-                     if (alpha > 229) /* opaque */

-                     {

-                        entry = (231 * gray + 128) >> 8;

-                     }

-                     else if (alpha < 26) /* transparent */

-                     {

-                        entry = 231;

-                     }

-                     else /* partially opaque */

-                     {

-                        entry = 226 + 6 * PNG_DIV51(alpha) + PNG_DIV51(gray);

-                     }

-

-                     *outrow = (png_byte)entry;

-                  }

-                  break;

-

-               case PNG_CMAP_TRANS:

-                  for (; outrow < end_row; outrow += stepx)

-                  {

-                     png_byte gray = *inrow++;

-                     png_byte alpha = *inrow++;

-

-                     if (alpha == 0)

-                        *outrow = PNG_CMAP_TRANS_BACKGROUND;

-

-                     else if (gray != PNG_CMAP_TRANS_BACKGROUND)

-                        *outrow = gray;

-

-                     else

-                        *outrow = (png_byte)(PNG_CMAP_TRANS_BACKGROUND+1);

-                  }

-                  break;

-

-               case PNG_CMAP_RGB:

-                  for (; outrow < end_row; outrow += stepx)

-                  {

-                     *outrow = PNG_RGB_INDEX(inrow[0], inrow[1], inrow[2]);

-                     inrow += 3;

-                  }

-                  break;

-

-               case PNG_CMAP_RGB_ALPHA:

-                  for (; outrow < end_row; outrow += stepx)

-                  {

-                     unsigned int alpha = inrow[3];

-

-                     /* Because the alpha entries only hold alpha==0.5 values

-                      * split the processing at alpha==0.25 (64) and 0.75

-                      * (196).

-                      */

-

-                     if (alpha >= 196)

-                        *outrow = PNG_RGB_INDEX(inrow[0], inrow[1],

-                            inrow[2]);

-

-                     else if (alpha < 64)

-                        *outrow = PNG_CMAP_RGB_ALPHA_BACKGROUND;

-

-                     else

-                     {

-                        /* Likewise there are three entries for each of r, g

-                         * and b.  We could select the entry by popcount on

-                         * the top two bits on those architectures that

-                         * support it, this is what the code below does,

-                         * crudely.

-                         */

-                        unsigned int back_i = PNG_CMAP_RGB_ALPHA_BACKGROUND+1;

-

-                        /* Here are how the values map:

-                         *

-                         * 0x00 .. 0x3f -> 0

-                         * 0x40 .. 0xbf -> 1

-                         * 0xc0 .. 0xff -> 2

-                         *

-                         * So, as above with the explicit alpha checks, the

-                         * breakpoints are at 64 and 196.

-                         */

-                        if (inrow[0] & 0x80) back_i += 9; /* red */

-                        if (inrow[0] & 0x40) back_i += 9;

-                        if (inrow[0] & 0x80) back_i += 3; /* green */

-                        if (inrow[0] & 0x40) back_i += 3;

-                        if (inrow[0] & 0x80) back_i += 1; /* blue */

-                        if (inrow[0] & 0x40) back_i += 1;

-

-                        *outrow = (png_byte)back_i;

-                     }

-

-                     inrow += 4;

-                  }

-                  break;

-

-               default:

-                  break;

-            }

-         }

-      }

-   }

-

-   return 1;

-}

-

-static int

-png_image_read_colormapped(png_voidp argument)

-{

-   png_image_read_control *display = png_voidcast(png_image_read_control*,

-       argument);

-   png_imagep image = display->image;

-   png_controlp control = image->opaque;

-   png_structrp png_ptr = control->png_ptr;

-   png_inforp info_ptr = control->info_ptr;

-

-   int passes = 0; /* As a flag */

-

-   PNG_SKIP_CHUNKS(png_ptr);

-

-   /* Update the 'info' structure and make sure the result is as required; first

-    * make sure to turn on the interlace handling if it will be required

-    * (because it can't be turned on *after* the call to png_read_update_info!)

-    */

-   if (display->colormap_processing == PNG_CMAP_NONE)

-      passes = png_set_interlace_handling(png_ptr);

-

-   png_read_update_info(png_ptr, info_ptr);

-

-   /* The expected output can be deduced from the colormap_processing option. */

-   switch (display->colormap_processing)

-   {

-      case PNG_CMAP_NONE:

-         /* Output must be one channel and one byte per pixel, the output

-          * encoding can be anything.

-          */

-         if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||

-            info_ptr->color_type == PNG_COLOR_TYPE_GRAY) &&

-            info_ptr->bit_depth == 8)

-            break;

-

-         goto bad_output;

-

-      case PNG_CMAP_TRANS:

-      case PNG_CMAP_GA:

-         /* Output must be two channels and the 'G' one must be sRGB, the latter

-          * can be checked with an exact number because it should have been set

-          * to this number above!

-          */

-         if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&

-            info_ptr->bit_depth == 8 &&

-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&

-            image->colormap_entries == 256)

-            break;

-

-         goto bad_output;

-

-      case PNG_CMAP_RGB:

-         /* Output must be 8-bit sRGB encoded RGB */

-         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&

-            info_ptr->bit_depth == 8 &&

-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&

-            image->colormap_entries == 216)

-            break;

-

-         goto bad_output;

-

-      case PNG_CMAP_RGB_ALPHA:

-         /* Output must be 8-bit sRGB encoded RGBA */

-         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&

-            info_ptr->bit_depth == 8 &&

-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&

-            image->colormap_entries == 244 /* 216 + 1 + 27 */)

-            break;

-

-         goto bad_output;

-

-      default:

-      bad_output:

-         png_error(png_ptr, "bad color-map processing (internal error)");

-   }

-

-   /* Now read the rows.  Do this here if it is possible to read directly into

-    * the output buffer, otherwise allocate a local row buffer of the maximum

-    * size libpng requires and call the relevant processing routine safely.

-    */

-   {

-      png_voidp first_row = display->buffer;

-      ptrdiff_t row_bytes = display->row_stride;

-

-      /* The following expression is designed to work correctly whether it gives

-       * a signed or an unsigned result.

-       */

-      if (row_bytes < 0)

-      {

-         char *ptr = png_voidcast(char*, first_row);

-         ptr += (image->height-1) * (-row_bytes);

-         first_row = png_voidcast(png_voidp, ptr);

-      }

-

-      display->first_row = first_row;

-      display->row_bytes = row_bytes;

-   }

-

-   if (passes == 0)

-   {

-      int result;

-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));

-

-      display->local_row = row;

-      result = png_safe_execute(image, png_image_read_and_map, display);

-      display->local_row = NULL;

-      png_free(png_ptr, row);

-

-      return result;

-   }

-

-   else

-   {

-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;

-

-      while (--passes >= 0)

-      {

-         png_uint_32      y = image->height;

-         png_bytep        row = png_voidcast(png_bytep, display->first_row);

-

-         for (; y > 0; --y)

-         {

-            png_read_row(png_ptr, row, NULL);

-            row += row_bytes;

-         }

-      }

-

-      return 1;

-   }

-}

-

-/* Just the row reading part of png_image_read. */

-static int

-png_image_read_composite(png_voidp argument)

-{

-   png_image_read_control *display = png_voidcast(png_image_read_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-   int passes;

-

-   switch (png_ptr->interlaced)

-   {

-      case PNG_INTERLACE_NONE:

-         passes = 1;

-         break;

-

-      case PNG_INTERLACE_ADAM7:

-         passes = PNG_INTERLACE_ADAM7_PASSES;

-         break;

-

-      default:

-         png_error(png_ptr, "unknown interlace type");

-   }

-

-   {

-      png_uint_32  height = image->height;

-      png_uint_32  width = image->width;

-      ptrdiff_t    step_row = display->row_bytes;

-      unsigned int channels =

-          (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;

-      int pass;

-

-      for (pass = 0; pass < passes; ++pass)

-      {

-         unsigned int     startx, stepx, stepy;

-         png_uint_32      y;

-

-         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)

-         {

-            /* The row may be empty for a short image: */

-            if (PNG_PASS_COLS(width, pass) == 0)

-               continue;

-

-            startx = PNG_PASS_START_COL(pass) * channels;

-            stepx = PNG_PASS_COL_OFFSET(pass) * channels;

-            y = PNG_PASS_START_ROW(pass);

-            stepy = PNG_PASS_ROW_OFFSET(pass);

-         }

-

-         else

-         {

-            y = 0;

-            startx = 0;

-            stepx = channels;

-            stepy = 1;

-         }

-

-         for (; y<height; y += stepy)

-         {

-            png_bytep inrow = png_voidcast(png_bytep, display->local_row);

-            png_bytep outrow;

-            png_const_bytep end_row;

-

-            /* Read the row, which is packed: */

-            png_read_row(png_ptr, inrow, NULL);

-

-            outrow = png_voidcast(png_bytep, display->first_row);

-            outrow += y * step_row;

-            end_row = outrow + width * channels;

-

-            /* Now do the composition on each pixel in this row. */

-            outrow += startx;

-            for (; outrow < end_row; outrow += stepx)

-            {

-               png_byte alpha = inrow[channels];

-

-               if (alpha > 0) /* else no change to the output */

-               {

-                  unsigned int c;

-

-                  for (c=0; c<channels; ++c)

-                  {

-                     png_uint_32 component = inrow[c];

-

-                     if (alpha < 255) /* else just use component */

-                     {

-                        /* This is PNG_OPTIMIZED_ALPHA, the component value

-                         * is a linear 8-bit value.  Combine this with the

-                         * current outrow[c] value which is sRGB encoded.

-                         * Arithmetic here is 16-bits to preserve the output

-                         * values correctly.

-                         */

-                        component *= 257*255; /* =65535 */

-                        component += (255-alpha)*png_sRGB_table[outrow[c]];

-

-                        /* So 'component' is scaled by 255*65535 and is

-                         * therefore appropriate for the sRGB to linear

-                         * conversion table.

-                         */

-                        component = PNG_sRGB_FROM_LINEAR(component);

-                     }

-

-                     outrow[c] = (png_byte)component;

-                  }

-               }

-

-               inrow += channels+1; /* components and alpha channel */

-            }

-         }

-      }

-   }

-

-   return 1;

-}

-

-/* The do_local_background case; called when all the following transforms are to

- * be done:

- *

- * PNG_RGB_TO_GRAY

- * PNG_COMPOSITE

- * PNG_GAMMA

- *

- * This is a work-around for the fact that both the PNG_RGB_TO_GRAY and

- * PNG_COMPOSITE code performs gamma correction, so we get double gamma

- * correction.  The fix-up is to prevent the PNG_COMPOSITE operation from

- * happening inside libpng, so this routine sees an 8 or 16-bit gray+alpha

- * row and handles the removal or pre-multiplication of the alpha channel.

- */

-static int

-png_image_read_background(png_voidp argument)

-{

-   png_image_read_control *display = png_voidcast(png_image_read_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-   png_inforp info_ptr = image->opaque->info_ptr;

-   png_uint_32 height = image->height;

-   png_uint_32 width = image->width;

-   int pass, passes;

-

-   /* Double check the convoluted logic below.  We expect to get here with

-    * libpng doing rgb to gray and gamma correction but background processing

-    * left to the png_image_read_background function.  The rows libpng produce

-    * might be 8 or 16-bit but should always have two channels; gray plus alpha.

-    */

-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)

-      png_error(png_ptr, "lost rgb to gray");

-

-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-      png_error(png_ptr, "unexpected compose");

-

-   if (png_get_channels(png_ptr, info_ptr) != 2)

-      png_error(png_ptr, "lost/gained channels");

-

-   /* Expect the 8-bit case to always remove the alpha channel */

-   if ((image->format & PNG_FORMAT_FLAG_LINEAR) == 0 &&

-      (image->format & PNG_FORMAT_FLAG_ALPHA) != 0)

-      png_error(png_ptr, "unexpected 8-bit transformation");

-

-   switch (png_ptr->interlaced)

-   {

-      case PNG_INTERLACE_NONE:

-         passes = 1;

-         break;

-

-      case PNG_INTERLACE_ADAM7:

-         passes = PNG_INTERLACE_ADAM7_PASSES;

-         break;

-

-      default:

-         png_error(png_ptr, "unknown interlace type");

-   }

-

-   /* Use direct access to info_ptr here because otherwise the simplified API

-    * would require PNG_EASY_ACCESS_SUPPORTED (just for this.)  Note this is

-    * checking the value after libpng expansions, not the original value in the

-    * PNG.

-    */

-   switch (info_ptr->bit_depth)

-   {

-      case 8:

-         /* 8-bit sRGB gray values with an alpha channel; the alpha channel is

-          * to be removed by composing on a background: either the row if

-          * display->background is NULL or display->background->green if not.

-          * Unlike the code above ALPHA_OPTIMIZED has *not* been done.

-          */

-         {

-            png_bytep first_row = png_voidcast(png_bytep, display->first_row);

-            ptrdiff_t step_row = display->row_bytes;

-

-            for (pass = 0; pass < passes; ++pass)

-            {

-               png_bytep row = png_voidcast(png_bytep, display->first_row);

-               unsigned int     startx, stepx, stepy;

-               png_uint_32      y;

-

-               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)

-               {

-                  /* The row may be empty for a short image: */

-                  if (PNG_PASS_COLS(width, pass) == 0)

-                     continue;

-

-                  startx = PNG_PASS_START_COL(pass);

-                  stepx = PNG_PASS_COL_OFFSET(pass);

-                  y = PNG_PASS_START_ROW(pass);

-                  stepy = PNG_PASS_ROW_OFFSET(pass);

-               }

-

-               else

-               {

-                  y = 0;

-                  startx = 0;

-                  stepx = stepy = 1;

-               }

-

-               if (display->background == NULL)

-               {

-                  for (; y<height; y += stepy)

-                  {

-                     png_bytep inrow = png_voidcast(png_bytep,

-                         display->local_row);

-                     png_bytep outrow = first_row + y * step_row;

-                     png_const_bytep end_row = outrow + width;

-

-                     /* Read the row, which is packed: */

-                     png_read_row(png_ptr, inrow, NULL);

-

-                     /* Now do the composition on each pixel in this row. */

-                     outrow += startx;

-                     for (; outrow < end_row; outrow += stepx)

-                     {

-                        png_byte alpha = inrow[1];

-

-                        if (alpha > 0) /* else no change to the output */

-                        {

-                           png_uint_32 component = inrow[0];

-

-                           if (alpha < 255) /* else just use component */

-                           {

-                              /* Since PNG_OPTIMIZED_ALPHA was not set it is

-                               * necessary to invert the sRGB transfer

-                               * function and multiply the alpha out.

-                               */

-                              component = png_sRGB_table[component] * alpha;

-                              component += png_sRGB_table[outrow[0]] *

-                                 (255-alpha);

-                              component = PNG_sRGB_FROM_LINEAR(component);

-                           }

-

-                           outrow[0] = (png_byte)component;

-                        }

-

-                        inrow += 2; /* gray and alpha channel */

-                     }

-                  }

-               }

-

-               else /* constant background value */

-               {

-                  png_byte background8 = display->background->green;

-                  png_uint_16 background = png_sRGB_table[background8];

-

-                  for (; y<height; y += stepy)

-                  {

-                     png_bytep inrow = png_voidcast(png_bytep,

-                         display->local_row);

-                     png_bytep outrow = first_row + y * step_row;

-                     png_const_bytep end_row = outrow + width;

-

-                     /* Read the row, which is packed: */

-                     png_read_row(png_ptr, inrow, NULL);

-

-                     /* Now do the composition on each pixel in this row. */

-                     outrow += startx;

-                     for (; outrow < end_row; outrow += stepx)

-                     {

-                        png_byte alpha = inrow[1];

-

-                        if (alpha > 0) /* else use background */

-                        {

-                           png_uint_32 component = inrow[0];

-

-                           if (alpha < 255) /* else just use component */

-                           {

-                              component = png_sRGB_table[component] * alpha;

-                              component += background * (255-alpha);

-                              component = PNG_sRGB_FROM_LINEAR(component);

-                           }

-

-                           outrow[0] = (png_byte)component;

-                        }

-

-                        else

-                           outrow[0] = background8;

-

-                        inrow += 2; /* gray and alpha channel */

-                     }

-

-                     row += display->row_bytes;

-                  }

-               }

-            }

-         }

-         break;

-

-      case 16:

-         /* 16-bit linear with pre-multiplied alpha; the pre-multiplication must

-          * still be done and, maybe, the alpha channel removed.  This code also

-          * handles the alpha-first option.

-          */

-         {

-            png_uint_16p first_row = png_voidcast(png_uint_16p,

-                display->first_row);

-            /* The division by two is safe because the caller passed in a

-             * stride which was multiplied by 2 (below) to get row_bytes.

-             */

-            ptrdiff_t    step_row = display->row_bytes / 2;

-            unsigned int preserve_alpha = (image->format &

-                PNG_FORMAT_FLAG_ALPHA) != 0;

-            unsigned int outchannels = 1U+preserve_alpha;

-            int swap_alpha = 0;

-

-#           ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED

-               if (preserve_alpha != 0 &&

-                   (image->format & PNG_FORMAT_FLAG_AFIRST) != 0)

-                  swap_alpha = 1;

-#           endif

-

-            for (pass = 0; pass < passes; ++pass)

-            {

-               unsigned int     startx, stepx, stepy;

-               png_uint_32      y;

-

-               /* The 'x' start and step are adjusted to output components here.

-                */

-               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)

-               {

-                  /* The row may be empty for a short image: */

-                  if (PNG_PASS_COLS(width, pass) == 0)

-                     continue;

-

-                  startx = PNG_PASS_START_COL(pass) * outchannels;

-                  stepx = PNG_PASS_COL_OFFSET(pass) * outchannels;

-                  y = PNG_PASS_START_ROW(pass);

-                  stepy = PNG_PASS_ROW_OFFSET(pass);

-               }

-

-               else

-               {

-                  y = 0;

-                  startx = 0;

-                  stepx = outchannels;

-                  stepy = 1;

-               }

-

-               for (; y<height; y += stepy)

-               {

-                  png_const_uint_16p inrow;

-                  png_uint_16p outrow = first_row + y*step_row;

-                  png_uint_16p end_row = outrow + width * outchannels;

-

-                  /* Read the row, which is packed: */

-                  png_read_row(png_ptr, png_voidcast(png_bytep,

-                      display->local_row), NULL);

-                  inrow = png_voidcast(png_const_uint_16p, display->local_row);

-

-                  /* Now do the pre-multiplication on each pixel in this row.

-                   */

-                  outrow += startx;

-                  for (; outrow < end_row; outrow += stepx)

-                  {

-                     png_uint_32 component = inrow[0];

-                     png_uint_16 alpha = inrow[1];

-

-                     if (alpha > 0) /* else 0 */

-                     {

-                        if (alpha < 65535) /* else just use component */

-                        {

-                           component *= alpha;

-                           component += 32767;

-                           component /= 65535;

-                        }

-                     }

-

-                     else

-                        component = 0;

-

-                     outrow[swap_alpha] = (png_uint_16)component;

-                     if (preserve_alpha != 0)

-                        outrow[1 ^ swap_alpha] = alpha;

-

-                     inrow += 2; /* components and alpha channel */

-                  }

-               }

-            }

-         }

-         break;

-

-#ifdef __GNUC__

-      default:

-         png_error(png_ptr, "unexpected bit depth");

-#endif

-   }

-

-   return 1;

-}

-

-/* The guts of png_image_finish_read as a png_safe_execute callback. */

-static int

-png_image_read_direct(png_voidp argument)

-{

-   png_image_read_control *display = png_voidcast(png_image_read_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-   png_inforp info_ptr = image->opaque->info_ptr;

-

-   png_uint_32 format = image->format;

-   int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;

-   int do_local_compose = 0;

-   int do_local_background = 0; /* to avoid double gamma correction bug */

-   int passes = 0;

-

-   /* Add transforms to ensure the correct output format is produced then check

-    * that the required implementation support is there.  Always expand; always

-    * need 8 bits minimum, no palette and expanded tRNS.

-    */

-   png_set_expand(png_ptr);

-

-   /* Now check the format to see if it was modified. */

-   {

-      png_uint_32 base_format = png_image_format(png_ptr) &

-         ~PNG_FORMAT_FLAG_COLORMAP /* removed by png_set_expand */;

-      png_uint_32 change = format ^ base_format;

-      png_fixed_point output_gamma;

-      int mode; /* alpha mode */

-

-      /* Do this first so that we have a record if rgb to gray is happening. */

-      if ((change & PNG_FORMAT_FLAG_COLOR) != 0)

-      {

-         /* gray<->color transformation required. */

-         if ((format & PNG_FORMAT_FLAG_COLOR) != 0)

-            png_set_gray_to_rgb(png_ptr);

-

-         else

-         {

-            /* libpng can't do both rgb to gray and

-             * background/pre-multiplication if there is also significant gamma

-             * correction, because both operations require linear colors and

-             * the code only supports one transform doing the gamma correction.

-             * Handle this by doing the pre-multiplication or background

-             * operation in this code, if necessary.

-             *

-             * TODO: fix this by rewriting pngrtran.c (!)

-             *

-             * For the moment (given that fixing this in pngrtran.c is an

-             * enormous change) 'do_local_background' is used to indicate that

-             * the problem exists.

-             */

-            if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-               do_local_background = 1/*maybe*/;

-

-            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,

-                PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);

-         }

-

-         change &= ~PNG_FORMAT_FLAG_COLOR;

-      }

-

-      /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.

-       */

-      {

-         png_fixed_point input_gamma_default;

-

-         if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&

-             (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)

-            input_gamma_default = PNG_GAMMA_LINEAR;

-         else

-            input_gamma_default = PNG_DEFAULT_sRGB;

-

-         /* Call png_set_alpha_mode to set the default for the input gamma; the

-          * output gamma is set by a second call below.

-          */

-         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, input_gamma_default);

-      }

-

-      if (linear != 0)

-      {

-         /* If there *is* an alpha channel in the input it must be multiplied

-          * out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG.

-          */

-         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-            mode = PNG_ALPHA_STANDARD; /* associated alpha */

-

-         else

-            mode = PNG_ALPHA_PNG;

-

-         output_gamma = PNG_GAMMA_LINEAR;

-      }

-

-      else

-      {

-         mode = PNG_ALPHA_PNG;

-         output_gamma = PNG_DEFAULT_sRGB;

-      }

-      

-      if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0)

-      {

-         mode = PNG_ALPHA_OPTIMIZED;

-         change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;

-      }

-      

-      /* If 'do_local_background' is set check for the presence of gamma

-       * correction; this is part of the work-round for the libpng bug

-       * described above.

-       *

-       * TODO: fix libpng and remove this.

-       */

-      if (do_local_background != 0)

-      {

-         png_fixed_point gtest;

-

-         /* This is 'png_gamma_threshold' from pngrtran.c; the test used for

-          * gamma correction, the screen gamma hasn't been set on png_struct

-          * yet; it's set below.  png_struct::gamma, however, is set to the

-          * final value.

-          */

-         if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,

-             PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)

-            do_local_background = 0;

-

-         else if (mode == PNG_ALPHA_STANDARD)

-         {

-            do_local_background = 2/*required*/;

-            mode = PNG_ALPHA_PNG; /* prevent libpng doing it */

-         }

-

-         /* else leave as 1 for the checks below */

-      }

-

-      /* If the bit-depth changes then handle that here. */

-      if ((change & PNG_FORMAT_FLAG_LINEAR) != 0)

-      {

-         if (linear != 0 /*16-bit output*/)

-            png_set_expand_16(png_ptr);

-

-         else /* 8-bit output */

-            png_set_scale_16(png_ptr);

-

-         change &= ~PNG_FORMAT_FLAG_LINEAR;

-      }

-

-      /* Now the background/alpha channel changes. */

-      if ((change & PNG_FORMAT_FLAG_ALPHA) != 0)

-      {

-         /* Removing an alpha channel requires composition for the 8-bit

-          * formats; for the 16-bit it is already done, above, by the

-          * pre-multiplication and the channel just needs to be stripped.

-          */

-         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)

-         {

-            /* If RGB->gray is happening the alpha channel must be left and the

-             * operation completed locally.

-             *

-             * TODO: fix libpng and remove this.

-             */

-            if (do_local_background != 0)

-               do_local_background = 2/*required*/;

-

-            /* 16-bit output: just remove the channel */

-            else if (linear != 0) /* compose on black (well, pre-multiply) */

-               png_set_strip_alpha(png_ptr);

-

-            /* 8-bit output: do an appropriate compose */

-            else if (display->background != NULL)

-            {

-               png_color_16 c;

-

-               c.index = 0; /*unused*/

-               c.red = display->background->red;

-               c.green = display->background->green;

-               c.blue = display->background->blue;

-               c.gray = display->background->green;

-

-               /* This is always an 8-bit sRGB value, using the 'green' channel

-                * for gray is much better than calculating the luminance here;

-                * we can get off-by-one errors in that calculation relative to

-                * the app expectations and that will show up in transparent

-                * pixels.

-                */

-               png_set_background_fixed(png_ptr, &c,

-                   PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,

-                   0/*gamma: not used*/);

-            }

-

-            else /* compose on row: implemented below. */

-            {

-               do_local_compose = 1;

-               /* This leaves the alpha channel in the output, so it has to be

-                * removed by the code below.  Set the encoding to the 'OPTIMIZE'

-                * one so the code only has to hack on the pixels that require

-                * composition.

-                */

-               mode = PNG_ALPHA_OPTIMIZED;

-            }

-         }

-

-         else /* output needs an alpha channel */

-         {

-            /* This is tricky because it happens before the swap operation has

-             * been accomplished; however, the swap does *not* swap the added

-             * alpha channel (weird API), so it must be added in the correct

-             * place.

-             */

-            png_uint_32 filler; /* opaque filler */

-            int where;

-

-            if (linear != 0)

-               filler = 65535;

-

-            else

-               filler = 255;

-

-#ifdef PNG_FORMAT_AFIRST_SUPPORTED

-            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)

-            {

-               where = PNG_FILLER_BEFORE;

-               change &= ~PNG_FORMAT_FLAG_AFIRST;

-            }

-

-            else

-#endif

-            where = PNG_FILLER_AFTER;

-

-            png_set_add_alpha(png_ptr, filler, where);

-         }

-

-         /* This stops the (irrelevant) call to swap_alpha below. */

-         change &= ~PNG_FORMAT_FLAG_ALPHA;

-      }

-

-      /* Now set the alpha mode correctly; this is always done, even if there is

-       * no alpha channel in either the input or the output because it correctly

-       * sets the output gamma.

-       */

-      png_set_alpha_mode_fixed(png_ptr, mode, output_gamma);

-

-#     ifdef PNG_FORMAT_BGR_SUPPORTED

-         if ((change & PNG_FORMAT_FLAG_BGR) != 0)

-         {

-            /* Check only the output format; PNG is never BGR; don't do this if

-             * the output is gray, but fix up the 'format' value in that case.

-             */

-            if ((format & PNG_FORMAT_FLAG_COLOR) != 0)

-               png_set_bgr(png_ptr);

-

-            else

-               format &= ~PNG_FORMAT_FLAG_BGR;

-

-            change &= ~PNG_FORMAT_FLAG_BGR;

-         }

-#     endif

-

-#     ifdef PNG_FORMAT_AFIRST_SUPPORTED

-         if ((change & PNG_FORMAT_FLAG_AFIRST) != 0)

-         {

-            /* Only relevant if there is an alpha channel - it's particularly

-             * important to handle this correctly because do_local_compose may

-             * be set above and then libpng will keep the alpha channel for this

-             * code to remove.

-             */

-            if ((format & PNG_FORMAT_FLAG_ALPHA) != 0)

-            {

-               /* Disable this if doing a local background,

-                * TODO: remove this when local background is no longer required.

-                */

-               if (do_local_background != 2)

-                  png_set_swap_alpha(png_ptr);

-            }

-

-            else

-               format &= ~PNG_FORMAT_FLAG_AFIRST;

-

-            change &= ~PNG_FORMAT_FLAG_AFIRST;

-         }

-#     endif

-

-      /* If the *output* is 16-bit then we need to check for a byte-swap on this

-       * architecture.

-       */

-      if (linear != 0)

-      {

-         PNG_CONST png_uint_16 le = 0x0001;

-

-         if ((*(png_const_bytep) & le) != 0)

-            png_set_swap(png_ptr);

-      }

-

-      /* If change is not now 0 some transformation is missing - error out. */

-      if (change != 0)

-         png_error(png_ptr, "png_read_image: unsupported transformation");

-   }

-

-   PNG_SKIP_CHUNKS(png_ptr);

-

-   /* Update the 'info' structure and make sure the result is as required; first

-    * make sure to turn on the interlace handling if it will be required

-    * (because it can't be turned on *after* the call to png_read_update_info!)

-    *

-    * TODO: remove the do_local_background fixup below.

-    */

-   if (do_local_compose == 0 && do_local_background != 2)

-      passes = png_set_interlace_handling(png_ptr);

-

-   png_read_update_info(png_ptr, info_ptr);

-

-   {

-      png_uint_32 info_format = 0;

-

-      if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-         info_format |= PNG_FORMAT_FLAG_COLOR;

-

-      if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      {

-         /* do_local_compose removes this channel below. */

-         if (do_local_compose == 0)

-         {

-            /* do_local_background does the same if required. */

-            if (do_local_background != 2 ||

-               (format & PNG_FORMAT_FLAG_ALPHA) != 0)

-               info_format |= PNG_FORMAT_FLAG_ALPHA;

-         }

-      }

-

-      else if (do_local_compose != 0) /* internal error */

-         png_error(png_ptr, "png_image_read: alpha channel lost");

-

-      if ((format & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) {

-         info_format |= PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;

-      }

-

-      if (info_ptr->bit_depth == 16)

-         info_format |= PNG_FORMAT_FLAG_LINEAR;

-

-#ifdef PNG_FORMAT_BGR_SUPPORTED

-      if ((png_ptr->transformations & PNG_BGR) != 0)

-         info_format |= PNG_FORMAT_FLAG_BGR;

-#endif

-

-#ifdef PNG_FORMAT_AFIRST_SUPPORTED

-         if (do_local_background == 2)

-         {

-            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)

-               info_format |= PNG_FORMAT_FLAG_AFIRST;

-         }

-

-         if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0 ||

-            ((png_ptr->transformations & PNG_ADD_ALPHA) != 0 &&

-            (png_ptr->flags & PNG_FLAG_FILLER_AFTER) == 0))

-         {

-            if (do_local_background == 2)

-               png_error(png_ptr, "unexpected alpha swap transformation");

-

-            info_format |= PNG_FORMAT_FLAG_AFIRST;

-         }

-#     endif

-

-      /* This is actually an internal error. */

-      if (info_format != format)

-         png_error(png_ptr, "png_read_image: invalid transformations");

-   }

-

-   /* Now read the rows.  If do_local_compose is set then it is necessary to use

-    * a local row buffer.  The output will be GA, RGBA or BGRA and must be

-    * converted to G, RGB or BGR as appropriate.  The 'local_row' member of the

-    * display acts as a flag.

-    */

-   {

-      png_voidp first_row = display->buffer;

-      ptrdiff_t row_bytes = display->row_stride;

-

-      if (linear != 0)

-         row_bytes *= 2;

-

-      /* The following expression is designed to work correctly whether it gives

-       * a signed or an unsigned result.

-       */

-      if (row_bytes < 0)

-      {

-         char *ptr = png_voidcast(char*, first_row);

-         ptr += (image->height-1) * (-row_bytes);

-         first_row = png_voidcast(png_voidp, ptr);

-      }

-

-      display->first_row = first_row;

-      display->row_bytes = row_bytes;

-   }

-

-   if (do_local_compose != 0)

-   {

-      int result;

-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));

-

-      display->local_row = row;

-      result = png_safe_execute(image, png_image_read_composite, display);

-      display->local_row = NULL;

-      png_free(png_ptr, row);

-

-      return result;

-   }

-

-   else if (do_local_background == 2)

-   {

-      int result;

-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));

-

-      display->local_row = row;

-      result = png_safe_execute(image, png_image_read_background, display);

-      display->local_row = NULL;

-      png_free(png_ptr, row);

-

-      return result;

-   }

-

-   else

-   {

-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;

-

-      while (--passes >= 0)

-      {

-         png_uint_32      y = image->height;

-         png_bytep        row = png_voidcast(png_bytep, display->first_row);

-

-         for (; y > 0; --y)

-         {

-            png_read_row(png_ptr, row, NULL);

-            row += row_bytes;

-         }

-      }

-

-      return 1;

-   }

-}

-

-int PNGAPI

-png_image_finish_read(png_imagep image, png_const_colorp background,

-    void *buffer, png_int_32 row_stride, void *colormap)

-{

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      /* Check for row_stride overflow.  This check is not performed on the

-       * original PNG format because it may not occur in the output PNG format

-       * and libpng deals with the issues of reading the original.

-       */

-      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);

-

-      /* The following checks just the 'row_stride' calculation to ensure it

-       * fits in a signed 32-bit value.  Because channels/components can be

-       * either 1 or 2 bytes in size the length of a row can still overflow 32

-       * bits; this is just to verify that the 'row_stride' argument can be

-       * represented.

-       */

-      if (image->width <= 0x7fffffffU/channels) /* no overflow */

-      {

-         png_uint_32 check;

-         const png_uint_32 png_row_stride = image->width * channels;

-

-         if (row_stride == 0)

-            row_stride = (png_int_32)/*SAFE*/png_row_stride;

-

-         if (row_stride < 0)

-            check = (png_uint_32)(-row_stride);

-

-         else

-            check = (png_uint_32)row_stride;

-

-         /* This verifies 'check', the absolute value of the actual stride

-          * passed in and detects overflow in the application calculation (i.e.

-          * if the app did actually pass in a non-zero 'row_stride'.

-          */

-         if (image->opaque != NULL && buffer != NULL && check >= png_row_stride)

-         {

-            /* Now check for overflow of the image buffer calculation; this

-             * limits the whole image size to 32 bits for API compatibility with

-             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.

-             *

-             * The PNG_IMAGE_BUFFER_SIZE macro is:

-             *

-             *    (PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)*height*(row_stride))

-             *

-             * And the component size is always 1 or 2, so make sure that the

-             * number of *bytes* that the application is saying are available

-             * does actually fit into a 32-bit number.

-             *

-             * NOTE: this will be changed in 1.7 because PNG_IMAGE_BUFFER_SIZE

-             * will be changed to use png_alloc_size_t; bigger images can be

-             * accomodated on 64-bit systems.

-             */

-            if (image->height <=

-                0xffffffffU/PNG_IMAGE_PIXEL_COMPONENT_SIZE(image->format)/check)

-            {

-               if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||

-                  (image->colormap_entries > 0 && colormap != NULL))

-               {

-                  int result;

-                  png_image_read_control display;

-

-                  memset(&display, 0, (sizeof display));

-                  display.image = image;

-                  display.buffer = buffer;

-                  display.row_stride = row_stride;

-                  display.colormap = colormap;

-                  display.background = background;

-                  display.local_row = NULL;

-

-                  /* Choose the correct 'end' routine; for the color-map case

-                   * all the setup has already been done.

-                   */

-                  if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)

-                     result =

-                         png_safe_execute(image,

-                             png_image_read_colormap, &display) &&

-                             png_safe_execute(image,

-                             png_image_read_colormapped, &display);

-

-                  else

-                     result =

-                        png_safe_execute(image,

-                            png_image_read_direct, &display);

-

-                  png_image_free(image);

-                  return result;

-               }

-

-               else

-                  return png_image_error(image,

-                      "png_image_finish_read[color-map]: no color-map");

-            }

-

-            else

-               return png_image_error(image,

-                   "png_image_finish_read: image too large");

-         }

-

-         else

-            return png_image_error(image,

-                "png_image_finish_read: invalid argument");

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_finish_read: row_stride too large");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_finish_read: damaged PNG_IMAGE_VERSION");

-

-   return 0;

-}

-

-#endif /* SIMPLIFIED_READ */

-#endif /* READ */

diff --git a/plugins/AdvaImg/src/LibPNG/pngrio.c b/plugins/AdvaImg/src/LibPNG/pngrio.c
deleted file mode 100644
index 381f506993..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngrio.c
+++ /dev/null
@@ -1,120 +0,0 @@
-

-/* pngrio.c - functions for data input

- *

- * Last changed in libpng 1.6.24 [August 4, 2016]

- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file provides a location for all input.  Users who need

- * special handling are expected to write a function that has the same

- * arguments as this and performs a similar function, but that possibly

- * has a different input method.  Note that you shouldn't change this

- * function, but rather write a replacement function and then make

- * libpng use it at run time with png_set_read_fn(...).

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_READ_SUPPORTED

-

-/* Read the data from whatever input you are using.  The default routine

- * reads from a file pointer.  Note that this routine sometimes gets called

- * with very small lengths, so you should implement some kind of simple

- * buffering if you are using unbuffered reads.  This should never be asked

- * to read more than 64K on a 16-bit machine.

- */

-void /* PRIVATE */

-png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)

-{

-   png_debug1(4, "reading %d bytes", (int)length);

-

-   if (png_ptr->read_data_fn != NULL)

-      (*(png_ptr->read_data_fn))(png_ptr, data, length);

-

-   else

-      png_error(png_ptr, "Call to NULL read function");

-}

-

-#ifdef PNG_STDIO_SUPPORTED

-/* This is the function that does the actual reading of data.  If you are

- * not reading from a standard C stream, you should create a replacement

- * read_data function and use it at run time with png_set_read_fn(), rather

- * than changing the library.

- */

-void PNGCBAPI

-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)

-{

-   png_size_t check;

-

-   if (png_ptr == NULL)

-      return;

-

-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t

-    * instead of an int, which is what fread() actually returns.

-    */

-   check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));

-

-   if (check != length)

-      png_error(png_ptr, "Read Error");

-}

-#endif

-

-/* This function allows the application to supply a new input function

- * for libpng if standard C streams aren't being used.

- *

- * This function takes as its arguments:

- *

- * png_ptr      - pointer to a png input data structure

- *

- * io_ptr       - pointer to user supplied structure containing info about

- *                the input functions.  May be NULL.

- *

- * read_data_fn - pointer to a new input function that takes as its

- *                arguments a pointer to a png_struct, a pointer to

- *                a location where input data can be stored, and a 32-bit

- *                unsigned int that is the number of bytes to be read.

- *                To exit and output any fatal error messages the new write

- *                function should call png_error(png_ptr, "Error msg").

- *                May be NULL, in which case libpng's default function will

- *                be used.

- */

-void PNGAPI

-png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,

-    png_rw_ptr read_data_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->io_ptr = io_ptr;

-

-#ifdef PNG_STDIO_SUPPORTED

-   if (read_data_fn != NULL)

-      png_ptr->read_data_fn = read_data_fn;

-

-   else

-      png_ptr->read_data_fn = png_default_read_data;

-#else

-   png_ptr->read_data_fn = read_data_fn;

-#endif

-

-#ifdef PNG_WRITE_SUPPORTED

-   /* It is an error to write to a read device */

-   if (png_ptr->write_data_fn != NULL)

-   {

-      png_ptr->write_data_fn = NULL;

-      png_warning(png_ptr,

-          "Can't set both read_data_fn and write_data_fn in the"

-          " same structure");

-   }

-#endif

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-   png_ptr->output_flush_fn = NULL;

-#endif

-}

-#endif /* READ */

diff --git a/plugins/AdvaImg/src/LibPNG/pngrtran.c b/plugins/AdvaImg/src/LibPNG/pngrtran.c
deleted file mode 100644
index eebd592f20..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngrtran.c
+++ /dev/null
@@ -1,5010 +0,0 @@
-

-/* pngrtran.c - transforms the data in a row for PNG readers

- *

- * Last changed in libpng 1.6.33 [September 28, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file contains functions optionally called by an application

- * in order to tell libpng how to handle data when reading a PNG.

- * Transformations that are used in both reading and writing are

- * in pngtrans.c.

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_READ_SUPPORTED

-

-/* Set the action on getting a CRC error for an ancillary or critical chunk. */

-void PNGAPI

-png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action)

-{

-   png_debug(1, "in png_set_crc_action");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* Tell libpng how we react to CRC errors in critical chunks */

-   switch (crit_action)

-   {

-      case PNG_CRC_NO_CHANGE:                        /* Leave setting as is */

-         break;

-

-      case PNG_CRC_WARN_USE:                               /* Warn/use data */

-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;

-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;

-         break;

-

-      case PNG_CRC_QUIET_USE:                             /* Quiet/use data */

-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;

-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |

-                           PNG_FLAG_CRC_CRITICAL_IGNORE;

-         break;

-

-      case PNG_CRC_WARN_DISCARD:    /* Not a valid action for critical data */

-         png_warning(png_ptr,

-             "Can't discard critical data on CRC error");

-         /* FALLTHROUGH */

-      case PNG_CRC_ERROR_QUIT:                                /* Error/quit */

-

-      case PNG_CRC_DEFAULT:

-      default:

-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;

-         break;

-   }

-

-   /* Tell libpng how we react to CRC errors in ancillary chunks */

-   switch (ancil_action)

-   {

-      case PNG_CRC_NO_CHANGE:                       /* Leave setting as is */

-         break;

-

-      case PNG_CRC_WARN_USE:                              /* Warn/use data */

-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;

-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;

-         break;

-

-      case PNG_CRC_QUIET_USE:                            /* Quiet/use data */

-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;

-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |

-                           PNG_FLAG_CRC_ANCILLARY_NOWARN;

-         break;

-

-      case PNG_CRC_ERROR_QUIT:                               /* Error/quit */

-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;

-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;

-         break;

-

-      case PNG_CRC_WARN_DISCARD:                      /* Warn/discard data */

-

-      case PNG_CRC_DEFAULT:

-      default:

-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;

-         break;

-   }

-}

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-/* Is it OK to set a transformation now?  Only if png_start_read_image or

- * png_read_update_info have not been called.  It is not necessary for the IHDR

- * to have been read in all cases; the need_IHDR parameter allows for this

- * check too.

- */

-static int

-png_rtran_ok(png_structrp png_ptr, int need_IHDR)

-{

-   if (png_ptr != NULL)

-   {

-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)

-         png_app_error(png_ptr,

-             "invalid after png_start_read_image or png_read_update_info");

-

-      else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0)

-         png_app_error(png_ptr, "invalid before the PNG header has been read");

-

-      else

-      {

-         /* Turn on failure to initialize correctly for all transforms. */

-         png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;

-

-         return 1; /* Ok */

-      }

-   }

-

-   return 0; /* no png_error possible! */

-}

-#endif

-

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-/* Handle alpha and tRNS via a background color */

-void PNGFAPI

-png_set_background_fixed(png_structrp png_ptr,

-    png_const_color_16p background_color, int background_gamma_code,

-    int need_expand, png_fixed_point background_gamma)

-{

-   png_debug(1, "in png_set_background_fixed");

-

-   if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL)

-      return;

-

-   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)

-   {

-      png_warning(png_ptr, "Application must supply a known background gamma");

-      return;

-   }

-

-   png_ptr->transformations |= PNG_COMPOSE | PNG_STRIP_ALPHA;

-   png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-   png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-

-   png_ptr->background = *background_color;

-   png_ptr->background_gamma = background_gamma;

-   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);

-   if (need_expand != 0)

-      png_ptr->transformations |= PNG_BACKGROUND_EXPAND;

-   else

-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_background(png_structrp png_ptr,

-    png_const_color_16p background_color, int background_gamma_code,

-    int need_expand, double background_gamma)

-{

-   png_set_background_fixed(png_ptr, background_color, background_gamma_code,

-      need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));

-}

-#  endif /* FLOATING_POINT */

-#endif /* READ_BACKGROUND */

-

-/* Scale 16-bit depth files to 8-bit depth.  If both of these are set then the

- * one that pngrtran does first (scale) happens.  This is necessary to allow the

- * TRANSFORM and API behavior to be somewhat consistent, and it's simpler.

- */

-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-void PNGAPI

-png_set_scale_16(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_scale_16");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= PNG_SCALE_16_TO_8;

-}

-#endif

-

-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-/* Chop 16-bit depth files to 8-bit depth */

-void PNGAPI

-png_set_strip_16(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_strip_16");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= PNG_16_TO_8;

-}

-#endif

-

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-void PNGAPI

-png_set_strip_alpha(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_strip_alpha");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= PNG_STRIP_ALPHA;

-}

-#endif

-

-#if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)

-static png_fixed_point

-translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,

-    int is_screen)

-{

-   /* Check for flag values.  The main reason for having the old Mac value as a

-    * flag is that it is pretty near impossible to work out what the correct

-    * value is from Apple documentation - a working Mac system is needed to

-    * discover the value!

-    */

-   if (output_gamma == PNG_DEFAULT_sRGB ||

-      output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB)

-   {

-      /* If there is no sRGB support this just sets the gamma to the standard

-       * sRGB value.  (This is a side effect of using this function!)

-       */

-#     ifdef PNG_READ_sRGB_SUPPORTED

-         png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;

-#     else

-         PNG_UNUSED(png_ptr)

-#     endif

-      if (is_screen != 0)

-         output_gamma = PNG_GAMMA_sRGB;

-      else

-         output_gamma = PNG_GAMMA_sRGB_INVERSE;

-   }

-

-   else if (output_gamma == PNG_GAMMA_MAC_18 ||

-      output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18)

-   {

-      if (is_screen != 0)

-         output_gamma = PNG_GAMMA_MAC_OLD;

-      else

-         output_gamma = PNG_GAMMA_MAC_INVERSE;

-   }

-

-   return output_gamma;

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-static png_fixed_point

-convert_gamma_value(png_structrp png_ptr, double output_gamma)

-{

-   /* The following silently ignores cases where fixed point (times 100,000)

-    * gamma values are passed to the floating point API.  This is safe and it

-    * means the fixed point constants work just fine with the floating point

-    * API.  The alternative would just lead to undetected errors and spurious

-    * bug reports.  Negative values fail inside the _fixed API unless they

-    * correspond to the flag values.

-    */

-   if (output_gamma > 0 && output_gamma < 128)

-      output_gamma *= PNG_FP_1;

-

-   /* This preserves -1 and -2 exactly: */

-   output_gamma = floor(output_gamma + .5);

-

-   if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN)

-      png_fixed_error(png_ptr, "gamma value");

-

-   return (png_fixed_point)output_gamma;

-}

-#  endif

-#endif /* READ_ALPHA_MODE || READ_GAMMA */

-

-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-void PNGFAPI

-png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,

-    png_fixed_point output_gamma)

-{

-   int compose = 0;

-   png_fixed_point file_gamma;

-

-   png_debug(1, "in png_set_alpha_mode");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);

-

-   /* Validate the value to ensure it is in a reasonable range. The value

-    * is expected to be 1 or greater, but this range test allows for some

-    * viewing correction values.  The intent is to weed out users of this API

-    * who use the inverse of the gamma value accidentally!  Since some of these

-    * values are reasonable this may have to be changed:

-    *

-    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accomodate the optimal 16-bit

-    * gamma of 36, and its reciprocal.)

-    */

-   if (output_gamma < 1000 || output_gamma > 10000000)

-      png_error(png_ptr, "output gamma out of expected range");

-

-   /* The default file gamma is the inverse of the output gamma; the output

-    * gamma may be changed below so get the file value first:

-    */

-   file_gamma = png_reciprocal(output_gamma);

-

-   /* There are really 8 possibilities here, composed of any combination

-    * of:

-    *

-    *    premultiply the color channels

-    *    do not encode non-opaque pixels

-    *    encode the alpha as well as the color channels

-    *

-    * The differences disappear if the input/output ('screen') gamma is 1.0,

-    * because then the encoding is a no-op and there is only the choice of

-    * premultiplying the color channels or not.

-    *

-    * png_set_alpha_mode and png_set_background interact because both use

-    * png_compose to do the work.  Calling both is only useful when

-    * png_set_alpha_mode is used to set the default mode - PNG_ALPHA_PNG - along

-    * with a default gamma value.  Otherwise PNG_COMPOSE must not be set.

-    */

-   switch (mode)

-   {

-      case PNG_ALPHA_PNG:        /* default: png standard */

-         /* No compose, but it may be set by png_set_background! */

-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-         break;

-

-      case PNG_ALPHA_ASSOCIATED: /* color channels premultiplied */

-         compose = 1;

-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-         /* The output is linear: */

-         output_gamma = PNG_FP_1;

-         break;

-

-      case PNG_ALPHA_OPTIMIZED:  /* associated, non-opaque pixels linear */

-         compose = 1;

-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-         png_ptr->flags |= PNG_FLAG_OPTIMIZE_ALPHA;

-         /* output_gamma records the encoding of opaque pixels! */

-         break;

-

-      case PNG_ALPHA_BROKEN:     /* associated, non-linear, alpha encoded */

-         compose = 1;

-         png_ptr->transformations |= PNG_ENCODE_ALPHA;

-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-         break;

-

-      default:

-         png_error(png_ptr, "invalid alpha mode");

-   }

-

-   /* Only set the default gamma if the file gamma has not been set (this has

-    * the side effect that the gamma in a second call to png_set_alpha_mode will

-    * be ignored.)

-    */

-   if (png_ptr->colorspace.gamma == 0)

-   {

-      png_ptr->colorspace.gamma = file_gamma;

-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;

-   }

-

-   /* But always set the output gamma: */

-   png_ptr->screen_gamma = output_gamma;

-

-   /* Finally, if pre-multiplying, set the background fields to achieve the

-    * desired result.

-    */

-   if (compose != 0)

-   {

-      /* And obtain alpha pre-multiplication by composing on black: */

-      memset(&png_ptr->background, 0, (sizeof png_ptr->background));

-      png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */

-      png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;

-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;

-

-      if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-         png_error(png_ptr,

-             "conflicting calls to set alpha mode and background");

-

-      png_ptr->transformations |= PNG_COMPOSE;

-   }

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma)

-{

-   png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,

-       output_gamma));

-}

-#  endif

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-/* Dither file to 8-bit.  Supply a palette, the current number

- * of elements in the palette, the maximum number of elements

- * allowed, and a histogram if possible.  If the current number

- * of colors is greater than the maximum number, the palette will be

- * modified to fit in the maximum number.  "full_quantize" indicates

- * whether we need a quantizing cube set up for RGB images, or if we

- * simply are reducing the number of colors in a paletted image.

- */

-

-typedef struct png_dsort_struct

-{

-   struct png_dsort_struct * next;

-   png_byte left;

-   png_byte right;

-} png_dsort;

-typedef png_dsort *   png_dsortp;

-typedef png_dsort * * png_dsortpp;

-

-void PNGAPI

-png_set_quantize(png_structrp png_ptr, png_colorp palette,

-    int num_palette, int maximum_colors, png_const_uint_16p histogram,

-    int full_quantize)

-{

-   png_debug(1, "in png_set_quantize");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= PNG_QUANTIZE;

-

-   if (full_quantize == 0)

-   {

-      int i;

-

-      png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,

-          (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));

-      for (i = 0; i < num_palette; i++)

-         png_ptr->quantize_index[i] = (png_byte)i;

-   }

-

-   if (num_palette > maximum_colors)

-   {

-      if (histogram != NULL)

-      {

-         /* This is easy enough, just throw out the least used colors.

-          * Perhaps not the best solution, but good enough.

-          */

-

-         int i;

-

-         /* Initialize an array to sort colors */

-         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,

-             (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));

-

-         /* Initialize the quantize_sort array */

-         for (i = 0; i < num_palette; i++)

-            png_ptr->quantize_sort[i] = (png_byte)i;

-

-         /* Find the least used palette entries by starting a

-          * bubble sort, and running it until we have sorted

-          * out enough colors.  Note that we don't care about

-          * sorting all the colors, just finding which are

-          * least used.

-          */

-

-         for (i = num_palette - 1; i >= maximum_colors; i--)

-         {

-            int done; /* To stop early if the list is pre-sorted */

-            int j;

-

-            done = 1;

-            for (j = 0; j < i; j++)

-            {

-               if (histogram[png_ptr->quantize_sort[j]]

-                   < histogram[png_ptr->quantize_sort[j + 1]])

-               {

-                  png_byte t;

-

-                  t = png_ptr->quantize_sort[j];

-                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];

-                  png_ptr->quantize_sort[j + 1] = t;

-                  done = 0;

-               }

-            }

-

-            if (done != 0)

-               break;

-         }

-

-         /* Swap the palette around, and set up a table, if necessary */

-         if (full_quantize != 0)

-         {

-            int j = num_palette;

-

-            /* Put all the useful colors within the max, but don't

-             * move the others.

-             */

-            for (i = 0; i < maximum_colors; i++)

-            {

-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)

-               {

-                  do

-                     j--;

-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);

-

-                  palette[i] = palette[j];

-               }

-            }

-         }

-         else

-         {

-            int j = num_palette;

-

-            /* Move all the used colors inside the max limit, and

-             * develop a translation table.

-             */

-            for (i = 0; i < maximum_colors; i++)

-            {

-               /* Only move the colors we need to */

-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)

-               {

-                  png_color tmp_color;

-

-                  do

-                     j--;

-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);

-

-                  tmp_color = palette[j];

-                  palette[j] = palette[i];

-                  palette[i] = tmp_color;

-                  /* Indicate where the color went */

-                  png_ptr->quantize_index[j] = (png_byte)i;

-                  png_ptr->quantize_index[i] = (png_byte)j;

-               }

-            }

-

-            /* Find closest color for those colors we are not using */

-            for (i = 0; i < num_palette; i++)

-            {

-               if ((int)png_ptr->quantize_index[i] >= maximum_colors)

-               {

-                  int min_d, k, min_k, d_index;

-

-                  /* Find the closest color to one we threw out */

-                  d_index = png_ptr->quantize_index[i];

-                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);

-                  for (k = 1, min_k = 0; k < maximum_colors; k++)

-                  {

-                     int d;

-

-                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);

-

-                     if (d < min_d)

-                     {

-                        min_d = d;

-                        min_k = k;

-                     }

-                  }

-                  /* Point to closest color */

-                  png_ptr->quantize_index[i] = (png_byte)min_k;

-               }

-            }

-         }

-         png_free(png_ptr, png_ptr->quantize_sort);

-         png_ptr->quantize_sort = NULL;

-      }

-      else

-      {

-         /* This is much harder to do simply (and quickly).  Perhaps

-          * we need to go through a median cut routine, but those

-          * don't always behave themselves with only a few colors

-          * as input.  So we will just find the closest two colors,

-          * and throw out one of them (chosen somewhat randomly).

-          * [We don't understand this at all, so if someone wants to

-          *  work on improving it, be our guest - AED, GRP]

-          */

-         int i;

-         int max_d;

-         int num_new_palette;

-         png_dsortp t;

-         png_dsortpp hash;

-

-         t = NULL;

-

-         /* Initialize palette index arrays */

-         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,

-             (png_alloc_size_t)((png_uint_32)num_palette *

-             (sizeof (png_byte))));

-         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,

-             (png_alloc_size_t)((png_uint_32)num_palette *

-             (sizeof (png_byte))));

-

-         /* Initialize the sort array */

-         for (i = 0; i < num_palette; i++)

-         {

-            png_ptr->index_to_palette[i] = (png_byte)i;

-            png_ptr->palette_to_index[i] = (png_byte)i;

-         }

-

-         hash = (png_dsortpp)png_calloc(png_ptr, (png_alloc_size_t)(769 *

-             (sizeof (png_dsortp))));

-

-         num_new_palette = num_palette;

-

-         /* Initial wild guess at how far apart the farthest pixel

-          * pair we will be eliminating will be.  Larger

-          * numbers mean more areas will be allocated, Smaller

-          * numbers run the risk of not saving enough data, and

-          * having to do this all over again.

-          *

-          * I have not done extensive checking on this number.

-          */

-         max_d = 96;

-

-         while (num_new_palette > maximum_colors)

-         {

-            for (i = 0; i < num_new_palette - 1; i++)

-            {

-               int j;

-

-               for (j = i + 1; j < num_new_palette; j++)

-               {

-                  int d;

-

-                  d = PNG_COLOR_DIST(palette[i], palette[j]);

-

-                  if (d <= max_d)

-                  {

-

-                     t = (png_dsortp)png_malloc_warn(png_ptr,

-                         (png_alloc_size_t)(sizeof (png_dsort)));

-

-                     if (t == NULL)

-                         break;

-

-                     t->next = hash[d];

-                     t->left = (png_byte)i;

-                     t->right = (png_byte)j;

-                     hash[d] = t;

-                  }

-               }

-               if (t == NULL)

-                  break;

-            }

-

-            if (t != NULL)

-            for (i = 0; i <= max_d; i++)

-            {

-               if (hash[i] != NULL)

-               {

-                  png_dsortp p;

-

-                  for (p = hash[i]; p; p = p->next)

-                  {

-                     if ((int)png_ptr->index_to_palette[p->left]

-                         < num_new_palette &&

-                         (int)png_ptr->index_to_palette[p->right]

-                         < num_new_palette)

-                     {

-                        int j, next_j;

-

-                        if (num_new_palette & 0x01)

-                        {

-                           j = p->left;

-                           next_j = p->right;

-                        }

-                        else

-                        {

-                           j = p->right;

-                           next_j = p->left;

-                        }

-

-                        num_new_palette--;

-                        palette[png_ptr->index_to_palette[j]]

-                            = palette[num_new_palette];

-                        if (full_quantize == 0)

-                        {

-                           int k;

-

-                           for (k = 0; k < num_palette; k++)

-                           {

-                              if (png_ptr->quantize_index[k] ==

-                                  png_ptr->index_to_palette[j])

-                                 png_ptr->quantize_index[k] =

-                                     png_ptr->index_to_palette[next_j];

-

-                              if ((int)png_ptr->quantize_index[k] ==

-                                  num_new_palette)

-                                 png_ptr->quantize_index[k] =

-                                     png_ptr->index_to_palette[j];

-                           }

-                        }

-

-                        png_ptr->index_to_palette[png_ptr->palette_to_index

-                            [num_new_palette]] = png_ptr->index_to_palette[j];

-

-                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]

-                            = png_ptr->palette_to_index[num_new_palette];

-

-                        png_ptr->index_to_palette[j] =

-                            (png_byte)num_new_palette;

-

-                        png_ptr->palette_to_index[num_new_palette] =

-                            (png_byte)j;

-                     }

-                     if (num_new_palette <= maximum_colors)

-                        break;

-                  }

-                  if (num_new_palette <= maximum_colors)

-                     break;

-               }

-            }

-

-            for (i = 0; i < 769; i++)

-            {

-               if (hash[i] != NULL)

-               {

-                  png_dsortp p = hash[i];

-                  while (p)

-                  {

-                     t = p->next;

-                     png_free(png_ptr, p);

-                     p = t;

-                  }

-               }

-               hash[i] = 0;

-            }

-            max_d += 96;

-         }

-         png_free(png_ptr, hash);

-         png_free(png_ptr, png_ptr->palette_to_index);

-         png_free(png_ptr, png_ptr->index_to_palette);

-         png_ptr->palette_to_index = NULL;

-         png_ptr->index_to_palette = NULL;

-      }

-      num_palette = maximum_colors;

-   }

-   if (png_ptr->palette == NULL)

-   {

-      png_ptr->palette = palette;

-   }

-   png_ptr->num_palette = (png_uint_16)num_palette;

-

-   if (full_quantize != 0)

-   {

-      int i;

-      png_bytep distance;

-      int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS +

-          PNG_QUANTIZE_BLUE_BITS;

-      int num_red = (1 << PNG_QUANTIZE_RED_BITS);

-      int num_green = (1 << PNG_QUANTIZE_GREEN_BITS);

-      int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS);

-      png_size_t num_entries = ((png_size_t)1 << total_bits);

-

-      png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,

-          (png_alloc_size_t)(num_entries * (sizeof (png_byte))));

-

-      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)(num_entries *

-          (sizeof (png_byte))));

-

-      memset(distance, 0xff, num_entries * (sizeof (png_byte)));

-

-      for (i = 0; i < num_palette; i++)

-      {

-         int ir, ig, ib;

-         int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS));

-         int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS));

-         int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS));

-

-         for (ir = 0; ir < num_red; ir++)

-         {

-            /* int dr = abs(ir - r); */

-            int dr = ((ir > r) ? ir - r : r - ir);

-            int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS +

-                PNG_QUANTIZE_GREEN_BITS));

-

-            for (ig = 0; ig < num_green; ig++)

-            {

-               /* int dg = abs(ig - g); */

-               int dg = ((ig > g) ? ig - g : g - ig);

-               int dt = dr + dg;

-               int dm = ((dr > dg) ? dr : dg);

-               int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS);

-

-               for (ib = 0; ib < num_blue; ib++)

-               {

-                  int d_index = index_g | ib;

-                  /* int db = abs(ib - b); */

-                  int db = ((ib > b) ? ib - b : b - ib);

-                  int dmax = ((dm > db) ? dm : db);

-                  int d = dmax + dt + db;

-

-                  if (d < (int)distance[d_index])

-                  {

-                     distance[d_index] = (png_byte)d;

-                     png_ptr->palette_lookup[d_index] = (png_byte)i;

-                  }

-               }

-            }

-         }

-      }

-

-      png_free(png_ptr, distance);

-   }

-}

-#endif /* READ_QUANTIZE */

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-void PNGFAPI

-png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,

-    png_fixed_point file_gamma)

-{

-   png_debug(1, "in png_set_gamma_fixed");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   /* New in libpng-1.5.4 - reserve particular negative values as flags. */

-   scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);

-   file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);

-

-   /* Checking the gamma values for being >0 was added in 1.5.4 along with the

-    * premultiplied alpha support; this actually hides an undocumented feature

-    * of the previous implementation which allowed gamma processing to be

-    * disabled in background handling.  There is no evidence (so far) that this

-    * was being used; however, png_set_background itself accepted and must still

-    * accept '0' for the gamma value it takes, because it isn't always used.

-    *

-    * Since this is an API change (albeit a very minor one that removes an

-    * undocumented API feature) the following checks were only enabled in

-    * libpng-1.6.0.

-    */

-   if (file_gamma <= 0)

-      png_error(png_ptr, "invalid file gamma in png_set_gamma");

-

-   if (scrn_gamma <= 0)

-      png_error(png_ptr, "invalid screen gamma in png_set_gamma");

-

-   /* Set the gamma values unconditionally - this overrides the value in the PNG

-    * file if a gAMA chunk was present.  png_set_alpha_mode provides a

-    * different, easier, way to default the file gamma.

-    */

-   png_ptr->colorspace.gamma = file_gamma;

-   png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;

-   png_ptr->screen_gamma = scrn_gamma;

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)

-{

-   png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),

-       convert_gamma_value(png_ptr, file_gamma));

-}

-#  endif /* FLOATING_POINT */

-#endif /* READ_GAMMA */

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-/* Expand paletted images to RGB, expand grayscale images of

- * less than 8-bit depth to 8-bit depth, and expand tRNS chunks

- * to alpha channels.

- */

-void PNGAPI

-png_set_expand(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_expand");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);

-}

-

-/* GRR 19990627:  the following three functions currently are identical

- *  to png_set_expand().  However, it is entirely reasonable that someone

- *  might wish to expand an indexed image to RGB but *not* expand a single,

- *  fully transparent palette entry to a full alpha channel--perhaps instead

- *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace

- *  the transparent color with a particular RGB value, or drop tRNS entirely.

- *  IOW, a future version of the library may make the transformations flag

- *  a bit more fine-grained, with separate bits for each of these three

- *  functions.

- *

- *  More to the point, these functions make it obvious what libpng will be

- *  doing, whereas "expand" can (and does) mean any number of things.

- *

- *  GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified

- *  to expand only the sample depth but not to expand the tRNS to alpha

- *  and its name was changed to png_set_expand_gray_1_2_4_to_8().

- */

-

-/* Expand paletted images to RGB. */

-void PNGAPI

-png_set_palette_to_rgb(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_palette_to_rgb");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);

-}

-

-/* Expand grayscale images of less than 8-bit depth to 8 bits. */

-void PNGAPI

-png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= PNG_EXPAND;

-}

-

-/* Expand tRNS chunks to alpha channels. */

-void PNGAPI

-png_set_tRNS_to_alpha(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_tRNS_to_alpha");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);

-}

-#endif /* READ_EXPAND */

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-/* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise

- * it may not work correctly.)

- */

-void PNGAPI

-png_set_expand_16(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_expand_16");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);

-}

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-void PNGAPI

-png_set_gray_to_rgb(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_gray_to_rgb");

-

-   if (png_rtran_ok(png_ptr, 0) == 0)

-      return;

-

-   /* Because rgb must be 8 bits or more: */

-   png_set_expand_gray_1_2_4_to_8(png_ptr);

-   png_ptr->transformations |= PNG_GRAY_TO_RGB;

-}

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-void PNGFAPI

-png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,

-    png_fixed_point red, png_fixed_point green)

-{

-   png_debug(1, "in png_set_rgb_to_gray");

-

-   /* Need the IHDR here because of the check on color_type below. */

-   /* TODO: fix this */

-   if (png_rtran_ok(png_ptr, 1) == 0)

-      return;

-

-   switch (error_action)

-   {

-      case PNG_ERROR_ACTION_NONE:

-         png_ptr->transformations |= PNG_RGB_TO_GRAY;

-         break;

-

-      case PNG_ERROR_ACTION_WARN:

-         png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;

-         break;

-

-      case PNG_ERROR_ACTION_ERROR:

-         png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;

-         break;

-

-      default:

-         png_error(png_ptr, "invalid error action to rgb_to_gray");

-   }

-

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-#ifdef PNG_READ_EXPAND_SUPPORTED

-      png_ptr->transformations |= PNG_EXPAND;

-#else

-   {

-      /* Make this an error in 1.6 because otherwise the application may assume

-       * that it just worked and get a memory overwrite.

-       */

-      png_error(png_ptr,

-          "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");

-

-      /* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */

-   }

-#endif

-   {

-      if (red >= 0 && green >= 0 && red + green <= PNG_FP_1)

-      {

-         png_uint_16 red_int, green_int;

-

-         /* NOTE: this calculation does not round, but this behavior is retained

-          * for consistency; the inaccuracy is very small.  The code here always

-          * overwrites the coefficients, regardless of whether they have been

-          * defaulted or set already.

-          */

-         red_int = (png_uint_16)(((png_uint_32)red*32768)/100000);

-         green_int = (png_uint_16)(((png_uint_32)green*32768)/100000);

-

-         png_ptr->rgb_to_gray_red_coeff   = red_int;

-         png_ptr->rgb_to_gray_green_coeff = green_int;

-         png_ptr->rgb_to_gray_coefficients_set = 1;

-      }

-

-      else

-      {

-         if (red >= 0 && green >= 0)

-            png_app_warning(png_ptr,

-                "ignoring out of range rgb_to_gray coefficients");

-

-         /* Use the defaults, from the cHRM chunk if set, else the historical

-          * values which are close to the sRGB/HDTV/ITU-Rec 709 values.  See

-          * png_do_rgb_to_gray for more discussion of the values.  In this case

-          * the coefficients are not marked as 'set' and are not overwritten if

-          * something has already provided a default.

-          */

-         if (png_ptr->rgb_to_gray_red_coeff == 0 &&

-             png_ptr->rgb_to_gray_green_coeff == 0)

-         {

-            png_ptr->rgb_to_gray_red_coeff   = 6968;

-            png_ptr->rgb_to_gray_green_coeff = 23434;

-            /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */

-         }

-      }

-   }

-}

-

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-/* Convert a RGB image to a grayscale of the same width.  This allows us,

- * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.

- */

-

-void PNGAPI

-png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,

-    double green)

-{

-   png_set_rgb_to_gray_fixed(png_ptr, error_action,

-       png_fixed(png_ptr, red, "rgb to gray red coefficient"),

-      png_fixed(png_ptr, green, "rgb to gray green coefficient"));

-}

-#endif /* FLOATING POINT */

-

-#endif /* RGB_TO_GRAY */

-

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \

-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-void PNGAPI

-png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr

-    read_user_transform_fn)

-{

-   png_debug(1, "in png_set_read_user_transform_fn");

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-   png_ptr->transformations |= PNG_USER_TRANSFORM;

-   png_ptr->read_user_transform_fn = read_user_transform_fn;

-#endif

-}

-#endif

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-#ifdef PNG_READ_GAMMA_SUPPORTED

-/* In the case of gamma transformations only do transformations on images where

- * the [file] gamma and screen_gamma are not close reciprocals, otherwise it

- * slows things down slightly, and also needlessly introduces small errors.

- */

-static int /* PRIVATE */

-png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma)

-{

-   /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma

-    * correction as a difference of the overall transform from 1.0

-    *

-    * We want to compare the threshold with s*f - 1, if we get

-    * overflow here it is because of wacky gamma values so we

-    * turn on processing anyway.

-    */

-   png_fixed_point gtest;

-   return !png_muldiv(&gtest, screen_gamma, file_gamma, PNG_FP_1) ||

-       png_gamma_significant(gtest);

-}

-#endif

-

-/* Initialize everything needed for the read.  This includes modifying

- * the palette.

- */

-

-/* For the moment 'png_init_palette_transformations' and

- * 'png_init_rgb_transformations' only do some flag canceling optimizations.

- * The intent is that these two routines should have palette or rgb operations

- * extracted from 'png_init_read_transformations'.

- */

-static void /* PRIVATE */

-png_init_palette_transformations(png_structrp png_ptr)

-{

-   /* Called to handle the (input) palette case.  In png_do_read_transformations

-    * the first step is to expand the palette if requested, so this code must

-    * take care to only make changes that are invariant with respect to the

-    * palette expansion, or only do them if there is no expansion.

-    *

-    * STRIP_ALPHA has already been handled in the caller (by setting num_trans

-    * to 0.)

-    */

-   int input_has_alpha = 0;

-   int input_has_transparency = 0;

-

-   if (png_ptr->num_trans > 0)

-   {

-      int i;

-

-      /* Ignore if all the entries are opaque (unlikely!) */

-      for (i=0; i<png_ptr->num_trans; ++i)

-      {

-         if (png_ptr->trans_alpha[i] == 255)

-            continue;

-         else if (png_ptr->trans_alpha[i] == 0)

-            input_has_transparency = 1;

-         else

-         {

-            input_has_transparency = 1;

-            input_has_alpha = 1;

-            break;

-         }

-      }

-   }

-

-   /* If no alpha we can optimize. */

-   if (input_has_alpha == 0)

-   {

-      /* Any alpha means background and associative alpha processing is

-       * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA

-       * and ENCODE_ALPHA are irrelevant.

-       */

-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-

-      if (input_has_transparency == 0)

-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);

-   }

-

-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)

-   /* png_set_background handling - deals with the complexity of whether the

-    * background color is in the file format or the screen format in the case

-    * where an 'expand' will happen.

-    */

-

-   /* The following code cannot be entered in the alpha pre-multiplication case

-    * because PNG_BACKGROUND_EXPAND is cancelled below.

-    */

-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&

-       (png_ptr->transformations & PNG_EXPAND) != 0)

-   {

-      {

-         png_ptr->background.red   =

-             png_ptr->palette[png_ptr->background.index].red;

-         png_ptr->background.green =

-             png_ptr->palette[png_ptr->background.index].green;

-         png_ptr->background.blue  =

-             png_ptr->palette[png_ptr->background.index].blue;

-

-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED

-        if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)

-        {

-           if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)

-           {

-              /* Invert the alpha channel (in tRNS) unless the pixels are

-               * going to be expanded, in which case leave it for later

-               */

-              int i, istop = png_ptr->num_trans;

-

-              for (i=0; i<istop; i++)

-                 png_ptr->trans_alpha[i] = (png_byte)(255 -

-                    png_ptr->trans_alpha[i]);

-           }

-        }

-#endif /* READ_INVERT_ALPHA */

-      }

-   } /* background expand and (therefore) no alpha association. */

-#endif /* READ_EXPAND && READ_BACKGROUND */

-}

-

-static void /* PRIVATE */

-png_init_rgb_transformations(png_structrp png_ptr)

-{

-   /* Added to libpng-1.5.4: check the color type to determine whether there

-    * is any alpha or transparency in the image and simply cancel the

-    * background and alpha mode stuff if there isn't.

-    */

-   int input_has_alpha = (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0;

-   int input_has_transparency = png_ptr->num_trans > 0;

-

-   /* If no alpha we can optimize. */

-   if (input_has_alpha == 0)

-   {

-      /* Any alpha means background and associative alpha processing is

-       * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA

-       * and ENCODE_ALPHA are irrelevant.

-       */

-#     ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-#     endif

-

-      if (input_has_transparency == 0)

-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);

-   }

-

-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)

-   /* png_set_background handling - deals with the complexity of whether the

-    * background color is in the file format or the screen format in the case

-    * where an 'expand' will happen.

-    */

-

-   /* The following code cannot be entered in the alpha pre-multiplication case

-    * because PNG_BACKGROUND_EXPAND is cancelled below.

-    */

-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&

-       (png_ptr->transformations & PNG_EXPAND) != 0 &&

-       (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)

-       /* i.e., GRAY or GRAY_ALPHA */

-   {

-      {

-         /* Expand background and tRNS chunks */

-         int gray = png_ptr->background.gray;

-         int trans_gray = png_ptr->trans_color.gray;

-

-         switch (png_ptr->bit_depth)

-         {

-            case 1:

-               gray *= 0xff;

-               trans_gray *= 0xff;

-               break;

-

-            case 2:

-               gray *= 0x55;

-               trans_gray *= 0x55;

-               break;

-

-            case 4:

-               gray *= 0x11;

-               trans_gray *= 0x11;

-               break;

-

-            default:

-

-            case 8:

-               /* FALLTHROUGH */ /*  (Already 8 bits) */

-

-            case 16:

-               /* Already a full 16 bits */

-               break;

-         }

-

-         png_ptr->background.red = png_ptr->background.green =

-            png_ptr->background.blue = (png_uint_16)gray;

-

-         if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)

-         {

-            png_ptr->trans_color.red = png_ptr->trans_color.green =

-               png_ptr->trans_color.blue = (png_uint_16)trans_gray;

-         }

-      }

-   } /* background expand and (therefore) no alpha association. */

-#endif /* READ_EXPAND && READ_BACKGROUND */

-}

-

-void /* PRIVATE */

-png_init_read_transformations(png_structrp png_ptr)

-{

-   png_debug(1, "in png_init_read_transformations");

-

-   /* This internal function is called from png_read_start_row in pngrutil.c

-    * and it is called before the 'rowbytes' calculation is done, so the code

-    * in here can change or update the transformations flags.

-    *

-    * First do updates that do not depend on the details of the PNG image data

-    * being processed.

-    */

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   /* Prior to 1.5.4 these tests were performed from png_set_gamma, 1.5.4 adds

-    * png_set_alpha_mode and this is another source for a default file gamma so

-    * the test needs to be performed later - here.  In addition prior to 1.5.4

-    * the tests were repeated for the PALETTE color type here - this is no

-    * longer necessary (and doesn't seem to have been necessary before.)

-    */

-   {

-      /* The following temporary indicates if overall gamma correction is

-       * required.

-       */

-      int gamma_correction = 0;

-

-      if (png_ptr->colorspace.gamma != 0) /* has been set */

-      {

-         if (png_ptr->screen_gamma != 0) /* screen set too */

-            gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,

-                png_ptr->screen_gamma);

-

-         else

-            /* Assume the output matches the input; a long time default behavior

-             * of libpng, although the standard has nothing to say about this.

-             */

-            png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);

-      }

-

-      else if (png_ptr->screen_gamma != 0)

-         /* The converse - assume the file matches the screen, note that this

-          * perhaps undesireable default can (from 1.5.4) be changed by calling

-          * png_set_alpha_mode (even if the alpha handling mode isn't required

-          * or isn't changed from the default.)

-          */

-         png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);

-

-      else /* neither are set */

-         /* Just in case the following prevents any processing - file and screen

-          * are both assumed to be linear and there is no way to introduce a

-          * third gamma value other than png_set_background with 'UNIQUE', and,

-          * prior to 1.5.4

-          */

-         png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;

-

-      /* We have a gamma value now. */

-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;

-

-      /* Now turn the gamma transformation on or off as appropriate.  Notice

-       * that PNG_GAMMA just refers to the file->screen correction.  Alpha

-       * composition may independently cause gamma correction because it needs

-       * linear data (e.g. if the file has a gAMA chunk but the screen gamma

-       * hasn't been specified.)  In any case this flag may get turned off in

-       * the code immediately below if the transform can be handled outside the

-       * row loop.

-       */

-      if (gamma_correction != 0)

-         png_ptr->transformations |= PNG_GAMMA;

-

-      else

-         png_ptr->transformations &= ~PNG_GAMMA;

-   }

-#endif

-

-   /* Certain transformations have the effect of preventing other

-    * transformations that happen afterward in png_do_read_transformations;

-    * resolve the interdependencies here.  From the code of

-    * png_do_read_transformations the order is:

-    *

-    *  1) PNG_EXPAND (including PNG_EXPAND_tRNS)

-    *  2) PNG_STRIP_ALPHA (if no compose)

-    *  3) PNG_RGB_TO_GRAY

-    *  4) PNG_GRAY_TO_RGB iff !PNG_BACKGROUND_IS_GRAY

-    *  5) PNG_COMPOSE

-    *  6) PNG_GAMMA

-    *  7) PNG_STRIP_ALPHA (if compose)

-    *  8) PNG_ENCODE_ALPHA

-    *  9) PNG_SCALE_16_TO_8

-    * 10) PNG_16_TO_8

-    * 11) PNG_QUANTIZE (converts to palette)

-    * 12) PNG_EXPAND_16

-    * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY

-    * 14) PNG_INVERT_MONO

-    * 15) PNG_INVERT_ALPHA

-    * 16) PNG_SHIFT

-    * 17) PNG_PACK

-    * 18) PNG_BGR

-    * 19) PNG_PACKSWAP

-    * 20) PNG_FILLER (includes PNG_ADD_ALPHA)

-    * 21) PNG_SWAP_ALPHA

-    * 22) PNG_SWAP_BYTES

-    * 23) PNG_USER_TRANSFORM [must be last]

-    */

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&

-       (png_ptr->transformations & PNG_COMPOSE) == 0)

-   {

-      /* Stripping the alpha channel happens immediately after the 'expand'

-       * transformations, before all other transformation, so it cancels out

-       * the alpha handling.  It has the side effect negating the effect of

-       * PNG_EXPAND_tRNS too:

-       */

-      png_ptr->transformations &= ~(PNG_BACKGROUND_EXPAND | PNG_ENCODE_ALPHA |

-         PNG_EXPAND_tRNS);

-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-

-      /* Kill the tRNS chunk itself too.  Prior to 1.5.4 this did not happen

-       * so transparency information would remain just so long as it wasn't

-       * expanded.  This produces unexpected API changes if the set of things

-       * that do PNG_EXPAND_tRNS changes (perfectly possible given the

-       * documentation - which says ask for what you want, accept what you

-       * get.)  This makes the behavior consistent from 1.5.4:

-       */

-      png_ptr->num_trans = 0;

-   }

-#endif /* STRIP_ALPHA supported, no COMPOSE */

-

-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-   /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA

-    * settings will have no effect.

-    */

-   if (png_gamma_significant(png_ptr->screen_gamma) == 0)

-   {

-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;

-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;

-   }

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-   /* Make sure the coefficients for the rgb to gray conversion are set

-    * appropriately.

-    */

-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)

-      png_colorspace_set_rgb_coefficients(png_ptr);

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)

-   /* Detect gray background and attempt to enable optimization for

-    * gray --> RGB case.

-    *

-    * Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or

-    * RGB_ALPHA (in which case need_expand is superfluous anyway), the

-    * background color might actually be gray yet not be flagged as such.

-    * This is not a problem for the current code, which uses

-    * PNG_BACKGROUND_IS_GRAY only to decide when to do the

-    * png_do_gray_to_rgb() transformation.

-    *

-    * TODO: this code needs to be revised to avoid the complexity and

-    * interdependencies.  The color type of the background should be recorded in

-    * png_set_background, along with the bit depth, then the code has a record

-    * of exactly what color space the background is currently in.

-    */

-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0)

-   {

-      /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if

-       * the file was grayscale the background value is gray.

-       */

-      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)

-         png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;

-   }

-

-   else if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-   {

-      /* PNG_COMPOSE: png_set_background was called with need_expand false,

-       * so the color is in the color space of the output or png_set_alpha_mode

-       * was called and the color is black.  Ignore RGB_TO_GRAY because that

-       * happens before GRAY_TO_RGB.

-       */

-      if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)

-      {

-         if (png_ptr->background.red == png_ptr->background.green &&

-             png_ptr->background.red == png_ptr->background.blue)

-         {

-            png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;

-            png_ptr->background.gray = png_ptr->background.red;

-         }

-      }

-   }

-#endif /* READ_EXPAND && READ_BACKGROUND */

-#endif /* READ_GRAY_TO_RGB */

-

-   /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations

-    * can be performed directly on the palette, and some (such as rgb to gray)

-    * can be optimized inside the palette.  This is particularly true of the

-    * composite (background and alpha) stuff, which can be pretty much all done

-    * in the palette even if the result is expanded to RGB or gray afterward.

-    *

-    * NOTE: this is Not Yet Implemented, the code behaves as in 1.5.1 and

-    * earlier and the palette stuff is actually handled on the first row.  This

-    * leads to the reported bug that the palette returned by png_get_PLTE is not

-    * updated.

-    */

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      png_init_palette_transformations(png_ptr);

-

-   else

-      png_init_rgb_transformations(png_ptr);

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \

-   defined(PNG_READ_EXPAND_16_SUPPORTED)

-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&

-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&

-       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&

-       png_ptr->bit_depth != 16)

-   {

-      /* TODO: fix this.  Because the expand_16 operation is after the compose

-       * handling the background color must be 8, not 16, bits deep, but the

-       * application will supply a 16-bit value so reduce it here.

-       *

-       * The PNG_BACKGROUND_EXPAND code above does not expand to 16 bits at

-       * present, so that case is ok (until do_expand_16 is moved.)

-       *

-       * NOTE: this discards the low 16 bits of the user supplied background

-       * color, but until expand_16 works properly there is no choice!

-       */

-#     define CHOP(x) (x)=((png_uint_16)PNG_DIV257(x))

-      CHOP(png_ptr->background.red);

-      CHOP(png_ptr->background.green);

-      CHOP(png_ptr->background.blue);

-      CHOP(png_ptr->background.gray);

-#     undef CHOP

-   }

-#endif /* READ_BACKGROUND && READ_EXPAND_16 */

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \

-   (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \

-   defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))

-   if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 &&

-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&

-       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&

-       png_ptr->bit_depth == 16)

-   {

-      /* On the other hand, if a 16-bit file is to be reduced to 8-bits per

-       * component this will also happen after PNG_COMPOSE and so the background

-       * color must be pre-expanded here.

-       *

-       * TODO: fix this too.

-       */

-      png_ptr->background.red = (png_uint_16)(png_ptr->background.red * 257);

-      png_ptr->background.green =

-         (png_uint_16)(png_ptr->background.green * 257);

-      png_ptr->background.blue = (png_uint_16)(png_ptr->background.blue * 257);

-      png_ptr->background.gray = (png_uint_16)(png_ptr->background.gray * 257);

-   }

-#endif

-

-   /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the

-    * background support (see the comments in scripts/pnglibconf.dfa), this

-    * allows pre-multiplication of the alpha channel to be implemented as

-    * compositing on black.  This is probably sub-optimal and has been done in

-    * 1.5.4 betas simply to enable external critique and testing (i.e. to

-    * implement the new API quickly, without lots of internal changes.)

-    */

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-#  ifdef PNG_READ_BACKGROUND_SUPPORTED

-      /* Includes ALPHA_MODE */

-      png_ptr->background_1 = png_ptr->background;

-#  endif

-

-   /* This needs to change - in the palette image case a whole set of tables are

-    * built when it would be quicker to just calculate the correct value for

-    * each palette entry directly.  Also, the test is too tricky - why check

-    * PNG_RGB_TO_GRAY if PNG_GAMMA is not set?  The answer seems to be that

-    * PNG_GAMMA is cancelled even if the gamma is known?  The test excludes the

-    * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction

-    * the gamma tables will not be built even if composition is required on a

-    * gamma encoded value.

-    *

-    * In 1.5.4 this is addressed below by an additional check on the individual

-    * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the

-    * tables.

-    */

-   if ((png_ptr->transformations & PNG_GAMMA) != 0 ||

-       ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&

-        (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||

-         png_gamma_significant(png_ptr->screen_gamma) != 0)) ||

-        ((png_ptr->transformations & PNG_COMPOSE) != 0 &&

-         (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||

-          png_gamma_significant(png_ptr->screen_gamma) != 0

-#  ifdef PNG_READ_BACKGROUND_SUPPORTED

-         || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&

-           png_gamma_significant(png_ptr->background_gamma) != 0)

-#  endif

-        )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&

-       png_gamma_significant(png_ptr->screen_gamma) != 0))

-   {

-      png_build_gamma_table(png_ptr, png_ptr->bit_depth);

-

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-      if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-      {

-         /* Issue a warning about this combination: because RGB_TO_GRAY is

-          * optimized to do the gamma transform if present yet do_background has

-          * to do the same thing if both options are set a

-          * double-gamma-correction happens.  This is true in all versions of

-          * libpng to date.

-          */

-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)

-            png_warning(png_ptr,

-                "libpng does not support gamma+background+rgb_to_gray");

-

-         if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)

-         {

-            /* We don't get to here unless there is a tRNS chunk with non-opaque

-             * entries - see the checking code at the start of this function.

-             */

-            png_color back, back_1;

-            png_colorp palette = png_ptr->palette;

-            int num_palette = png_ptr->num_palette;

-            int i;

-            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)

-            {

-

-               back.red = png_ptr->gamma_table[png_ptr->background.red];

-               back.green = png_ptr->gamma_table[png_ptr->background.green];

-               back.blue = png_ptr->gamma_table[png_ptr->background.blue];

-

-               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];

-               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];

-               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];

-            }

-            else

-            {

-               png_fixed_point g, gs;

-

-               switch (png_ptr->background_gamma_type)

-               {

-                  case PNG_BACKGROUND_GAMMA_SCREEN:

-                     g = (png_ptr->screen_gamma);

-                     gs = PNG_FP_1;

-                     break;

-

-                  case PNG_BACKGROUND_GAMMA_FILE:

-                     g = png_reciprocal(png_ptr->colorspace.gamma);

-                     gs = png_reciprocal2(png_ptr->colorspace.gamma,

-                         png_ptr->screen_gamma);

-                     break;

-

-                  case PNG_BACKGROUND_GAMMA_UNIQUE:

-                     g = png_reciprocal(png_ptr->background_gamma);

-                     gs = png_reciprocal2(png_ptr->background_gamma,

-                         png_ptr->screen_gamma);

-                     break;

-                  default:

-                     g = PNG_FP_1;    /* back_1 */

-                     gs = PNG_FP_1;   /* back */

-                     break;

-               }

-

-               if (png_gamma_significant(gs) != 0)

-               {

-                  back.red = png_gamma_8bit_correct(png_ptr->background.red,

-                      gs);

-                  back.green = png_gamma_8bit_correct(png_ptr->background.green,

-                      gs);

-                  back.blue = png_gamma_8bit_correct(png_ptr->background.blue,

-                      gs);

-               }

-

-               else

-               {

-                  back.red   = (png_byte)png_ptr->background.red;

-                  back.green = (png_byte)png_ptr->background.green;

-                  back.blue  = (png_byte)png_ptr->background.blue;

-               }

-

-               if (png_gamma_significant(g) != 0)

-               {

-                  back_1.red = png_gamma_8bit_correct(png_ptr->background.red,

-                      g);

-                  back_1.green = png_gamma_8bit_correct(

-                      png_ptr->background.green, g);

-                  back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue,

-                      g);

-               }

-

-               else

-               {

-                  back_1.red   = (png_byte)png_ptr->background.red;

-                  back_1.green = (png_byte)png_ptr->background.green;

-                  back_1.blue  = (png_byte)png_ptr->background.blue;

-               }

-            }

-

-            for (i = 0; i < num_palette; i++)

-            {

-               if (i < (int)png_ptr->num_trans &&

-                   png_ptr->trans_alpha[i] != 0xff)

-               {

-                  if (png_ptr->trans_alpha[i] == 0)

-                  {

-                     palette[i] = back;

-                  }

-                  else /* if (png_ptr->trans_alpha[i] != 0xff) */

-                  {

-                     png_byte v, w;

-

-                     v = png_ptr->gamma_to_1[palette[i].red];

-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);

-                     palette[i].red = png_ptr->gamma_from_1[w];

-

-                     v = png_ptr->gamma_to_1[palette[i].green];

-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);

-                     palette[i].green = png_ptr->gamma_from_1[w];

-

-                     v = png_ptr->gamma_to_1[palette[i].blue];

-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);

-                     palette[i].blue = png_ptr->gamma_from_1[w];

-                  }

-               }

-               else

-               {

-                  palette[i].red = png_ptr->gamma_table[palette[i].red];

-                  palette[i].green = png_ptr->gamma_table[palette[i].green];

-                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];

-               }

-            }

-

-            /* Prevent the transformations being done again.

-             *

-             * NOTE: this is highly dubious; it removes the transformations in

-             * place.  This seems inconsistent with the general treatment of the

-             * transformations elsewhere.

-             */

-            png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA);

-         } /* color_type == PNG_COLOR_TYPE_PALETTE */

-

-         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */

-         else /* color_type != PNG_COLOR_TYPE_PALETTE */

-         {

-            int gs_sig, g_sig;

-            png_fixed_point g = PNG_FP_1;  /* Correction to linear */

-            png_fixed_point gs = PNG_FP_1; /* Correction to screen */

-

-            switch (png_ptr->background_gamma_type)

-            {

-               case PNG_BACKGROUND_GAMMA_SCREEN:

-                  g = png_ptr->screen_gamma;

-                  /* gs = PNG_FP_1; */

-                  break;

-

-               case PNG_BACKGROUND_GAMMA_FILE:

-                  g = png_reciprocal(png_ptr->colorspace.gamma);

-                  gs = png_reciprocal2(png_ptr->colorspace.gamma,

-                      png_ptr->screen_gamma);

-                  break;

-

-               case PNG_BACKGROUND_GAMMA_UNIQUE:

-                  g = png_reciprocal(png_ptr->background_gamma);

-                  gs = png_reciprocal2(png_ptr->background_gamma,

-                      png_ptr->screen_gamma);

-                  break;

-

-               default:

-                  png_error(png_ptr, "invalid background gamma type");

-            }

-

-            g_sig = png_gamma_significant(g);

-            gs_sig = png_gamma_significant(gs);

-

-            if (g_sig != 0)

-               png_ptr->background_1.gray = png_gamma_correct(png_ptr,

-                   png_ptr->background.gray, g);

-

-            if (gs_sig != 0)

-               png_ptr->background.gray = png_gamma_correct(png_ptr,

-                   png_ptr->background.gray, gs);

-

-            if ((png_ptr->background.red != png_ptr->background.green) ||

-                (png_ptr->background.red != png_ptr->background.blue) ||

-                (png_ptr->background.red != png_ptr->background.gray))

-            {

-               /* RGB or RGBA with color background */

-               if (g_sig != 0)

-               {

-                  png_ptr->background_1.red = png_gamma_correct(png_ptr,

-                      png_ptr->background.red, g);

-

-                  png_ptr->background_1.green = png_gamma_correct(png_ptr,

-                      png_ptr->background.green, g);

-

-                  png_ptr->background_1.blue = png_gamma_correct(png_ptr,

-                      png_ptr->background.blue, g);

-               }

-

-               if (gs_sig != 0)

-               {

-                  png_ptr->background.red = png_gamma_correct(png_ptr,

-                      png_ptr->background.red, gs);

-

-                  png_ptr->background.green = png_gamma_correct(png_ptr,

-                      png_ptr->background.green, gs);

-

-                  png_ptr->background.blue = png_gamma_correct(png_ptr,

-                      png_ptr->background.blue, gs);

-               }

-            }

-

-            else

-            {

-               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */

-               png_ptr->background_1.red = png_ptr->background_1.green

-                   = png_ptr->background_1.blue = png_ptr->background_1.gray;

-

-               png_ptr->background.red = png_ptr->background.green

-                   = png_ptr->background.blue = png_ptr->background.gray;

-            }

-

-            /* The background is now in screen gamma: */

-            png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_SCREEN;

-         } /* color_type != PNG_COLOR_TYPE_PALETTE */

-      }/* png_ptr->transformations & PNG_BACKGROUND */

-

-      else

-      /* Transformation does not include PNG_BACKGROUND */

-#endif /* READ_BACKGROUND */

-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-         /* RGB_TO_GRAY needs to have non-gamma-corrected values! */

-         && ((png_ptr->transformations & PNG_EXPAND) == 0 ||

-         (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)

-#endif

-         )

-      {

-         png_colorp palette = png_ptr->palette;

-         int num_palette = png_ptr->num_palette;

-         int i;

-

-         /* NOTE: there are other transformations that should probably be in

-          * here too.

-          */

-         for (i = 0; i < num_palette; i++)

-         {

-            palette[i].red = png_ptr->gamma_table[palette[i].red];

-            palette[i].green = png_ptr->gamma_table[palette[i].green];

-            palette[i].blue = png_ptr->gamma_table[palette[i].blue];

-         }

-

-         /* Done the gamma correction. */

-         png_ptr->transformations &= ~PNG_GAMMA;

-      } /* color_type == PALETTE && !PNG_BACKGROUND transformation */

-   }

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-   else

-#endif

-#endif /* READ_GAMMA */

-

-#ifdef PNG_READ_BACKGROUND_SUPPORTED

-   /* No GAMMA transformation (see the hanging else 4 lines above) */

-   if ((png_ptr->transformations & PNG_COMPOSE) != 0 &&

-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))

-   {

-      int i;

-      int istop = (int)png_ptr->num_trans;

-      png_color back;

-      png_colorp palette = png_ptr->palette;

-

-      back.red   = (png_byte)png_ptr->background.red;

-      back.green = (png_byte)png_ptr->background.green;

-      back.blue  = (png_byte)png_ptr->background.blue;

-

-      for (i = 0; i < istop; i++)

-      {

-         if (png_ptr->trans_alpha[i] == 0)

-         {

-            palette[i] = back;

-         }

-

-         else if (png_ptr->trans_alpha[i] != 0xff)

-         {

-            /* The png_composite() macro is defined in png.h */

-            png_composite(palette[i].red, palette[i].red,

-                png_ptr->trans_alpha[i], back.red);

-

-            png_composite(palette[i].green, palette[i].green,

-                png_ptr->trans_alpha[i], back.green);

-

-            png_composite(palette[i].blue, palette[i].blue,

-                png_ptr->trans_alpha[i], back.blue);

-         }

-      }

-

-      png_ptr->transformations &= ~PNG_COMPOSE;

-   }

-#endif /* READ_BACKGROUND */

-

-#ifdef PNG_READ_SHIFT_SUPPORTED

-   if ((png_ptr->transformations & PNG_SHIFT) != 0 &&

-       (png_ptr->transformations & PNG_EXPAND) == 0 &&

-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))

-   {

-      int i;

-      int istop = png_ptr->num_palette;

-      int shift = 8 - png_ptr->sig_bit.red;

-

-      png_ptr->transformations &= ~PNG_SHIFT;

-

-      /* significant bits can be in the range 1 to 7 for a meaninful result, if

-       * the number of significant bits is 0 then no shift is done (this is an

-       * error condition which is silently ignored.)

-       */

-      if (shift > 0 && shift < 8)

-         for (i=0; i<istop; ++i)

-         {

-            int component = png_ptr->palette[i].red;

-

-            component >>= shift;

-            png_ptr->palette[i].red = (png_byte)component;

-         }

-

-      shift = 8 - png_ptr->sig_bit.green;

-      if (shift > 0 && shift < 8)

-         for (i=0; i<istop; ++i)

-         {

-            int component = png_ptr->palette[i].green;

-

-            component >>= shift;

-            png_ptr->palette[i].green = (png_byte)component;

-         }

-

-      shift = 8 - png_ptr->sig_bit.blue;

-      if (shift > 0 && shift < 8)

-         for (i=0; i<istop; ++i)

-         {

-            int component = png_ptr->palette[i].blue;

-

-            component >>= shift;

-            png_ptr->palette[i].blue = (png_byte)component;

-         }

-   }

-#endif /* READ_SHIFT */

-}

-

-/* Modify the info structure to reflect the transformations.  The

- * info should be updated so a PNG file could be written with it,

- * assuming the transformations result in valid PNG data.

- */

-void /* PRIVATE */

-png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_debug(1, "in png_read_transform_info");

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-   if ((png_ptr->transformations & PNG_EXPAND) != 0)

-   {

-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         /* This check must match what actually happens in

-          * png_do_expand_palette; if it ever checks the tRNS chunk to see if

-          * it is all opaque we must do the same (at present it does not.)

-          */

-         if (png_ptr->num_trans > 0)

-            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;

-

-         else

-            info_ptr->color_type = PNG_COLOR_TYPE_RGB;

-

-         info_ptr->bit_depth = 8;

-         info_ptr->num_trans = 0;

-

-         if (png_ptr->palette == NULL)

-            png_error (png_ptr, "Palette is NULL in indexed image");

-      }

-      else

-      {

-         if (png_ptr->num_trans != 0)

-         {

-            if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0)

-               info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;

-         }

-         if (info_ptr->bit_depth < 8)

-            info_ptr->bit_depth = 8;

-

-         info_ptr->num_trans = 0;

-      }

-   }

-#endif

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-   /* The following is almost certainly wrong unless the background value is in

-    * the screen space!

-    */

-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-      info_ptr->background = png_ptr->background;

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   /* The following used to be conditional on PNG_GAMMA (prior to 1.5.4),

-    * however it seems that the code in png_init_read_transformations, which has

-    * been called before this from png_read_update_info->png_read_start_row

-    * sometimes does the gamma transform and cancels the flag.

-    *

-    * TODO: this looks wrong; the info_ptr should end up with a gamma equal to

-    * the screen_gamma value.  The following probably results in weirdness if

-    * the info_ptr is used by the app after the rows have been read.

-    */

-   info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;

-#endif

-

-   if (info_ptr->bit_depth == 16)

-   {

-#  ifdef PNG_READ_16BIT_SUPPORTED

-#     ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-         if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)

-            info_ptr->bit_depth = 8;

-#     endif

-

-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-         if ((png_ptr->transformations & PNG_16_TO_8) != 0)

-            info_ptr->bit_depth = 8;

-#     endif

-

-#  else

-      /* No 16-bit support: force chopping 16-bit input down to 8, in this case

-       * the app program can chose if both APIs are available by setting the

-       * correct scaling to use.

-       */

-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-         /* For compatibility with previous versions use the strip method by

-          * default.  This code works because if PNG_SCALE_16_TO_8 is already

-          * set the code below will do that in preference to the chop.

-          */

-         png_ptr->transformations |= PNG_16_TO_8;

-         info_ptr->bit_depth = 8;

-#     else

-

-#        ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-            png_ptr->transformations |= PNG_SCALE_16_TO_8;

-            info_ptr->bit_depth = 8;

-#        else

-

-            CONFIGURATION ERROR: you must enable at least one 16 to 8 method

-#        endif

-#    endif

-#endif /* !READ_16BIT */

-   }

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)

-      info_ptr->color_type = (png_byte)(info_ptr->color_type |

-         PNG_COLOR_MASK_COLOR);

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)

-      info_ptr->color_type = (png_byte)(info_ptr->color_type &

-         ~PNG_COLOR_MASK_COLOR);

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)

-   {

-      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||

-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&

-          png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8)

-      {

-         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;

-      }

-   }

-#endif

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&

-       info_ptr->bit_depth == 8 &&

-       info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)

-   {

-      info_ptr->bit_depth = 16;

-   }

-#endif

-

-#ifdef PNG_READ_PACK_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACK) != 0 &&

-       (info_ptr->bit_depth < 8))

-      info_ptr->bit_depth = 8;

-#endif

-

-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      info_ptr->channels = 1;

-

-   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      info_ptr->channels = 3;

-

-   else

-      info_ptr->channels = 1;

-

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0)

-   {

-      info_ptr->color_type = (png_byte)(info_ptr->color_type &

-         ~PNG_COLOR_MASK_ALPHA);

-      info_ptr->num_trans = 0;

-   }

-#endif

-

-   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      info_ptr->channels++;

-

-#ifdef PNG_READ_FILLER_SUPPORTED

-   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */

-   if ((png_ptr->transformations & PNG_FILLER) != 0 &&

-       (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||

-       info_ptr->color_type == PNG_COLOR_TYPE_GRAY))

-   {

-      info_ptr->channels++;

-      /* If adding a true alpha channel not just filler */

-      if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0)

-         info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;

-   }

-#endif

-

-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \

-defined(PNG_READ_USER_TRANSFORM_SUPPORTED)

-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)

-   {

-      if (png_ptr->user_transform_depth != 0)

-         info_ptr->bit_depth = png_ptr->user_transform_depth;

-

-      if (png_ptr->user_transform_channels != 0)

-         info_ptr->channels = png_ptr->user_transform_channels;

-   }

-#endif

-

-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *

-       info_ptr->bit_depth);

-

-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);

-

-   /* Adding in 1.5.4: cache the above value in png_struct so that we can later

-    * check in png_rowbytes that the user buffer won't get overwritten.  Note

-    * that the field is not always set - if png_read_update_info isn't called

-    * the application has to either not do any transforms or get the calculation

-    * right itself.

-    */

-   png_ptr->info_rowbytes = info_ptr->rowbytes;

-

-#ifndef PNG_READ_EXPAND_SUPPORTED

-   if (png_ptr != NULL)

-      return;

-#endif

-}

-

-#ifdef PNG_READ_PACK_SUPPORTED

-/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,

- * without changing the actual values.  Thus, if you had a row with

- * a bit depth of 1, you would end up with bytes that only contained

- * the numbers 0 or 1.  If you would rather they contain 0 and 255, use

- * png_do_shift() after this.

- */

-static void

-png_do_unpack(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_unpack");

-

-   if (row_info->bit_depth < 8)

-   {

-      png_uint_32 i;

-      png_uint_32 row_width=row_info->width;

-

-      switch (row_info->bit_depth)

-      {

-         case 1:

-         {

-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);

-            png_bytep dp = row + (png_size_t)row_width - 1;

-            png_uint_32 shift = 7U - ((row_width + 7U) & 0x07);

-            for (i = 0; i < row_width; i++)

-            {

-               *dp = (png_byte)((*sp >> shift) & 0x01);

-

-               if (shift == 7)

-               {

-                  shift = 0;

-                  sp--;

-               }

-

-               else

-                  shift++;

-

-               dp--;

-            }

-            break;

-         }

-

-         case 2:

-         {

-

-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);

-            png_bytep dp = row + (png_size_t)row_width - 1;

-            png_uint_32 shift = ((3U - ((row_width + 3U) & 0x03)) << 1);

-            for (i = 0; i < row_width; i++)

-            {

-               *dp = (png_byte)((*sp >> shift) & 0x03);

-

-               if (shift == 6)

-               {

-                  shift = 0;

-                  sp--;

-               }

-

-               else

-                  shift += 2;

-

-               dp--;

-            }

-            break;

-         }

-

-         case 4:

-         {

-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);

-            png_bytep dp = row + (png_size_t)row_width - 1;

-            png_uint_32 shift = ((1U - ((row_width + 1U) & 0x01)) << 2);

-            for (i = 0; i < row_width; i++)

-            {

-               *dp = (png_byte)((*sp >> shift) & 0x0f);

-

-               if (shift == 4)

-               {

-                  shift = 0;

-                  sp--;

-               }

-

-               else

-                  shift = 4;

-

-               dp--;

-            }

-            break;

-         }

-

-         default:

-            break;

-      }

-      row_info->bit_depth = 8;

-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);

-      row_info->rowbytes = row_width * row_info->channels;

-   }

-}

-#endif

-

-#ifdef PNG_READ_SHIFT_SUPPORTED

-/* Reverse the effects of png_do_shift.  This routine merely shifts the

- * pixels back to their significant bits values.  Thus, if you have

- * a row of bit depth 8, but only 5 are significant, this will shift

- * the values back to 0 through 31.

- */

-static void

-png_do_unshift(png_row_infop row_info, png_bytep row,

-    png_const_color_8p sig_bits)

-{

-   int color_type;

-

-   png_debug(1, "in png_do_unshift");

-

-   /* The palette case has already been handled in the _init routine. */

-   color_type = row_info->color_type;

-

-   if (color_type != PNG_COLOR_TYPE_PALETTE)

-   {

-      int shift[4];

-      int channels = 0;

-      int bit_depth = row_info->bit_depth;

-

-      if ((color_type & PNG_COLOR_MASK_COLOR) != 0)

-      {

-         shift[channels++] = bit_depth - sig_bits->red;

-         shift[channels++] = bit_depth - sig_bits->green;

-         shift[channels++] = bit_depth - sig_bits->blue;

-      }

-

-      else

-      {

-         shift[channels++] = bit_depth - sig_bits->gray;

-      }

-

-      if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      {

-         shift[channels++] = bit_depth - sig_bits->alpha;

-      }

-

-      {

-         int c, have_shift;

-

-         for (c = have_shift = 0; c < channels; ++c)

-         {

-            /* A shift of more than the bit depth is an error condition but it

-             * gets ignored here.

-             */

-            if (shift[c] <= 0 || shift[c] >= bit_depth)

-               shift[c] = 0;

-

-            else

-               have_shift = 1;

-         }

-

-         if (have_shift == 0)

-            return;

-      }

-

-      switch (bit_depth)

-      {

-         default:

-         /* Must be 1bpp gray: should not be here! */

-            /* NOTREACHED */

-            break;

-

-         case 2:

-         /* Must be 2bpp gray */

-         /* assert(channels == 1 && shift[0] == 1) */

-         {

-            png_bytep bp = row;

-            png_bytep bp_end = bp + row_info->rowbytes;

-

-            while (bp < bp_end)

-            {

-               int b = (*bp >> 1) & 0x55;

-               *bp++ = (png_byte)b;

-            }

-            break;

-         }

-

-         case 4:

-         /* Must be 4bpp gray */

-         /* assert(channels == 1) */

-         {

-            png_bytep bp = row;

-            png_bytep bp_end = bp + row_info->rowbytes;

-            int gray_shift = shift[0];

-            int mask =  0xf >> gray_shift;

-

-            mask |= mask << 4;

-

-            while (bp < bp_end)

-            {

-               int b = (*bp >> gray_shift) & mask;

-               *bp++ = (png_byte)b;

-            }

-            break;

-         }

-

-         case 8:

-         /* Single byte components, G, GA, RGB, RGBA */

-         {

-            png_bytep bp = row;

-            png_bytep bp_end = bp + row_info->rowbytes;

-            int channel = 0;

-

-            while (bp < bp_end)

-            {

-               int b = *bp >> shift[channel];

-               if (++channel >= channels)

-                  channel = 0;

-               *bp++ = (png_byte)b;

-            }

-            break;

-         }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-         case 16:

-         /* Double byte components, G, GA, RGB, RGBA */

-         {

-            png_bytep bp = row;

-            png_bytep bp_end = bp + row_info->rowbytes;

-            int channel = 0;

-

-            while (bp < bp_end)

-            {

-               int value = (bp[0] << 8) + bp[1];

-

-               value >>= shift[channel];

-               if (++channel >= channels)

-                  channel = 0;

-               *bp++ = (png_byte)(value >> 8);

-               *bp++ = (png_byte)value;

-            }

-            break;

-         }

-#endif

-      }

-   }

-}

-#endif

-

-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-/* Scale rows of bit depth 16 down to 8 accurately */

-static void

-png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_scale_16_to_8");

-

-   if (row_info->bit_depth == 16)

-   {

-      png_bytep sp = row; /* source */

-      png_bytep dp = row; /* destination */

-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */

-

-      while (sp < ep)

-      {

-         /* The input is an array of 16-bit components, these must be scaled to

-          * 8 bits each.  For a 16-bit value V the required value (from the PNG

-          * specification) is:

-          *

-          *    (V * 255) / 65535

-          *

-          * This reduces to round(V / 257), or floor((V + 128.5)/257)

-          *

-          * Represent V as the two byte value vhi.vlo.  Make a guess that the

-          * result is the top byte of V, vhi, then the correction to this value

-          * is:

-          *

-          *    error = floor(((V-vhi.vhi) + 128.5) / 257)

-          *          = floor(((vlo-vhi) + 128.5) / 257)

-          *

-          * This can be approximated using integer arithmetic (and a signed

-          * shift):

-          *

-          *    error = (vlo-vhi+128) >> 8;

-          *

-          * The approximate differs from the exact answer only when (vlo-vhi) is

-          * 128; it then gives a correction of +1 when the exact correction is

-          * 0.  This gives 128 errors.  The exact answer (correct for all 16-bit

-          * input values) is:

-          *

-          *    error = (vlo-vhi+128)*65535 >> 24;

-          *

-          * An alternative arithmetic calculation which also gives no errors is:

-          *

-          *    (V * 255 + 32895) >> 16

-          */

-

-         png_int_32 tmp = *sp++; /* must be signed! */

-         tmp += (((int)*sp++ - tmp + 128) * 65535) >> 24;

-         *dp++ = (png_byte)tmp;

-      }

-

-      row_info->bit_depth = 8;

-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);

-      row_info->rowbytes = row_info->width * row_info->channels;

-   }

-}

-#endif

-

-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-static void

-/* Simply discard the low byte.  This was the default behavior prior

- * to libpng-1.5.4.

- */

-png_do_chop(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_chop");

-

-   if (row_info->bit_depth == 16)

-   {

-      png_bytep sp = row; /* source */

-      png_bytep dp = row; /* destination */

-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */

-

-      while (sp < ep)

-      {

-         *dp++ = *sp;

-         sp += 2; /* skip low byte */

-      }

-

-      row_info->bit_depth = 8;

-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);

-      row_info->rowbytes = row_info->width * row_info->channels;

-   }

-}

-#endif

-

-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED

-static void

-png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_read_swap_alpha");

-

-   {

-      png_uint_32 row_width = row_info->width;

-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-      {

-         /* This converts from RGBA to ARGB */

-         if (row_info->bit_depth == 8)

-         {

-            png_bytep sp = row + row_info->rowbytes;

-            png_bytep dp = sp;

-            png_byte save;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               save = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = save;

-            }

-         }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-         /* This converts from RRGGBBAA to AARRGGBB */

-         else

-         {

-            png_bytep sp = row + row_info->rowbytes;

-            png_bytep dp = sp;

-            png_byte save[2];

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               save[0] = *(--sp);

-               save[1] = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = save[0];

-               *(--dp) = save[1];

-            }

-         }

-#endif

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      {

-         /* This converts from GA to AG */

-         if (row_info->bit_depth == 8)

-         {

-            png_bytep sp = row + row_info->rowbytes;

-            png_bytep dp = sp;

-            png_byte save;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               save = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = save;

-            }

-         }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-         /* This converts from GGAA to AAGG */

-         else

-         {

-            png_bytep sp = row + row_info->rowbytes;

-            png_bytep dp = sp;

-            png_byte save[2];

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               save[0] = *(--sp);

-               save[1] = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = save[0];

-               *(--dp) = save[1];

-            }

-         }

-#endif

-      }

-   }

-}

-#endif

-

-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED

-static void

-png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)

-{

-   png_uint_32 row_width;

-   png_debug(1, "in png_do_read_invert_alpha");

-

-   row_width = row_info->width;

-   if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         /* This inverts the alpha channel in RGBA */

-         png_bytep sp = row + row_info->rowbytes;

-         png_bytep dp = sp;

-         png_uint_32 i;

-

-         for (i = 0; i < row_width; i++)

-         {

-            *(--dp) = (png_byte)(255 - *(--sp));

-

-/*          This does nothing:

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            We can replace it with:

-*/

-            sp-=3;

-            dp=sp;

-         }

-      }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-      /* This inverts the alpha channel in RRGGBBAA */

-      else

-      {

-         png_bytep sp = row + row_info->rowbytes;

-         png_bytep dp = sp;

-         png_uint_32 i;

-

-         for (i = 0; i < row_width; i++)

-         {

-            *(--dp) = (png_byte)(255 - *(--sp));

-            *(--dp) = (png_byte)(255 - *(--sp));

-

-/*          This does nothing:

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-            We can replace it with:

-*/

-            sp-=6;

-            dp=sp;

-         }

-      }

-#endif

-   }

-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         /* This inverts the alpha channel in GA */

-         png_bytep sp = row + row_info->rowbytes;

-         png_bytep dp = sp;

-         png_uint_32 i;

-

-         for (i = 0; i < row_width; i++)

-         {

-            *(--dp) = (png_byte)(255 - *(--sp));

-            *(--dp) = *(--sp);

-         }

-      }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-      else

-      {

-         /* This inverts the alpha channel in GGAA */

-         png_bytep sp  = row + row_info->rowbytes;

-         png_bytep dp = sp;

-         png_uint_32 i;

-

-         for (i = 0; i < row_width; i++)

-         {

-            *(--dp) = (png_byte)(255 - *(--sp));

-            *(--dp) = (png_byte)(255 - *(--sp));

-/*

-            *(--dp) = *(--sp);

-            *(--dp) = *(--sp);

-*/

-            sp-=2;

-            dp=sp;

-         }

-      }

-#endif

-   }

-}

-#endif

-

-#ifdef PNG_READ_FILLER_SUPPORTED

-/* Add filler channel if we have RGB color */

-static void

-png_do_read_filler(png_row_infop row_info, png_bytep row,

-    png_uint_32 filler, png_uint_32 flags)

-{

-   png_uint_32 i;

-   png_uint_32 row_width = row_info->width;

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-   png_byte hi_filler = (png_byte)(filler>>8);

-#endif

-   png_byte lo_filler = (png_byte)filler;

-

-   png_debug(1, "in png_do_read_filler");

-

-   if (

-       row_info->color_type == PNG_COLOR_TYPE_GRAY)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)

-         {

-            /* This changes the data from G to GX */

-            png_bytep sp = row + (png_size_t)row_width;

-            png_bytep dp =  sp + (png_size_t)row_width;

-            for (i = 1; i < row_width; i++)

-            {

-               *(--dp) = lo_filler;

-               *(--dp) = *(--sp);

-            }

-            *(--dp) = lo_filler;

-            row_info->channels = 2;

-            row_info->pixel_depth = 16;

-            row_info->rowbytes = row_width * 2;

-         }

-

-         else

-         {

-            /* This changes the data from G to XG */

-            png_bytep sp = row + (png_size_t)row_width;

-            png_bytep dp = sp  + (png_size_t)row_width;

-            for (i = 0; i < row_width; i++)

-            {

-               *(--dp) = *(--sp);

-               *(--dp) = lo_filler;

-            }

-            row_info->channels = 2;

-            row_info->pixel_depth = 16;

-            row_info->rowbytes = row_width * 2;

-         }

-      }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-      else if (row_info->bit_depth == 16)

-      {

-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)

-         {

-            /* This changes the data from GG to GGXX */

-            png_bytep sp = row + (png_size_t)row_width * 2;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 1; i < row_width; i++)

-            {

-               *(--dp) = lo_filler;

-               *(--dp) = hi_filler;

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-            }

-            *(--dp) = lo_filler;

-            *(--dp) = hi_filler;

-            row_info->channels = 2;

-            row_info->pixel_depth = 32;

-            row_info->rowbytes = row_width * 4;

-         }

-

-         else

-         {

-            /* This changes the data from GG to XXGG */

-            png_bytep sp = row + (png_size_t)row_width * 2;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 0; i < row_width; i++)

-            {

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = lo_filler;

-               *(--dp) = hi_filler;

-            }

-            row_info->channels = 2;

-            row_info->pixel_depth = 32;

-            row_info->rowbytes = row_width * 4;

-         }

-      }

-#endif

-   } /* COLOR_TYPE == GRAY */

-   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)

-         {

-            /* This changes the data from RGB to RGBX */

-            png_bytep sp = row + (png_size_t)row_width * 3;

-            png_bytep dp = sp  + (png_size_t)row_width;

-            for (i = 1; i < row_width; i++)

-            {

-               *(--dp) = lo_filler;

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-            }

-            *(--dp) = lo_filler;

-            row_info->channels = 4;

-            row_info->pixel_depth = 32;

-            row_info->rowbytes = row_width * 4;

-         }

-

-         else

-         {

-            /* This changes the data from RGB to XRGB */

-            png_bytep sp = row + (png_size_t)row_width * 3;

-            png_bytep dp = sp + (png_size_t)row_width;

-            for (i = 0; i < row_width; i++)

-            {

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = lo_filler;

-            }

-            row_info->channels = 4;

-            row_info->pixel_depth = 32;

-            row_info->rowbytes = row_width * 4;

-         }

-      }

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-      else if (row_info->bit_depth == 16)

-      {

-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)

-         {

-            /* This changes the data from RRGGBB to RRGGBBXX */

-            png_bytep sp = row + (png_size_t)row_width * 6;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 1; i < row_width; i++)

-            {

-               *(--dp) = lo_filler;

-               *(--dp) = hi_filler;

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-            }

-            *(--dp) = lo_filler;

-            *(--dp) = hi_filler;

-            row_info->channels = 4;

-            row_info->pixel_depth = 64;

-            row_info->rowbytes = row_width * 8;

-         }

-

-         else

-         {

-            /* This changes the data from RRGGBB to XXRRGGBB */

-            png_bytep sp = row + (png_size_t)row_width * 6;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 0; i < row_width; i++)

-            {

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = *(--sp);

-               *(--dp) = lo_filler;

-               *(--dp) = hi_filler;

-            }

-

-            row_info->channels = 4;

-            row_info->pixel_depth = 64;

-            row_info->rowbytes = row_width * 8;

-         }

-      }

-#endif

-   } /* COLOR_TYPE == RGB */

-}

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-/* Expand grayscale files to RGB, with or without alpha */

-static void

-png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)

-{

-   png_uint_32 i;

-   png_uint_32 row_width = row_info->width;

-

-   png_debug(1, "in png_do_gray_to_rgb");

-

-   if (row_info->bit_depth >= 8 &&

-       (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0)

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This changes G to RGB */

-            png_bytep sp = row + (png_size_t)row_width - 1;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 0; i < row_width; i++)

-            {

-               *(dp--) = *sp;

-               *(dp--) = *sp;

-               *(dp--) = *(sp--);

-            }

-         }

-

-         else

-         {

-            /* This changes GG to RRGGBB */

-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;

-            png_bytep dp = sp  + (png_size_t)row_width * 4;

-            for (i = 0; i < row_width; i++)

-            {

-               *(dp--) = *sp;

-               *(dp--) = *(sp - 1);

-               *(dp--) = *sp;

-               *(dp--) = *(sp - 1);

-               *(dp--) = *(sp--);

-               *(dp--) = *(sp--);

-            }

-         }

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This changes GA to RGBA */

-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;

-            png_bytep dp = sp  + (png_size_t)row_width * 2;

-            for (i = 0; i < row_width; i++)

-            {

-               *(dp--) = *(sp--);

-               *(dp--) = *sp;

-               *(dp--) = *sp;

-               *(dp--) = *(sp--);

-            }

-         }

-

-         else

-         {

-            /* This changes GGAA to RRGGBBAA */

-            png_bytep sp = row + (png_size_t)row_width * 4 - 1;

-            png_bytep dp = sp  + (png_size_t)row_width * 4;

-            for (i = 0; i < row_width; i++)

-            {

-               *(dp--) = *(sp--);

-               *(dp--) = *(sp--);

-               *(dp--) = *sp;

-               *(dp--) = *(sp - 1);

-               *(dp--) = *sp;

-               *(dp--) = *(sp - 1);

-               *(dp--) = *(sp--);

-               *(dp--) = *(sp--);

-            }

-         }

-      }

-      row_info->channels = (png_byte)(row_info->channels + 2);

-      row_info->color_type |= PNG_COLOR_MASK_COLOR;

-      row_info->pixel_depth = (png_byte)(row_info->channels *

-          row_info->bit_depth);

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);

-   }

-}

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-/* Reduce RGB files to grayscale, with or without alpha

- * using the equation given in Poynton's ColorFAQ of 1998-01-04 at

- * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008 but

- * versions dated 1998 through November 2002 have been archived at

- * https://web.archive.org/web/20000816232553/www.inforamp.net/

- * ~poynton/notes/colour_and_gamma/ColorFAQ.txt )

- * Charles Poynton poynton at poynton.com

- *

- *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B

- *

- *  which can be expressed with integers as

- *

- *     Y = (6969 * R + 23434 * G + 2365 * B)/32768

- *

- * Poynton's current link (as of January 2003 through July 2011):

- * <http://www.poynton.com/notes/colour_and_gamma/>

- * has changed the numbers slightly:

- *

- *     Y = 0.2126*R + 0.7152*G + 0.0722*B

- *

- *  which can be expressed with integers as

- *

- *     Y = (6966 * R + 23436 * G + 2366 * B)/32768

- *

- *  Historically, however, libpng uses numbers derived from the ITU-R Rec 709

- *  end point chromaticities and the D65 white point.  Depending on the

- *  precision used for the D65 white point this produces a variety of different

- *  numbers, however if the four decimal place value used in ITU-R Rec 709 is

- *  used (0.3127,0.3290) the Y calculation would be:

- *

- *     Y = (6968 * R + 23435 * G + 2366 * B)/32768

- *

- *  While this is correct the rounding results in an overflow for white, because

- *  the sum of the rounded coefficients is 32769, not 32768.  Consequently

- *  libpng uses, instead, the closest non-overflowing approximation:

- *

- *     Y = (6968 * R + 23434 * G + 2366 * B)/32768

- *

- *  Starting with libpng-1.5.5, if the image being converted has a cHRM chunk

- *  (including an sRGB chunk) then the chromaticities are used to calculate the

- *  coefficients.  See the chunk handling in pngrutil.c for more information.

- *

- *  In all cases the calculation is to be done in a linear colorspace.  If no

- *  gamma information is available to correct the encoding of the original RGB

- *  values this results in an implicit assumption that the original PNG RGB

- *  values were linear.

- *

- *  Other integer coefficents can be used via png_set_rgb_to_gray().  Because

- *  the API takes just red and green coefficients the blue coefficient is

- *  calculated to make the sum 32768.  This will result in different rounding

- *  to that used above.

- */

-static int

-png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)

-

-{

-   int rgb_error = 0;

-

-   png_debug(1, "in png_do_rgb_to_gray");

-

-   if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&

-       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;

-      PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;

-      PNG_CONST png_uint_32 bc = 32768 - rc - gc;

-      PNG_CONST png_uint_32 row_width = row_info->width;

-      PNG_CONST int have_alpha =

-         (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;

-

-      if (row_info->bit_depth == 8)

-      {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-         /* Notice that gamma to/from 1 are not necessarily inverses (if

-          * there is an overall gamma correction).  Prior to 1.5.5 this code

-          * checked the linearized values for equality; this doesn't match

-          * the documentation, the original values must be checked.

-          */

-         if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)

-         {

-            png_bytep sp = row;

-            png_bytep dp = row;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_byte red   = *(sp++);

-               png_byte green = *(sp++);

-               png_byte blue  = *(sp++);

-

-               if (red != green || red != blue)

-               {

-                  red = png_ptr->gamma_to_1[red];

-                  green = png_ptr->gamma_to_1[green];

-                  blue = png_ptr->gamma_to_1[blue];

-

-                  rgb_error |= 1;

-                  *(dp++) = png_ptr->gamma_from_1[

-                      (rc*red + gc*green + bc*blue + 16384)>>15];

-               }

-

-               else

-               {

-                  /* If there is no overall correction the table will not be

-                   * set.

-                   */

-                  if (png_ptr->gamma_table != NULL)

-                     red = png_ptr->gamma_table[red];

-

-                  *(dp++) = red;

-               }

-

-               if (have_alpha != 0)

-                  *(dp++) = *(sp++);

-            }

-         }

-         else

-#endif

-         {

-            png_bytep sp = row;

-            png_bytep dp = row;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_byte red   = *(sp++);

-               png_byte green = *(sp++);

-               png_byte blue  = *(sp++);

-

-               if (red != green || red != blue)

-               {

-                  rgb_error |= 1;

-                  /* NOTE: this is the historical approach which simply

-                   * truncates the results.

-                   */

-                  *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);

-               }

-

-               else

-                  *(dp++) = red;

-

-               if (have_alpha != 0)

-                  *(dp++) = *(sp++);

-            }

-         }

-      }

-

-      else /* RGB bit_depth == 16 */

-      {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-         if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL)

-         {

-            png_bytep sp = row;

-            png_bytep dp = row;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_uint_16 red, green, blue, w;

-               png_byte hi,lo;

-

-               hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));

-               hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));

-               hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));

-

-               if (red == green && red == blue)

-               {

-                  if (png_ptr->gamma_16_table != NULL)

-                     w = png_ptr->gamma_16_table[(red & 0xff)

-                         >> png_ptr->gamma_shift][red >> 8];

-

-                  else

-                     w = red;

-               }

-

-               else

-               {

-                  png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red & 0xff)

-                      >> png_ptr->gamma_shift][red>>8];

-                  png_uint_16 green_1 =

-                      png_ptr->gamma_16_to_1[(green & 0xff) >>

-                      png_ptr->gamma_shift][green>>8];

-                  png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue & 0xff)

-                      >> png_ptr->gamma_shift][blue>>8];

-                  png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1

-                      + bc*blue_1 + 16384)>>15);

-                  w = png_ptr->gamma_16_from_1[(gray16 & 0xff) >>

-                      png_ptr->gamma_shift][gray16 >> 8];

-                  rgb_error |= 1;

-               }

-

-               *(dp++) = (png_byte)((w>>8) & 0xff);

-               *(dp++) = (png_byte)(w & 0xff);

-

-               if (have_alpha != 0)

-               {

-                  *(dp++) = *(sp++);

-                  *(dp++) = *(sp++);

-               }

-            }

-         }

-         else

-#endif

-         {

-            png_bytep sp = row;

-            png_bytep dp = row;

-            png_uint_32 i;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_uint_16 red, green, blue, gray16;

-               png_byte hi,lo;

-

-               hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));

-               hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));

-               hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));

-

-               if (red != green || red != blue)

-                  rgb_error |= 1;

-

-               /* From 1.5.5 in the 16-bit case do the accurate conversion even

-                * in the 'fast' case - this is because this is where the code

-                * ends up when handling linear 16-bit data.

-                */

-               gray16  = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>

-                  15);

-               *(dp++) = (png_byte)((gray16 >> 8) & 0xff);

-               *(dp++) = (png_byte)(gray16 & 0xff);

-

-               if (have_alpha != 0)

-               {

-                  *(dp++) = *(sp++);

-                  *(dp++) = *(sp++);

-               }

-            }

-         }

-      }

-

-      row_info->channels = (png_byte)(row_info->channels - 2);

-      row_info->color_type = (png_byte)(row_info->color_type &

-          ~PNG_COLOR_MASK_COLOR);

-      row_info->pixel_depth = (png_byte)(row_info->channels *

-          row_info->bit_depth);

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);

-   }

-   return rgb_error;

-}

-#endif

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-/* Replace any alpha or transparency with the supplied background color.

- * "background" is already in the screen gamma, while "background_1" is

- * at a gamma of 1.0.  Paletted files have already been taken care of.

- */

-static void

-png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)

-{

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   png_const_bytep gamma_table = png_ptr->gamma_table;

-   png_const_bytep gamma_from_1 = png_ptr->gamma_from_1;

-   png_const_bytep gamma_to_1 = png_ptr->gamma_to_1;

-   png_const_uint_16pp gamma_16 = png_ptr->gamma_16_table;

-   png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1;

-   png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1;

-   int gamma_shift = png_ptr->gamma_shift;

-   int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;

-#endif

-

-   png_bytep sp;

-   png_uint_32 i;

-   png_uint_32 row_width = row_info->width;

-   int shift;

-

-   png_debug(1, "in png_do_compose");

-

-   {

-      switch (row_info->color_type)

-      {

-         case PNG_COLOR_TYPE_GRAY:

-         {

-            switch (row_info->bit_depth)

-            {

-               case 1:

-               {

-                  sp = row;

-                  shift = 7;

-                  for (i = 0; i < row_width; i++)

-                  {

-                     if ((png_uint_16)((*sp >> shift) & 0x01)

-                        == png_ptr->trans_color.gray)

-                     {

-                        unsigned int tmp = *sp & (0x7f7f >> (7 - shift));

-                        tmp |=

-                            (unsigned int)(png_ptr->background.gray << shift);

-                        *sp = (png_byte)(tmp & 0xff);

-                     }

-

-                     if (shift == 0)

-                     {

-                        shift = 7;

-                        sp++;

-                     }

-

-                     else

-                        shift--;

-                  }

-                  break;

-               }

-

-               case 2:

-               {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-                  if (gamma_table != NULL)

-                  {

-                     sp = row;

-                     shift = 6;

-                     for (i = 0; i < row_width; i++)

-                     {

-                        if ((png_uint_16)((*sp >> shift) & 0x03)

-                            == png_ptr->trans_color.gray)

-                        {

-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));

-                           tmp |=

-                              (unsigned int)png_ptr->background.gray << shift;

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        else

-                        {

-                           unsigned int p = (*sp >> shift) & 0x03;

-                           unsigned int g = (gamma_table [p | (p << 2) |

-                               (p << 4) | (p << 6)] >> 6) & 0x03;

-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));

-                           tmp |= (unsigned int)(g << shift);

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        if (shift == 0)

-                        {

-                           shift = 6;

-                           sp++;

-                        }

-

-                        else

-                           shift -= 2;

-                     }

-                  }

-

-                  else

-#endif

-                  {

-                     sp = row;

-                     shift = 6;

-                     for (i = 0; i < row_width; i++)

-                     {

-                        if ((png_uint_16)((*sp >> shift) & 0x03)

-                            == png_ptr->trans_color.gray)

-                        {

-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));

-                           tmp |=

-                               (unsigned int)png_ptr->background.gray << shift;

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        if (shift == 0)

-                        {

-                           shift = 6;

-                           sp++;

-                        }

-

-                        else

-                           shift -= 2;

-                     }

-                  }

-                  break;

-               }

-

-               case 4:

-               {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-                  if (gamma_table != NULL)

-                  {

-                     sp = row;

-                     shift = 4;

-                     for (i = 0; i < row_width; i++)

-                     {

-                        if ((png_uint_16)((*sp >> shift) & 0x0f)

-                            == png_ptr->trans_color.gray)

-                        {

-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));

-                           tmp |=

-                              (unsigned int)(png_ptr->background.gray << shift);

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        else

-                        {

-                           unsigned int p = (*sp >> shift) & 0x0f;

-                           unsigned int g = (gamma_table[p | (p << 4)] >> 4) &

-                              0x0f;

-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));

-                           tmp |= (unsigned int)(g << shift);

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        if (shift == 0)

-                        {

-                           shift = 4;

-                           sp++;

-                        }

-

-                        else

-                           shift -= 4;

-                     }

-                  }

-

-                  else

-#endif

-                  {

-                     sp = row;

-                     shift = 4;

-                     for (i = 0; i < row_width; i++)

-                     {

-                        if ((png_uint_16)((*sp >> shift) & 0x0f)

-                            == png_ptr->trans_color.gray)

-                        {

-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));

-                           tmp |=

-                              (unsigned int)(png_ptr->background.gray << shift);

-                           *sp = (png_byte)(tmp & 0xff);

-                        }

-

-                        if (shift == 0)

-                        {

-                           shift = 4;

-                           sp++;

-                        }

-

-                        else

-                           shift -= 4;

-                     }

-                  }

-                  break;

-               }

-

-               case 8:

-               {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-                  if (gamma_table != NULL)

-                  {

-                     sp = row;

-                     for (i = 0; i < row_width; i++, sp++)

-                     {

-                        if (*sp == png_ptr->trans_color.gray)

-                           *sp = (png_byte)png_ptr->background.gray;

-

-                        else

-                           *sp = gamma_table[*sp];

-                     }

-                  }

-                  else

-#endif

-                  {

-                     sp = row;

-                     for (i = 0; i < row_width; i++, sp++)

-                     {

-                        if (*sp == png_ptr->trans_color.gray)

-                           *sp = (png_byte)png_ptr->background.gray;

-                     }

-                  }

-                  break;

-               }

-

-               case 16:

-               {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-                  if (gamma_16 != NULL)

-                  {

-                     sp = row;

-                     for (i = 0; i < row_width; i++, sp += 2)

-                     {

-                        png_uint_16 v;

-

-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-

-                        if (v == png_ptr->trans_color.gray)

-                        {

-                           /* Background is already in screen gamma */

-                           *sp = (png_byte)((png_ptr->background.gray >> 8)

-                                & 0xff);

-                           *(sp + 1) = (png_byte)(png_ptr->background.gray

-                                & 0xff);

-                        }

-

-                        else

-                        {

-                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];

-                           *sp = (png_byte)((v >> 8) & 0xff);

-                           *(sp + 1) = (png_byte)(v & 0xff);

-                        }

-                     }

-                  }

-                  else

-#endif

-                  {

-                     sp = row;

-                     for (i = 0; i < row_width; i++, sp += 2)

-                     {

-                        png_uint_16 v;

-

-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-

-                        if (v == png_ptr->trans_color.gray)

-                        {

-                           *sp = (png_byte)((png_ptr->background.gray >> 8)

-                                & 0xff);

-                           *(sp + 1) = (png_byte)(png_ptr->background.gray

-                                & 0xff);

-                        }

-                     }

-                  }

-                  break;

-               }

-

-               default:

-                  break;

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_RGB:

-         {

-            if (row_info->bit_depth == 8)

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_table != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 3)

-                  {

-                     if (*sp == png_ptr->trans_color.red &&

-                         *(sp + 1) == png_ptr->trans_color.green &&

-                         *(sp + 2) == png_ptr->trans_color.blue)

-                     {

-                        *sp = (png_byte)png_ptr->background.red;

-                        *(sp + 1) = (png_byte)png_ptr->background.green;

-                        *(sp + 2) = (png_byte)png_ptr->background.blue;

-                     }

-

-                     else

-                     {

-                        *sp = gamma_table[*sp];

-                        *(sp + 1) = gamma_table[*(sp + 1)];

-                        *(sp + 2) = gamma_table[*(sp + 2)];

-                     }

-                  }

-               }

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 3)

-                  {

-                     if (*sp == png_ptr->trans_color.red &&

-                         *(sp + 1) == png_ptr->trans_color.green &&

-                         *(sp + 2) == png_ptr->trans_color.blue)

-                     {

-                        *sp = (png_byte)png_ptr->background.red;

-                        *(sp + 1) = (png_byte)png_ptr->background.green;

-                        *(sp + 2) = (png_byte)png_ptr->background.blue;

-                     }

-                  }

-               }

-            }

-            else /* if (row_info->bit_depth == 16) */

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_16 != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 6)

-                  {

-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-

-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)

-                         + *(sp + 3));

-

-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)

-                         + *(sp + 5));

-

-                     if (r == png_ptr->trans_color.red &&

-                         g == png_ptr->trans_color.green &&

-                         b == png_ptr->trans_color.blue)

-                     {

-                        /* Background is already in screen gamma */

-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);

-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)

-                                & 0xff);

-                        *(sp + 3) = (png_byte)(png_ptr->background.green

-                                & 0xff);

-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)

-                                & 0xff);

-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);

-                     }

-

-                     else

-                     {

-                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];

-                        *sp = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(v & 0xff);

-

-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];

-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 3) = (png_byte)(v & 0xff);

-

-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];

-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 5) = (png_byte)(v & 0xff);

-                     }

-                  }

-               }

-

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 6)

-                  {

-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-

-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)

-                         + *(sp + 3));

-

-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)

-                         + *(sp + 5));

-

-                     if (r == png_ptr->trans_color.red &&

-                         g == png_ptr->trans_color.green &&

-                         b == png_ptr->trans_color.blue)

-                     {

-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);

-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)

-                                & 0xff);

-                        *(sp + 3) = (png_byte)(png_ptr->background.green

-                                & 0xff);

-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)

-                                & 0xff);

-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);

-                     }

-                  }

-               }

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_GRAY_ALPHA:

-         {

-            if (row_info->bit_depth == 8)

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&

-                   gamma_table != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 2)

-                  {

-                     png_uint_16 a = *(sp + 1);

-

-                     if (a == 0xff)

-                        *sp = gamma_table[*sp];

-

-                     else if (a == 0)

-                     {

-                        /* Background is already in screen gamma */

-                        *sp = (png_byte)png_ptr->background.gray;

-                     }

-

-                     else

-                     {

-                        png_byte v, w;

-

-                        v = gamma_to_1[*sp];

-                        png_composite(w, v, a, png_ptr->background_1.gray);

-                        if (optimize == 0)

-                           w = gamma_from_1[w];

-                        *sp = w;

-                     }

-                  }

-               }

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 2)

-                  {

-                     png_byte a = *(sp + 1);

-

-                     if (a == 0)

-                        *sp = (png_byte)png_ptr->background.gray;

-

-                     else if (a < 0xff)

-                        png_composite(*sp, *sp, a, png_ptr->background.gray);

-                  }

-               }

-            }

-            else /* if (png_ptr->bit_depth == 16) */

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&

-                   gamma_16_to_1 != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 4)

-                  {

-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)

-                         + *(sp + 3));

-

-                     if (a == (png_uint_16)0xffff)

-                     {

-                        png_uint_16 v;

-

-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];

-                        *sp = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(v & 0xff);

-                     }

-

-                     else if (a == 0)

-                     {

-                        /* Background is already in screen gamma */

-                        *sp = (png_byte)((png_ptr->background.gray >> 8)

-                                & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);

-                     }

-

-                     else

-                     {

-                        png_uint_16 g, v, w;

-

-                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];

-                        png_composite_16(v, g, a, png_ptr->background_1.gray);

-                        if (optimize != 0)

-                           w = v;

-                        else

-                           w = gamma_16_from_1[(v & 0xff) >>

-                               gamma_shift][v >> 8];

-                        *sp = (png_byte)((w >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(w & 0xff);

-                     }

-                  }

-               }

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 4)

-                  {

-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)

-                         + *(sp + 3));

-

-                     if (a == 0)

-                     {

-                        *sp = (png_byte)((png_ptr->background.gray >> 8)

-                                & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);

-                     }

-

-                     else if (a < 0xffff)

-                     {

-                        png_uint_16 g, v;

-

-                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-                        png_composite_16(v, g, a, png_ptr->background.gray);

-                        *sp = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(v & 0xff);

-                     }

-                  }

-               }

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_RGB_ALPHA:

-         {

-            if (row_info->bit_depth == 8)

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&

-                   gamma_table != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 4)

-                  {

-                     png_byte a = *(sp + 3);

-

-                     if (a == 0xff)

-                     {

-                        *sp = gamma_table[*sp];

-                        *(sp + 1) = gamma_table[*(sp + 1)];

-                        *(sp + 2) = gamma_table[*(sp + 2)];

-                     }

-

-                     else if (a == 0)

-                     {

-                        /* Background is already in screen gamma */

-                        *sp = (png_byte)png_ptr->background.red;

-                        *(sp + 1) = (png_byte)png_ptr->background.green;

-                        *(sp + 2) = (png_byte)png_ptr->background.blue;

-                     }

-

-                     else

-                     {

-                        png_byte v, w;

-

-                        v = gamma_to_1[*sp];

-                        png_composite(w, v, a, png_ptr->background_1.red);

-                        if (optimize == 0) w = gamma_from_1[w];

-                        *sp = w;

-

-                        v = gamma_to_1[*(sp + 1)];

-                        png_composite(w, v, a, png_ptr->background_1.green);

-                        if (optimize == 0) w = gamma_from_1[w];

-                        *(sp + 1) = w;

-

-                        v = gamma_to_1[*(sp + 2)];

-                        png_composite(w, v, a, png_ptr->background_1.blue);

-                        if (optimize == 0) w = gamma_from_1[w];

-                        *(sp + 2) = w;

-                     }

-                  }

-               }

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 4)

-                  {

-                     png_byte a = *(sp + 3);

-

-                     if (a == 0)

-                     {

-                        *sp = (png_byte)png_ptr->background.red;

-                        *(sp + 1) = (png_byte)png_ptr->background.green;

-                        *(sp + 2) = (png_byte)png_ptr->background.blue;

-                     }

-

-                     else if (a < 0xff)

-                     {

-                        png_composite(*sp, *sp, a, png_ptr->background.red);

-

-                        png_composite(*(sp + 1), *(sp + 1), a,

-                            png_ptr->background.green);

-

-                        png_composite(*(sp + 2), *(sp + 2), a,

-                            png_ptr->background.blue);

-                     }

-                  }

-               }

-            }

-            else /* if (row_info->bit_depth == 16) */

-            {

-#ifdef PNG_READ_GAMMA_SUPPORTED

-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&

-                   gamma_16_to_1 != NULL)

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 8)

-                  {

-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))

-                         << 8) + (png_uint_16)(*(sp + 7)));

-

-                     if (a == (png_uint_16)0xffff)

-                     {

-                        png_uint_16 v;

-

-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];

-                        *sp = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(v & 0xff);

-

-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];

-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 3) = (png_byte)(v & 0xff);

-

-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];

-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 5) = (png_byte)(v & 0xff);

-                     }

-

-                     else if (a == 0)

-                     {

-                        /* Background is already in screen gamma */

-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);

-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)

-                                & 0xff);

-                        *(sp + 3) = (png_byte)(png_ptr->background.green

-                                & 0xff);

-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)

-                                & 0xff);

-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);

-                     }

-

-                     else

-                     {

-                        png_uint_16 v, w;

-

-                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];

-                        png_composite_16(w, v, a, png_ptr->background_1.red);

-                        if (optimize == 0)

-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>

-                                8];

-                        *sp = (png_byte)((w >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(w & 0xff);

-

-                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];

-                        png_composite_16(w, v, a, png_ptr->background_1.green);

-                        if (optimize == 0)

-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>

-                                8];

-

-                        *(sp + 2) = (png_byte)((w >> 8) & 0xff);

-                        *(sp + 3) = (png_byte)(w & 0xff);

-

-                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];

-                        png_composite_16(w, v, a, png_ptr->background_1.blue);

-                        if (optimize == 0)

-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>

-                                8];

-

-                        *(sp + 4) = (png_byte)((w >> 8) & 0xff);

-                        *(sp + 5) = (png_byte)(w & 0xff);

-                     }

-                  }

-               }

-

-               else

-#endif

-               {

-                  sp = row;

-                  for (i = 0; i < row_width; i++, sp += 8)

-                  {

-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))

-                         << 8) + (png_uint_16)(*(sp + 7)));

-

-                     if (a == 0)

-                     {

-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);

-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)

-                                & 0xff);

-                        *(sp + 3) = (png_byte)(png_ptr->background.green

-                                & 0xff);

-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)

-                                & 0xff);

-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);

-                     }

-

-                     else if (a < 0xffff)

-                     {

-                        png_uint_16 v;

-

-                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));

-                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)

-                            + *(sp + 3));

-                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)

-                            + *(sp + 5));

-

-                        png_composite_16(v, r, a, png_ptr->background.red);

-                        *sp = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 1) = (png_byte)(v & 0xff);

-

-                        png_composite_16(v, g, a, png_ptr->background.green);

-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 3) = (png_byte)(v & 0xff);

-

-                        png_composite_16(v, b, a, png_ptr->background.blue);

-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);

-                        *(sp + 5) = (png_byte)(v & 0xff);

-                     }

-                  }

-               }

-            }

-            break;

-         }

-

-         default:

-            break;

-      }

-   }

-}

-#endif /* READ_BACKGROUND || READ_ALPHA_MODE */

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-/* Gamma correct the image, avoiding the alpha channel.  Make sure

- * you do this after you deal with the transparency issue on grayscale

- * or RGB images. If your bit depth is 8, use gamma_table, if it

- * is 16, use gamma_16_table and gamma_shift.  Build these with

- * build_gamma_table().

- */

-static void

-png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr)

-{

-   png_const_bytep gamma_table = png_ptr->gamma_table;

-   png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table;

-   int gamma_shift = png_ptr->gamma_shift;

-

-   png_bytep sp;

-   png_uint_32 i;

-   png_uint_32 row_width=row_info->width;

-

-   png_debug(1, "in png_do_gamma");

-

-   if (((row_info->bit_depth <= 8 && gamma_table != NULL) ||

-       (row_info->bit_depth == 16 && gamma_16_table != NULL)))

-   {

-      switch (row_info->color_type)

-      {

-         case PNG_COLOR_TYPE_RGB:

-         {

-            if (row_info->bit_depth == 8)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  *sp = gamma_table[*sp];

-                  sp++;

-                  *sp = gamma_table[*sp];

-                  sp++;

-                  *sp = gamma_table[*sp];

-                  sp++;

-               }

-            }

-

-            else /* if (row_info->bit_depth == 16) */

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  png_uint_16 v;

-

-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-

-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-

-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-               }

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_RGB_ALPHA:

-         {

-            if (row_info->bit_depth == 8)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  *sp = gamma_table[*sp];

-                  sp++;

-

-                  *sp = gamma_table[*sp];

-                  sp++;

-

-                  *sp = gamma_table[*sp];

-                  sp++;

-

-                  sp++;

-               }

-            }

-

-            else /* if (row_info->bit_depth == 16) */

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-

-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-

-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 4;

-               }

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_GRAY_ALPHA:

-         {

-            if (row_info->bit_depth == 8)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  *sp = gamma_table[*sp];

-                  sp += 2;

-               }

-            }

-

-            else /* if (row_info->bit_depth == 16) */

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 4;

-               }

-            }

-            break;

-         }

-

-         case PNG_COLOR_TYPE_GRAY:

-         {

-            if (row_info->bit_depth == 2)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i += 4)

-               {

-                  int a = *sp & 0xc0;

-                  int b = *sp & 0x30;

-                  int c = *sp & 0x0c;

-                  int d = *sp & 0x03;

-

-                  *sp = (png_byte)(

-                      ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|

-                      ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|

-                      ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|

-                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));

-                  sp++;

-               }

-            }

-

-            if (row_info->bit_depth == 4)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i += 2)

-               {

-                  int msb = *sp & 0xf0;

-                  int lsb = *sp & 0x0f;

-

-                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)

-                      | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));

-                  sp++;

-               }

-            }

-

-            else if (row_info->bit_depth == 8)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  *sp = gamma_table[*sp];

-                  sp++;

-               }

-            }

-

-            else if (row_info->bit_depth == 16)

-            {

-               sp = row;

-               for (i = 0; i < row_width; i++)

-               {

-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];

-                  *sp = (png_byte)((v >> 8) & 0xff);

-                  *(sp + 1) = (png_byte)(v & 0xff);

-                  sp += 2;

-               }

-            }

-            break;

-         }

-

-         default:

-            break;

-      }

-   }

-}

-#endif

-

-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-/* Encode the alpha channel to the output gamma (the input channel is always

- * linear.)  Called only with color types that have an alpha channel.  Needs the

- * from_1 tables.

- */

-static void

-png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr)

-{

-   png_uint_32 row_width = row_info->width;

-

-   png_debug(1, "in png_do_encode_alpha");

-

-   if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         PNG_CONST png_bytep table = png_ptr->gamma_from_1;

-

-         if (table != NULL)

-         {

-            PNG_CONST int step =

-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2;

-

-            /* The alpha channel is the last component: */

-            row += step - 1;

-

-            for (; row_width > 0; --row_width, row += step)

-               *row = table[*row];

-

-            return;

-         }

-      }

-

-      else if (row_info->bit_depth == 16)

-      {

-         PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1;

-         PNG_CONST int gamma_shift = png_ptr->gamma_shift;

-

-         if (table != NULL)

-         {

-            PNG_CONST int step =

-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4;

-

-            /* The alpha channel is the last component: */

-            row += step - 2;

-

-            for (; row_width > 0; --row_width, row += step)

-            {

-               png_uint_16 v;

-

-               v = table[*(row + 1) >> gamma_shift][*row];

-               *row = (png_byte)((v >> 8) & 0xff);

-               *(row + 1) = (png_byte)(v & 0xff);

-            }

-

-            return;

-         }

-      }

-   }

-

-   /* Only get to here if called with a weird row_info; no harm has been done,

-    * so just issue a warning.

-    */

-   png_warning(png_ptr, "png_do_encode_alpha: unexpected call");

-}

-#endif

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-/* Expands a palette row to an RGB or RGBA row depending

- * upon whether you supply trans and num_trans.

- */

-static void

-png_do_expand_palette(png_row_infop row_info, png_bytep row,

-    png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)

-{

-   int shift, value;

-   png_bytep sp, dp;

-   png_uint_32 i;

-   png_uint_32 row_width=row_info->width;

-

-   png_debug(1, "in png_do_expand_palette");

-

-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      if (row_info->bit_depth < 8)

-      {

-         switch (row_info->bit_depth)

-         {

-            case 1:

-            {

-               sp = row + (png_size_t)((row_width - 1) >> 3);

-               dp = row + (png_size_t)row_width - 1;

-               shift = 7 - (int)((row_width + 7) & 0x07);

-               for (i = 0; i < row_width; i++)

-               {

-                  if ((*sp >> shift) & 0x01)

-                     *dp = 1;

-

-                  else

-                     *dp = 0;

-

-                  if (shift == 7)

-                  {

-                     shift = 0;

-                     sp--;

-                  }

-

-                  else

-                     shift++;

-

-                  dp--;

-               }

-               break;

-            }

-

-            case 2:

-            {

-               sp = row + (png_size_t)((row_width - 1) >> 2);

-               dp = row + (png_size_t)row_width - 1;

-               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);

-               for (i = 0; i < row_width; i++)

-               {

-                  value = (*sp >> shift) & 0x03;

-                  *dp = (png_byte)value;

-                  if (shift == 6)

-                  {

-                     shift = 0;

-                     sp--;

-                  }

-

-                  else

-                     shift += 2;

-

-                  dp--;

-               }

-               break;

-            }

-

-            case 4:

-            {

-               sp = row + (png_size_t)((row_width - 1) >> 1);

-               dp = row + (png_size_t)row_width - 1;

-               shift = (int)((row_width & 0x01) << 2);

-               for (i = 0; i < row_width; i++)

-               {

-                  value = (*sp >> shift) & 0x0f;

-                  *dp = (png_byte)value;

-                  if (shift == 4)

-                  {

-                     shift = 0;

-                     sp--;

-                  }

-

-                  else

-                     shift += 4;

-

-                  dp--;

-               }

-               break;

-            }

-

-            default:

-               break;

-         }

-         row_info->bit_depth = 8;

-         row_info->pixel_depth = 8;

-         row_info->rowbytes = row_width;

-      }

-

-      if (row_info->bit_depth == 8)

-      {

-         {

-            if (num_trans > 0)

-            {

-               sp = row + (png_size_t)row_width - 1;

-               dp = row + ((png_size_t)row_width << 2) - 1;

-

-               for (i = 0; i < row_width; i++)

-               {

-                  if ((int)(*sp) >= num_trans)

-                     *dp-- = 0xff;

-

-                  else

-                     *dp-- = trans_alpha[*sp];

-

-                  *dp-- = palette[*sp].blue;

-                  *dp-- = palette[*sp].green;

-                  *dp-- = palette[*sp].red;

-                  sp--;

-               }

-               row_info->bit_depth = 8;

-               row_info->pixel_depth = 32;

-               row_info->rowbytes = row_width * 4;

-               row_info->color_type = 6;

-               row_info->channels = 4;

-            }

-

-            else

-            {

-               sp = row + (png_size_t)row_width - 1;

-               dp = row + (png_size_t)(row_width * 3) - 1;

-

-               for (i = 0; i < row_width; i++)

-               {

-                  *dp-- = palette[*sp].blue;

-                  *dp-- = palette[*sp].green;

-                  *dp-- = palette[*sp].red;

-                  sp--;

-               }

-

-               row_info->bit_depth = 8;

-               row_info->pixel_depth = 24;

-               row_info->rowbytes = row_width * 3;

-               row_info->color_type = 2;

-               row_info->channels = 3;

-            }

-         }

-      }

-   }

-}

-

-/* If the bit depth < 8, it is expanded to 8.  Also, if the already

- * expanded transparency value is supplied, an alpha channel is built.

- */

-static void

-png_do_expand(png_row_infop row_info, png_bytep row,

-    png_const_color_16p trans_color)

-{

-   int shift, value;

-   png_bytep sp, dp;

-   png_uint_32 i;

-   png_uint_32 row_width=row_info->width;

-

-   png_debug(1, "in png_do_expand");

-

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)

-      {

-         unsigned int gray = trans_color != NULL ? trans_color->gray : 0;

-

-         if (row_info->bit_depth < 8)

-         {

-            switch (row_info->bit_depth)

-            {

-               case 1:

-               {

-                  gray = (gray & 0x01) * 0xff;

-                  sp = row + (png_size_t)((row_width - 1) >> 3);

-                  dp = row + (png_size_t)row_width - 1;

-                  shift = 7 - (int)((row_width + 7) & 0x07);

-                  for (i = 0; i < row_width; i++)

-                  {

-                     if ((*sp >> shift) & 0x01)

-                        *dp = 0xff;

-

-                     else

-                        *dp = 0;

-

-                     if (shift == 7)

-                     {

-                        shift = 0;

-                        sp--;

-                     }

-

-                     else

-                        shift++;

-

-                     dp--;

-                  }

-                  break;

-               }

-

-               case 2:

-               {

-                  gray = (gray & 0x03) * 0x55;

-                  sp = row + (png_size_t)((row_width - 1) >> 2);

-                  dp = row + (png_size_t)row_width - 1;

-                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);

-                  for (i = 0; i < row_width; i++)

-                  {

-                     value = (*sp >> shift) & 0x03;

-                     *dp = (png_byte)(value | (value << 2) | (value << 4) |

-                        (value << 6));

-                     if (shift == 6)

-                     {

-                        shift = 0;

-                        sp--;

-                     }

-

-                     else

-                        shift += 2;

-

-                     dp--;

-                  }

-                  break;

-               }

-

-               case 4:

-               {

-                  gray = (gray & 0x0f) * 0x11;

-                  sp = row + (png_size_t)((row_width - 1) >> 1);

-                  dp = row + (png_size_t)row_width - 1;

-                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);

-                  for (i = 0; i < row_width; i++)

-                  {

-                     value = (*sp >> shift) & 0x0f;

-                     *dp = (png_byte)(value | (value << 4));

-                     if (shift == 4)

-                     {

-                        shift = 0;

-                        sp--;

-                     }

-

-                     else

-                        shift = 4;

-

-                     dp--;

-                  }

-                  break;

-               }

-

-               default:

-                  break;

-            }

-

-            row_info->bit_depth = 8;

-            row_info->pixel_depth = 8;

-            row_info->rowbytes = row_width;

-         }

-

-         if (trans_color != NULL)

-         {

-            if (row_info->bit_depth == 8)

-            {

-               gray = gray & 0xff;

-               sp = row + (png_size_t)row_width - 1;

-               dp = row + ((png_size_t)row_width << 1) - 1;

-

-               for (i = 0; i < row_width; i++)

-               {

-                  if ((*sp & 0xffU) == gray)

-                     *dp-- = 0;

-

-                  else

-                     *dp-- = 0xff;

-

-                  *dp-- = *sp--;

-               }

-            }

-

-            else if (row_info->bit_depth == 16)

-            {

-               unsigned int gray_high = (gray >> 8) & 0xff;

-               unsigned int gray_low = gray & 0xff;

-               sp = row + row_info->rowbytes - 1;

-               dp = row + (row_info->rowbytes << 1) - 1;

-               for (i = 0; i < row_width; i++)

-               {

-                  if ((*(sp - 1) & 0xffU) == gray_high &&

-                      (*(sp) & 0xffU) == gray_low)

-                  {

-                     *dp-- = 0;

-                     *dp-- = 0;

-                  }

-

-                  else

-                  {

-                     *dp-- = 0xff;

-                     *dp-- = 0xff;

-                  }

-

-                  *dp-- = *sp--;

-                  *dp-- = *sp--;

-               }

-            }

-

-            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;

-            row_info->channels = 2;

-            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);

-            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,

-                row_width);

-         }

-      }

-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&

-          trans_color != NULL)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            png_byte red = (png_byte)(trans_color->red & 0xff);

-            png_byte green = (png_byte)(trans_color->green & 0xff);

-            png_byte blue = (png_byte)(trans_color->blue & 0xff);

-            sp = row + (png_size_t)row_info->rowbytes - 1;

-            dp = row + ((png_size_t)row_width << 2) - 1;

-            for (i = 0; i < row_width; i++)

-            {

-               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)

-                  *dp-- = 0;

-

-               else

-                  *dp-- = 0xff;

-

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-            }

-         }

-         else if (row_info->bit_depth == 16)

-         {

-            png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff);

-            png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff);

-            png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff);

-            png_byte red_low = (png_byte)(trans_color->red & 0xff);

-            png_byte green_low = (png_byte)(trans_color->green & 0xff);

-            png_byte blue_low = (png_byte)(trans_color->blue & 0xff);

-            sp = row + row_info->rowbytes - 1;

-            dp = row + ((png_size_t)row_width << 3) - 1;

-            for (i = 0; i < row_width; i++)

-            {

-               if (*(sp - 5) == red_high &&

-                   *(sp - 4) == red_low &&

-                   *(sp - 3) == green_high &&

-                   *(sp - 2) == green_low &&

-                   *(sp - 1) == blue_high &&

-                   *(sp    ) == blue_low)

-               {

-                  *dp-- = 0;

-                  *dp-- = 0;

-               }

-

-               else

-               {

-                  *dp-- = 0xff;

-                  *dp-- = 0xff;

-               }

-

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-               *dp-- = *sp--;

-            }

-         }

-         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;

-         row_info->channels = 4;

-         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);

-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);

-      }

-   }

-}

-#endif

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-/* If the bit depth is 8 and the color type is not a palette type expand the

- * whole row to 16 bits.  Has no effect otherwise.

- */

-static void

-png_do_expand_16(png_row_infop row_info, png_bytep row)

-{

-   if (row_info->bit_depth == 8 &&

-      row_info->color_type != PNG_COLOR_TYPE_PALETTE)

-   {

-      /* The row have a sequence of bytes containing [0..255] and we need

-       * to turn it into another row containing [0..65535], to do this we

-       * calculate:

-       *

-       *  (input / 255) * 65535

-       *

-       *  Which happens to be exactly input * 257 and this can be achieved

-       *  simply by byte replication in place (copying backwards).

-       */

-      png_byte *sp = row + row_info->rowbytes; /* source, last byte + 1 */

-      png_byte *dp = sp + row_info->rowbytes;  /* destination, end + 1 */

-      while (dp > sp)

-      {

-         dp[-2] = dp[-1] = *--sp; dp -= 2;

-      }

-

-      row_info->rowbytes *= 2;

-      row_info->bit_depth = 16;

-      row_info->pixel_depth = (png_byte)(row_info->channels * 16);

-   }

-}

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-static void

-png_do_quantize(png_row_infop row_info, png_bytep row,

-    png_const_bytep palette_lookup, png_const_bytep quantize_lookup)

-{

-   png_bytep sp, dp;

-   png_uint_32 i;

-   png_uint_32 row_width=row_info->width;

-

-   png_debug(1, "in png_do_quantize");

-

-   if (row_info->bit_depth == 8)

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup)

-      {

-         int r, g, b, p;

-         sp = row;

-         dp = row;

-         for (i = 0; i < row_width; i++)

-         {

-            r = *sp++;

-            g = *sp++;

-            b = *sp++;

-

-            /* This looks real messy, but the compiler will reduce

-             * it down to a reasonable formula.  For example, with

-             * 5 bits per color, we get:

-             * p = (((r >> 3) & 0x1f) << 10) |

-             *    (((g >> 3) & 0x1f) << 5) |

-             *    ((b >> 3) & 0x1f);

-             */

-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &

-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<

-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |

-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &

-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<

-                (PNG_QUANTIZE_BLUE_BITS)) |

-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &

-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));

-

-            *dp++ = palette_lookup[p];

-         }

-

-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;

-         row_info->channels = 1;

-         row_info->pixel_depth = row_info->bit_depth;

-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&

-         palette_lookup != NULL)

-      {

-         int r, g, b, p;

-         sp = row;

-         dp = row;

-         for (i = 0; i < row_width; i++)

-         {

-            r = *sp++;

-            g = *sp++;

-            b = *sp++;

-            sp++;

-

-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &

-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<

-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |

-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &

-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<

-                (PNG_QUANTIZE_BLUE_BITS)) |

-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &

-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));

-

-            *dp++ = palette_lookup[p];

-         }

-

-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;

-         row_info->channels = 1;

-         row_info->pixel_depth = row_info->bit_depth;

-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&

-         quantize_lookup)

-      {

-         sp = row;

-

-         for (i = 0; i < row_width; i++, sp++)

-         {

-            *sp = quantize_lookup[*sp];

-         }

-      }

-   }

-}

-#endif /* READ_QUANTIZE */

-

-/* Transform the row.  The order of transformations is significant,

- * and is very touchy.  If you add a transformation, take care to

- * decide how it fits in with the other transformations here.

- */

-void /* PRIVATE */

-png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)

-{

-   png_debug(1, "in png_do_read_transformations");

-

-   if (png_ptr->row_buf == NULL)

-   {

-      /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this

-       * error is incredibly rare and incredibly easy to debug without this

-       * information.

-       */

-      png_error(png_ptr, "NULL row buffer");

-   }

-

-   /* The following is debugging; prior to 1.5.4 the code was never compiled in;

-    * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro

-    * PNG_WARN_UNINITIALIZED_ROW removed.  In 1.6 the new flag is set only for

-    * all transformations, however in practice the ROW_INIT always gets done on

-    * demand, if necessary.

-    */

-   if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&

-       (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)

-   {

-      /* Application has failed to call either png_read_start_image() or

-       * png_read_update_info() after setting transforms that expand pixels.

-       * This check added to libpng-1.2.19 (but not enabled until 1.5.4).

-       */

-      png_error(png_ptr, "Uninitialized row");

-   }

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-   if ((png_ptr->transformations & PNG_EXPAND) != 0)

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         png_do_expand_palette(row_info, png_ptr->row_buf + 1,

-             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);

-      }

-

-      else

-      {

-         if (png_ptr->num_trans != 0 &&

-             (png_ptr->transformations & PNG_EXPAND_tRNS) != 0)

-            png_do_expand(row_info, png_ptr->row_buf + 1,

-                &(png_ptr->trans_color));

-

-         else

-            png_do_expand(row_info, png_ptr->row_buf + 1,

-                NULL);

-      }

-   }

-#endif

-

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&

-       (png_ptr->transformations & PNG_COMPOSE) == 0 &&

-       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))

-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,

-          0 /* at_start == false, because SWAP_ALPHA happens later */);

-#endif

-

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)

-   {

-      int rgb_error =

-          png_do_rgb_to_gray(png_ptr, row_info,

-              png_ptr->row_buf + 1);

-

-      if (rgb_error != 0)

-      {

-         png_ptr->rgb_to_gray_status=1;

-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==

-             PNG_RGB_TO_GRAY_WARN)

-            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");

-

-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==

-             PNG_RGB_TO_GRAY_ERR)

-            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");

-      }

-   }

-#endif

-

-/* From Andreas Dilger e-mail to png-implement, 26 March 1998:

- *

- *   In most cases, the "simple transparency" should be done prior to doing

- *   gray-to-RGB, or you will have to test 3x as many bytes to check if a

- *   pixel is transparent.  You would also need to make sure that the

- *   transparency information is upgraded to RGB.

- *

- *   To summarize, the current flow is:

- *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite

- *                                   with background "in place" if transparent,

- *                                   convert to RGB if necessary

- *   - Gray + alpha -> composite with gray background and remove alpha bytes,

- *                                   convert to RGB if necessary

- *

- *   To support RGB backgrounds for gray images we need:

- *   - Gray + simple transparency -> convert to RGB + simple transparency,

- *                                   compare 3 or 6 bytes and composite with

- *                                   background "in place" if transparent

- *                                   (3x compare/pixel compared to doing

- *                                   composite with gray bkgrnd)

- *   - Gray + alpha -> convert to RGB + alpha, composite with background and

- *                                   remove alpha bytes (3x float

- *                                   operations/pixel compared with composite

- *                                   on gray background)

- *

- *  Greg's change will do this.  The reason it wasn't done before is for

- *  performance, as this increases the per-pixel operations.  If we would check

- *  in advance if the background was gray or RGB, and position the gray-to-RGB

- *  transform appropriately, then it would save a lot of work/time.

- */

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-   /* If gray -> RGB, do so now only if background is non-gray; else do later

-    * for performance reasons

-    */

-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&

-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0)

-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);

-#endif

-

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)

-      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   if ((png_ptr->transformations & PNG_GAMMA) != 0 &&

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-      /* Because RGB_TO_GRAY does the gamma transform. */

-      (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 &&

-#endif

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-      /* Because PNG_COMPOSE does the gamma transform if there is something to

-       * do (if there is an alpha channel or transparency.)

-       */

-       !((png_ptr->transformations & PNG_COMPOSE) != 0 &&

-       ((png_ptr->num_trans != 0) ||

-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) &&

-#endif

-      /* Because png_init_read_transformations transforms the palette, unless

-       * RGB_TO_GRAY will do the transform.

-       */

-       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))

-      png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);

-#endif

-

-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&

-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&

-       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||

-       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))

-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,

-          0 /* at_start == false, because SWAP_ALPHA happens later */);

-#endif

-

-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED

-   if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&

-       (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);

-#endif

-

-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED

-   if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)

-      png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED

-   /* There is no harm in doing both of these because only one has any effect,

-    * by putting the 'scale' option first if the app asks for scale (either by

-    * calling the API or in a TRANSFORM flag) this is what happens.

-    */

-   if ((png_ptr->transformations & PNG_16_TO_8) != 0)

-      png_do_chop(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)

-   {

-      png_do_quantize(row_info, png_ptr->row_buf + 1,

-          png_ptr->palette_lookup, png_ptr->quantize_index);

-

-      if (row_info->rowbytes == 0)

-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");

-   }

-#endif /* READ_QUANTIZE */

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-   /* Do the expansion now, after all the arithmetic has been done.  Notice

-    * that previous transformations can handle the PNG_EXPAND_16 flag if this

-    * is efficient (particularly true in the case of gamma correction, where

-    * better accuracy results faster!)

-    */

-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)

-      png_do_expand_16(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-   /* NOTE: moved here in 1.5.4 (from much later in this list.) */

-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&

-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0)

-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_INVERT_SUPPORTED

-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)

-      png_do_invert(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)

-      png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_SHIFT_SUPPORTED

-   if ((png_ptr->transformations & PNG_SHIFT) != 0)

-      png_do_unshift(row_info, png_ptr->row_buf + 1,

-          &(png_ptr->shift));

-#endif

-

-#ifdef PNG_READ_PACK_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACK) != 0)

-      png_do_unpack(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   /* Added at libpng-1.5.10 */

-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&

-       png_ptr->num_palette_max >= 0)

-      png_do_check_palette_indexes(png_ptr, row_info);

-#endif

-

-#ifdef PNG_READ_BGR_SUPPORTED

-   if ((png_ptr->transformations & PNG_BGR) != 0)

-      png_do_bgr(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_PACKSWAP_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-      png_do_packswap(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_FILLER_SUPPORTED

-   if ((png_ptr->transformations & PNG_FILLER) != 0)

-      png_do_read_filler(row_info, png_ptr->row_buf + 1,

-          (png_uint_32)png_ptr->filler, png_ptr->flags);

-#endif

-

-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)

-      png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_READ_16BIT_SUPPORTED

-#ifdef PNG_READ_SWAP_SUPPORTED

-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)

-      png_do_swap(row_info, png_ptr->row_buf + 1);

-#endif

-#endif

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)

-   {

-      if (png_ptr->read_user_transform_fn != NULL)

-         (*(png_ptr->read_user_transform_fn)) /* User read transform function */

-             (png_ptr,     /* png_ptr */

-             row_info,     /* row_info: */

-                /*  png_uint_32 width;       width of row */

-                /*  png_size_t rowbytes;     number of bytes in row */

-                /*  png_byte color_type;     color type of pixels */

-                /*  png_byte bit_depth;      bit depth of samples */

-                /*  png_byte channels;       number of channels (1-4) */

-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */

-             png_ptr->row_buf + 1);    /* start of pixel data for row */

-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED

-      if (png_ptr->user_transform_depth != 0)

-         row_info->bit_depth = png_ptr->user_transform_depth;

-

-      if (png_ptr->user_transform_channels != 0)

-         row_info->channels = png_ptr->user_transform_channels;

-#endif

-      row_info->pixel_depth = (png_byte)(row_info->bit_depth *

-          row_info->channels);

-

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);

-   }

-#endif

-}

-

-#endif /* READ_TRANSFORMS */

-#endif /* READ */

diff --git a/plugins/AdvaImg/src/LibPNG/pngrutil.c b/plugins/AdvaImg/src/LibPNG/pngrutil.c
deleted file mode 100644
index ff639293aa..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngrutil.c
+++ /dev/null
@@ -1,4661 +0,0 @@
-

-/* pngrutil.c - utilities to read a PNG file

- *

- * Last changed in libpng 1.6.33 [September 28, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file contains routines that are only called from within

- * libpng itself during the course of reading an image.

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_READ_SUPPORTED

-

-png_uint_32 PNGAPI

-png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)

-{

-   png_uint_32 uval = png_get_uint_32(buf);

-

-   if (uval > PNG_UINT_31_MAX)

-      png_error(png_ptr, "PNG unsigned integer out of range");

-

-   return (uval);

-}

-

-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)

-/* The following is a variation on the above for use with the fixed

- * point values used for gAMA and cHRM.  Instead of png_error it

- * issues a warning and returns (-1) - an invalid value because both

- * gAMA and cHRM use *unsigned* integers for fixed point values.

- */

-#define PNG_FIXED_ERROR (-1)

-

-static png_fixed_point /* PRIVATE */

-png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)

-{

-   png_uint_32 uval = png_get_uint_32(buf);

-

-   if (uval <= PNG_UINT_31_MAX)

-      return (png_fixed_point)uval; /* known to be in range */

-

-   /* The caller can turn off the warning by passing NULL. */

-   if (png_ptr != NULL)

-      png_warning(png_ptr, "PNG fixed point integer out of range");

-

-   return PNG_FIXED_ERROR;

-}

-#endif

-

-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED

-/* NOTE: the read macros will obscure these definitions, so that if

- * PNG_USE_READ_MACROS is set the library will not use them internally,

- * but the APIs will still be available externally.

- *

- * The parentheses around "PNGAPI function_name" in the following three

- * functions are necessary because they allow the macros to co-exist with

- * these (unused but exported) functions.

- */

-

-/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */

-png_uint_32 (PNGAPI

-png_get_uint_32)(png_const_bytep buf)

-{

-   png_uint_32 uval =

-       ((png_uint_32)(*(buf    )) << 24) +

-       ((png_uint_32)(*(buf + 1)) << 16) +

-       ((png_uint_32)(*(buf + 2)) <<  8) +

-       ((png_uint_32)(*(buf + 3))      ) ;

-

-   return uval;

-}

-

-/* Grab a signed 32-bit integer from a buffer in big-endian format.  The

- * data is stored in the PNG file in two's complement format and there

- * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore

- * the following code does a two's complement to native conversion.

- */

-png_int_32 (PNGAPI

-png_get_int_32)(png_const_bytep buf)

-{

-   png_uint_32 uval = png_get_uint_32(buf);

-   if ((uval & 0x80000000) == 0) /* non-negative */

-      return (png_int_32)uval;

-

-   uval = (uval ^ 0xffffffff) + 1;  /* 2's complement: -x = ~x+1 */

-   if ((uval & 0x80000000) == 0) /* no overflow */

-      return -(png_int_32)uval;

-   /* The following has to be safe; this function only gets called on PNG data

-    * and if we get here that data is invalid.  0 is the most safe value and

-    * if not then an attacker would surely just generate a PNG with 0 instead.

-    */

-   return 0;

-}

-

-/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */

-png_uint_16 (PNGAPI

-png_get_uint_16)(png_const_bytep buf)

-{

-   /* ANSI-C requires an int value to accomodate at least 16 bits so this

-    * works and allows the compiler not to worry about possible narrowing

-    * on 32-bit systems.  (Pre-ANSI systems did not make integers smaller

-    * than 16 bits either.)

-    */

-   unsigned int val =

-       ((unsigned int)(*buf) << 8) +

-       ((unsigned int)(*(buf + 1)));

-

-   return (png_uint_16)val;

-}

-

-#endif /* READ_INT_FUNCTIONS */

-

-/* Read and check the PNG file signature */

-void /* PRIVATE */

-png_read_sig(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_size_t num_checked, num_to_check;

-

-   /* Exit if the user application does not expect a signature. */

-   if (png_ptr->sig_bytes >= 8)

-      return;

-

-   num_checked = png_ptr->sig_bytes;

-   num_to_check = 8 - num_checked;

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;

-#endif

-

-   /* The signature must be serialized in a single I/O call. */

-   png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);

-   png_ptr->sig_bytes = 8;

-

-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)

-   {

-      if (num_checked < 4 &&

-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))

-         png_error(png_ptr, "Not a PNG file");

-      else

-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");

-   }

-   if (num_checked < 3)

-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;

-}

-

-/* Read the chunk header (length + type name).

- * Put the type name into png_ptr->chunk_name, and return the length.

- */

-png_uint_32 /* PRIVATE */

-png_read_chunk_header(png_structrp png_ptr)

-{

-   png_byte buf[8];

-   png_uint_32 length;

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;

-#endif

-

-   /* Read the length and the chunk name.

-    * This must be performed in a single I/O call.

-    */

-   png_read_data(png_ptr, buf, 8);

-   length = png_get_uint_31(png_ptr, buf);

-

-   /* Put the chunk name into png_ptr->chunk_name. */

-   png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);

-

-   png_debug2(0, "Reading %lx chunk, length = %lu",

-       (unsigned long)png_ptr->chunk_name, (unsigned long)length);

-

-   /* Reset the crc and run it over the chunk name. */

-   png_reset_crc(png_ptr);

-   png_calculate_crc(png_ptr, buf + 4, 4);

-

-   /* Check to see if chunk name is valid. */

-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);

-

-   /* Check for too-large chunk length */

-   png_check_chunk_length(png_ptr, length);

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;

-#endif

-

-   return length;

-}

-

-/* Read data, and (optionally) run it through the CRC. */

-void /* PRIVATE */

-png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_read_data(png_ptr, buf, length);

-   png_calculate_crc(png_ptr, buf, length);

-}

-

-/* Optionally skip data and then check the CRC.  Depending on whether we

- * are reading an ancillary or critical chunk, and how the program has set

- * things up, we may calculate the CRC on the data and print a message.

- * Returns '1' if there was a CRC error, '0' otherwise.

- */

-int /* PRIVATE */

-png_crc_finish(png_structrp png_ptr, png_uint_32 skip)

-{

-   /* The size of the local buffer for inflate is a good guess as to a

-    * reasonable size to use for buffering reads from the application.

-    */

-   while (skip > 0)

-   {

-      png_uint_32 len;

-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];

-

-      len = (sizeof tmpbuf);

-      if (len > skip)

-         len = skip;

-      skip -= len;

-

-      png_crc_read(png_ptr, tmpbuf, len);

-   }

-

-   if (png_crc_error(png_ptr) != 0)

-   {

-      if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?

-          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :

-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)

-      {

-         png_chunk_warning(png_ptr, "CRC error");

-      }

-

-      else

-         png_chunk_error(png_ptr, "CRC error");

-

-      return (1);

-   }

-

-   return (0);

-}

-

-/* Compare the CRC stored in the PNG file with that calculated by libpng from

- * the data it has read thus far.

- */

-int /* PRIVATE */

-png_crc_error(png_structrp png_ptr)

-{

-   png_byte crc_bytes[4];

-   png_uint_32 crc;

-   int need_crc = 1;

-

-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)

-   {

-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==

-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))

-         need_crc = 0;

-   }

-

-   else /* critical */

-   {

-      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)

-         need_crc = 0;

-   }

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;

-#endif

-

-   /* The chunk CRC must be serialized in a single I/O call. */

-   png_read_data(png_ptr, crc_bytes, 4);

-

-   if (need_crc != 0)

-   {

-      crc = png_get_uint_32(crc_bytes);

-      return ((int)(crc != png_ptr->crc));

-   }

-

-   else

-      return (0);

-}

-

-#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\

-    defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\

-    defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\

-    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)

-/* Manage the read buffer; this simply reallocates the buffer if it is not small

- * enough (or if it is not allocated).  The routine returns a pointer to the

- * buffer; if an error occurs and 'warn' is set the routine returns NULL, else

- * it will call png_error (via png_malloc) on failure.  (warn == 2 means

- * 'silent').

- */

-static png_bytep

-png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)

-{

-   png_bytep buffer = png_ptr->read_buffer;

-

-   if (buffer != NULL && new_size > png_ptr->read_buffer_size)

-   {

-      png_ptr->read_buffer = NULL;

-      png_ptr->read_buffer = NULL;

-      png_ptr->read_buffer_size = 0;

-      png_free(png_ptr, buffer);

-      buffer = NULL;

-   }

-

-   if (buffer == NULL)

-   {

-      buffer = png_voidcast(png_bytep, png_malloc_base(png_ptr, new_size));

-

-      if (buffer != NULL)

-      {

-         memset(buffer, 0, new_size); /* just in case */

-         png_ptr->read_buffer = buffer;

-         png_ptr->read_buffer_size = new_size;

-      }

-

-      else if (warn < 2) /* else silent */

-      {

-         if (warn != 0)

-             png_chunk_warning(png_ptr, "insufficient memory to read chunk");

-

-         else

-             png_chunk_error(png_ptr, "insufficient memory to read chunk");

-      }

-   }

-

-   return buffer;

-}

-#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */

-

-/* png_inflate_claim: claim the zstream for some nefarious purpose that involves

- * decompression.  Returns Z_OK on success, else a zlib error code.  It checks

- * the owner but, in final release builds, just issues a warning if some other

- * chunk apparently owns the stream.  Prior to release it does a png_error.

- */

-static int

-png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)

-{

-   if (png_ptr->zowner != 0)

-   {

-      char msg[64];

-

-      PNG_STRING_FROM_CHUNK(msg, png_ptr->zowner);

-      /* So the message that results is "<chunk> using zstream"; this is an

-       * internal error, but is very useful for debugging.  i18n requirements

-       * are minimal.

-       */

-      (void)png_safecat(msg, (sizeof msg), 4, " using zstream");

-#if PNG_RELEASE_BUILD

-      png_chunk_warning(png_ptr, msg);

-      png_ptr->zowner = 0;

-#else

-      png_chunk_error(png_ptr, msg);

-#endif

-   }

-

-   /* Implementation note: unlike 'png_deflate_claim' this internal function

-    * does not take the size of the data as an argument.  Some efficiency could

-    * be gained by using this when it is known *if* the zlib stream itself does

-    * not record the number; however, this is an illusion: the original writer

-    * of the PNG may have selected a lower window size, and we really must

-    * follow that because, for systems with with limited capabilities, we

-    * would otherwise reject the application's attempts to use a smaller window

-    * size (zlib doesn't have an interface to say "this or lower"!).

-    *

-    * inflateReset2 was added to zlib 1.2.4; before this the window could not be

-    * reset, therefore it is necessary to always allocate the maximum window

-    * size with earlier zlibs just in case later compressed chunks need it.

-    */

-   {

-      int ret; /* zlib return code */

-#if ZLIB_VERNUM >= 0x1240

-      int window_bits = 0;

-

-# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)

-      if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) ==

-          PNG_OPTION_ON)

-      {

-         window_bits = 15;

-         png_ptr->zstream_start = 0; /* fixed window size */

-      }

-

-      else

-      {

-         png_ptr->zstream_start = 1;

-      }

-# endif

-

-#endif /* ZLIB_VERNUM >= 0x1240 */

-

-      /* Set this for safety, just in case the previous owner left pointers to

-       * memory allocations.

-       */

-      png_ptr->zstream.next_in = NULL;

-      png_ptr->zstream.avail_in = 0;

-      png_ptr->zstream.next_out = NULL;

-      png_ptr->zstream.avail_out = 0;

-

-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)

-      {

-#if ZLIB_VERNUM >= 0x1240

-         ret = inflateReset2(&png_ptr->zstream, window_bits);

-#else

-         ret = inflateReset(&png_ptr->zstream);

-#endif

-      }

-

-      else

-      {

-#if ZLIB_VERNUM >= 0x1240

-         ret = inflateInit2(&png_ptr->zstream, window_bits);

-#else

-         ret = inflateInit(&png_ptr->zstream);

-#endif

-

-         if (ret == Z_OK)

-            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;

-      }

-

-#if ZLIB_VERNUM >= 0x1290 && \

-   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)

-      if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)

-         /* Turn off validation of the ADLER32 checksum in IDAT chunks */

-         ret = inflateValidate(&png_ptr->zstream, 0);

-#endif

-

-      if (ret == Z_OK)

-         png_ptr->zowner = owner;

-

-      else

-         png_zstream_error(png_ptr, ret);

-

-      return ret;

-   }

-

-#ifdef window_bits

-# undef window_bits

-#endif

-}

-

-#if ZLIB_VERNUM >= 0x1240

-/* Handle the start of the inflate stream if we called inflateInit2(strm,0);

- * in this case some zlib versions skip validation of the CINFO field and, in

- * certain circumstances, libpng may end up displaying an invalid image, in

- * contrast to implementations that call zlib in the normal way (e.g. libpng

- * 1.5).

- */

-int /* PRIVATE */

-png_zlib_inflate(png_structrp png_ptr, int flush)

-{

-   if (png_ptr->zstream_start && png_ptr->zstream.avail_in > 0)

-   {

-      if ((*png_ptr->zstream.next_in >> 4) > 7)

-      {

-         png_ptr->zstream.msg = "invalid window size (libpng)";

-         return Z_DATA_ERROR;

-      }

-

-      png_ptr->zstream_start = 0;

-   }

-

-   return inflate(&png_ptr->zstream, flush);

-}

-#endif /* Zlib >= 1.2.4 */

-

-#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED

-#if defined(PNG_READ_zTXt_SUPPORTED) || defined (PNG_READ_iTXt_SUPPORTED)

-/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to

- * allow the caller to do multiple calls if required.  If the 'finish' flag is

- * set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must

- * be returned or there has been a problem, otherwise Z_SYNC_FLUSH is used and

- * Z_OK or Z_STREAM_END will be returned on success.

- *

- * The input and output sizes are updated to the actual amounts of data consumed

- * or written, not the amount available (as in a z_stream).  The data pointers

- * are not changed, so the next input is (data+input_size) and the next

- * available output is (output+output_size).

- */

-static int

-png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish,

-    /* INPUT: */ png_const_bytep input, png_uint_32p input_size_ptr,

-    /* OUTPUT: */ png_bytep output, png_alloc_size_t *output_size_ptr)

-{

-   if (png_ptr->zowner == owner) /* Else not claimed */

-   {

-      int ret;

-      png_alloc_size_t avail_out = *output_size_ptr;

-      png_uint_32 avail_in = *input_size_ptr;

-

-      /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it

-       * can't even necessarily handle 65536 bytes) because the type uInt is

-       * "16 bits or more".  Consequently it is necessary to chunk the input to

-       * zlib.  This code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the

-       * maximum value that can be stored in a uInt.)  It is possible to set

-       * ZLIB_IO_MAX to a lower value in pngpriv.h and this may sometimes have

-       * a performance advantage, because it reduces the amount of data accessed

-       * at each step and that may give the OS more time to page it in.

-       */

-      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);

-      /* avail_in and avail_out are set below from 'size' */

-      png_ptr->zstream.avail_in = 0;

-      png_ptr->zstream.avail_out = 0;

-

-      /* Read directly into the output if it is available (this is set to

-       * a local buffer below if output is NULL).

-       */

-      if (output != NULL)

-         png_ptr->zstream.next_out = output;

-

-      do

-      {

-         uInt avail;

-         Byte local_buffer[PNG_INFLATE_BUF_SIZE];

-

-         /* zlib INPUT BUFFER */

-         /* The setting of 'avail_in' used to be outside the loop; by setting it

-          * inside it is possible to chunk the input to zlib and simply rely on

-          * zlib to advance the 'next_in' pointer.  This allows arbitrary

-          * amounts of data to be passed through zlib at the unavoidable cost of

-          * requiring a window save (memcpy of up to 32768 output bytes)

-          * every ZLIB_IO_MAX input bytes.

-          */

-         avail_in += png_ptr->zstream.avail_in; /* not consumed last time */

-

-         avail = ZLIB_IO_MAX;

-

-         if (avail_in < avail)

-            avail = (uInt)avail_in; /* safe: < than ZLIB_IO_MAX */

-

-         avail_in -= avail;

-         png_ptr->zstream.avail_in = avail;

-

-         /* zlib OUTPUT BUFFER */

-         avail_out += png_ptr->zstream.avail_out; /* not written last time */

-

-         avail = ZLIB_IO_MAX; /* maximum zlib can process */

-

-         if (output == NULL)

-         {

-            /* Reset the output buffer each time round if output is NULL and

-             * make available the full buffer, up to 'remaining_space'

-             */

-            png_ptr->zstream.next_out = local_buffer;

-            if ((sizeof local_buffer) < avail)

-               avail = (sizeof local_buffer);

-         }

-

-         if (avail_out < avail)

-            avail = (uInt)avail_out; /* safe: < ZLIB_IO_MAX */

-

-         png_ptr->zstream.avail_out = avail;

-         avail_out -= avail;

-

-         /* zlib inflate call */

-         /* In fact 'avail_out' may be 0 at this point, that happens at the end

-          * of the read when the final LZ end code was not passed at the end of

-          * the previous chunk of input data.  Tell zlib if we have reached the

-          * end of the output buffer.

-          */

-         ret = PNG_INFLATE(png_ptr, avail_out > 0 ? Z_NO_FLUSH :

-             (finish ? Z_FINISH : Z_SYNC_FLUSH));

-      } while (ret == Z_OK);

-

-      /* For safety kill the local buffer pointer now */

-      if (output == NULL)

-         png_ptr->zstream.next_out = NULL;

-

-      /* Claw back the 'size' and 'remaining_space' byte counts. */

-      avail_in += png_ptr->zstream.avail_in;

-      avail_out += png_ptr->zstream.avail_out;

-

-      /* Update the input and output sizes; the updated values are the amount

-       * consumed or written, effectively the inverse of what zlib uses.

-       */

-      if (avail_out > 0)

-         *output_size_ptr -= avail_out;

-

-      if (avail_in > 0)

-         *input_size_ptr -= avail_in;

-

-      /* Ensure png_ptr->zstream.msg is set (even in the success case!) */

-      png_zstream_error(png_ptr, ret);

-      return ret;

-   }

-

-   else

-   {

-      /* This is a bad internal error.  The recovery assigns to the zstream msg

-       * pointer, which is not owned by the caller, but this is safe; it's only

-       * used on errors!

-       */

-      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");

-      return Z_STREAM_ERROR;

-   }

-}

-

-/*

- * Decompress trailing data in a chunk.  The assumption is that read_buffer

- * points at an allocated area holding the contents of a chunk with a

- * trailing compressed part.  What we get back is an allocated area

- * holding the original prefix part and an uncompressed version of the

- * trailing part (the malloc area passed in is freed).

- */

-static int

-png_decompress_chunk(png_structrp png_ptr,

-    png_uint_32 chunklength, png_uint_32 prefix_size,

-    png_alloc_size_t *newlength /* must be initialized to the maximum! */,

-    int terminate /*add a '\0' to the end of the uncompressed data*/)

-{

-   /* TODO: implement different limits for different types of chunk.

-    *

-    * The caller supplies *newlength set to the maximum length of the

-    * uncompressed data, but this routine allocates space for the prefix and

-    * maybe a '\0' terminator too.  We have to assume that 'prefix_size' is

-    * limited only by the maximum chunk size.

-    */

-   png_alloc_size_t limit = PNG_SIZE_MAX;

-

-# ifdef PNG_SET_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_malloc_max > 0 &&

-       png_ptr->user_chunk_malloc_max < limit)

-      limit = png_ptr->user_chunk_malloc_max;

-# elif PNG_USER_CHUNK_MALLOC_MAX > 0

-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)

-      limit = PNG_USER_CHUNK_MALLOC_MAX;

-# endif

-

-   if (limit >= prefix_size + (terminate != 0))

-   {

-      int ret;

-

-      limit -= prefix_size + (terminate != 0);

-

-      if (limit < *newlength)

-         *newlength = limit;

-

-      /* Now try to claim the stream. */

-      ret = png_inflate_claim(png_ptr, png_ptr->chunk_name);

-

-      if (ret == Z_OK)

-      {

-         png_uint_32 lzsize = chunklength - prefix_size;

-

-         ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,

-             /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,

-             /* output: */ NULL, newlength);

-

-         if (ret == Z_STREAM_END)

-         {

-            /* Use 'inflateReset' here, not 'inflateReset2' because this

-             * preserves the previously decided window size (otherwise it would

-             * be necessary to store the previous window size.)  In practice

-             * this doesn't matter anyway, because png_inflate will call inflate

-             * with Z_FINISH in almost all cases, so the window will not be

-             * maintained.

-             */

-            if (inflateReset(&png_ptr->zstream) == Z_OK)

-            {

-               /* Because of the limit checks above we know that the new,

-                * expanded, size will fit in a size_t (let alone an

-                * png_alloc_size_t).  Use png_malloc_base here to avoid an

-                * extra OOM message.

-                */

-               png_alloc_size_t new_size = *newlength;

-               png_alloc_size_t buffer_size = prefix_size + new_size +

-                   (terminate != 0);

-               png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,

-                   buffer_size));

-

-               if (text != NULL)

-               {

-                  memset(text, 0, buffer_size);

-

-                  ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,

-                      png_ptr->read_buffer + prefix_size, &lzsize,

-                      text + prefix_size, newlength);

-

-                  if (ret == Z_STREAM_END)

-                  {

-                     if (new_size == *newlength)

-                     {

-                        if (terminate != 0)

-                           text[prefix_size + *newlength] = 0;

-

-                        if (prefix_size > 0)

-                           memcpy(text, png_ptr->read_buffer, prefix_size);

-

-                        {

-                           png_bytep old_ptr = png_ptr->read_buffer;

-

-                           png_ptr->read_buffer = text;

-                           png_ptr->read_buffer_size = buffer_size;

-                           text = old_ptr; /* freed below */

-                        }

-                     }

-

-                     else

-                     {

-                        /* The size changed on the second read, there can be no

-                         * guarantee that anything is correct at this point.

-                         * The 'msg' pointer has been set to "unexpected end of

-                         * LZ stream", which is fine, but return an error code

-                         * that the caller won't accept.

-                         */

-                        ret = PNG_UNEXPECTED_ZLIB_RETURN;

-                     }

-                  }

-

-                  else if (ret == Z_OK)

-                     ret = PNG_UNEXPECTED_ZLIB_RETURN; /* for safety */

-

-                  /* Free the text pointer (this is the old read_buffer on

-                   * success)

-                   */

-                  png_free(png_ptr, text);

-

-                  /* This really is very benign, but it's still an error because

-                   * the extra space may otherwise be used as a Trojan Horse.

-                   */

-                  if (ret == Z_STREAM_END &&

-                      chunklength - prefix_size != lzsize)

-                     png_chunk_benign_error(png_ptr, "extra compressed data");

-               }

-

-               else

-               {

-                  /* Out of memory allocating the buffer */

-                  ret = Z_MEM_ERROR;

-                  png_zstream_error(png_ptr, Z_MEM_ERROR);

-               }

-            }

-

-            else

-            {

-               /* inflateReset failed, store the error message */

-               png_zstream_error(png_ptr, ret);

-               ret = PNG_UNEXPECTED_ZLIB_RETURN;

-            }

-         }

-

-         else if (ret == Z_OK)

-            ret = PNG_UNEXPECTED_ZLIB_RETURN;

-

-         /* Release the claimed stream */

-         png_ptr->zowner = 0;

-      }

-

-      else /* the claim failed */ if (ret == Z_STREAM_END) /* impossible! */

-         ret = PNG_UNEXPECTED_ZLIB_RETURN;

-

-      return ret;

-   }

-

-   else

-   {

-      /* Application/configuration limits exceeded */

-      png_zstream_error(png_ptr, Z_MEM_ERROR);

-      return Z_MEM_ERROR;

-   }

-}

-#endif /* READ_zTXt || READ_iTXt */

-#endif /* READ_COMPRESSED_TEXT */

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-/* Perform a partial read and decompress, producing 'avail_out' bytes and

- * reading from the current chunk as required.

- */

-static int

-png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,

-    png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,

-    int finish)

-{

-   if (png_ptr->zowner == png_ptr->chunk_name)

-   {

-      int ret;

-

-      /* next_in and avail_in must have been initialized by the caller. */

-      png_ptr->zstream.next_out = next_out;

-      png_ptr->zstream.avail_out = 0; /* set in the loop */

-

-      do

-      {

-         if (png_ptr->zstream.avail_in == 0)

-         {

-            if (read_size > *chunk_bytes)

-               read_size = (uInt)*chunk_bytes;

-            *chunk_bytes -= read_size;

-

-            if (read_size > 0)

-               png_crc_read(png_ptr, read_buffer, read_size);

-

-            png_ptr->zstream.next_in = read_buffer;

-            png_ptr->zstream.avail_in = read_size;

-         }

-

-         if (png_ptr->zstream.avail_out == 0)

-         {

-            uInt avail = ZLIB_IO_MAX;

-            if (avail > *out_size)

-               avail = (uInt)*out_size;

-            *out_size -= avail;

-

-            png_ptr->zstream.avail_out = avail;

-         }

-

-         /* Use Z_SYNC_FLUSH when there is no more chunk data to ensure that all

-          * the available output is produced; this allows reading of truncated

-          * streams.

-          */

-         ret = PNG_INFLATE(png_ptr, *chunk_bytes > 0 ?

-             Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));

-      }

-      while (ret == Z_OK && (*out_size > 0 || png_ptr->zstream.avail_out > 0));

-

-      *out_size += png_ptr->zstream.avail_out;

-      png_ptr->zstream.avail_out = 0; /* Should not be required, but is safe */

-

-      /* Ensure the error message pointer is always set: */

-      png_zstream_error(png_ptr, ret);

-      return ret;

-   }

-

-   else

-   {

-      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");

-      return Z_STREAM_ERROR;

-   }

-}

-#endif /* READ_iCCP */

-

-/* Read and check the IDHR chunk */

-

-void /* PRIVATE */

-png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte buf[13];

-   png_uint_32 width, height;

-   int bit_depth, color_type, compression_type, filter_type;

-   int interlace_type;

-

-   png_debug(1, "in png_handle_IHDR");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)

-      png_chunk_error(png_ptr, "out of place");

-

-   /* Check the length */

-   if (length != 13)

-      png_chunk_error(png_ptr, "invalid");

-

-   png_ptr->mode |= PNG_HAVE_IHDR;

-

-   png_crc_read(png_ptr, buf, 13);

-   png_crc_finish(png_ptr, 0);

-

-   width = png_get_uint_31(png_ptr, buf);

-   height = png_get_uint_31(png_ptr, buf + 4);

-   bit_depth = buf[8];

-   color_type = buf[9];

-   compression_type = buf[10];

-   filter_type = buf[11];

-   interlace_type = buf[12];

-

-   /* Set internal variables */

-   png_ptr->width = width;

-   png_ptr->height = height;

-   png_ptr->bit_depth = (png_byte)bit_depth;

-   png_ptr->interlaced = (png_byte)interlace_type;

-   png_ptr->color_type = (png_byte)color_type;

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   png_ptr->filter_type = (png_byte)filter_type;

-#endif

-   png_ptr->compression_type = (png_byte)compression_type;

-

-   /* Find number of channels */

-   switch (png_ptr->color_type)

-   {

-      default: /* invalid, png_set_IHDR calls png_error */

-      case PNG_COLOR_TYPE_GRAY:

-      case PNG_COLOR_TYPE_PALETTE:

-         png_ptr->channels = 1;

-         break;

-

-      case PNG_COLOR_TYPE_RGB:

-         png_ptr->channels = 3;

-         break;

-

-      case PNG_COLOR_TYPE_GRAY_ALPHA:

-         png_ptr->channels = 2;

-         break;

-

-      case PNG_COLOR_TYPE_RGB_ALPHA:

-         png_ptr->channels = 4;

-         break;

-   }

-

-   /* Set up other useful info */

-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels);

-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);

-   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);

-   png_debug1(3, "channels = %d", png_ptr->channels);

-   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);

-   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,

-       color_type, interlace_type, compression_type, filter_type);

-}

-

-/* Read and check the palette */

-void /* PRIVATE */

-png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_color palette[PNG_MAX_PALETTE_LENGTH];

-   int max_palette_length, num, i;

-#ifdef PNG_POINTER_INDEXING_SUPPORTED

-   png_colorp pal_ptr;

-#endif

-

-   png_debug(1, "in png_handle_PLTE");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   /* Moved to before the 'after IDAT' check below because otherwise duplicate

-    * PLTE chunks are potentially ignored (the spec says there shall not be more

-    * than one PLTE, the error is not treated as benign, so this check trumps

-    * the requirement that PLTE appears before IDAT.)

-    */

-   else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)

-      png_chunk_error(png_ptr, "duplicate");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      /* This is benign because the non-benign error happened before, when an

-       * IDAT was encountered in a color-mapped image with no PLTE.

-       */

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   png_ptr->mode |= PNG_HAVE_PLTE;

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");

-      return;

-   }

-

-#ifndef PNG_READ_OPT_PLTE_SUPPORTED

-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)

-   {

-      png_crc_finish(png_ptr, length);

-      return;

-   }

-#endif

-

-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)

-   {

-      png_crc_finish(png_ptr, length);

-

-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)

-         png_chunk_benign_error(png_ptr, "invalid");

-

-      else

-         png_chunk_error(png_ptr, "invalid");

-

-      return;

-   }

-

-   /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */

-   num = (int)length / 3;

-

-   /* If the palette has 256 or fewer entries but is too large for the bit

-    * depth, we don't issue an error, to preserve the behavior of previous

-    * libpng versions. We silently truncate the unused extra palette entries

-    * here.

-    */

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      max_palette_length = (1 << png_ptr->bit_depth);

-   else

-      max_palette_length = PNG_MAX_PALETTE_LENGTH;

-

-   if (num > max_palette_length)

-      num = max_palette_length;

-

-#ifdef PNG_POINTER_INDEXING_SUPPORTED

-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)

-   {

-      png_byte buf[3];

-

-      png_crc_read(png_ptr, buf, 3);

-      pal_ptr->red = buf[0];

-      pal_ptr->green = buf[1];

-      pal_ptr->blue = buf[2];

-   }

-#else

-   for (i = 0; i < num; i++)

-   {

-      png_byte buf[3];

-

-      png_crc_read(png_ptr, buf, 3);

-      /* Don't depend upon png_color being any order */

-      palette[i].red = buf[0];

-      palette[i].green = buf[1];

-      palette[i].blue = buf[2];

-   }

-#endif

-

-   /* If we actually need the PLTE chunk (ie for a paletted image), we do

-    * whatever the normal CRC configuration tells us.  However, if we

-    * have an RGB image, the PLTE can be considered ancillary, so

-    * we will act as though it is.

-    */

-#ifndef PNG_READ_OPT_PLTE_SUPPORTED

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-#endif

-   {

-      png_crc_finish(png_ptr, (png_uint_32) (length - (unsigned int)num * 3));

-   }

-

-#ifndef PNG_READ_OPT_PLTE_SUPPORTED

-   else if (png_crc_error(png_ptr) != 0)  /* Only if we have a CRC error */

-   {

-      /* If we don't want to use the data from an ancillary chunk,

-       * we have two options: an error abort, or a warning and we

-       * ignore the data in this chunk (which should be OK, since

-       * it's considered ancillary for a RGB or RGBA image).

-       *

-       * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the

-       * chunk type to determine whether to check the ancillary or the critical

-       * flags.

-       */

-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)

-      {

-         if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)

-            return;

-

-         else

-            png_chunk_error(png_ptr, "CRC error");

-      }

-

-      /* Otherwise, we (optionally) emit a warning and use the chunk. */

-      else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)

-         png_chunk_warning(png_ptr, "CRC error");

-   }

-#endif

-

-   /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its

-    * own copy of the palette.  This has the side effect that when png_start_row

-    * is called (this happens after any call to png_read_update_info) the

-    * info_ptr palette gets changed.  This is extremely unexpected and

-    * confusing.

-    *

-    * Fix this by not sharing the palette in this way.

-    */

-   png_set_PLTE(png_ptr, info_ptr, palette, num);

-

-   /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before

-    * IDAT.  Prior to 1.6.0 this was not checked; instead the code merely

-    * checked the apparent validity of a tRNS chunk inserted before PLTE on a

-    * palette PNG.  1.6.0 attempts to rigorously follow the standard and

-    * therefore does a benign error if the erroneous condition is detected *and*

-    * cancels the tRNS if the benign error returns.  The alternative is to

-    * amend the standard since it would be rather hypocritical of the standards

-    * maintainers to ignore it.

-    */

-#ifdef PNG_READ_tRNS_SUPPORTED

-   if (png_ptr->num_trans > 0 ||

-       (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))

-   {

-      /* Cancel this because otherwise it would be used if the transforms

-       * require it.  Don't cancel the 'valid' flag because this would prevent

-       * detection of duplicate chunks.

-       */

-      png_ptr->num_trans = 0;

-

-      if (info_ptr != NULL)

-         info_ptr->num_trans = 0;

-

-      png_chunk_benign_error(png_ptr, "tRNS must be after");

-   }

-#endif

-

-#ifdef PNG_READ_hIST_SUPPORTED

-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)

-      png_chunk_benign_error(png_ptr, "hIST must be after");

-#endif

-

-#ifdef PNG_READ_bKGD_SUPPORTED

-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)

-      png_chunk_benign_error(png_ptr, "bKGD must be after");

-#endif

-}

-

-void /* PRIVATE */

-png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_debug(1, "in png_handle_IEND");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||

-       (png_ptr->mode & PNG_HAVE_IDAT) == 0)

-      png_chunk_error(png_ptr, "out of place");

-

-   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);

-

-   png_crc_finish(png_ptr, length);

-

-   if (length != 0)

-      png_chunk_benign_error(png_ptr, "invalid");

-

-   PNG_UNUSED(info_ptr)

-}

-

-#ifdef PNG_READ_gAMA_SUPPORTED

-void /* PRIVATE */

-png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_fixed_point igamma;

-   png_byte buf[4];

-

-   png_debug(1, "in png_handle_gAMA");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   if (length != 4)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, 4);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   igamma = png_get_fixed_point(NULL, buf);

-

-   png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);

-   png_colorspace_sync(png_ptr, info_ptr);

-}

-#endif

-

-#ifdef PNG_READ_sBIT_SUPPORTED

-void /* PRIVATE */

-png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   unsigned int truelen, i;

-   png_byte sample_depth;

-   png_byte buf[4];

-

-   png_debug(1, "in png_handle_sBIT");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      truelen = 3;

-      sample_depth = 8;

-   }

-

-   else

-   {

-      truelen = png_ptr->channels;

-      sample_depth = png_ptr->bit_depth;

-   }

-

-   if (length != truelen || length > 4)

-   {

-      png_chunk_benign_error(png_ptr, "invalid");

-      png_crc_finish(png_ptr, length);

-      return;

-   }

-

-   buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;

-   png_crc_read(png_ptr, buf, truelen);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   for (i=0; i<truelen; ++i)

-   {

-      if (buf[i] == 0 || buf[i] > sample_depth)

-      {

-         png_chunk_benign_error(png_ptr, "invalid");

-         return;

-      }

-   }

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      png_ptr->sig_bit.red = buf[0];

-      png_ptr->sig_bit.green = buf[1];

-      png_ptr->sig_bit.blue = buf[2];

-      png_ptr->sig_bit.alpha = buf[3];

-   }

-

-   else

-   {

-      png_ptr->sig_bit.gray = buf[0];

-      png_ptr->sig_bit.red = buf[0];

-      png_ptr->sig_bit.green = buf[0];

-      png_ptr->sig_bit.blue = buf[0];

-      png_ptr->sig_bit.alpha = buf[1];

-   }

-

-   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));

-}

-#endif

-

-#ifdef PNG_READ_cHRM_SUPPORTED

-void /* PRIVATE */

-png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte buf[32];

-   png_xy xy;

-

-   png_debug(1, "in png_handle_cHRM");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   if (length != 32)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, 32);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   xy.whitex = png_get_fixed_point(NULL, buf);

-   xy.whitey = png_get_fixed_point(NULL, buf + 4);

-   xy.redx   = png_get_fixed_point(NULL, buf + 8);

-   xy.redy   = png_get_fixed_point(NULL, buf + 12);

-   xy.greenx = png_get_fixed_point(NULL, buf + 16);

-   xy.greeny = png_get_fixed_point(NULL, buf + 20);

-   xy.bluex  = png_get_fixed_point(NULL, buf + 24);

-   xy.bluey  = png_get_fixed_point(NULL, buf + 28);

-

-   if (xy.whitex == PNG_FIXED_ERROR ||

-       xy.whitey == PNG_FIXED_ERROR ||

-       xy.redx   == PNG_FIXED_ERROR ||

-       xy.redy   == PNG_FIXED_ERROR ||

-       xy.greenx == PNG_FIXED_ERROR ||

-       xy.greeny == PNG_FIXED_ERROR ||

-       xy.bluex  == PNG_FIXED_ERROR ||

-       xy.bluey  == PNG_FIXED_ERROR)

-   {

-      png_chunk_benign_error(png_ptr, "invalid values");

-      return;

-   }

-

-   /* If a colorspace error has already been output skip this chunk */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)

-      return;

-

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)

-   {

-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;

-      png_colorspace_sync(png_ptr, info_ptr);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;

-   (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,

-       1/*prefer cHRM values*/);

-   png_colorspace_sync(png_ptr, info_ptr);

-}

-#endif

-

-#ifdef PNG_READ_sRGB_SUPPORTED

-void /* PRIVATE */

-png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte intent;

-

-   png_debug(1, "in png_handle_sRGB");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   if (length != 1)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, &intent, 1);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   /* If a colorspace error has already been output skip this chunk */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)

-      return;

-

-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect

-    * this.

-    */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)

-   {

-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;

-      png_colorspace_sync(png_ptr, info_ptr);

-      png_chunk_benign_error(png_ptr, "too many profiles");

-      return;

-   }

-

-   (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);

-   png_colorspace_sync(png_ptr, info_ptr);

-}

-#endif /* READ_sRGB */

-

-#ifdef PNG_READ_iCCP_SUPPORTED

-void /* PRIVATE */

-png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-/* Note: this does not properly handle profiles that are > 64K under DOS */

-{

-   png_const_charp errmsg = NULL; /* error message output, or no error */

-   int finished = 0; /* crc checked */

-

-   png_debug(1, "in png_handle_iCCP");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   /* Consistent with all the above colorspace handling an obviously *invalid*

-    * chunk is just ignored, so does not invalidate the color space.  An

-    * alternative is to set the 'invalid' flags at the start of this routine

-    * and only clear them in they were not set before and all the tests pass.

-    */

-

-   /* The keyword must be at least one character and there is a

-    * terminator (0) byte and the compression method byte, and the

-    * 'zlib' datastream is at least 11 bytes.

-    */

-   if (length < 14)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "too short");

-      return;

-   }

-

-   /* If a colorspace error has already been output skip this chunk */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      return;

-   }

-

-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect

-    * this.

-    */

-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)

-   {

-      uInt read_length, keyword_length;

-      char keyword[81];

-

-      /* Find the keyword; the keyword plus separator and compression method

-       * bytes can be at most 81 characters long.

-       */

-      read_length = 81; /* maximum */

-      if (read_length > length)

-         read_length = (uInt)length;

-

-      png_crc_read(png_ptr, (png_bytep)keyword, read_length);

-      length -= read_length;

-

-      /* The minimum 'zlib' stream is assumed to be just the 2 byte header,

-       * 5 bytes minimum 'deflate' stream, and the 4 byte checksum.

-       */

-      if (length < 11)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "too short");

-         return;

-      }

-

-      keyword_length = 0;

-      while (keyword_length < 80 && keyword_length < read_length &&

-         keyword[keyword_length] != 0)

-         ++keyword_length;

-

-      /* TODO: make the keyword checking common */

-      if (keyword_length >= 1 && keyword_length <= 79)

-      {

-         /* We only understand '0' compression - deflate - so if we get a

-          * different value we can't safely decode the chunk.

-          */

-         if (keyword_length+1 < read_length &&

-            keyword[keyword_length+1] == PNG_COMPRESSION_TYPE_BASE)

-         {

-            read_length -= keyword_length+2;

-

-            if (png_inflate_claim(png_ptr, png_iCCP) == Z_OK)

-            {

-               Byte profile_header[132]={0};

-               Byte local_buffer[PNG_INFLATE_BUF_SIZE];

-               png_alloc_size_t size = (sizeof profile_header);

-

-               png_ptr->zstream.next_in = (Bytef*)keyword + (keyword_length+2);

-               png_ptr->zstream.avail_in = read_length;

-               (void)png_inflate_read(png_ptr, local_buffer,

-                   (sizeof local_buffer), &length, profile_header, &size,

-                   0/*finish: don't, because the output is too small*/);

-

-               if (size == 0)

-               {

-                  /* We have the ICC profile header; do the basic header checks.

-                   */

-                  const png_uint_32 profile_length =

-                     png_get_uint_32(profile_header);

-

-                  if (png_icc_check_length(png_ptr, &png_ptr->colorspace,

-                      keyword, profile_length) != 0)

-                  {

-                     /* The length is apparently ok, so we can check the 132

-                      * byte header.

-                      */

-                     if (png_icc_check_header(png_ptr, &png_ptr->colorspace,

-                         keyword, profile_length, profile_header,

-                         png_ptr->color_type) != 0)

-                     {

-                        /* Now read the tag table; a variable size buffer is

-                         * needed at this point, allocate one for the whole

-                         * profile.  The header check has already validated

-                         * that none of this stuff will overflow.

-                         */

-                        const png_uint_32 tag_count = png_get_uint_32(

-                            profile_header+128);

-                        png_bytep profile = png_read_buffer(png_ptr,

-                            profile_length, 2/*silent*/);

-

-                        if (profile != NULL)

-                        {

-                           memcpy(profile, profile_header,

-                               (sizeof profile_header));

-

-                           size = 12 * tag_count;

-

-                           (void)png_inflate_read(png_ptr, local_buffer,

-                               (sizeof local_buffer), &length,

-                               profile + (sizeof profile_header), &size, 0);

-

-                           /* Still expect a buffer error because we expect

-                            * there to be some tag data!

-                            */

-                           if (size == 0)

-                           {

-                              if (png_icc_check_tag_table(png_ptr,

-                                  &png_ptr->colorspace, keyword, profile_length,

-                                  profile) != 0)

-                              {

-                                 /* The profile has been validated for basic

-                                  * security issues, so read the whole thing in.

-                                  */

-                                 size = profile_length - (sizeof profile_header)

-                                     - 12 * tag_count;

-

-                                 (void)png_inflate_read(png_ptr, local_buffer,

-                                     (sizeof local_buffer), &length,

-                                     profile + (sizeof profile_header) +

-                                     12 * tag_count, &size, 1/*finish*/);

-

-                                 if (length > 0 && !(png_ptr->flags &

-                                     PNG_FLAG_BENIGN_ERRORS_WARN))

-                                    errmsg = "extra compressed data";

-

-                                 /* But otherwise allow extra data: */

-                                 else if (size == 0)

-                                 {

-                                    if (length > 0)

-                                    {

-                                       /* This can be handled completely, so

-                                        * keep going.

-                                        */

-                                       png_chunk_warning(png_ptr,

-                                           "extra compressed data");

-                                    }

-

-                                    png_crc_finish(png_ptr, length);

-                                    finished = 1;

-

-# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0

-                                    /* Check for a match against sRGB */

-                                    png_icc_set_sRGB(png_ptr,

-                                        &png_ptr->colorspace, profile,

-                                        png_ptr->zstream.adler);

-# endif

-

-                                    /* Steal the profile for info_ptr. */

-                                    if (info_ptr != NULL)

-                                    {

-                                       png_free_data(png_ptr, info_ptr,

-                                           PNG_FREE_ICCP, 0);

-

-                                       info_ptr->iccp_name = png_voidcast(char*,

-                                           png_malloc_base(png_ptr,

-                                           keyword_length+1));

-                                       if (info_ptr->iccp_name != NULL)

-                                       {

-                                          memcpy(info_ptr->iccp_name, keyword,

-                                              keyword_length+1);

-                                          info_ptr->iccp_proflen =

-                                              profile_length;

-                                          info_ptr->iccp_profile = profile;

-                                          png_ptr->read_buffer = NULL; /*steal*/

-                                          info_ptr->free_me |= PNG_FREE_ICCP;

-                                          info_ptr->valid |= PNG_INFO_iCCP;

-                                       }

-

-                                       else

-                                       {

-                                          png_ptr->colorspace.flags |=

-                                             PNG_COLORSPACE_INVALID;

-                                          errmsg = "out of memory";

-                                       }

-                                    }

-

-                                    /* else the profile remains in the read

-                                     * buffer which gets reused for subsequent

-                                     * chunks.

-                                     */

-

-                                    if (info_ptr != NULL)

-                                       png_colorspace_sync(png_ptr, info_ptr);

-

-                                    if (errmsg == NULL)

-                                    {

-                                       png_ptr->zowner = 0;

-                                       return;

-                                    }

-                                 }

-                                 if (errmsg == NULL)

-                                    errmsg = png_ptr->zstream.msg;

-                              }

-                              /* else png_icc_check_tag_table output an error */

-                           }

-                           else /* profile truncated */

-                              errmsg = png_ptr->zstream.msg;

-                        }

-

-                        else

-                           errmsg = "out of memory";

-                     }

-

-                     /* else png_icc_check_header output an error */

-                  }

-

-                  /* else png_icc_check_length output an error */

-               }

-

-               else /* profile truncated */

-                  errmsg = png_ptr->zstream.msg;

-

-               /* Release the stream */

-               png_ptr->zowner = 0;

-            }

-

-            else /* png_inflate_claim failed */

-               errmsg = png_ptr->zstream.msg;

-         }

-

-         else

-            errmsg = "bad compression method"; /* or missing */

-      }

-

-      else

-         errmsg = "bad keyword";

-   }

-

-   else

-      errmsg = "too many profiles";

-

-   /* Failure: the reason is in 'errmsg' */

-   if (finished == 0)

-      png_crc_finish(png_ptr, length);

-

-   png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;

-   png_colorspace_sync(png_ptr, info_ptr);

-   if (errmsg != NULL) /* else already output */

-      png_chunk_benign_error(png_ptr, errmsg);

-}

-#endif /* READ_iCCP */

-

-#ifdef PNG_READ_sPLT_SUPPORTED

-void /* PRIVATE */

-png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-/* Note: this does not properly handle chunks that are > 64K under DOS */

-{

-   png_bytep entry_start, buffer;

-   png_sPLT_t new_palette;

-   png_sPLT_entryp pp;

-   png_uint_32 data_length;

-   int entry_size, i;

-   png_uint_32 skip = 0;

-   png_uint_32 dl;

-   png_size_t max_dl;

-

-   png_debug(1, "in png_handle_sPLT");

-

-#ifdef PNG_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_cache_max != 0)

-   {

-      if (png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         return;

-      }

-

-      if (--png_ptr->user_chunk_cache_max == 1)

-      {

-         png_warning(png_ptr, "No space in chunk cache for sPLT");

-         png_crc_finish(png_ptr, length);

-         return;

-      }

-   }

-#endif

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-#ifdef PNG_MAX_MALLOC_64K

-   if (length > 65535U)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "too large to fit in memory");

-      return;

-   }

-#endif

-

-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);

-   if (buffer == NULL)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-

-   /* WARNING: this may break if size_t is less than 32 bits; it is assumed

-    * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a

-    * potential breakage point if the types in pngconf.h aren't exactly right.

-    */

-   png_crc_read(png_ptr, buffer, length);

-

-   if (png_crc_finish(png_ptr, skip) != 0)

-      return;

-

-   buffer[length] = 0;

-

-   for (entry_start = buffer; *entry_start; entry_start++)

-      /* Empty loop to find end of name */ ;

-

-   ++entry_start;

-

-   /* A sample depth should follow the separator, and we should be on it  */

-   if (length < 2U || entry_start > buffer + (length - 2U))

-   {

-      png_warning(png_ptr, "malformed sPLT chunk");

-      return;

-   }

-

-   new_palette.depth = *entry_start++;

-   entry_size = (new_palette.depth == 8 ? 6 : 10);

-   /* This must fit in a png_uint_32 because it is derived from the original

-    * chunk data length.

-    */

-   data_length = length - (png_uint_32)(entry_start - buffer);

-

-   /* Integrity-check the data length */

-   if ((data_length % (unsigned int)entry_size) != 0)

-   {

-      png_warning(png_ptr, "sPLT chunk has bad length");

-      return;

-   }

-

-   dl = (png_uint_32)(data_length / (unsigned int)entry_size);

-   max_dl = PNG_SIZE_MAX / (sizeof (png_sPLT_entry));

-

-   if (dl > max_dl)

-   {

-      png_warning(png_ptr, "sPLT chunk too long");

-      return;

-   }

-

-   new_palette.nentries = (png_int_32)(data_length / (unsigned int)entry_size);

-

-   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,

-       (png_alloc_size_t) new_palette.nentries * (sizeof (png_sPLT_entry)));

-

-   if (new_palette.entries == NULL)

-   {

-      png_warning(png_ptr, "sPLT chunk requires too much memory");

-      return;

-   }

-

-#ifdef PNG_POINTER_INDEXING_SUPPORTED

-   for (i = 0; i < new_palette.nentries; i++)

-   {

-      pp = new_palette.entries + i;

-

-      if (new_palette.depth == 8)

-      {

-         pp->red = *entry_start++;

-         pp->green = *entry_start++;

-         pp->blue = *entry_start++;

-         pp->alpha = *entry_start++;

-      }

-

-      else

-      {

-         pp->red   = png_get_uint_16(entry_start); entry_start += 2;

-         pp->green = png_get_uint_16(entry_start); entry_start += 2;

-         pp->blue  = png_get_uint_16(entry_start); entry_start += 2;

-         pp->alpha = png_get_uint_16(entry_start); entry_start += 2;

-      }

-

-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;

-   }

-#else

-   pp = new_palette.entries;

-

-   for (i = 0; i < new_palette.nentries; i++)

-   {

-

-      if (new_palette.depth == 8)

-      {

-         pp[i].red   = *entry_start++;

-         pp[i].green = *entry_start++;

-         pp[i].blue  = *entry_start++;

-         pp[i].alpha = *entry_start++;

-      }

-

-      else

-      {

-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;

-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;

-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;

-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;

-      }

-

-      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;

-   }

-#endif

-

-   /* Discard all chunk data except the name and stash that */

-   new_palette.name = (png_charp)buffer;

-

-   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);

-

-   png_free(png_ptr, new_palette.entries);

-}

-#endif /* READ_sPLT */

-

-#ifdef PNG_READ_tRNS_SUPPORTED

-void /* PRIVATE */

-png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];

-

-   png_debug(1, "in png_handle_tRNS");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)

-   {

-      png_byte buf[2];

-

-      if (length != 2)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "invalid");

-         return;

-      }

-

-      png_crc_read(png_ptr, buf, 2);

-      png_ptr->num_trans = 1;

-      png_ptr->trans_color.gray = png_get_uint_16(buf);

-   }

-

-   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)

-   {

-      png_byte buf[6];

-

-      if (length != 6)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "invalid");

-         return;

-      }

-

-      png_crc_read(png_ptr, buf, length);

-      png_ptr->num_trans = 1;

-      png_ptr->trans_color.red = png_get_uint_16(buf);

-      png_ptr->trans_color.green = png_get_uint_16(buf + 2);

-      png_ptr->trans_color.blue = png_get_uint_16(buf + 4);

-   }

-

-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)

-      {

-         /* TODO: is this actually an error in the ISO spec? */

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "out of place");

-         return;

-      }

-

-      if (length > (unsigned int) png_ptr->num_palette ||

-         length > (unsigned int) PNG_MAX_PALETTE_LENGTH ||

-         length == 0)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "invalid");

-         return;

-      }

-

-      png_crc_read(png_ptr, readbuf, length);

-      png_ptr->num_trans = (png_uint_16)length;

-   }

-

-   else

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid with alpha channel");

-      return;

-   }

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-   {

-      png_ptr->num_trans = 0;

-      return;

-   }

-

-   /* TODO: this is a horrible side effect in the palette case because the

-    * png_struct ends up with a pointer to the tRNS buffer owned by the

-    * png_info.  Fix this.

-    */

-   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,

-       &(png_ptr->trans_color));

-}

-#endif

-

-#ifdef PNG_READ_bKGD_SUPPORTED

-void /* PRIVATE */

-png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   unsigned int truelen;

-   png_byte buf[6];

-   png_color_16 background;

-

-   png_debug(1, "in png_handle_bKGD");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||

-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

-       (png_ptr->mode & PNG_HAVE_PLTE) == 0))

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      truelen = 1;

-

-   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      truelen = 6;

-

-   else

-      truelen = 2;

-

-   if (length != truelen)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, truelen);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   /* We convert the index value into RGB components so that we can allow

-    * arbitrary RGB values for background when we have transparency, and

-    * so it is easy to determine the RGB values of the background color

-    * from the info_ptr struct.

-    */

-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      background.index = buf[0];

-

-      if (info_ptr != NULL && info_ptr->num_palette != 0)

-      {

-         if (buf[0] >= info_ptr->num_palette)

-         {

-            png_chunk_benign_error(png_ptr, "invalid index");

-            return;

-         }

-

-         background.red = (png_uint_16)png_ptr->palette[buf[0]].red;

-         background.green = (png_uint_16)png_ptr->palette[buf[0]].green;

-         background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;

-      }

-

-      else

-         background.red = background.green = background.blue = 0;

-

-      background.gray = 0;

-   }

-

-   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */

-   {

-      background.index = 0;

-      background.red =

-      background.green =

-      background.blue =

-      background.gray = png_get_uint_16(buf);

-   }

-

-   else

-   {

-      background.index = 0;

-      background.red = png_get_uint_16(buf);

-      background.green = png_get_uint_16(buf + 2);

-      background.blue = png_get_uint_16(buf + 4);

-      background.gray = 0;

-   }

-

-   png_set_bKGD(png_ptr, info_ptr, &background);

-}

-#endif

-

-#ifdef PNG_READ_eXIf_SUPPORTED

-void /* PRIVATE */

-png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   unsigned int i;

-

-   png_debug(1, "in png_handle_eXIf");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   if (length < 2)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "too short");

-      return;

-   }

-

-   else if (info_ptr == NULL || (info_ptr->valid & PNG_INFO_eXIf) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   info_ptr->free_me |= PNG_FREE_EXIF;

-

-   info_ptr->eXIf_buf = png_voidcast(png_bytep,

-             png_malloc_warn(png_ptr, length));

-

-   if (info_ptr->eXIf_buf == NULL)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   for (i = 0; i < length; i++)

-   {

-      png_byte buf[1];

-      png_crc_read(png_ptr, buf, 1);

-      info_ptr->eXIf_buf[i] = buf[0];

-      if (i == 1 && buf[0] != 'M' && buf[0] != 'I'

-                 && info_ptr->eXIf_buf[0] != buf[0])

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");

-         png_free(png_ptr, info_ptr->eXIf_buf);

-         info_ptr->eXIf_buf = NULL;

-         return;

-      }

-   }

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);

-

-   png_free(png_ptr, info_ptr->eXIf_buf);

-   info_ptr->eXIf_buf = NULL;

-}

-#endif

-

-#ifdef PNG_READ_hIST_SUPPORTED

-void /* PRIVATE */

-png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   unsigned int num, i;

-   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];

-

-   png_debug(1, "in png_handle_hIST");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||

-       (png_ptr->mode & PNG_HAVE_PLTE) == 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   num = length / 2 ;

-

-   if (num != (unsigned int) png_ptr->num_palette ||

-       num > (unsigned int) PNG_MAX_PALETTE_LENGTH)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   for (i = 0; i < num; i++)

-   {

-      png_byte buf[2];

-

-      png_crc_read(png_ptr, buf, 2);

-      readbuf[i] = png_get_uint_16(buf);

-   }

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   png_set_hIST(png_ptr, info_ptr, readbuf);

-}

-#endif

-

-#ifdef PNG_READ_pHYs_SUPPORTED

-void /* PRIVATE */

-png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte buf[9];

-   png_uint_32 res_x, res_y;

-   int unit_type;

-

-   png_debug(1, "in png_handle_pHYs");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if (length != 9)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, 9);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   res_x = png_get_uint_32(buf);

-   res_y = png_get_uint_32(buf + 4);

-   unit_type = buf[8];

-   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);

-}

-#endif

-

-#ifdef PNG_READ_oFFs_SUPPORTED

-void /* PRIVATE */

-png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte buf[9];

-   png_int_32 offset_x, offset_y;

-   int unit_type;

-

-   png_debug(1, "in png_handle_oFFs");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if (length != 9)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, 9);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   offset_x = png_get_int_32(buf);

-   offset_y = png_get_int_32(buf + 4);

-   unit_type = buf[8];

-   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);

-}

-#endif

-

-#ifdef PNG_READ_pCAL_SUPPORTED

-/* Read the pCAL chunk (described in the PNG Extensions document) */

-void /* PRIVATE */

-png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_int_32 X0, X1;

-   png_byte type, nparams;

-   png_bytep buffer, buf, units, endptr;

-   png_charpp params;

-   int i;

-

-   png_debug(1, "in png_handle_pCAL");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",

-       length + 1);

-

-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);

-

-   if (buffer == NULL)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   png_crc_read(png_ptr, buffer, length);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   buffer[length] = 0; /* Null terminate the last string */

-

-   png_debug(3, "Finding end of pCAL purpose string");

-   for (buf = buffer; *buf; buf++)

-      /* Empty loop */ ;

-

-   endptr = buffer + length;

-

-   /* We need to have at least 12 bytes after the purpose string

-    * in order to get the parameter information.

-    */

-   if (endptr - buf <= 12)

-   {

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");

-   X0 = png_get_int_32((png_bytep)buf+1);

-   X1 = png_get_int_32((png_bytep)buf+5);

-   type = buf[9];

-   nparams = buf[10];

-   units = buf + 11;

-

-   png_debug(3, "Checking pCAL equation type and number of parameters");

-   /* Check that we have the right number of parameters for known

-    * equation types.

-    */

-   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||

-       (type == PNG_EQUATION_BASE_E && nparams != 3) ||

-       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||

-       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))

-   {

-      png_chunk_benign_error(png_ptr, "invalid parameter count");

-      return;

-   }

-

-   else if (type >= PNG_EQUATION_LAST)

-   {

-      png_chunk_benign_error(png_ptr, "unrecognized equation type");

-   }

-

-   for (buf = units; *buf; buf++)

-      /* Empty loop to move past the units string. */ ;

-

-   png_debug(3, "Allocating pCAL parameters array");

-

-   params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,

-       nparams * (sizeof (png_charp))));

-

-   if (params == NULL)

-   {

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   /* Get pointers to the start of each parameter string. */

-   for (i = 0; i < nparams; i++)

-   {

-      buf++; /* Skip the null string terminator from previous parameter. */

-

-      png_debug1(3, "Reading pCAL parameter %d", i);

-

-      for (params[i] = (png_charp)buf; buf <= endptr && *buf != 0; buf++)

-         /* Empty loop to move past each parameter string */ ;

-

-      /* Make sure we haven't run out of data yet */

-      if (buf > endptr)

-      {

-         png_free(png_ptr, params);

-         png_chunk_benign_error(png_ptr, "invalid data");

-         return;

-      }

-   }

-

-   png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,

-       (png_charp)units, params);

-

-   png_free(png_ptr, params);

-}

-#endif

-

-#ifdef PNG_READ_sCAL_SUPPORTED

-/* Read the sCAL chunk */

-void /* PRIVATE */

-png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_bytep buffer;

-   png_size_t i;

-   int state;

-

-   png_debug(1, "in png_handle_sCAL");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of place");

-      return;

-   }

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   /* Need unit type, width, \0, height: minimum 4 bytes */

-   else if (length < 4)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",

-       length + 1);

-

-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);

-

-   if (buffer == NULL)

-   {

-      png_chunk_benign_error(png_ptr, "out of memory");

-      png_crc_finish(png_ptr, length);

-      return;

-   }

-

-   png_crc_read(png_ptr, buffer, length);

-   buffer[length] = 0; /* Null terminate the last string */

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   /* Validate the unit. */

-   if (buffer[0] != 1 && buffer[0] != 2)

-   {

-      png_chunk_benign_error(png_ptr, "invalid unit");

-      return;

-   }

-

-   /* Validate the ASCII numbers, need two ASCII numbers separated by

-    * a '\0' and they need to fit exactly in the chunk data.

-    */

-   i = 1;

-   state = 0;

-

-   if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 ||

-       i >= length || buffer[i++] != 0)

-      png_chunk_benign_error(png_ptr, "bad width format");

-

-   else if (PNG_FP_IS_POSITIVE(state) == 0)

-      png_chunk_benign_error(png_ptr, "non-positive width");

-

-   else

-   {

-      png_size_t heighti = i;

-

-      state = 0;

-      if (png_check_fp_number((png_const_charp)buffer, length,

-          &state, &i) == 0 || i != length)

-         png_chunk_benign_error(png_ptr, "bad height format");

-

-      else if (PNG_FP_IS_POSITIVE(state) == 0)

-         png_chunk_benign_error(png_ptr, "non-positive height");

-

-      else

-         /* This is the (only) success case. */

-         png_set_sCAL_s(png_ptr, info_ptr, buffer[0],

-             (png_charp)buffer+1, (png_charp)buffer+heighti);

-   }

-}

-#endif

-

-#ifdef PNG_READ_tIME_SUPPORTED

-void /* PRIVATE */

-png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_byte buf[7];

-   png_time mod_time;

-

-   png_debug(1, "in png_handle_tIME");

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "duplicate");

-      return;

-   }

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-      png_ptr->mode |= PNG_AFTER_IDAT;

-

-   if (length != 7)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "invalid");

-      return;

-   }

-

-   png_crc_read(png_ptr, buf, 7);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   mod_time.second = buf[6];

-   mod_time.minute = buf[5];

-   mod_time.hour = buf[4];

-   mod_time.day = buf[3];

-   mod_time.month = buf[2];

-   mod_time.year = png_get_uint_16(buf);

-

-   png_set_tIME(png_ptr, info_ptr, &mod_time);

-}

-#endif

-

-#ifdef PNG_READ_tEXt_SUPPORTED

-/* Note: this does not properly handle chunks that are > 64K under DOS */

-void /* PRIVATE */

-png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_text  text_info;

-   png_bytep buffer;

-   png_charp key;

-   png_charp text;

-   png_uint_32 skip = 0;

-

-   png_debug(1, "in png_handle_tEXt");

-

-#ifdef PNG_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_cache_max != 0)

-   {

-      if (png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         return;

-      }

-

-      if (--png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "no space in chunk cache");

-         return;

-      }

-   }

-#endif

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-      png_ptr->mode |= PNG_AFTER_IDAT;

-

-#ifdef PNG_MAX_MALLOC_64K

-   if (length > 65535U)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "too large to fit in memory");

-      return;

-   }

-#endif

-

-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);

-

-   if (buffer == NULL)

-   {

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   png_crc_read(png_ptr, buffer, length);

-

-   if (png_crc_finish(png_ptr, skip) != 0)

-      return;

-

-   key = (png_charp)buffer;

-   key[length] = 0;

-

-   for (text = key; *text; text++)

-      /* Empty loop to find end of key */ ;

-

-   if (text != key + length)

-      text++;

-

-   text_info.compression = PNG_TEXT_COMPRESSION_NONE;

-   text_info.key = key;

-   text_info.lang = NULL;

-   text_info.lang_key = NULL;

-   text_info.itxt_length = 0;

-   text_info.text = text;

-   text_info.text_length = strlen(text);

-

-   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)

-      png_warning(png_ptr, "Insufficient memory to process text chunk");

-}

-#endif

-

-#ifdef PNG_READ_zTXt_SUPPORTED

-/* Note: this does not correctly handle chunks that are > 64K under DOS */

-void /* PRIVATE */

-png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_const_charp errmsg = NULL;

-   png_bytep       buffer;

-   png_uint_32     keyword_length;

-

-   png_debug(1, "in png_handle_zTXt");

-

-#ifdef PNG_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_cache_max != 0)

-   {

-      if (png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         return;

-      }

-

-      if (--png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "no space in chunk cache");

-         return;

-      }

-   }

-#endif

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-      png_ptr->mode |= PNG_AFTER_IDAT;

-

-   /* Note, "length" is sufficient here; we won't be adding

-    * a null terminator later.

-    */

-   buffer = png_read_buffer(png_ptr, length, 2/*silent*/);

-

-   if (buffer == NULL)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   png_crc_read(png_ptr, buffer, length);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   /* TODO: also check that the keyword contents match the spec! */

-   for (keyword_length = 0;

-      keyword_length < length && buffer[keyword_length] != 0;

-      ++keyword_length)

-      /* Empty loop to find end of name */ ;

-

-   if (keyword_length > 79 || keyword_length < 1)

-      errmsg = "bad keyword";

-

-   /* zTXt must have some LZ data after the keyword, although it may expand to

-    * zero bytes; we need a '\0' at the end of the keyword, the compression type

-    * then the LZ data:

-    */

-   else if (keyword_length + 3 > length)

-      errmsg = "truncated";

-

-   else if (buffer[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)

-      errmsg = "unknown compression type";

-

-   else

-   {

-      png_alloc_size_t uncompressed_length = PNG_SIZE_MAX;

-

-      /* TODO: at present png_decompress_chunk imposes a single application

-       * level memory limit, this should be split to different values for iCCP

-       * and text chunks.

-       */

-      if (png_decompress_chunk(png_ptr, length, keyword_length+2,

-          &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)

-      {

-         png_text text;

-

-         if (png_ptr->read_buffer == NULL)

-           errmsg="Read failure in png_handle_zTXt";

-         else

-         {

-            /* It worked; png_ptr->read_buffer now looks like a tEXt chunk

-             * except for the extra compression type byte and the fact that

-             * it isn't necessarily '\0' terminated.

-             */

-            buffer = png_ptr->read_buffer;

-            buffer[uncompressed_length+(keyword_length+2)] = 0;

-

-            text.compression = PNG_TEXT_COMPRESSION_zTXt;

-            text.key = (png_charp)buffer;

-            text.text = (png_charp)(buffer + keyword_length+2);

-            text.text_length = uncompressed_length;

-            text.itxt_length = 0;

-            text.lang = NULL;

-            text.lang_key = NULL;

-

-            if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)

-               errmsg = "insufficient memory";

-         }

-      }

-

-      else

-         errmsg = png_ptr->zstream.msg;

-   }

-

-   if (errmsg != NULL)

-      png_chunk_benign_error(png_ptr, errmsg);

-}

-#endif

-

-#ifdef PNG_READ_iTXt_SUPPORTED

-/* Note: this does not correctly handle chunks that are > 64K under DOS */

-void /* PRIVATE */

-png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

-{

-   png_const_charp errmsg = NULL;

-   png_bytep buffer;

-   png_uint_32 prefix_length;

-

-   png_debug(1, "in png_handle_iTXt");

-

-#ifdef PNG_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_cache_max != 0)

-   {

-      if (png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         return;

-      }

-

-      if (--png_ptr->user_chunk_cache_max == 1)

-      {

-         png_crc_finish(png_ptr, length);

-         png_chunk_benign_error(png_ptr, "no space in chunk cache");

-         return;

-      }

-   }

-#endif

-

-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

-      png_chunk_error(png_ptr, "missing IHDR");

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

-      png_ptr->mode |= PNG_AFTER_IDAT;

-

-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);

-

-   if (buffer == NULL)

-   {

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "out of memory");

-      return;

-   }

-

-   png_crc_read(png_ptr, buffer, length);

-

-   if (png_crc_finish(png_ptr, 0) != 0)

-      return;

-

-   /* First the keyword. */

-   for (prefix_length=0;

-      prefix_length < length && buffer[prefix_length] != 0;

-      ++prefix_length)

-      /* Empty loop */ ;

-

-   /* Perform a basic check on the keyword length here. */

-   if (prefix_length > 79 || prefix_length < 1)

-      errmsg = "bad keyword";

-

-   /* Expect keyword, compression flag, compression type, language, translated

-    * keyword (both may be empty but are 0 terminated) then the text, which may

-    * be empty.

-    */

-   else if (prefix_length + 5 > length)

-      errmsg = "truncated";

-

-   else if (buffer[prefix_length+1] == 0 ||

-      (buffer[prefix_length+1] == 1 &&

-      buffer[prefix_length+2] == PNG_COMPRESSION_TYPE_BASE))

-   {

-      int compressed = buffer[prefix_length+1] != 0;

-      png_uint_32 language_offset, translated_keyword_offset;

-      png_alloc_size_t uncompressed_length = 0;

-

-      /* Now the language tag */

-      prefix_length += 3;

-      language_offset = prefix_length;

-

-      for (; prefix_length < length && buffer[prefix_length] != 0;

-         ++prefix_length)

-         /* Empty loop */ ;

-

-      /* WARNING: the length may be invalid here, this is checked below. */

-      translated_keyword_offset = ++prefix_length;

-

-      for (; prefix_length < length && buffer[prefix_length] != 0;

-         ++prefix_length)

-         /* Empty loop */ ;

-

-      /* prefix_length should now be at the trailing '\0' of the translated

-       * keyword, but it may already be over the end.  None of this arithmetic

-       * can overflow because chunks are at most 2^31 bytes long, but on 16-bit

-       * systems the available allocation may overflow.

-       */

-      ++prefix_length;

-

-      if (compressed == 0 && prefix_length <= length)

-         uncompressed_length = length - prefix_length;

-

-      else if (compressed != 0 && prefix_length < length)

-      {

-         uncompressed_length = PNG_SIZE_MAX;

-

-         /* TODO: at present png_decompress_chunk imposes a single application

-          * level memory limit, this should be split to different values for

-          * iCCP and text chunks.

-          */

-         if (png_decompress_chunk(png_ptr, length, prefix_length,

-             &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)

-            buffer = png_ptr->read_buffer;

-

-         else

-            errmsg = png_ptr->zstream.msg;

-      }

-

-      else

-         errmsg = "truncated";

-

-      if (errmsg == NULL)

-      {

-         png_text text;

-

-         buffer[uncompressed_length+prefix_length] = 0;

-

-         if (compressed == 0)

-            text.compression = PNG_ITXT_COMPRESSION_NONE;

-

-         else

-            text.compression = PNG_ITXT_COMPRESSION_zTXt;

-

-         text.key = (png_charp)buffer;

-         text.lang = (png_charp)buffer + language_offset;

-         text.lang_key = (png_charp)buffer + translated_keyword_offset;

-         text.text = (png_charp)buffer + prefix_length;

-         text.text_length = 0;

-         text.itxt_length = uncompressed_length;

-

-         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)

-            errmsg = "insufficient memory";

-      }

-   }

-

-   else

-      errmsg = "bad compression info";

-

-   if (errmsg != NULL)

-      png_chunk_benign_error(png_ptr, errmsg);

-}

-#endif

-

-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

-/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */

-static int

-png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)

-{

-   png_alloc_size_t limit = PNG_SIZE_MAX;

-

-   if (png_ptr->unknown_chunk.data != NULL)

-   {

-      png_free(png_ptr, png_ptr->unknown_chunk.data);

-      png_ptr->unknown_chunk.data = NULL;

-   }

-

-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_malloc_max > 0 &&

-       png_ptr->user_chunk_malloc_max < limit)

-      limit = png_ptr->user_chunk_malloc_max;

-

-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0

-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)

-      limit = PNG_USER_CHUNK_MALLOC_MAX;

-#  endif

-

-   if (length <= limit)

-   {

-      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);

-      /* The following is safe because of the PNG_SIZE_MAX init above */

-      png_ptr->unknown_chunk.size = (png_size_t)length/*SAFE*/;

-      /* 'mode' is a flag array, only the bottom four bits matter here */

-      png_ptr->unknown_chunk.location = (png_byte)png_ptr->mode/*SAFE*/;

-

-      if (length == 0)

-         png_ptr->unknown_chunk.data = NULL;

-

-      else

-      {

-         /* Do a 'warn' here - it is handled below. */

-         png_ptr->unknown_chunk.data = png_voidcast(png_bytep,

-             png_malloc_warn(png_ptr, length));

-      }

-   }

-

-   if (png_ptr->unknown_chunk.data == NULL && length > 0)

-   {

-      /* This is benign because we clean up correctly */

-      png_crc_finish(png_ptr, length);

-      png_chunk_benign_error(png_ptr, "unknown chunk exceeds memory limits");

-      return 0;

-   }

-

-   else

-   {

-      if (length > 0)

-         png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);

-      png_crc_finish(png_ptr, 0);

-      return 1;

-   }

-}

-#endif /* READ_UNKNOWN_CHUNKS */

-

-/* Handle an unknown, or known but disabled, chunk */

-void /* PRIVATE */

-png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,

-    png_uint_32 length, int keep)

-{

-   int handled = 0; /* the chunk was handled */

-

-   png_debug(1, "in png_handle_unknown");

-

-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

-   /* NOTE: this code is based on the code in libpng-1.4.12 except for fixing

-    * the bug which meant that setting a non-default behavior for a specific

-    * chunk would be ignored (the default was always used unless a user

-    * callback was installed).

-    *

-    * 'keep' is the value from the png_chunk_unknown_handling, the setting for

-    * this specific chunk_name, if PNG_HANDLE_AS_UNKNOWN_SUPPORTED, if not it

-    * will always be PNG_HANDLE_CHUNK_AS_DEFAULT and it needs to be set here.

-    * This is just an optimization to avoid multiple calls to the lookup

-    * function.

-    */

-#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-#     ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-   keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name);

-#     endif

-#  endif

-

-   /* One of the following methods will read the chunk or skip it (at least one

-    * of these is always defined because this is the only way to switch on

-    * PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)

-    */

-#  ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-   /* The user callback takes precedence over the chunk keep value, but the

-    * keep value is still required to validate a save of a critical chunk.

-    */

-   if (png_ptr->read_user_chunk_fn != NULL)

-   {

-      if (png_cache_unknown_chunk(png_ptr, length) != 0)

-      {

-         /* Callback to user unknown chunk handler */

-         int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,

-             &png_ptr->unknown_chunk);

-

-         /* ret is:

-          * negative: An error occurred; png_chunk_error will be called.

-          *     zero: The chunk was not handled, the chunk will be discarded

-          *           unless png_set_keep_unknown_chunks has been used to set

-          *           a 'keep' behavior for this particular chunk, in which

-          *           case that will be used.  A critical chunk will cause an

-          *           error at this point unless it is to be saved.

-          * positive: The chunk was handled, libpng will ignore/discard it.

-          */

-         if (ret < 0)

-            png_chunk_error(png_ptr, "error in user chunk");

-

-         else if (ret == 0)

-         {

-            /* If the keep value is 'default' or 'never' override it, but

-             * still error out on critical chunks unless the keep value is

-             * 'always'  While this is weird it is the behavior in 1.4.12.

-             * A possible improvement would be to obey the value set for the

-             * chunk, but this would be an API change that would probably

-             * damage some applications.

-             *

-             * The png_app_warning below catches the case that matters, where

-             * the application has not set specific save or ignore for this

-             * chunk or global save or ignore.

-             */

-            if (keep < PNG_HANDLE_CHUNK_IF_SAFE)

-            {

-#              ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-               if (png_ptr->unknown_default < PNG_HANDLE_CHUNK_IF_SAFE)

-               {

-                  png_chunk_warning(png_ptr, "Saving unknown chunk:");

-                  png_app_warning(png_ptr,

-                      "forcing save of an unhandled chunk;"

-                      " please call png_set_keep_unknown_chunks");

-                      /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */

-               }

-#              endif

-               keep = PNG_HANDLE_CHUNK_IF_SAFE;

-            }

-         }

-

-         else /* chunk was handled */

-         {

-            handled = 1;

-            /* Critical chunks can be safely discarded at this point. */

-            keep = PNG_HANDLE_CHUNK_NEVER;

-         }

-      }

-

-      else

-         keep = PNG_HANDLE_CHUNK_NEVER; /* insufficient memory */

-   }

-

-   else

-   /* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */

-#  endif /* READ_USER_CHUNKS */

-

-#  ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED

-   {

-      /* keep is currently just the per-chunk setting, if there was no

-       * setting change it to the global default now (not that this may

-       * still be AS_DEFAULT) then obtain the cache of the chunk if required,

-       * if not simply skip the chunk.

-       */

-      if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)

-         keep = png_ptr->unknown_default;

-

-      if (keep == PNG_HANDLE_CHUNK_ALWAYS ||

-         (keep == PNG_HANDLE_CHUNK_IF_SAFE &&

-          PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))

-      {

-         if (png_cache_unknown_chunk(png_ptr, length) == 0)

-            keep = PNG_HANDLE_CHUNK_NEVER;

-      }

-

-      else

-         png_crc_finish(png_ptr, length);

-   }

-#  else

-#     ifndef PNG_READ_USER_CHUNKS_SUPPORTED

-#        error no method to support READ_UNKNOWN_CHUNKS

-#     endif

-

-   {

-      /* If here there is no read callback pointer set and no support is

-       * compiled in to just save the unknown chunks, so simply skip this

-       * chunk.  If 'keep' is something other than AS_DEFAULT or NEVER then

-       * the app has erroneously asked for unknown chunk saving when there

-       * is no support.

-       */

-      if (keep > PNG_HANDLE_CHUNK_NEVER)

-         png_app_error(png_ptr, "no unknown chunk support available");

-

-      png_crc_finish(png_ptr, length);

-   }

-#  endif

-

-#  ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-   /* Now store the chunk in the chunk list if appropriate, and if the limits

-    * permit it.

-    */

-   if (keep == PNG_HANDLE_CHUNK_ALWAYS ||

-      (keep == PNG_HANDLE_CHUNK_IF_SAFE &&

-       PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))

-   {

-#     ifdef PNG_USER_LIMITS_SUPPORTED

-      switch (png_ptr->user_chunk_cache_max)

-      {

-         case 2:

-            png_ptr->user_chunk_cache_max = 1;

-            png_chunk_benign_error(png_ptr, "no space in chunk cache");

-            /* FALLTHROUGH */

-         case 1:

-            /* NOTE: prior to 1.6.0 this case resulted in an unknown critical

-             * chunk being skipped, now there will be a hard error below.

-             */

-            break;

-

-         default: /* not at limit */

-            --(png_ptr->user_chunk_cache_max);

-            /* FALLTHROUGH */

-         case 0: /* no limit */

-#  endif /* USER_LIMITS */

-            /* Here when the limit isn't reached or when limits are compiled

-             * out; store the chunk.

-             */

-            png_set_unknown_chunks(png_ptr, info_ptr,

-                &png_ptr->unknown_chunk, 1);

-            handled = 1;

-#  ifdef PNG_USER_LIMITS_SUPPORTED

-            break;

-      }

-#  endif

-   }

-#  else /* no store support: the chunk must be handled by the user callback */

-   PNG_UNUSED(info_ptr)

-#  endif

-

-   /* Regardless of the error handling below the cached data (if any) can be

-    * freed now.  Notice that the data is not freed if there is a png_error, but

-    * it will be freed by destroy_read_struct.

-    */

-   if (png_ptr->unknown_chunk.data != NULL)

-      png_free(png_ptr, png_ptr->unknown_chunk.data);

-   png_ptr->unknown_chunk.data = NULL;

-

-#else /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */

-   /* There is no support to read an unknown chunk, so just skip it. */

-   png_crc_finish(png_ptr, length);

-   PNG_UNUSED(info_ptr)

-   PNG_UNUSED(keep)

-#endif /* !READ_UNKNOWN_CHUNKS */

-

-   /* Check for unhandled critical chunks */

-   if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))

-      png_chunk_error(png_ptr, "unhandled critical chunk");

-}

-

-/* This function is called to verify that a chunk name is valid.

- * This function can't have the "critical chunk check" incorporated

- * into it, since in the future we will need to be able to call user

- * functions to handle unknown critical chunks after we check that

- * the chunk name itself is valid.

- */

-

-/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:

- *

- * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))

- */

-

-void /* PRIVATE */

-png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name)

-{

-   int i;

-   png_uint_32 cn=chunk_name;

-

-   png_debug(1, "in png_check_chunk_name");

-

-   for (i=1; i<=4; ++i)

-   {

-      int c = cn & 0xff;

-

-      if (c < 65 || c > 122 || (c > 90 && c < 97))

-         png_chunk_error(png_ptr, "invalid chunk type");

-

-      cn >>= 8;

-   }

-}

-

-void /* PRIVATE */

-png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length)

-{

-   png_alloc_size_t limit = PNG_UINT_31_MAX;

-

-# ifdef PNG_SET_USER_LIMITS_SUPPORTED

-   if (png_ptr->user_chunk_malloc_max > 0 &&

-       png_ptr->user_chunk_malloc_max < limit)

-      limit = png_ptr->user_chunk_malloc_max;

-# elif PNG_USER_CHUNK_MALLOC_MAX > 0

-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)

-      limit = PNG_USER_CHUNK_MALLOC_MAX;

-# endif

-   if (png_ptr->chunk_name == png_IDAT)

-   {

-      png_alloc_size_t idat_limit = PNG_UINT_31_MAX;

-      size_t row_factor =

-         (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)

-          + 1 + (png_ptr->interlaced? 6: 0));

-      if (png_ptr->height > PNG_UINT_32_MAX/row_factor)

-         idat_limit=PNG_UINT_31_MAX;

-      else

-         idat_limit = png_ptr->height * row_factor;

-      row_factor = row_factor > 32566? 32566 : row_factor;

-      idat_limit += 6 + 5*(idat_limit/row_factor+1); /* zlib+deflate overhead */

-      idat_limit=idat_limit < PNG_UINT_31_MAX? idat_limit : PNG_UINT_31_MAX;

-      limit = limit < idat_limit? idat_limit : limit;

-   }

-

-   if (length > limit)

-   {

-      png_debug2(0," length = %lu, limit = %lu",

-         (unsigned long)length,(unsigned long)limit);

-      png_chunk_error(png_ptr, "chunk data is too large");

-   }

-}

-

-/* Combines the row recently read in with the existing pixels in the row.  This

- * routine takes care of alpha and transparency if requested.  This routine also

- * handles the two methods of progressive display of interlaced images,

- * depending on the 'display' value; if 'display' is true then the whole row

- * (dp) is filled from the start by replicating the available pixels.  If

- * 'display' is false only those pixels present in the pass are filled in.

- */

-void /* PRIVATE */

-png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)

-{

-   unsigned int pixel_depth = png_ptr->transformed_pixel_depth;

-   png_const_bytep sp = png_ptr->row_buf + 1;

-   png_alloc_size_t row_width = png_ptr->width;

-   unsigned int pass = png_ptr->pass;

-   png_bytep end_ptr = 0;

-   png_byte end_byte = 0;

-   unsigned int end_mask;

-

-   png_debug(1, "in png_combine_row");

-

-   /* Added in 1.5.6: it should not be possible to enter this routine until at

-    * least one row has been read from the PNG data and transformed.

-    */

-   if (pixel_depth == 0)

-      png_error(png_ptr, "internal row logic error");

-

-   /* Added in 1.5.4: the pixel depth should match the information returned by

-    * any call to png_read_update_info at this point.  Do not continue if we got

-    * this wrong.

-    */

-   if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=

-          PNG_ROWBYTES(pixel_depth, row_width))

-      png_error(png_ptr, "internal row size calculation error");

-

-   /* Don't expect this to ever happen: */

-   if (row_width == 0)

-      png_error(png_ptr, "internal row width error");

-

-   /* Preserve the last byte in cases where only part of it will be overwritten,

-    * the multiply below may overflow, we don't care because ANSI-C guarantees

-    * we get the low bits.

-    */

-   end_mask = (pixel_depth * row_width) & 7;

-   if (end_mask != 0)

-   {

-      /* end_ptr == NULL is a flag to say do nothing */

-      end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;

-      end_byte = *end_ptr;

-#     ifdef PNG_READ_PACKSWAP_SUPPORTED

-      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-         /* little-endian byte */

-         end_mask = (unsigned int)(0xff << end_mask);

-

-      else /* big-endian byte */

-#     endif

-      end_mask = 0xff >> end_mask;

-      /* end_mask is now the bits to *keep* from the destination row */

-   }

-

-   /* For non-interlaced images this reduces to a memcpy(). A memcpy()

-    * will also happen if interlacing isn't supported or if the application

-    * does not call png_set_interlace_handling().  In the latter cases the

-    * caller just gets a sequence of the unexpanded rows from each interlace

-    * pass.

-    */

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-   if (png_ptr->interlaced != 0 &&

-       (png_ptr->transformations & PNG_INTERLACE) != 0 &&

-       pass < 6 && (display == 0 ||

-       /* The following copies everything for 'display' on passes 0, 2 and 4. */

-       (display == 1 && (pass & 1) != 0)))

-   {

-      /* Narrow images may have no bits in a pass; the caller should handle

-       * this, but this test is cheap:

-       */

-      if (row_width <= PNG_PASS_START_COL(pass))

-         return;

-

-      if (pixel_depth < 8)

-      {

-         /* For pixel depths up to 4 bpp the 8-pixel mask can be expanded to fit

-          * into 32 bits, then a single loop over the bytes using the four byte

-          * values in the 32-bit mask can be used.  For the 'display' option the

-          * expanded mask may also not require any masking within a byte.  To

-          * make this work the PACKSWAP option must be taken into account - it

-          * simply requires the pixels to be reversed in each byte.

-          *

-          * The 'regular' case requires a mask for each of the first 6 passes,

-          * the 'display' case does a copy for the even passes in the range

-          * 0..6.  This has already been handled in the test above.

-          *

-          * The masks are arranged as four bytes with the first byte to use in

-          * the lowest bits (little-endian) regardless of the order (PACKSWAP or

-          * not) of the pixels in each byte.

-          *

-          * NOTE: the whole of this logic depends on the caller of this function

-          * only calling it on rows appropriate to the pass.  This function only

-          * understands the 'x' logic; the 'y' logic is handled by the caller.

-          *

-          * The following defines allow generation of compile time constant bit

-          * masks for each pixel depth and each possibility of swapped or not

-          * swapped bytes.  Pass 'p' is in the range 0..6; 'x', a pixel index,

-          * is in the range 0..7; and the result is 1 if the pixel is to be

-          * copied in the pass, 0 if not.  'S' is for the sparkle method, 'B'

-          * for the block method.

-          *

-          * With some compilers a compile time expression of the general form:

-          *

-          *    (shift >= 32) ? (a >> (shift-32)) : (b >> shift)

-          *

-          * Produces warnings with values of 'shift' in the range 33 to 63

-          * because the right hand side of the ?: expression is evaluated by

-          * the compiler even though it isn't used.  Microsoft Visual C (various

-          * versions) and the Intel C compiler are known to do this.  To avoid

-          * this the following macros are used in 1.5.6.  This is a temporary

-          * solution to avoid destabilizing the code during the release process.

-          */

-#        if PNG_USE_COMPILE_TIME_MASKS

-#           define PNG_LSR(x,s) ((x)>>((s) & 0x1f))

-#           define PNG_LSL(x,s) ((x)<<((s) & 0x1f))

-#        else

-#           define PNG_LSR(x,s) ((x)>>(s))

-#           define PNG_LSL(x,s) ((x)<<(s))

-#        endif

-#        define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\

-           PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1)

-#        define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\

-           PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1)

-

-         /* Return a mask for pass 'p' pixel 'x' at depth 'd'.  The mask is

-          * little endian - the first pixel is at bit 0 - however the extra

-          * parameter 's' can be set to cause the mask position to be swapped

-          * within each byte, to match the PNG format.  This is done by XOR of

-          * the shift with 7, 6 or 4 for bit depths 1, 2 and 4.

-          */

-#        define PIXEL_MASK(p,x,d,s) \

-            (PNG_LSL(((PNG_LSL(1U,(d)))-1),(((x)*(d))^((s)?8-(d):0))))

-

-         /* Hence generate the appropriate 'block' or 'sparkle' pixel copy mask.

-          */

-#        define S_MASKx(p,x,d,s) (S_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)

-#        define B_MASKx(p,x,d,s) (B_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)

-

-         /* Combine 8 of these to get the full mask.  For the 1-bpp and 2-bpp

-          * cases the result needs replicating, for the 4-bpp case the above

-          * generates a full 32 bits.

-          */

-#        define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1)))

-

-#        define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\

-            S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\

-            S_MASKx(p,5,d,s) + S_MASKx(p,6,d,s) + S_MASKx(p,7,d,s), d)

-

-#        define B_MASK(p,d,s) MASK_EXPAND(B_MASKx(p,0,d,s) + B_MASKx(p,1,d,s) +\

-            B_MASKx(p,2,d,s) + B_MASKx(p,3,d,s) + B_MASKx(p,4,d,s) +\

-            B_MASKx(p,5,d,s) + B_MASKx(p,6,d,s) + B_MASKx(p,7,d,s), d)

-

-#if PNG_USE_COMPILE_TIME_MASKS

-         /* Utility macros to construct all the masks for a depth/swap

-          * combination.  The 's' parameter says whether the format is PNG

-          * (big endian bytes) or not.  Only the three odd-numbered passes are

-          * required for the display/block algorithm.

-          */

-#        define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\

-            S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) }

-

-#        define B_MASKS(d,s) { B_MASK(1,d,s), B_MASK(3,d,s), B_MASK(5,d,s) }

-

-#        define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))

-

-         /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and

-          * then pass:

-          */

-         static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =

-         {

-            /* Little-endian byte masks for PACKSWAP */

-            { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },

-            /* Normal (big-endian byte) masks - PNG format */

-            { S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }

-         };

-

-         /* display_mask has only three entries for the odd passes, so index by

-          * pass>>1.

-          */

-         static PNG_CONST png_uint_32 display_mask[2][3][3] =

-         {

-            /* Little-endian byte masks for PACKSWAP */

-            { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },

-            /* Normal (big-endian byte) masks - PNG format */

-            { B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }

-         };

-

-#        define MASK(pass,depth,display,png)\

-            ((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\

-               row_mask[png][DEPTH_INDEX(depth)][pass])

-

-#else /* !PNG_USE_COMPILE_TIME_MASKS */

-         /* This is the runtime alternative: it seems unlikely that this will

-          * ever be either smaller or faster than the compile time approach.

-          */

-#        define MASK(pass,depth,display,png)\

-            ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))

-#endif /* !USE_COMPILE_TIME_MASKS */

-

-         /* Use the appropriate mask to copy the required bits.  In some cases

-          * the byte mask will be 0 or 0xff; optimize these cases.  row_width is

-          * the number of pixels, but the code copies bytes, so it is necessary

-          * to special case the end.

-          */

-         png_uint_32 pixels_per_byte = 8 / pixel_depth;

-         png_uint_32 mask;

-

-#        ifdef PNG_READ_PACKSWAP_SUPPORTED

-         if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-            mask = MASK(pass, pixel_depth, display, 0);

-

-         else

-#        endif

-         mask = MASK(pass, pixel_depth, display, 1);

-

-         for (;;)

-         {

-            png_uint_32 m;

-

-            /* It doesn't matter in the following if png_uint_32 has more than

-             * 32 bits because the high bits always match those in m<<24; it is,

-             * however, essential to use OR here, not +, because of this.

-             */

-            m = mask;

-            mask = (m >> 8) | (m << 24); /* rotate right to good compilers */

-            m &= 0xff;

-

-            if (m != 0) /* something to copy */

-            {

-               if (m != 0xff)

-                  *dp = (png_byte)((*dp & ~m) | (*sp & m));

-               else

-                  *dp = *sp;

-            }

-

-            /* NOTE: this may overwrite the last byte with garbage if the image

-             * is not an exact number of bytes wide; libpng has always done

-             * this.

-             */

-            if (row_width <= pixels_per_byte)

-               break; /* May need to restore part of the last byte */

-

-            row_width -= pixels_per_byte;

-            ++dp;

-            ++sp;

-         }

-      }

-

-      else /* pixel_depth >= 8 */

-      {

-         unsigned int bytes_to_copy, bytes_to_jump;

-

-         /* Validate the depth - it must be a multiple of 8 */

-         if (pixel_depth & 7)

-            png_error(png_ptr, "invalid user transform pixel depth");

-

-         pixel_depth >>= 3; /* now in bytes */

-         row_width *= pixel_depth;

-

-         /* Regardless of pass number the Adam 7 interlace always results in a

-          * fixed number of pixels to copy then to skip.  There may be a

-          * different number of pixels to skip at the start though.

-          */

-         {

-            unsigned int offset = PNG_PASS_START_COL(pass) * pixel_depth;

-

-            row_width -= offset;

-            dp += offset;

-            sp += offset;

-         }

-

-         /* Work out the bytes to copy. */

-         if (display != 0)

-         {

-            /* When doing the 'block' algorithm the pixel in the pass gets

-             * replicated to adjacent pixels.  This is why the even (0,2,4,6)

-             * passes are skipped above - the entire expanded row is copied.

-             */

-            bytes_to_copy = (1<<((6-pass)>>1)) * pixel_depth;

-

-            /* But don't allow this number to exceed the actual row width. */

-            if (bytes_to_copy > row_width)

-               bytes_to_copy = (unsigned int)/*SAFE*/row_width;

-         }

-

-         else /* normal row; Adam7 only ever gives us one pixel to copy. */

-            bytes_to_copy = pixel_depth;

-

-         /* In Adam7 there is a constant offset between where the pixels go. */

-         bytes_to_jump = PNG_PASS_COL_OFFSET(pass) * pixel_depth;

-

-         /* And simply copy these bytes.  Some optimization is possible here,

-          * depending on the value of 'bytes_to_copy'.  Special case the low

-          * byte counts, which we know to be frequent.

-          *

-          * Notice that these cases all 'return' rather than 'break' - this

-          * avoids an unnecessary test on whether to restore the last byte

-          * below.

-          */

-         switch (bytes_to_copy)

-         {

-            case 1:

-               for (;;)

-               {

-                  *dp = *sp;

-

-                  if (row_width <= bytes_to_jump)

-                     return;

-

-                  dp += bytes_to_jump;

-                  sp += bytes_to_jump;

-                  row_width -= bytes_to_jump;

-               }

-

-            case 2:

-               /* There is a possibility of a partial copy at the end here; this

-                * slows the code down somewhat.

-                */

-               do

-               {

-                  dp[0] = sp[0]; dp[1] = sp[1];

-

-                  if (row_width <= bytes_to_jump)

-                     return;

-

-                  sp += bytes_to_jump;

-                  dp += bytes_to_jump;

-                  row_width -= bytes_to_jump;

-               }

-               while (row_width > 1);

-

-               /* And there can only be one byte left at this point: */

-               *dp = *sp;

-               return;

-

-            case 3:

-               /* This can only be the RGB case, so each copy is exactly one

-                * pixel and it is not necessary to check for a partial copy.

-                */

-               for (;;)

-               {

-                  dp[0] = sp[0]; dp[1] = sp[1]; dp[2] = sp[2];

-

-                  if (row_width <= bytes_to_jump)

-                     return;

-

-                  sp += bytes_to_jump;

-                  dp += bytes_to_jump;

-                  row_width -= bytes_to_jump;

-               }

-

-            default:

-#if PNG_ALIGN_TYPE != PNG_ALIGN_NONE

-               /* Check for double byte alignment and, if possible, use a

-                * 16-bit copy.  Don't attempt this for narrow images - ones that

-                * are less than an interlace panel wide.  Don't attempt it for

-                * wide bytes_to_copy either - use the memcpy there.

-                */

-               if (bytes_to_copy < 16 /*else use memcpy*/ &&

-                   png_isaligned(dp, png_uint_16) &&

-                   png_isaligned(sp, png_uint_16) &&

-                   bytes_to_copy % (sizeof (png_uint_16)) == 0 &&

-                   bytes_to_jump % (sizeof (png_uint_16)) == 0)

-               {

-                  /* Everything is aligned for png_uint_16 copies, but try for

-                   * png_uint_32 first.

-                   */

-                  if (png_isaligned(dp, png_uint_32) &&

-                      png_isaligned(sp, png_uint_32) &&

-                      bytes_to_copy % (sizeof (png_uint_32)) == 0 &&

-                      bytes_to_jump % (sizeof (png_uint_32)) == 0)

-                  {

-                     png_uint_32p dp32 = png_aligncast(png_uint_32p,dp);

-                     png_const_uint_32p sp32 = png_aligncastconst(

-                         png_const_uint_32p, sp);

-                     size_t skip = (bytes_to_jump-bytes_to_copy) /

-                         (sizeof (png_uint_32));

-

-                     do

-                     {

-                        size_t c = bytes_to_copy;

-                        do

-                        {

-                           *dp32++ = *sp32++;

-                           c -= (sizeof (png_uint_32));

-                        }

-                        while (c > 0);

-

-                        if (row_width <= bytes_to_jump)

-                           return;

-

-                        dp32 += skip;

-                        sp32 += skip;

-                        row_width -= bytes_to_jump;

-                     }

-                     while (bytes_to_copy <= row_width);

-

-                     /* Get to here when the row_width truncates the final copy.

-                      * There will be 1-3 bytes left to copy, so don't try the

-                      * 16-bit loop below.

-                      */

-                     dp = (png_bytep)dp32;

-                     sp = (png_const_bytep)sp32;

-                     do

-                        *dp++ = *sp++;

-                     while (--row_width > 0);

-                     return;

-                  }

-

-                  /* Else do it in 16-bit quantities, but only if the size is

-                   * not too large.

-                   */

-                  else

-                  {

-                     png_uint_16p dp16 = png_aligncast(png_uint_16p, dp);

-                     png_const_uint_16p sp16 = png_aligncastconst(

-                        png_const_uint_16p, sp);

-                     size_t skip = (bytes_to_jump-bytes_to_copy) /

-                        (sizeof (png_uint_16));

-

-                     do

-                     {

-                        size_t c = bytes_to_copy;

-                        do

-                        {

-                           *dp16++ = *sp16++;

-                           c -= (sizeof (png_uint_16));

-                        }

-                        while (c > 0);

-

-                        if (row_width <= bytes_to_jump)

-                           return;

-

-                        dp16 += skip;

-                        sp16 += skip;

-                        row_width -= bytes_to_jump;

-                     }

-                     while (bytes_to_copy <= row_width);

-

-                     /* End of row - 1 byte left, bytes_to_copy > row_width: */

-                     dp = (png_bytep)dp16;

-                     sp = (png_const_bytep)sp16;

-                     do

-                        *dp++ = *sp++;

-                     while (--row_width > 0);

-                     return;

-                  }

-               }

-#endif /* ALIGN_TYPE code */

-

-               /* The true default - use a memcpy: */

-               for (;;)

-               {

-                  memcpy(dp, sp, bytes_to_copy);

-

-                  if (row_width <= bytes_to_jump)

-                     return;

-

-                  sp += bytes_to_jump;

-                  dp += bytes_to_jump;

-                  row_width -= bytes_to_jump;

-                  if (bytes_to_copy > row_width)

-                     bytes_to_copy = (unsigned int)/*SAFE*/row_width;

-               }

-         }

-

-         /* NOT REACHED*/

-      } /* pixel_depth >= 8 */

-

-      /* Here if pixel_depth < 8 to check 'end_ptr' below. */

-   }

-   else

-#endif /* READ_INTERLACING */

-

-   /* If here then the switch above wasn't used so just memcpy the whole row

-    * from the temporary row buffer (notice that this overwrites the end of the

-    * destination row if it is a partial byte.)

-    */

-   memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));

-

-   /* Restore the overwritten bits from the last byte if necessary. */

-   if (end_ptr != NULL)

-      *end_ptr = (png_byte)((end_byte & end_mask) | (*end_ptr & ~end_mask));

-}

-

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-void /* PRIVATE */

-png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,

-    png_uint_32 transformations /* Because these may affect the byte layout */)

-{

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-   /* Offset to next interlace block */

-   static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   png_debug(1, "in png_do_read_interlace");

-   if (row != NULL && row_info != NULL)

-   {

-      png_uint_32 final_width;

-

-      final_width = row_info->width * png_pass_inc[pass];

-

-      switch (row_info->pixel_depth)

-      {

-         case 1:

-         {

-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);

-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);

-            unsigned int sshift, dshift;

-            unsigned int s_start, s_end;

-            int s_inc;

-            int jstop = (int)png_pass_inc[pass];

-            png_byte v;

-            png_uint_32 i;

-            int j;

-

-#ifdef PNG_READ_PACKSWAP_SUPPORTED

-            if ((transformations & PNG_PACKSWAP) != 0)

-            {

-                sshift = ((row_info->width + 7) & 0x07);

-                dshift = ((final_width + 7) & 0x07);

-                s_start = 7;

-                s_end = 0;

-                s_inc = -1;

-            }

-

-            else

-#endif

-            {

-                sshift = 7 - ((row_info->width + 7) & 0x07);

-                dshift = 7 - ((final_width + 7) & 0x07);

-                s_start = 0;

-                s_end = 7;

-                s_inc = 1;

-            }

-

-            for (i = 0; i < row_info->width; i++)

-            {

-               v = (png_byte)((*sp >> sshift) & 0x01);

-               for (j = 0; j < jstop; j++)

-               {

-                  unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));

-                  tmp |= (unsigned int)(v << dshift);

-                  *dp = (png_byte)(tmp & 0xff);

-

-                  if (dshift == s_end)

-                  {

-                     dshift = s_start;

-                     dp--;

-                  }

-

-                  else

-                     dshift = (unsigned int)((int)dshift + s_inc);

-               }

-

-               if (sshift == s_end)

-               {

-                  sshift = s_start;

-                  sp--;

-               }

-

-               else

-                  sshift = (unsigned int)((int)sshift + s_inc);

-            }

-            break;

-         }

-

-         case 2:

-         {

-            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);

-            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);

-            unsigned int sshift, dshift;

-            unsigned int s_start, s_end;

-            int s_inc;

-            int jstop = (int)png_pass_inc[pass];

-            png_uint_32 i;

-

-#ifdef PNG_READ_PACKSWAP_SUPPORTED

-            if ((transformations & PNG_PACKSWAP) != 0)

-            {

-               sshift = (((row_info->width + 3) & 0x03) << 1);

-               dshift = (((final_width + 3) & 0x03) << 1);

-               s_start = 6;

-               s_end = 0;

-               s_inc = -2;

-            }

-

-            else

-#endif

-            {

-               sshift = ((3 - ((row_info->width + 3) & 0x03)) << 1);

-               dshift = ((3 - ((final_width + 3) & 0x03)) << 1);

-               s_start = 0;

-               s_end = 6;

-               s_inc = 2;

-            }

-

-            for (i = 0; i < row_info->width; i++)

-            {

-               png_byte v;

-               int j;

-

-               v = (png_byte)((*sp >> sshift) & 0x03);

-               for (j = 0; j < jstop; j++)

-               {

-                  unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));

-                  tmp |= (unsigned int)(v << dshift);

-                  *dp = (png_byte)(tmp & 0xff);

-

-                  if (dshift == s_end)

-                  {

-                     dshift = s_start;

-                     dp--;

-                  }

-

-                  else

-                     dshift = (unsigned int)((int)dshift + s_inc);

-               }

-

-               if (sshift == s_end)

-               {

-                  sshift = s_start;

-                  sp--;

-               }

-

-               else

-                  sshift = (unsigned int)((int)sshift + s_inc);

-            }

-            break;

-         }

-

-         case 4:

-         {

-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);

-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);

-            unsigned int sshift, dshift;

-            unsigned int s_start, s_end;

-            int s_inc;

-            png_uint_32 i;

-            int jstop = (int)png_pass_inc[pass];

-

-#ifdef PNG_READ_PACKSWAP_SUPPORTED

-            if ((transformations & PNG_PACKSWAP) != 0)

-            {

-               sshift = (((row_info->width + 1) & 0x01) << 2);

-               dshift = (((final_width + 1) & 0x01) << 2);

-               s_start = 4;

-               s_end = 0;

-               s_inc = -4;

-            }

-

-            else

-#endif

-            {

-               sshift = ((1 - ((row_info->width + 1) & 0x01)) << 2);

-               dshift = ((1 - ((final_width + 1) & 0x01)) << 2);

-               s_start = 0;

-               s_end = 4;

-               s_inc = 4;

-            }

-

-            for (i = 0; i < row_info->width; i++)

-            {

-               png_byte v = (png_byte)((*sp >> sshift) & 0x0f);

-               int j;

-

-               for (j = 0; j < jstop; j++)

-               {

-                  unsigned int tmp = *dp & (0xf0f >> (4 - dshift));

-                  tmp |= (unsigned int)(v << dshift);

-                  *dp = (png_byte)(tmp & 0xff);

-

-                  if (dshift == s_end)

-                  {

-                     dshift = s_start;

-                     dp--;

-                  }

-

-                  else

-                     dshift = (unsigned int)((int)dshift + s_inc);

-               }

-

-               if (sshift == s_end)

-               {

-                  sshift = s_start;

-                  sp--;

-               }

-

-               else

-                  sshift = (unsigned int)((int)sshift + s_inc);

-            }

-            break;

-         }

-

-         default:

-         {

-            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);

-

-            png_bytep sp = row + (png_size_t)(row_info->width - 1)

-                * pixel_bytes;

-

-            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;

-

-            int jstop = (int)png_pass_inc[pass];

-            png_uint_32 i;

-

-            for (i = 0; i < row_info->width; i++)

-            {

-               png_byte v[8]; /* SAFE; pixel_depth does not exceed 64 */

-               int j;

-

-               memcpy(v, sp, pixel_bytes);

-

-               for (j = 0; j < jstop; j++)

-               {

-                  memcpy(dp, v, pixel_bytes);

-                  dp -= pixel_bytes;

-               }

-

-               sp -= pixel_bytes;

-            }

-            break;

-         }

-      }

-

-      row_info->width = final_width;

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);

-   }

-#ifndef PNG_READ_PACKSWAP_SUPPORTED

-   PNG_UNUSED(transformations)  /* Silence compiler warning */

-#endif

-}

-#endif /* READ_INTERLACING */

-

-static void

-png_read_filter_row_sub(png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row)

-{

-   png_size_t i;

-   png_size_t istop = row_info->rowbytes;

-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;

-   png_bytep rp = row + bpp;

-

-   PNG_UNUSED(prev_row)

-

-   for (i = bpp; i < istop; i++)

-   {

-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);

-      rp++;

-   }

-}

-

-static void

-png_read_filter_row_up(png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row)

-{

-   png_size_t i;

-   png_size_t istop = row_info->rowbytes;

-   png_bytep rp = row;

-   png_const_bytep pp = prev_row;

-

-   for (i = 0; i < istop; i++)

-   {

-      *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);

-      rp++;

-   }

-}

-

-static void

-png_read_filter_row_avg(png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row)

-{

-   png_size_t i;

-   png_bytep rp = row;

-   png_const_bytep pp = prev_row;

-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;

-   png_size_t istop = row_info->rowbytes - bpp;

-

-   for (i = 0; i < bpp; i++)

-   {

-      *rp = (png_byte)(((int)(*rp) +

-         ((int)(*pp++) / 2 )) & 0xff);

-

-      rp++;

-   }

-

-   for (i = 0; i < istop; i++)

-   {

-      *rp = (png_byte)(((int)(*rp) +

-         (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);

-

-      rp++;

-   }

-}

-

-static void

-png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row)

-{

-   png_bytep rp_end = row + row_info->rowbytes;

-   int a, c;

-

-   /* First pixel/byte */

-   c = *prev_row++;

-   a = *row + c;

-   *row++ = (png_byte)a;

-

-   /* Remainder */

-   while (row < rp_end)

-   {

-      int b, pa, pb, pc, p;

-

-      a &= 0xff; /* From previous iteration or start */

-      b = *prev_row++;

-

-      p = b - c;

-      pc = a - c;

-

-#ifdef PNG_USE_ABS

-      pa = abs(p);

-      pb = abs(pc);

-      pc = abs(p + pc);

-#else

-      pa = p < 0 ? -p : p;

-      pb = pc < 0 ? -pc : pc;

-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;

-#endif

-

-      /* Find the best predictor, the least of pa, pb, pc favoring the earlier

-       * ones in the case of a tie.

-       */

-      if (pb < pa)

-      {

-         pa = pb; a = b;

-      }

-      if (pc < pa) a = c;

-

-      /* Calculate the current pixel in a, and move the previous row pixel to c

-       * for the next time round the loop

-       */

-      c = b;

-      a += *row;

-      *row++ = (png_byte)a;

-   }

-}

-

-static void

-png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row)

-{

-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;

-   png_bytep rp_end = row + bpp;

-

-   /* Process the first pixel in the row completely (this is the same as 'up'

-    * because there is only one candidate predictor for the first row).

-    */

-   while (row < rp_end)

-   {

-      int a = *row + *prev_row++;

-      *row++ = (png_byte)a;

-   }

-

-   /* Remainder */

-   rp_end = rp_end + (row_info->rowbytes - bpp);

-

-   while (row < rp_end)

-   {

-      int a, b, c, pa, pb, pc, p;

-

-      c = *(prev_row - bpp);

-      a = *(row - bpp);

-      b = *prev_row++;

-

-      p = b - c;

-      pc = a - c;

-

-#ifdef PNG_USE_ABS

-      pa = abs(p);

-      pb = abs(pc);

-      pc = abs(p + pc);

-#else

-      pa = p < 0 ? -p : p;

-      pb = pc < 0 ? -pc : pc;

-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;

-#endif

-

-      if (pb < pa)

-      {

-         pa = pb; a = b;

-      }

-      if (pc < pa) a = c;

-

-      a += *row;

-      *row++ = (png_byte)a;

-   }

-}

-

-static void

-png_init_filter_functions(png_structrp pp)

-   /* This function is called once for every PNG image (except for PNG images

-    * that only use PNG_FILTER_VALUE_NONE for all rows) to set the

-    * implementations required to reverse the filtering of PNG rows.  Reversing

-    * the filter is the first transformation performed on the row data.  It is

-    * performed in place, therefore an implementation can be selected based on

-    * the image pixel format.  If the implementation depends on image width then

-    * take care to ensure that it works correctly if the image is interlaced -

-    * interlacing causes the actual row width to vary.

-    */

-{

-   unsigned int bpp = (pp->pixel_depth + 7) >> 3;

-

-   pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub;

-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up;

-   pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg;

-   if (bpp == 1)

-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =

-         png_read_filter_row_paeth_1byte_pixel;

-   else

-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =

-         png_read_filter_row_paeth_multibyte_pixel;

-

-#ifdef PNG_FILTER_OPTIMIZATIONS

-   /* To use this define PNG_FILTER_OPTIMIZATIONS as the name of a function to

-    * call to install hardware optimizations for the above functions; simply

-    * replace whatever elements of the pp->read_filter[] array with a hardware

-    * specific (or, for that matter, generic) optimization.

-    *

-    * To see an example of this examine what configure.ac does when

-    * --enable-arm-neon is specified on the command line.

-    */

-   PNG_FILTER_OPTIMIZATIONS(pp, bpp);

-#endif

-}

-

-void /* PRIVATE */

-png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,

-    png_const_bytep prev_row, int filter)

-{

-   /* OPTIMIZATION: DO NOT MODIFY THIS FUNCTION, instead #define

-    * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic

-    * implementations.  See png_init_filter_functions above.

-    */

-   if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)

-   {

-      if (pp->read_filter[0] == NULL)

-         png_init_filter_functions(pp);

-

-      pp->read_filter[filter-1](row_info, row, prev_row);

-   }

-}

-

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-void /* PRIVATE */

-png_read_IDAT_data(png_structrp png_ptr, png_bytep output,

-    png_alloc_size_t avail_out)

-{

-   /* Loop reading IDATs and decompressing the result into output[avail_out] */

-   png_ptr->zstream.next_out = output;

-   png_ptr->zstream.avail_out = 0; /* safety: set below */

-

-   if (output == NULL)

-      avail_out = 0;

-

-   do

-   {

-      int ret;

-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];

-

-      if (png_ptr->zstream.avail_in == 0)

-      {

-         uInt avail_in;

-         png_bytep buffer;

-

-         while (png_ptr->idat_size == 0)

-         {

-            png_crc_finish(png_ptr, 0);

-

-            png_ptr->idat_size = png_read_chunk_header(png_ptr);

-            /* This is an error even in the 'check' case because the code just

-             * consumed a non-IDAT header.

-             */

-            if (png_ptr->chunk_name != png_IDAT)

-               png_error(png_ptr, "Not enough image data");

-         }

-

-         avail_in = png_ptr->IDAT_read_size;

-

-         if (avail_in > png_ptr->idat_size)

-            avail_in = (uInt)png_ptr->idat_size;

-

-         /* A PNG with a gradually increasing IDAT size will defeat this attempt

-          * to minimize memory usage by causing lots of re-allocs, but

-          * realistically doing IDAT_read_size re-allocs is not likely to be a

-          * big problem.

-          */

-         buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);

-

-         png_crc_read(png_ptr, buffer, avail_in);

-         png_ptr->idat_size -= avail_in;

-

-         png_ptr->zstream.next_in = buffer;

-         png_ptr->zstream.avail_in = avail_in;

-      }

-

-      /* And set up the output side. */

-      if (output != NULL) /* standard read */

-      {

-         uInt out = ZLIB_IO_MAX;

-

-         if (out > avail_out)

-            out = (uInt)avail_out;

-

-         avail_out -= out;

-         png_ptr->zstream.avail_out = out;

-      }

-

-      else /* after last row, checking for end */

-      {

-         png_ptr->zstream.next_out = tmpbuf;

-         png_ptr->zstream.avail_out = (sizeof tmpbuf);

-      }

-

-      /* Use NO_FLUSH; this gives zlib the maximum opportunity to optimize the

-       * process.  If the LZ stream is truncated the sequential reader will

-       * terminally damage the stream, above, by reading the chunk header of the

-       * following chunk (it then exits with png_error).

-       *

-       * TODO: deal more elegantly with truncated IDAT lists.

-       */

-      ret = PNG_INFLATE(png_ptr, Z_NO_FLUSH);

-

-      /* Take the unconsumed output back. */

-      if (output != NULL)

-         avail_out += png_ptr->zstream.avail_out;

-

-      else /* avail_out counts the extra bytes */

-         avail_out += (sizeof tmpbuf) - png_ptr->zstream.avail_out;

-

-      png_ptr->zstream.avail_out = 0;

-

-      if (ret == Z_STREAM_END)

-      {

-         /* Do this for safety; we won't read any more into this row. */

-         png_ptr->zstream.next_out = NULL;

-

-         png_ptr->mode |= PNG_AFTER_IDAT;

-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;

-

-         if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)

-            png_chunk_benign_error(png_ptr, "Extra compressed data");

-         break;

-      }

-

-      if (ret != Z_OK)

-      {

-         png_zstream_error(png_ptr, ret);

-

-         if (output != NULL)

-            png_chunk_error(png_ptr, png_ptr->zstream.msg);

-

-         else /* checking */

-         {

-            png_chunk_benign_error(png_ptr, png_ptr->zstream.msg);

-            return;

-         }

-      }

-   } while (avail_out > 0);

-

-   if (avail_out > 0)

-   {

-      /* The stream ended before the image; this is the same as too few IDATs so

-       * should be handled the same way.

-       */

-      if (output != NULL)

-         png_error(png_ptr, "Not enough image data");

-

-      else /* the deflate stream contained extra data */

-         png_chunk_benign_error(png_ptr, "Too much image data");

-   }

-}

-

-void /* PRIVATE */

-png_read_finish_IDAT(png_structrp png_ptr)

-{

-   /* We don't need any more data and the stream should have ended, however the

-    * LZ end code may actually not have been processed.  In this case we must

-    * read it otherwise stray unread IDAT data or, more likely, an IDAT chunk

-    * may still remain to be consumed.

-    */

-   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)

-   {

-      /* The NULL causes png_read_IDAT_data to swallow any remaining bytes in

-       * the compressed stream, but the stream may be damaged too, so even after

-       * this call we may need to terminate the zstream ownership.

-       */

-      png_read_IDAT_data(png_ptr, NULL, 0);

-      png_ptr->zstream.next_out = NULL; /* safety */

-

-      /* Now clear everything out for safety; the following may not have been

-       * done.

-       */

-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)

-      {

-         png_ptr->mode |= PNG_AFTER_IDAT;

-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;

-      }

-   }

-

-   /* If the zstream has not been released do it now *and* terminate the reading

-    * of the final IDAT chunk.

-    */

-   if (png_ptr->zowner == png_IDAT)

-   {

-      /* Always do this; the pointers otherwise point into the read buffer. */

-      png_ptr->zstream.next_in = NULL;

-      png_ptr->zstream.avail_in = 0;

-

-      /* Now we no longer own the zstream. */

-      png_ptr->zowner = 0;

-

-      /* The slightly weird semantics of the sequential IDAT reading is that we

-       * are always in or at the end of an IDAT chunk, so we always need to do a

-       * crc_finish here.  If idat_size is non-zero we also need to read the

-       * spurious bytes at the end of the chunk now.

-       */

-      (void)png_crc_finish(png_ptr, png_ptr->idat_size);

-   }

-}

-

-void /* PRIVATE */

-png_read_finish_row(png_structrp png_ptr)

-{

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   /* Start of interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};

-

-   /* Offset to next interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};

-

-   png_debug(1, "in png_read_finish_row");

-   png_ptr->row_number++;

-   if (png_ptr->row_number < png_ptr->num_rows)

-      return;

-

-   if (png_ptr->interlaced != 0)

-   {

-      png_ptr->row_number = 0;

-

-      /* TO DO: don't do this if prev_row isn't needed (requires

-       * read-ahead of the next row's filter byte.

-       */

-      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);

-

-      do

-      {

-         png_ptr->pass++;

-

-         if (png_ptr->pass >= 7)

-            break;

-

-         png_ptr->iwidth = (png_ptr->width +

-            png_pass_inc[png_ptr->pass] - 1 -

-            png_pass_start[png_ptr->pass]) /

-            png_pass_inc[png_ptr->pass];

-

-         if ((png_ptr->transformations & PNG_INTERLACE) == 0)

-         {

-            png_ptr->num_rows = (png_ptr->height +

-                png_pass_yinc[png_ptr->pass] - 1 -

-                png_pass_ystart[png_ptr->pass]) /

-                png_pass_yinc[png_ptr->pass];

-         }

-

-         else  /* if (png_ptr->transformations & PNG_INTERLACE) */

-            break; /* libpng deinterlacing sees every row */

-

-      } while (png_ptr->num_rows == 0 || png_ptr->iwidth == 0);

-

-      if (png_ptr->pass < 7)

-         return;

-   }

-

-   /* Here after at the end of the last row of the last pass. */

-   png_read_finish_IDAT(png_ptr);

-}

-#endif /* SEQUENTIAL_READ */

-

-void /* PRIVATE */

-png_read_start_row(png_structrp png_ptr)

-{

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   /* Start of interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};

-

-   /* Offset to next interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};

-

-   unsigned int max_pixel_depth;

-   png_size_t row_bytes;

-

-   png_debug(1, "in png_read_start_row");

-

-#ifdef PNG_READ_TRANSFORMS_SUPPORTED

-   png_init_read_transformations(png_ptr);

-#endif

-   if (png_ptr->interlaced != 0)

-   {

-      if ((png_ptr->transformations & PNG_INTERLACE) == 0)

-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -

-             png_pass_ystart[0]) / png_pass_yinc[0];

-

-      else

-         png_ptr->num_rows = png_ptr->height;

-

-      png_ptr->iwidth = (png_ptr->width +

-          png_pass_inc[png_ptr->pass] - 1 -

-          png_pass_start[png_ptr->pass]) /

-          png_pass_inc[png_ptr->pass];

-   }

-

-   else

-   {

-      png_ptr->num_rows = png_ptr->height;

-      png_ptr->iwidth = png_ptr->width;

-   }

-

-   max_pixel_depth = (unsigned int)png_ptr->pixel_depth;

-

-   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of

-    * calculations to calculate the final pixel depth, then

-    * png_do_read_transforms actually does the transforms.  This means that the

-    * code which effectively calculates this value is actually repeated in three

-    * separate places.  They must all match.  Innocent changes to the order of

-    * transformations can and will break libpng in a way that causes memory

-    * overwrites.

-    *

-    * TODO: fix this.

-    */

-#ifdef PNG_READ_PACK_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8)

-      max_pixel_depth = 8;

-#endif

-

-#ifdef PNG_READ_EXPAND_SUPPORTED

-   if ((png_ptr->transformations & PNG_EXPAND) != 0)

-   {

-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         if (png_ptr->num_trans != 0)

-            max_pixel_depth = 32;

-

-         else

-            max_pixel_depth = 24;

-      }

-

-      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)

-      {

-         if (max_pixel_depth < 8)

-            max_pixel_depth = 8;

-

-         if (png_ptr->num_trans != 0)

-            max_pixel_depth *= 2;

-      }

-

-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)

-      {

-         if (png_ptr->num_trans != 0)

-         {

-            max_pixel_depth *= 4;

-            max_pixel_depth /= 3;

-         }

-      }

-   }

-#endif

-

-#ifdef PNG_READ_EXPAND_16_SUPPORTED

-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)

-   {

-#  ifdef PNG_READ_EXPAND_SUPPORTED

-      /* In fact it is an error if it isn't supported, but checking is

-       * the safe way.

-       */

-      if ((png_ptr->transformations & PNG_EXPAND) != 0)

-      {

-         if (png_ptr->bit_depth < 16)

-            max_pixel_depth *= 2;

-      }

-      else

-#  endif

-      png_ptr->transformations &= ~PNG_EXPAND_16;

-   }

-#endif

-

-#ifdef PNG_READ_FILLER_SUPPORTED

-   if ((png_ptr->transformations & (PNG_FILLER)) != 0)

-   {

-      if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)

-      {

-         if (max_pixel_depth <= 8)

-            max_pixel_depth = 16;

-

-         else

-            max_pixel_depth = 32;

-      }

-

-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB ||

-         png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         if (max_pixel_depth <= 32)

-            max_pixel_depth = 32;

-

-         else

-            max_pixel_depth = 64;

-      }

-   }

-#endif

-

-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED

-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)

-   {

-      if (

-#ifdef PNG_READ_EXPAND_SUPPORTED

-          (png_ptr->num_trans != 0 &&

-          (png_ptr->transformations & PNG_EXPAND) != 0) ||

-#endif

-#ifdef PNG_READ_FILLER_SUPPORTED

-          (png_ptr->transformations & (PNG_FILLER)) != 0 ||

-#endif

-          png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      {

-         if (max_pixel_depth <= 16)

-            max_pixel_depth = 32;

-

-         else

-            max_pixel_depth = 64;

-      }

-

-      else

-      {

-         if (max_pixel_depth <= 8)

-         {

-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-               max_pixel_depth = 32;

-

-            else

-               max_pixel_depth = 24;

-         }

-

-         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-            max_pixel_depth = 64;

-

-         else

-            max_pixel_depth = 48;

-      }

-   }

-#endif

-

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \

-defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)

-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)

-   {

-      unsigned int user_pixel_depth = png_ptr->user_transform_depth *

-         png_ptr->user_transform_channels;

-

-      if (user_pixel_depth > max_pixel_depth)

-         max_pixel_depth = user_pixel_depth;

-   }

-#endif

-

-   /* This value is stored in png_struct and double checked in the row read

-    * code.

-    */

-   png_ptr->maximum_pixel_depth = (png_byte)max_pixel_depth;

-   png_ptr->transformed_pixel_depth = 0; /* calculated on demand */

-

-   /* Align the width on the next larger 8 pixels.  Mainly used

-    * for interlacing

-    */

-   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));

-   /* Calculate the maximum bytes needed, adding a byte and a pixel

-    * for safety's sake

-    */

-   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +

-       1 + ((max_pixel_depth + 7) >> 3U);

-

-#ifdef PNG_MAX_MALLOC_64K

-   if (row_bytes > (png_uint_32)65536L)

-      png_error(png_ptr, "This image requires a row greater than 64KB");

-#endif

-

-   if (row_bytes + 48 > png_ptr->old_big_row_buf_size)

-   {

-      png_free(png_ptr, png_ptr->big_row_buf);

-      png_free(png_ptr, png_ptr->big_prev_row);

-

-      if (png_ptr->interlaced != 0)

-         png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,

-             row_bytes + 48);

-

-      else

-         png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);

-

-      png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);

-

-#ifdef PNG_ALIGNED_MEMORY_SUPPORTED

-      /* Use 16-byte aligned memory for row_buf with at least 16 bytes

-       * of padding before and after row_buf; treat prev_row similarly.

-       * NOTE: the alignment is to the start of the pixels, one beyond the start

-       * of the buffer, because of the filter byte.  Prior to libpng 1.5.6 this

-       * was incorrect; the filter byte was aligned, which had the exact

-       * opposite effect of that intended.

-       */

-      {

-         png_bytep temp = png_ptr->big_row_buf + 32;

-         int extra = (int)((temp - (png_bytep)0) & 0x0f);

-         png_ptr->row_buf = temp - extra - 1/*filter byte*/;

-

-         temp = png_ptr->big_prev_row + 32;

-         extra = (int)((temp - (png_bytep)0) & 0x0f);

-         png_ptr->prev_row = temp - extra - 1/*filter byte*/;

-      }

-

-#else

-      /* Use 31 bytes of padding before and 17 bytes after row_buf. */

-      png_ptr->row_buf = png_ptr->big_row_buf + 31;

-      png_ptr->prev_row = png_ptr->big_prev_row + 31;

-#endif

-      png_ptr->old_big_row_buf_size = row_bytes + 48;

-   }

-

-#ifdef PNG_MAX_MALLOC_64K

-   if (png_ptr->rowbytes > 65535)

-      png_error(png_ptr, "This image requires a row greater than 64KB");

-

-#endif

-   if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))

-      png_error(png_ptr, "Row has too many bytes to allocate in memory");

-

-   memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);

-

-   png_debug1(3, "width = %u,", png_ptr->width);

-   png_debug1(3, "height = %u,", png_ptr->height);

-   png_debug1(3, "iwidth = %u,", png_ptr->iwidth);

-   png_debug1(3, "num_rows = %u,", png_ptr->num_rows);

-   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);

-   png_debug1(3, "irowbytes = %lu",

-       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);

-

-   /* The sequential reader needs a buffer for IDAT, but the progressive reader

-    * does not, so free the read buffer now regardless; the sequential reader

-    * reallocates it on demand.

-    */

-   if (png_ptr->read_buffer != NULL)

-   {

-      png_bytep buffer = png_ptr->read_buffer;

-

-      png_ptr->read_buffer_size = 0;

-      png_ptr->read_buffer = NULL;

-      png_free(png_ptr, buffer);

-   }

-

-   /* Finally claim the zstream for the inflate of the IDAT data, use the bits

-    * value from the stream (note that this will result in a fatal error if the

-    * IDAT stream has a bogus deflate header window_bits value, but this should

-    * not be happening any longer!)

-    */

-   if (png_inflate_claim(png_ptr, png_IDAT) != Z_OK)

-      png_error(png_ptr, png_ptr->zstream.msg);

-

-   png_ptr->flags |= PNG_FLAG_ROW_INIT;

-}

-#endif /* READ */

diff --git a/plugins/AdvaImg/src/LibPNG/pngset.c b/plugins/AdvaImg/src/LibPNG/pngset.c
deleted file mode 100644
index f3cb3ccfad..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngset.c
+++ /dev/null
@@ -1,1802 +0,0 @@
-

-/* pngset.c - storage of image information into info struct

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * The functions here are used during reads to store data from the file

- * into the info struct, and during writes to store application data

- * into the info struct for writing into the file.  This abstracts the

- * info struct and allows us to change the structure in the future.

- */

-

-#include "pngpriv.h"

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-

-#ifdef PNG_bKGD_SUPPORTED

-void PNGAPI

-png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_color_16p background)

-{

-   png_debug1(1, "in %s storage function", "bKGD");

-

-   if (png_ptr == NULL || info_ptr == NULL || background == NULL)

-      return;

-

-   info_ptr->background = *background;

-   info_ptr->valid |= PNG_INFO_bKGD;

-}

-#endif

-

-#ifdef PNG_cHRM_SUPPORTED

-void PNGFAPI

-png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,

-    png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,

-    png_fixed_point blue_x, png_fixed_point blue_y)

-{

-   png_xy xy;

-

-   png_debug1(1, "in %s storage function", "cHRM fixed");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   xy.redx = red_x;

-   xy.redy = red_y;

-   xy.greenx = green_x;

-   xy.greeny = green_y;

-   xy.bluex = blue_x;

-   xy.bluey = blue_y;

-   xy.whitex = white_x;

-   xy.whitey = white_y;

-

-   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,

-       2/* override with app values*/) != 0)

-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;

-

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-

-void PNGFAPI

-png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_fixed_point int_red_X, png_fixed_point int_red_Y,

-    png_fixed_point int_red_Z, png_fixed_point int_green_X,

-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,

-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,

-    png_fixed_point int_blue_Z)

-{

-   png_XYZ XYZ;

-

-   png_debug1(1, "in %s storage function", "cHRM XYZ fixed");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   XYZ.red_X = int_red_X;

-   XYZ.red_Y = int_red_Y;

-   XYZ.red_Z = int_red_Z;

-   XYZ.green_X = int_green_X;

-   XYZ.green_Y = int_green_Y;

-   XYZ.green_Z = int_green_Z;

-   XYZ.blue_X = int_blue_X;

-   XYZ.blue_Y = int_blue_Y;

-   XYZ.blue_Z = int_blue_Z;

-

-   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,

-       &XYZ, 2) != 0)

-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;

-

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,

-    double white_x, double white_y, double red_x, double red_y,

-    double green_x, double green_y, double blue_x, double blue_y)

-{

-   png_set_cHRM_fixed(png_ptr, info_ptr,

-       png_fixed(png_ptr, white_x, "cHRM White X"),

-       png_fixed(png_ptr, white_y, "cHRM White Y"),

-       png_fixed(png_ptr, red_x, "cHRM Red X"),

-       png_fixed(png_ptr, red_y, "cHRM Red Y"),

-       png_fixed(png_ptr, green_x, "cHRM Green X"),

-       png_fixed(png_ptr, green_y, "cHRM Green Y"),

-       png_fixed(png_ptr, blue_x, "cHRM Blue X"),

-       png_fixed(png_ptr, blue_y, "cHRM Blue Y"));

-}

-

-void PNGAPI

-png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,

-    double red_Y, double red_Z, double green_X, double green_Y, double green_Z,

-    double blue_X, double blue_Y, double blue_Z)

-{

-   png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,

-       png_fixed(png_ptr, red_X, "cHRM Red X"),

-       png_fixed(png_ptr, red_Y, "cHRM Red Y"),

-       png_fixed(png_ptr, red_Z, "cHRM Red Z"),

-       png_fixed(png_ptr, green_X, "cHRM Green X"),

-       png_fixed(png_ptr, green_Y, "cHRM Green Y"),

-       png_fixed(png_ptr, green_Z, "cHRM Green Z"),

-       png_fixed(png_ptr, blue_X, "cHRM Blue X"),

-       png_fixed(png_ptr, blue_Y, "cHRM Blue Y"),

-       png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));

-}

-#  endif /* FLOATING_POINT */

-

-#endif /* cHRM */

-

-#ifdef PNG_eXIf_SUPPORTED

-void PNGAPI

-png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,

-    const png_bytep eXIf_buf)

-{

-  png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");

-  PNG_UNUSED(info_ptr)

-  PNG_UNUSED(eXIf_buf)

-}

-

-void PNGAPI

-png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,

-    const png_uint_32 num_exif, const png_bytep eXIf_buf)

-{

-   int i;

-

-   png_debug1(1, "in %s storage function", "eXIf");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if (info_ptr->exif)

-   {

-      png_free(png_ptr, info_ptr->exif);

-      info_ptr->exif = NULL;

-   }

-

-   info_ptr->num_exif = num_exif;

-

-   info_ptr->exif = png_voidcast(png_bytep, png_malloc_warn(png_ptr,

-       info_ptr->num_exif));

-

-   if (info_ptr->exif == NULL)

-   {

-      png_warning(png_ptr, "Insufficient memory for eXIf chunk data");

-      return;

-   }

-

-   info_ptr->free_me |= PNG_FREE_EXIF;

-

-   for (i = 0; i < (int) info_ptr->num_exif; i++)

-      info_ptr->exif[i] = eXIf_buf[i];

-

-   info_ptr->valid |= PNG_INFO_eXIf;

-}

-#endif /* eXIf */

-

-#ifdef PNG_gAMA_SUPPORTED

-void PNGFAPI

-png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_fixed_point file_gamma)

-{

-   png_debug1(1, "in %s storage function", "gAMA");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)

-{

-   png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,

-       "png_set_gAMA"));

-}

-#  endif

-#endif

-

-#ifdef PNG_hIST_SUPPORTED

-void PNGAPI

-png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_uint_16p hist)

-{

-   int i;

-

-   png_debug1(1, "in %s storage function", "hIST");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if (info_ptr->num_palette == 0 || info_ptr->num_palette

-       > PNG_MAX_PALETTE_LENGTH)

-   {

-      png_warning(png_ptr,

-          "Invalid palette size, hIST allocation skipped");

-

-      return;

-   }

-

-   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);

-

-   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in

-    * version 1.2.1

-    */

-   info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,

-       PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));

-

-   if (info_ptr->hist == NULL)

-   {

-      png_warning(png_ptr, "Insufficient memory for hIST chunk data");

-

-      return;

-   }

-

-   info_ptr->free_me |= PNG_FREE_HIST;

-

-   for (i = 0; i < info_ptr->num_palette; i++)

-      info_ptr->hist[i] = hist[i];

-

-   info_ptr->valid |= PNG_INFO_hIST;

-}

-#endif

-

-void PNGAPI

-png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_uint_32 width, png_uint_32 height, int bit_depth,

-    int color_type, int interlace_type, int compression_type,

-    int filter_type)

-{

-   png_debug1(1, "in %s storage function", "IHDR");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   info_ptr->width = width;

-   info_ptr->height = height;

-   info_ptr->bit_depth = (png_byte)bit_depth;

-   info_ptr->color_type = (png_byte)color_type;

-   info_ptr->compression_type = (png_byte)compression_type;

-   info_ptr->filter_type = (png_byte)filter_type;

-   info_ptr->interlace_type = (png_byte)interlace_type;

-

-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,

-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,

-       info_ptr->compression_type, info_ptr->filter_type);

-

-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      info_ptr->channels = 1;

-

-   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      info_ptr->channels = 3;

-

-   else

-      info_ptr->channels = 1;

-

-   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      info_ptr->channels++;

-

-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);

-

-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);

-}

-

-#ifdef PNG_oFFs_SUPPORTED

-void PNGAPI

-png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_int_32 offset_x, png_int_32 offset_y, int unit_type)

-{

-   png_debug1(1, "in %s storage function", "oFFs");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   info_ptr->x_offset = offset_x;

-   info_ptr->y_offset = offset_y;

-   info_ptr->offset_unit_type = (png_byte)unit_type;

-   info_ptr->valid |= PNG_INFO_oFFs;

-}

-#endif

-

-#ifdef PNG_pCAL_SUPPORTED

-void PNGAPI

-png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,

-    int nparams, png_const_charp units, png_charpp params)

-{

-   png_size_t length;

-   int i;

-

-   png_debug1(1, "in %s storage function", "pCAL");

-

-   if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL

-       || (nparams > 0 && params == NULL))

-      return;

-

-   length = strlen(purpose) + 1;

-   png_debug1(3, "allocating purpose for info (%lu bytes)",

-       (unsigned long)length);

-

-   /* TODO: validate format of calibration name and unit name */

-

-   /* Check that the type matches the specification. */

-   if (type < 0 || type > 3)

-   {

-      png_chunk_report(png_ptr, "Invalid pCAL equation type",

-            PNG_CHUNK_WRITE_ERROR);

-      return;

-   }

-

-   if (nparams < 0 || nparams > 255)

-   {

-      png_chunk_report(png_ptr, "Invalid pCAL parameter count",

-            PNG_CHUNK_WRITE_ERROR);

-      return;

-   }

-

-   /* Validate params[nparams] */

-   for (i=0; i<nparams; ++i)

-   {

-      if (params[i] == NULL ||

-          !png_check_fp_string(params[i], strlen(params[i])))

-      {

-         png_chunk_report(png_ptr, "Invalid format for pCAL parameter",

-               PNG_CHUNK_WRITE_ERROR);

-         return;

-      }

-   }

-

-   info_ptr->pcal_purpose = png_voidcast(png_charp,

-       png_malloc_warn(png_ptr, length));

-

-   if (info_ptr->pcal_purpose == NULL)

-   {

-      png_chunk_report(png_ptr, "Insufficient memory for pCAL purpose",

-            PNG_CHUNK_WRITE_ERROR);

-      return;

-   }

-

-   memcpy(info_ptr->pcal_purpose, purpose, length);

-

-   png_debug(3, "storing X0, X1, type, and nparams in info");

-   info_ptr->pcal_X0 = X0;

-   info_ptr->pcal_X1 = X1;

-   info_ptr->pcal_type = (png_byte)type;

-   info_ptr->pcal_nparams = (png_byte)nparams;

-

-   length = strlen(units) + 1;

-   png_debug1(3, "allocating units for info (%lu bytes)",

-       (unsigned long)length);

-

-   info_ptr->pcal_units = png_voidcast(png_charp,

-       png_malloc_warn(png_ptr, length));

-

-   if (info_ptr->pcal_units == NULL)

-   {

-      png_warning(png_ptr, "Insufficient memory for pCAL units");

-

-      return;

-   }

-

-   memcpy(info_ptr->pcal_units, units, length);

-

-   info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,

-       (png_size_t)(((unsigned int)nparams + 1) * (sizeof (png_charp)))));

-

-   if (info_ptr->pcal_params == NULL)

-   {

-      png_warning(png_ptr, "Insufficient memory for pCAL params");

-

-      return;

-   }

-

-   memset(info_ptr->pcal_params, 0, ((unsigned int)nparams + 1) *

-       (sizeof (png_charp)));

-

-   for (i = 0; i < nparams; i++)

-   {

-      length = strlen(params[i]) + 1;

-      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,

-          (unsigned long)length);

-

-      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);

-

-      if (info_ptr->pcal_params[i] == NULL)

-      {

-         png_warning(png_ptr, "Insufficient memory for pCAL parameter");

-

-         return;

-      }

-

-      memcpy(info_ptr->pcal_params[i], params[i], length);

-   }

-

-   info_ptr->valid |= PNG_INFO_pCAL;

-   info_ptr->free_me |= PNG_FREE_PCAL;

-}

-#endif

-

-#ifdef PNG_sCAL_SUPPORTED

-void PNGAPI

-png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,

-    int unit, png_const_charp swidth, png_const_charp sheight)

-{

-   png_size_t lengthw = 0, lengthh = 0;

-

-   png_debug1(1, "in %s storage function", "sCAL");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   /* Double check the unit (should never get here with an invalid

-    * unit unless this is an API call.)

-    */

-   if (unit != 1 && unit != 2)

-      png_error(png_ptr, "Invalid sCAL unit");

-

-   if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||

-       swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))

-      png_error(png_ptr, "Invalid sCAL width");

-

-   if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||

-       sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))

-      png_error(png_ptr, "Invalid sCAL height");

-

-   info_ptr->scal_unit = (png_byte)unit;

-

-   ++lengthw;

-

-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);

-

-   info_ptr->scal_s_width = png_voidcast(png_charp,

-       png_malloc_warn(png_ptr, lengthw));

-

-   if (info_ptr->scal_s_width == NULL)

-   {

-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");

-

-      return;

-   }

-

-   memcpy(info_ptr->scal_s_width, swidth, lengthw);

-

-   ++lengthh;

-

-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);

-

-   info_ptr->scal_s_height = png_voidcast(png_charp,

-       png_malloc_warn(png_ptr, lengthh));

-

-   if (info_ptr->scal_s_height == NULL)

-   {

-      png_free (png_ptr, info_ptr->scal_s_width);

-      info_ptr->scal_s_width = NULL;

-

-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");

-

-      return;

-   }

-

-   memcpy(info_ptr->scal_s_height, sheight, lengthh);

-

-   info_ptr->valid |= PNG_INFO_sCAL;

-   info_ptr->free_me |= PNG_FREE_SCAL;

-}

-

-#  ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_sCAL(png_const_structrp png_ptr, png_inforp info_ptr, int unit,

-    double width, double height)

-{

-   png_debug1(1, "in %s storage function", "sCAL");

-

-   /* Check the arguments. */

-   if (width <= 0)

-      png_warning(png_ptr, "Invalid sCAL width ignored");

-

-   else if (height <= 0)

-      png_warning(png_ptr, "Invalid sCAL height ignored");

-

-   else

-   {

-      /* Convert 'width' and 'height' to ASCII. */

-      char swidth[PNG_sCAL_MAX_DIGITS+1];

-      char sheight[PNG_sCAL_MAX_DIGITS+1];

-

-      png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,

-          PNG_sCAL_PRECISION);

-      png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,

-          PNG_sCAL_PRECISION);

-

-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);

-   }

-}

-#  endif

-

-#  ifdef PNG_FIXED_POINT_SUPPORTED

-void PNGAPI

-png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,

-    png_fixed_point width, png_fixed_point height)

-{

-   png_debug1(1, "in %s storage function", "sCAL");

-

-   /* Check the arguments. */

-   if (width <= 0)

-      png_warning(png_ptr, "Invalid sCAL width ignored");

-

-   else if (height <= 0)

-      png_warning(png_ptr, "Invalid sCAL height ignored");

-

-   else

-   {

-      /* Convert 'width' and 'height' to ASCII. */

-      char swidth[PNG_sCAL_MAX_DIGITS+1];

-      char sheight[PNG_sCAL_MAX_DIGITS+1];

-

-      png_ascii_from_fixed(png_ptr, swidth, (sizeof swidth), width);

-      png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);

-

-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);

-   }

-}

-#  endif

-#endif

-

-#ifdef PNG_pHYs_SUPPORTED

-void PNGAPI

-png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_uint_32 res_x, png_uint_32 res_y, int unit_type)

-{

-   png_debug1(1, "in %s storage function", "pHYs");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   info_ptr->x_pixels_per_unit = res_x;

-   info_ptr->y_pixels_per_unit = res_y;

-   info_ptr->phys_unit_type = (png_byte)unit_type;

-   info_ptr->valid |= PNG_INFO_pHYs;

-}

-#endif

-

-void PNGAPI

-png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,

-    png_const_colorp palette, int num_palette)

-{

-

-   png_uint_32 max_palette_length;

-

-   png_debug1(1, "in %s storage function", "PLTE");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   max_palette_length = (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?

-      (1 << info_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;

-

-   if (num_palette < 0 || num_palette > (int) max_palette_length)

-   {

-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-         png_error(png_ptr, "Invalid palette length");

-

-      else

-      {

-         png_warning(png_ptr, "Invalid palette length");

-

-         return;

-      }

-   }

-

-   if ((num_palette > 0 && palette == NULL) ||

-      (num_palette == 0

-#        ifdef PNG_MNG_FEATURES_SUPPORTED

-            && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0

-#        endif

-      ))

-   {

-      png_error(png_ptr, "Invalid palette");

-   }

-

-   /* It may not actually be necessary to set png_ptr->palette here;

-    * we do it for backward compatibility with the way the png_handle_tRNS

-    * function used to do the allocation.

-    *

-    * 1.6.0: the above statement appears to be incorrect; something has to set

-    * the palette inside png_struct on read.

-    */

-   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);

-

-   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead

-    * of num_palette entries, in case of an invalid PNG file or incorrect

-    * call to png_set_PLTE() with too-large sample values.

-    */

-   png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,

-       PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));

-

-   if (num_palette > 0)

-      memcpy(png_ptr->palette, palette, (unsigned int)num_palette *

-          (sizeof (png_color)));

-   info_ptr->palette = png_ptr->palette;

-   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;

-

-   info_ptr->free_me |= PNG_FREE_PLTE;

-

-   info_ptr->valid |= PNG_INFO_PLTE;

-}

-

-#ifdef PNG_sBIT_SUPPORTED

-void PNGAPI

-png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_color_8p sig_bit)

-{

-   png_debug1(1, "in %s storage function", "sBIT");

-

-   if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)

-      return;

-

-   info_ptr->sig_bit = *sig_bit;

-   info_ptr->valid |= PNG_INFO_sBIT;

-}

-#endif

-

-#ifdef PNG_sRGB_SUPPORTED

-void PNGAPI

-png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)

-{

-   png_debug1(1, "in %s storage function", "sRGB");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-

-void PNGAPI

-png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,

-    int srgb_intent)

-{

-   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,

-       srgb_intent) != 0)

-   {

-      /* This causes the gAMA and cHRM to be written too */

-      info_ptr->colorspace.flags |=

-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;

-   }

-

-   png_colorspace_sync_info(png_ptr, info_ptr);

-}

-#endif /* sRGB */

-

-

-#ifdef PNG_iCCP_SUPPORTED

-void PNGAPI

-png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_charp name, int compression_type,

-    png_const_bytep profile, png_uint_32 proflen)

-{

-   png_charp new_iccp_name;

-   png_bytep new_iccp_profile;

-   png_size_t length;

-

-   png_debug1(1, "in %s storage function", "iCCP");

-

-   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)

-      return;

-

-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)

-      png_app_error(png_ptr, "Invalid iCCP compression method");

-

-   /* Set the colorspace first because this validates the profile; do not

-    * override previously set app cHRM or gAMA here (because likely as not the

-    * application knows better than libpng what the correct values are.)  Pass

-    * the info_ptr color_type field to png_colorspace_set_ICC because in the

-    * write case it has not yet been stored in png_ptr.

-    */

-   {

-      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,

-          proflen, profile, info_ptr->color_type);

-

-      png_colorspace_sync_info(png_ptr, info_ptr);

-

-      /* Don't do any of the copying if the profile was bad, or inconsistent. */

-      if (result == 0)

-         return;

-

-      /* But do write the gAMA and cHRM chunks from the profile. */

-      info_ptr->colorspace.flags |=

-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;

-   }

-

-   length = strlen(name)+1;

-   new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));

-

-   if (new_iccp_name == NULL)

-   {

-      png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");

-

-      return;

-   }

-

-   memcpy(new_iccp_name, name, length);

-   new_iccp_profile = png_voidcast(png_bytep,

-       png_malloc_warn(png_ptr, proflen));

-

-   if (new_iccp_profile == NULL)

-   {

-      png_free(png_ptr, new_iccp_name);

-      png_benign_error(png_ptr,

-          "Insufficient memory to process iCCP profile");

-

-      return;

-   }

-

-   memcpy(new_iccp_profile, profile, proflen);

-

-   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);

-

-   info_ptr->iccp_proflen = proflen;

-   info_ptr->iccp_name = new_iccp_name;

-   info_ptr->iccp_profile = new_iccp_profile;

-   info_ptr->free_me |= PNG_FREE_ICCP;

-   info_ptr->valid |= PNG_INFO_iCCP;

-}

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED

-void PNGAPI

-png_set_text(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_textp text_ptr, int num_text)

-{

-   int ret;

-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);

-

-   if (ret != 0)

-      png_error(png_ptr, "Insufficient memory to store text");

-}

-

-int /* PRIVATE */

-png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_textp text_ptr, int num_text)

-{

-   int i;

-

-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U :

-      (unsigned long)png_ptr->chunk_name);

-

-   if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)

-      return(0);

-

-   /* Make sure we have enough space in the "text" array in info_struct

-    * to hold all of the incoming text_ptr objects.  This compare can't overflow

-    * because max_text >= num_text (anyway, subtract of two positive integers

-    * can't overflow in any case.)

-    */

-   if (num_text > info_ptr->max_text - info_ptr->num_text)

-   {

-      int old_num_text = info_ptr->num_text;

-      int max_text;

-      png_textp new_text = NULL;

-

-      /* Calculate an appropriate max_text, checking for overflow. */

-      max_text = old_num_text;

-      if (num_text <= INT_MAX - max_text)

-      {

-         max_text += num_text;

-

-         /* Round up to a multiple of 8 */

-         if (max_text < INT_MAX-8)

-            max_text = (max_text + 8) & ~0x7;

-

-         else

-            max_text = INT_MAX;

-

-         /* Now allocate a new array and copy the old members in; this does all

-          * the overflow checks.

-          */

-         new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,

-             info_ptr->text, old_num_text, max_text-old_num_text,

-             sizeof *new_text));

-      }

-

-      if (new_text == NULL)

-      {

-         png_chunk_report(png_ptr, "too many text chunks",

-             PNG_CHUNK_WRITE_ERROR);

-

-         return 1;

-      }

-

-      png_free(png_ptr, info_ptr->text);

-

-      info_ptr->text = new_text;

-      info_ptr->free_me |= PNG_FREE_TEXT;

-      info_ptr->max_text = max_text;

-      /* num_text is adjusted below as the entries are copied in */

-

-      png_debug1(3, "allocated %d entries for info_ptr->text", max_text);

-   }

-

-   for (i = 0; i < num_text; i++)

-   {

-      size_t text_length, key_len;

-      size_t lang_len, lang_key_len;

-      png_textp textp = &(info_ptr->text[info_ptr->num_text]);

-

-      if (text_ptr[i].key == NULL)

-          continue;

-

-      if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||

-          text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)

-      {

-         png_chunk_report(png_ptr, "text compression mode is out of range",

-             PNG_CHUNK_WRITE_ERROR);

-         continue;

-      }

-

-      key_len = strlen(text_ptr[i].key);

-

-      if (text_ptr[i].compression <= 0)

-      {

-         lang_len = 0;

-         lang_key_len = 0;

-      }

-

-      else

-#  ifdef PNG_iTXt_SUPPORTED

-      {

-         /* Set iTXt data */

-

-         if (text_ptr[i].lang != NULL)

-            lang_len = strlen(text_ptr[i].lang);

-

-         else

-            lang_len = 0;

-

-         if (text_ptr[i].lang_key != NULL)

-            lang_key_len = strlen(text_ptr[i].lang_key);

-

-         else

-            lang_key_len = 0;

-      }

-#  else /* iTXt */

-      {

-         png_chunk_report(png_ptr, "iTXt chunk not supported",

-             PNG_CHUNK_WRITE_ERROR);

-         continue;

-      }

-#  endif

-

-      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')

-      {

-         text_length = 0;

-#  ifdef PNG_iTXt_SUPPORTED

-         if (text_ptr[i].compression > 0)

-            textp->compression = PNG_ITXT_COMPRESSION_NONE;

-

-         else

-#  endif

-            textp->compression = PNG_TEXT_COMPRESSION_NONE;

-      }

-

-      else

-      {

-         text_length = strlen(text_ptr[i].text);

-         textp->compression = text_ptr[i].compression;

-      }

-

-      textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,

-          key_len + text_length + lang_len + lang_key_len + 4));

-

-      if (textp->key == NULL)

-      {

-         png_chunk_report(png_ptr, "text chunk: out of memory",

-             PNG_CHUNK_WRITE_ERROR);

-

-         return 1;

-      }

-

-      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",

-          (unsigned long)(png_uint_32)

-          (key_len + lang_len + lang_key_len + text_length + 4),

-          textp->key);

-

-      memcpy(textp->key, text_ptr[i].key, key_len);

-      *(textp->key + key_len) = '\0';

-

-      if (text_ptr[i].compression > 0)

-      {

-         textp->lang = textp->key + key_len + 1;

-         memcpy(textp->lang, text_ptr[i].lang, lang_len);

-         *(textp->lang + lang_len) = '\0';

-         textp->lang_key = textp->lang + lang_len + 1;

-         memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);

-         *(textp->lang_key + lang_key_len) = '\0';

-         textp->text = textp->lang_key + lang_key_len + 1;

-      }

-

-      else

-      {

-         textp->lang=NULL;

-         textp->lang_key=NULL;

-         textp->text = textp->key + key_len + 1;

-      }

-

-      if (text_length != 0)

-         memcpy(textp->text, text_ptr[i].text, text_length);

-

-      *(textp->text + text_length) = '\0';

-

-#  ifdef PNG_iTXt_SUPPORTED

-      if (textp->compression > 0)

-      {

-         textp->text_length = 0;

-         textp->itxt_length = text_length;

-      }

-

-      else

-#  endif

-      {

-         textp->text_length = text_length;

-         textp->itxt_length = 0;

-      }

-

-      info_ptr->num_text++;

-      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);

-   }

-

-   return(0);

-}

-#endif

-

-#ifdef PNG_tIME_SUPPORTED

-void PNGAPI

-png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_const_timep mod_time)

-{

-   png_debug1(1, "in %s storage function", "tIME");

-

-   if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||

-       (png_ptr->mode & PNG_WROTE_tIME) != 0)

-      return;

-

-   if (mod_time->month == 0   || mod_time->month > 12  ||

-       mod_time->day   == 0   || mod_time->day   > 31  ||

-       mod_time->hour  > 23   || mod_time->minute > 59 ||

-       mod_time->second > 60)

-   {

-      png_warning(png_ptr, "Ignoring invalid time value");

-

-      return;

-   }

-

-   info_ptr->mod_time = *mod_time;

-   info_ptr->valid |= PNG_INFO_tIME;

-}

-#endif

-

-#ifdef PNG_tRNS_SUPPORTED

-void PNGAPI

-png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,

-    png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)

-{

-   png_debug1(1, "in %s storage function", "tRNS");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-

-      return;

-

-   if (trans_alpha != NULL)

-   {

-       /* It may not actually be necessary to set png_ptr->trans_alpha here;

-        * we do it for backward compatibility with the way the png_handle_tRNS

-        * function used to do the allocation.

-        *

-        * 1.6.0: The above statement is incorrect; png_handle_tRNS effectively

-        * relies on png_set_tRNS storing the information in png_struct

-        * (otherwise it won't be there for the code in pngrtran.c).

-        */

-

-       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);

-

-       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)

-       {

-         /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */

-          info_ptr->trans_alpha = png_voidcast(png_bytep,

-              png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));

-          memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);

-       }

-       png_ptr->trans_alpha = info_ptr->trans_alpha;

-   }

-

-   if (trans_color != NULL)

-   {

-#ifdef PNG_WARNINGS_SUPPORTED

-      if (info_ptr->bit_depth < 16)

-      {

-         int sample_max = (1 << info_ptr->bit_depth) - 1;

-

-         if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&

-             trans_color->gray > sample_max) ||

-             (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&

-             (trans_color->red > sample_max ||

-             trans_color->green > sample_max ||

-             trans_color->blue > sample_max)))

-            png_warning(png_ptr,

-                "tRNS chunk has out-of-range samples for bit_depth");

-      }

-#endif

-

-      info_ptr->trans_color = *trans_color;

-

-      if (num_trans == 0)

-         num_trans = 1;

-   }

-

-   info_ptr->num_trans = (png_uint_16)num_trans;

-

-   if (num_trans != 0)

-   {

-      info_ptr->valid |= PNG_INFO_tRNS;

-      info_ptr->free_me |= PNG_FREE_TRNS;

-   }

-}

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-void PNGAPI

-png_set_sPLT(png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)

-/*

- *  entries        - array of png_sPLT_t structures

- *                   to be added to the list of palettes

- *                   in the info structure.

- *

- *  nentries       - number of palette structures to be

- *                   added.

- */

-{

-   png_sPLT_tp np;

-

-   if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)

-      return;

-

-   /* Use the internal realloc function, which checks for all the possible

-    * overflows.  Notice that the parameters are (int) and (size_t)

-    */

-   np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,

-       info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,

-       sizeof *np));

-

-   if (np == NULL)

-   {

-      /* Out of memory or too many chunks */

-      png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);

-

-      return;

-   }

-

-   png_free(png_ptr, info_ptr->splt_palettes);

-   info_ptr->splt_palettes = np;

-   info_ptr->free_me |= PNG_FREE_SPLT;

-

-   np += info_ptr->splt_palettes_num;

-

-   do

-   {

-      png_size_t length;

-

-      /* Skip invalid input entries */

-      if (entries->name == NULL || entries->entries == NULL)

-      {

-         /* png_handle_sPLT doesn't do this, so this is an app error */

-         png_app_error(png_ptr, "png_set_sPLT: invalid sPLT");

-         /* Just skip the invalid entry */

-         continue;

-      }

-

-      np->depth = entries->depth;

-

-      /* In the event of out-of-memory just return - there's no point keeping

-       * on trying to add sPLT chunks.

-       */

-      length = strlen(entries->name) + 1;

-      np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length));

-

-      if (np->name == NULL)

-         break;

-

-      memcpy(np->name, entries->name, length);

-

-      /* IMPORTANT: we have memory now that won't get freed if something else

-       * goes wrong; this code must free it.  png_malloc_array produces no

-       * warnings; use a png_chunk_report (below) if there is an error.

-       */

-      np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr,

-          entries->nentries, sizeof (png_sPLT_entry)));

-

-      if (np->entries == NULL)

-      {

-         png_free(png_ptr, np->name);

-         np->name = NULL;

-         break;

-      }

-

-      np->nentries = entries->nentries;

-      /* This multiply can't overflow because png_malloc_array has already

-       * checked it when doing the allocation.

-       */

-      memcpy(np->entries, entries->entries,

-          (unsigned int)entries->nentries * sizeof (png_sPLT_entry));

-

-      /* Note that 'continue' skips the advance of the out pointer and out

-       * count, so an invalid entry is not added.

-       */

-      info_ptr->valid |= PNG_INFO_sPLT;

-      ++(info_ptr->splt_palettes_num);

-      ++np;

-      ++entries;

-   }

-   while (--nentries);

-

-   if (nentries > 0)

-      png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);

-}

-#endif /* sPLT */

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-static png_byte

-check_location(png_const_structrp png_ptr, int location)

-{

-   location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);

-

-   /* New in 1.6.0; copy the location and check it.  This is an API

-    * change; previously the app had to use the

-    * png_set_unknown_chunk_location API below for each chunk.

-    */

-   if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)

-   {

-      /* Write struct, so unknown chunks come from the app */

-      png_app_warning(png_ptr,

-          "png_set_unknown_chunks now expects a valid location");

-      /* Use the old behavior */

-      location = (png_byte)(png_ptr->mode &

-          (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));

-   }

-

-   /* This need not be an internal error - if the app calls

-    * png_set_unknown_chunks on a read pointer it must get the location right.

-    */

-   if (location == 0)

-      png_error(png_ptr, "invalid location in png_set_unknown_chunks");

-

-   /* Now reduce the location to the top-most set bit by removing each least

-    * significant bit in turn.

-    */

-   while (location != (location & -location))

-      location &= ~(location & -location);

-

-   /* The cast is safe because 'location' is a bit mask and only the low four

-    * bits are significant.

-    */

-   return (png_byte)location;

-}

-

-void PNGAPI

-png_set_unknown_chunks(png_const_structrp png_ptr,

-    png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)

-{

-   png_unknown_chunkp np;

-

-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||

-       unknowns == NULL)

-      return;

-

-   /* Check for the failure cases where support has been disabled at compile

-    * time.  This code is hardly ever compiled - it's here because

-    * STORE_UNKNOWN_CHUNKS is set by both read and write code (compiling in this

-    * code) but may be meaningless if the read or write handling of unknown

-    * chunks is not compiled in.

-    */

-#  if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \

-      defined(PNG_READ_SUPPORTED)

-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)

-      {

-         png_app_error(png_ptr, "no unknown chunk support on read");

-

-         return;

-      }

-#  endif

-#  if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \

-      defined(PNG_WRITE_SUPPORTED)

-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)

-      {

-         png_app_error(png_ptr, "no unknown chunk support on write");

-

-         return;

-      }

-#  endif

-

-   /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that

-    * unknown critical chunks could be lost with just a warning resulting in

-    * undefined behavior.  Now png_chunk_report is used to provide behavior

-    * appropriate to read or write.

-    */

-   np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,

-       info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,

-       sizeof *np));

-

-   if (np == NULL)

-   {

-      png_chunk_report(png_ptr, "too many unknown chunks",

-          PNG_CHUNK_WRITE_ERROR);

-

-      return;

-   }

-

-   png_free(png_ptr, info_ptr->unknown_chunks);

-   info_ptr->unknown_chunks = np; /* safe because it is initialized */

-   info_ptr->free_me |= PNG_FREE_UNKN;

-

-   np += info_ptr->unknown_chunks_num;

-

-   /* Increment unknown_chunks_num each time round the loop to protect the

-    * just-allocated chunk data.

-    */

-   for (; num_unknowns > 0; --num_unknowns, ++unknowns)

-   {

-      memcpy(np->name, unknowns->name, (sizeof np->name));

-      np->name[(sizeof np->name)-1] = '\0';

-      np->location = check_location(png_ptr, unknowns->location);

-

-      if (unknowns->size == 0)

-      {

-         np->data = NULL;

-         np->size = 0;

-      }

-

-      else

-      {

-         np->data = png_voidcast(png_bytep,

-             png_malloc_base(png_ptr, unknowns->size));

-

-         if (np->data == NULL)

-         {

-            png_chunk_report(png_ptr, "unknown chunk: out of memory",

-                PNG_CHUNK_WRITE_ERROR);

-            /* But just skip storing the unknown chunk */

-            continue;

-         }

-

-         memcpy(np->data, unknowns->data, unknowns->size);

-         np->size = unknowns->size;

-      }

-

-      /* These increments are skipped on out-of-memory for the data - the

-       * unknown chunk entry gets overwritten if the png_chunk_report returns.

-       * This is correct in the read case (the chunk is just dropped.)

-       */

-      ++np;

-      ++(info_ptr->unknown_chunks_num);

-   }

-}

-

-void PNGAPI

-png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,

-    int chunk, int location)

-{

-   /* This API is pretty pointless in 1.6.0 because the location can be set

-    * before the call to png_set_unknown_chunks.

-    *

-    * TODO: add a png_app_warning in 1.7

-    */

-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&

-      chunk < info_ptr->unknown_chunks_num)

-   {

-      if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)

-      {

-         png_app_error(png_ptr, "invalid unknown chunk location");

-         /* Fake out the pre 1.6.0 behavior: */

-         if (((unsigned int)location & PNG_HAVE_IDAT) != 0) /* undocumented! */

-            location = PNG_AFTER_IDAT;

-

-         else

-            location = PNG_HAVE_IHDR; /* also undocumented */

-      }

-

-      info_ptr->unknown_chunks[chunk].location =

-         check_location(png_ptr, location);

-   }

-}

-#endif /* STORE_UNKNOWN_CHUNKS */

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-png_uint_32 PNGAPI

-png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)

-{

-   png_debug(1, "in png_permit_mng_features");

-

-   if (png_ptr == NULL)

-      return 0;

-

-   png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;

-

-   return png_ptr->mng_features_permitted;

-}

-#endif

-

-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-static unsigned int

-add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)

-{

-   unsigned int i;

-

-   /* Utility function: update the 'keep' state of a chunk if it is already in

-    * the list, otherwise add it to the list.

-    */

-   for (i=0; i<count; ++i, list += 5)

-   {

-      if (memcmp(list, add, 4) == 0)

-      {

-         list[4] = (png_byte)keep;

-

-         return count;

-      }

-   }

-

-   if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)

-   {

-      ++count;

-      memcpy(list, add, 4);

-      list[4] = (png_byte)keep;

-   }

-

-   return count;

-}

-

-void PNGAPI

-png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,

-    png_const_bytep chunk_list, int num_chunks_in)

-{

-   png_bytep new_list;

-   unsigned int num_chunks, old_num_chunks;

-

-   if (png_ptr == NULL)

-      return;

-

-   if (keep < 0 || keep >= PNG_HANDLE_CHUNK_LAST)

-   {

-      png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep");

-

-      return;

-   }

-

-   if (num_chunks_in <= 0)

-   {

-      png_ptr->unknown_default = keep;

-

-      /* '0' means just set the flags, so stop here */

-      if (num_chunks_in == 0)

-        return;

-   }

-

-   if (num_chunks_in < 0)

-   {

-      /* Ignore all unknown chunks and all chunks recognized by

-       * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND

-       */

-      static PNG_CONST png_byte chunks_to_ignore[] = {

-         98,  75,  71,  68, '\0',  /* bKGD */

-         99,  72,  82,  77, '\0',  /* cHRM */

-        101,  88,  73, 102, '\0',  /* eXIf */

-        103,  65,  77,  65, '\0',  /* gAMA */

-        104,  73,  83,  84, '\0',  /* hIST */

-        105,  67,  67,  80, '\0',  /* iCCP */

-        105,  84,  88, 116, '\0',  /* iTXt */

-        111,  70,  70, 115, '\0',  /* oFFs */

-        112,  67,  65,  76, '\0',  /* pCAL */

-        112,  72,  89, 115, '\0',  /* pHYs */

-        115,  66,  73,  84, '\0',  /* sBIT */

-        115,  67,  65,  76, '\0',  /* sCAL */

-        115,  80,  76,  84, '\0',  /* sPLT */

-        115,  84,  69,  82, '\0',  /* sTER */

-        115,  82,  71,  66, '\0',  /* sRGB */

-        116,  69,  88, 116, '\0',  /* tEXt */

-        116,  73,  77,  69, '\0',  /* tIME */

-        122,  84,  88, 116, '\0'   /* zTXt */

-      };

-

-      chunk_list = chunks_to_ignore;

-      num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U;

-   }

-

-   else /* num_chunks_in > 0 */

-   {

-      if (chunk_list == NULL)

-      {

-         /* Prior to 1.6.0 this was silently ignored, now it is an app_error

-          * which can be switched off.

-          */

-         png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list");

-

-         return;

-      }

-

-      num_chunks = (unsigned int)num_chunks_in;

-   }

-

-   old_num_chunks = png_ptr->num_chunk_list;

-   if (png_ptr->chunk_list == NULL)

-      old_num_chunks = 0;

-

-   /* Since num_chunks is always restricted to UINT_MAX/5 this can't overflow.

-    */

-   if (num_chunks + old_num_chunks > UINT_MAX/5)

-   {

-      png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks");

-

-      return;

-   }

-

-   /* If these chunks are being reset to the default then no more memory is

-    * required because add_one_chunk above doesn't extend the list if the 'keep'

-    * parameter is the default.

-    */

-   if (keep != 0)

-   {

-      new_list = png_voidcast(png_bytep, png_malloc(png_ptr,

-          5 * (num_chunks + old_num_chunks)));

-

-      if (old_num_chunks > 0)

-         memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);

-   }

-

-   else if (old_num_chunks > 0)

-      new_list = png_ptr->chunk_list;

-

-   else

-      new_list = NULL;

-

-   /* Add the new chunks together with each one's handling code.  If the chunk

-    * already exists the code is updated, otherwise the chunk is added to the

-    * end.  (In libpng 1.6.0 order no longer matters because this code enforces

-    * the earlier convention that the last setting is the one that is used.)

-    */

-   if (new_list != NULL)

-   {

-      png_const_bytep inlist;

-      png_bytep outlist;

-      unsigned int i;

-

-      for (i=0; i<num_chunks; ++i)

-      {

-         old_num_chunks = add_one_chunk(new_list, old_num_chunks,

-             chunk_list+5*i, keep);

-      }

-

-      /* Now remove any spurious 'default' entries. */

-      num_chunks = 0;

-      for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)

-      {

-         if (inlist[4])

-         {

-            if (outlist != inlist)

-               memcpy(outlist, inlist, 5);

-            outlist += 5;

-            ++num_chunks;

-         }

-      }

-

-      /* This means the application has removed all the specialized handling. */

-      if (num_chunks == 0)

-      {

-         if (png_ptr->chunk_list != new_list)

-            png_free(png_ptr, new_list);

-

-         new_list = NULL;

-      }

-   }

-

-   else

-      num_chunks = 0;

-

-   png_ptr->num_chunk_list = num_chunks;

-

-   if (png_ptr->chunk_list != new_list)

-   {

-      if (png_ptr->chunk_list != NULL)

-         png_free(png_ptr, png_ptr->chunk_list);

-

-      png_ptr->chunk_list = new_list;

-   }

-}

-#endif

-

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-void PNGAPI

-png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,

-    png_user_chunk_ptr read_user_chunk_fn)

-{

-   png_debug(1, "in png_set_read_user_chunk_fn");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->read_user_chunk_fn = read_user_chunk_fn;

-   png_ptr->user_chunk_ptr = user_chunk_ptr;

-}

-#endif

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-void PNGAPI

-png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,

-    png_bytepp row_pointers)

-{

-   png_debug1(1, "in %s storage function", "rows");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if (info_ptr->row_pointers != NULL &&

-       (info_ptr->row_pointers != row_pointers))

-      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);

-

-   info_ptr->row_pointers = row_pointers;

-

-   if (row_pointers != NULL)

-      info_ptr->valid |= PNG_INFO_IDAT;

-}

-#endif

-

-void PNGAPI

-png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)

-{

-   if (png_ptr == NULL)

-      return;

-

-   if (size == 0 || size > PNG_UINT_31_MAX)

-      png_error(png_ptr, "invalid compression buffer size");

-

-#  ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)

-   {

-      png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */

-      return;

-   }

-#  endif

-

-#  ifdef PNG_WRITE_SUPPORTED

-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)

-   {

-      if (png_ptr->zowner != 0)

-      {

-         png_warning(png_ptr,

-             "Compression buffer size cannot be changed because it is in use");

-

-         return;

-      }

-

-#ifndef __COVERITY__

-      /* Some compilers complain that this is always false.  However, it

-       * can be true when integer overflow happens.

-       */

-      if (size > ZLIB_IO_MAX)

-      {

-         png_warning(png_ptr,

-             "Compression buffer size limited to system maximum");

-         size = ZLIB_IO_MAX; /* must fit */

-      }

-#endif

-

-      if (size < 6)

-      {

-         /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH

-          * if this is permitted.

-          */

-         png_warning(png_ptr,

-             "Compression buffer size cannot be reduced below 6");

-

-         return;

-      }

-

-      if (png_ptr->zbuffer_size != size)

-      {

-         png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);

-         png_ptr->zbuffer_size = (uInt)size;

-      }

-   }

-#  endif

-}

-

-void PNGAPI

-png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)

-{

-   if (png_ptr != NULL && info_ptr != NULL)

-      info_ptr->valid &= (unsigned int)(~mask);

-}

-

-

-#ifdef PNG_SET_USER_LIMITS_SUPPORTED

-/* This function was added to libpng 1.2.6 */

-void PNGAPI

-png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,

-    png_uint_32 user_height_max)

-{

-   /* Images with dimensions larger than these limits will be

-    * rejected by png_set_IHDR().  To accept any PNG datastream

-    * regardless of dimensions, set both limits to 0x7fffffff.

-    */

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->user_width_max = user_width_max;

-   png_ptr->user_height_max = user_height_max;

-}

-

-/* This function was added to libpng 1.4.0 */

-void PNGAPI

-png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)

-{

-   if (png_ptr != NULL)

-      png_ptr->user_chunk_cache_max = user_chunk_cache_max;

-}

-

-/* This function was added to libpng 1.4.1 */

-void PNGAPI

-png_set_chunk_malloc_max (png_structrp png_ptr,

-    png_alloc_size_t user_chunk_malloc_max)

-{

-   if (png_ptr != NULL)

-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;

-}

-#endif /* ?SET_USER_LIMITS */

-

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-void PNGAPI

-png_set_benign_errors(png_structrp png_ptr, int allowed)

-{

-   png_debug(1, "in png_set_benign_errors");

-

-   /* If allowed is 1, png_benign_error() is treated as a warning.

-    *

-    * If allowed is 0, png_benign_error() is treated as an error (which

-    * is the default behavior if png_set_benign_errors() is not called).

-    */

-

-   if (allowed != 0)

-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |

-         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;

-

-   else

-      png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |

-         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);

-}

-#endif /* BENIGN_ERRORS */

-

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   /* Whether to report invalid palette index; added at libng-1.5.10.

-    * It is possible for an indexed (color-type==3) PNG file to contain

-    * pixels with invalid (out-of-range) indexes if the PLTE chunk has

-    * fewer entries than the image's bit-depth would allow. We recover

-    * from this gracefully by filling any incomplete palette with zeros

-    * (opaque black).  By default, when this occurs libpng will issue

-    * a benign error.  This API can be used to override that behavior.

-    */

-void PNGAPI

-png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)

-{

-   png_debug(1, "in png_set_check_for_invalid_index");

-

-   if (allowed > 0)

-      png_ptr->num_palette_max = 0;

-

-   else

-      png_ptr->num_palette_max = -1;

-}

-#endif

-

-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) || \

-    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)

-/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,

- * and if invalid, correct the keyword rather than discarding the entire

- * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in

- * length, forbids leading or trailing whitespace, multiple internal spaces,

- * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.

- *

- * The 'new_key' buffer must be 80 characters in size (for the keyword plus a

- * trailing '\0').  If this routine returns 0 then there was no keyword, or a

- * valid one could not be generated, and the caller must png_error.

- */

-png_uint_32 /* PRIVATE */

-png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)

-{

-#ifdef PNG_WARNINGS_SUPPORTED

-   png_const_charp orig_key = key;

-#endif

-   png_uint_32 key_len = 0;

-   int bad_character = 0;

-   int space = 1;

-

-   png_debug(1, "in png_check_keyword");

-

-   if (key == NULL)

-   {

-      *new_key = 0;

-      return 0;

-   }

-

-   while (*key && key_len < 79)

-   {

-      png_byte ch = (png_byte)*key++;

-

-      if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/))

-      {

-         *new_key++ = ch; ++key_len; space = 0;

-      }

-

-      else if (space == 0)

-      {

-         /* A space or an invalid character when one wasn't seen immediately

-          * before; output just a space.

-          */

-         *new_key++ = 32; ++key_len; space = 1;

-

-         /* If the character was not a space then it is invalid. */

-         if (ch != 32)

-            bad_character = ch;

-      }

-

-      else if (bad_character == 0)

-         bad_character = ch; /* just skip it, record the first error */

-   }

-

-   if (key_len > 0 && space != 0) /* trailing space */

-   {

-      --key_len; --new_key;

-      if (bad_character == 0)

-         bad_character = 32;

-   }

-

-   /* Terminate the keyword */

-   *new_key = 0;

-

-   if (key_len == 0)

-      return 0;

-

-#ifdef PNG_WARNINGS_SUPPORTED

-   /* Try to only output one warning per keyword: */

-   if (*key != 0) /* keyword too long */

-      png_warning(png_ptr, "keyword truncated");

-

-   else if (bad_character != 0)

-   {

-      PNG_WARNING_PARAMETERS(p)

-

-      png_warning_parameter(p, 1, orig_key);

-      png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_02x, bad_character);

-

-      png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'");

-   }

-#else /* !WARNINGS */

-   PNG_UNUSED(png_ptr)

-#endif /* !WARNINGS */

-

-   return key_len;

-}

-#endif /* TEXT || pCAL || iCCP || sPLT */

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngstruct.h b/plugins/AdvaImg/src/LibPNG/pngstruct.h
deleted file mode 100644
index 968764b296..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngstruct.h
+++ /dev/null
@@ -1,483 +0,0 @@
-

-/* pngstruct.h - header file for PNG reference library

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-/* The structure that holds the information to read and write PNG files.

- * The only people who need to care about what is inside of this are the

- * people who will be modifying the library for their own special needs.

- * It should NOT be accessed directly by an application.

- */

-

-#ifndef PNGSTRUCT_H

-#define PNGSTRUCT_H

-/* zlib.h defines the structure z_stream, an instance of which is included

- * in this structure and is required for decompressing the LZ compressed

- * data in PNG files.

- */

-#ifndef ZLIB_CONST

-   /* We must ensure that zlib uses 'const' in declarations. */

-#  define ZLIB_CONST

-#endif

-#include "zlib.h"

-#ifdef const

-   /* zlib.h sometimes #defines const to nothing, undo this. */

-#  undef const

-#endif

-

-/* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility

- * with older builds.

- */

-#if ZLIB_VERNUM < 0x1260

-#  define PNGZ_MSG_CAST(s) png_constcast(char*,s)

-#  define PNGZ_INPUT_CAST(b) png_constcast(png_bytep,b)

-#else

-#  define PNGZ_MSG_CAST(s) (s)

-#  define PNGZ_INPUT_CAST(b) (b)

-#endif

-

-/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib

- * can handle at once.  This type need be no larger than 16 bits (so maximum of

- * 65535), this define allows us to discover how big it is, but limited by the

- * maximuum for png_size_t.  The value can be overriden in a library build

- * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably

- * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)

- * and may even improve performance on some systems (and degrade it on others.)

- */

-#ifndef ZLIB_IO_MAX

-#  define ZLIB_IO_MAX ((uInt)-1)

-#endif

-

-#ifdef PNG_WRITE_SUPPORTED

-/* The type of a compression buffer list used by the write code. */

-typedef struct png_compression_buffer

-{

-   struct png_compression_buffer *next;

-   png_byte                       output[1]; /* actually zbuf_size */

-} png_compression_buffer, *png_compression_bufferp;

-

-#define PNG_COMPRESSION_BUFFER_SIZE(pp)\

-   (offsetof(png_compression_buffer, output) + (pp)->zbuffer_size)

-#endif

-

-/* Colorspace support; structures used in png_struct, png_info and in internal

- * functions to hold and communicate information about the color space.

- *

- * PNG_COLORSPACE_SUPPORTED is only required if the application will perform

- * colorspace corrections, otherwise all the colorspace information can be

- * skipped and the size of libpng can be reduced (significantly) by compiling

- * out the colorspace support.

- */

-#ifdef PNG_COLORSPACE_SUPPORTED

-/* The chromaticities of the red, green and blue colorants and the chromaticity

- * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).

- */

-typedef struct png_xy

-{

-   png_fixed_point redx, redy;

-   png_fixed_point greenx, greeny;

-   png_fixed_point bluex, bluey;

-   png_fixed_point whitex, whitey;

-} png_xy;

-

-/* The same data as above but encoded as CIE XYZ values.  When this data comes

- * from chromaticities the sum of the Y values is assumed to be 1.0

- */

-typedef struct png_XYZ

-{

-   png_fixed_point red_X, red_Y, red_Z;

-   png_fixed_point green_X, green_Y, green_Z;

-   png_fixed_point blue_X, blue_Y, blue_Z;

-} png_XYZ;

-#endif /* COLORSPACE */

-

-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)

-/* A colorspace is all the above plus, potentially, profile information;

- * however at present libpng does not use the profile internally so it is only

- * stored in the png_info struct (if iCCP is supported.)  The rendering intent

- * is retained here and is checked.

- *

- * The file gamma encoding information is also stored here and gamma correction

- * is done by libpng, whereas color correction must currently be done by the

- * application.

- */

-typedef struct png_colorspace

-{

-#ifdef PNG_GAMMA_SUPPORTED

-   png_fixed_point gamma;        /* File gamma */

-#endif

-

-#ifdef PNG_COLORSPACE_SUPPORTED

-   png_xy      end_points_xy;    /* End points as chromaticities */

-   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */

-   png_uint_16 rendering_intent; /* Rendering intent of a profile */

-#endif

-

-   /* Flags are always defined to simplify the code. */

-   png_uint_16 flags;            /* As defined below */

-} png_colorspace, * PNG_RESTRICT png_colorspacerp;

-

-typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;

-

-/* General flags for the 'flags' field */

-#define PNG_COLORSPACE_HAVE_GAMMA           0x0001

-#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002

-#define PNG_COLORSPACE_HAVE_INTENT          0x0004

-#define PNG_COLORSPACE_FROM_gAMA            0x0008

-#define PNG_COLORSPACE_FROM_cHRM            0x0010

-#define PNG_COLORSPACE_FROM_sRGB            0x0020

-#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040

-#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */

-#define PNG_COLORSPACE_INVALID              0x8000

-#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))

-#endif /* COLORSPACE || GAMMA */

-

-struct png_struct_def

-{

-#ifdef PNG_SETJMP_SUPPORTED

-   jmp_buf jmp_buf_local;     /* New name in 1.6.0 for jmp_buf in png_struct */

-   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */

-   jmp_buf *jmp_buf_ptr;      /* passed to longjmp_fn */

-   size_t jmp_buf_size;       /* size of the above, if allocated */

-#endif

-   png_error_ptr error_fn;    /* function for printing errors and aborting */

-#ifdef PNG_WARNINGS_SUPPORTED

-   png_error_ptr warning_fn;  /* function for printing warnings */

-#endif

-   png_voidp error_ptr;       /* user supplied struct for error functions */

-   png_rw_ptr write_data_fn;  /* function for writing output data */

-   png_rw_ptr read_data_fn;   /* function for reading input data */

-   png_voidp io_ptr;          /* ptr to application struct for I/O functions */

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-   png_user_transform_ptr read_user_transform_fn; /* user read transform */

-#endif

-

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-   png_user_transform_ptr write_user_transform_fn; /* user write transform */

-#endif

-

-/* These were added in libpng-1.0.2 */

-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \

-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-   png_voidp user_transform_ptr; /* user supplied struct for user transform */

-   png_byte user_transform_depth;    /* bit depth of user transformed pixels */

-   png_byte user_transform_channels; /* channels in user transformed pixels */

-#endif

-#endif

-

-   png_uint_32 mode;          /* tells us where we are in the PNG file */

-   png_uint_32 flags;         /* flags indicating various things to libpng */

-   png_uint_32 transformations; /* which transformations to perform */

-

-   png_uint_32 zowner;        /* ID (chunk type) of zstream owner, 0 if none */

-   z_stream    zstream;       /* decompression structure */

-

-#ifdef PNG_WRITE_SUPPORTED

-   png_compression_bufferp zbuffer_list; /* Created on demand during write */

-   uInt                    zbuffer_size; /* size of the actual buffer */

-

-   int zlib_level;            /* holds zlib compression level */

-   int zlib_method;           /* holds zlib compression method */

-   int zlib_window_bits;      /* holds zlib compression window bits */

-   int zlib_mem_level;        /* holds zlib compression memory level */

-   int zlib_strategy;         /* holds zlib compression strategy */

-#endif

-/* Added at libpng 1.5.4 */

-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-   int zlib_text_level;            /* holds zlib compression level */

-   int zlib_text_method;           /* holds zlib compression method */

-   int zlib_text_window_bits;      /* holds zlib compression window bits */

-   int zlib_text_mem_level;        /* holds zlib compression memory level */

-   int zlib_text_strategy;         /* holds zlib compression strategy */

-#endif

-/* End of material added at libpng 1.5.4 */

-/* Added at libpng 1.6.0 */

-#ifdef PNG_WRITE_SUPPORTED

-   int zlib_set_level;        /* Actual values set into the zstream on write */

-   int zlib_set_method;

-   int zlib_set_window_bits;

-   int zlib_set_mem_level;

-   int zlib_set_strategy;

-#endif

-

-   png_uint_32 width;         /* width of image in pixels */

-   png_uint_32 height;        /* height of image in pixels */

-   png_uint_32 num_rows;      /* number of rows in current pass */

-   png_uint_32 usr_width;     /* width of row at start of write */

-   png_size_t rowbytes;       /* size of row in bytes */

-   png_uint_32 iwidth;        /* width of current interlaced row in pixels */

-   png_uint_32 row_number;    /* current row in interlace pass */

-   png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */

-   png_bytep prev_row;        /* buffer to save previous (unfiltered) row.

-                               * While reading this is a pointer into

-                               * big_prev_row; while writing it is separately

-                               * allocated if needed.

-                               */

-   png_bytep row_buf;         /* buffer to save current (unfiltered) row.

-                               * While reading, this is a pointer into

-                               * big_row_buf; while writing it is separately

-                               * allocated.

-                               */

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   png_bytep try_row;    /* buffer to save trial row when filtering */

-   png_bytep tst_row;    /* buffer to save best trial row when filtering */

-#endif

-   png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */

-

-   png_uint_32 idat_size;     /* current IDAT size for read */

-   png_uint_32 crc;           /* current chunk CRC value */

-   png_colorp palette;        /* palette from the input file */

-   png_uint_16 num_palette;   /* number of color entries in palette */

-

-/* Added at libpng-1.5.10 */

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   int num_palette_max;       /* maximum palette index found in IDAT */

-#endif

-

-   png_uint_16 num_trans;     /* number of transparency values */

-   png_byte compression;      /* file compression type (always 0) */

-   png_byte filter;           /* file filter type (always 0) */

-   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */

-   png_byte pass;             /* current interlace pass (0 - 6) */

-   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ in png.h ) */

-   png_byte color_type;       /* color type of file */

-   png_byte bit_depth;        /* bit depth of file */

-   png_byte usr_bit_depth;    /* bit depth of users row: write only */

-   png_byte pixel_depth;      /* number of bits per pixel */

-   png_byte channels;         /* number of channels in file */

-#ifdef PNG_WRITE_SUPPORTED

-   png_byte usr_channels;     /* channels at start of write: write only */

-#endif

-   png_byte sig_bytes;        /* magic bytes read/written from start of file */

-   png_byte maximum_pixel_depth;

-                              /* pixel depth used for the row buffers */

-   png_byte transformed_pixel_depth;

-                              /* pixel depth after read/write transforms */

-#if ZLIB_VERNUM >= 0x1240

-   png_byte zstream_start;    /* at start of an input zlib stream */

-#endif /* Zlib >= 1.2.4 */

-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)

-   png_uint_16 filler;           /* filler bytes for pixel expansion */

-#endif

-

-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) ||\

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)

-   png_byte background_gamma_type;

-   png_fixed_point background_gamma;

-   png_color_16 background;   /* background color in screen gamma space */

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   png_color_16 background_1; /* background normalized to gamma 1.0 */

-#endif

-#endif /* bKGD */

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-   png_flush_ptr output_flush_fn; /* Function for flushing output */

-   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */

-   png_uint_32 flush_rows;    /* number of rows written since last flush */

-#endif

-

-#ifdef PNG_READ_GAMMA_SUPPORTED

-   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */

-   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */

-

-   png_bytep gamma_table;     /* gamma table for 8-bit depth files */

-   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \

-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \

-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)

-   png_bytep gamma_from_1;    /* converts from 1.0 to screen */

-   png_bytep gamma_to_1;      /* converts from file to 1.0 */

-   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */

-   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */

-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */

-#endif

-

-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)

-   png_color_8 sig_bit;       /* significant bits in each available channel */

-#endif

-

-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)

-   png_color_8 shift;         /* shift for significant bit tranformation */

-#endif

-

-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \

- || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)

-   png_bytep trans_alpha;           /* alpha values for paletted files */

-   png_color_16 trans_color;  /* transparent color for non-paletted files */

-#endif

-

-   png_read_status_ptr read_row_fn;   /* called after each row is decoded */

-   png_write_status_ptr write_row_fn; /* called after each row is encoded */

-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED

-   png_progressive_info_ptr info_fn; /* called after header data fully read */

-   png_progressive_row_ptr row_fn;   /* called after a prog. row is decoded */

-   png_progressive_end_ptr end_fn;   /* called after image is complete */

-   png_bytep save_buffer_ptr;        /* current location in save_buffer */

-   png_bytep save_buffer;            /* buffer for previously read data */

-   png_bytep current_buffer_ptr;     /* current location in current_buffer */

-   png_bytep current_buffer;         /* buffer for recently used data */

-   png_uint_32 push_length;          /* size of current input chunk */

-   png_uint_32 skip_length;          /* bytes to skip in input data */

-   png_size_t save_buffer_size;      /* amount of data now in save_buffer */

-   png_size_t save_buffer_max;       /* total size of save_buffer */

-   png_size_t buffer_size;           /* total amount of available input data */

-   png_size_t current_buffer_size;   /* amount of data now in current_buffer */

-   int process_mode;                 /* what push library is currently doing */

-   int cur_palette;                  /* current push library palette index */

-

-#endif /* PROGRESSIVE_READ */

-

-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)

-/* For the Borland special 64K segment handler */

-   png_bytepp offset_table_ptr;

-   png_bytep offset_table;

-   png_uint_16 offset_table_number;

-   png_uint_16 offset_table_count;

-   png_uint_16 offset_table_count_free;

-#endif

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-   png_bytep palette_lookup; /* lookup table for quantizing */

-   png_bytep quantize_index; /* index translation for palette files */

-#endif

-

-/* Options */

-#ifdef PNG_SET_OPTION_SUPPORTED

-   png_uint_32 options;           /* On/off state (up to 16 options) */

-#endif

-

-#if PNG_LIBPNG_VER < 10700

-/* To do: remove this from libpng-1.7 */

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-   char time_buffer[29]; /* String to hold RFC 1123 time text */

-#endif

-#endif

-

-/* New members added in libpng-1.0.6 */

-

-   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */

-

-#ifdef PNG_USER_CHUNKS_SUPPORTED

-   png_voidp user_chunk_ptr;

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */

-#endif

-#endif

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-   int          unknown_default; /* As PNG_HANDLE_* */

-   unsigned int num_chunk_list;  /* Number of entries in the list */

-   png_bytep    chunk_list;      /* List of png_byte[5]; the textual chunk name

-                                  * followed by a PNG_HANDLE_* byte */

-#endif

-

-/* New members added in libpng-1.0.3 */

-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED

-   png_byte rgb_to_gray_status;

-   /* Added in libpng 1.5.5 to record setting of coefficients: */

-   png_byte rgb_to_gray_coefficients_set;

-   /* These were changed from png_byte in libpng-1.0.6 */

-   png_uint_16 rgb_to_gray_red_coeff;

-   png_uint_16 rgb_to_gray_green_coeff;

-   /* deleted in 1.5.5: rgb_to_gray_blue_coeff; */

-#endif

-

-/* New member added in libpng-1.0.4 (renamed in 1.0.9) */

-#if defined(PNG_MNG_FEATURES_SUPPORTED)

-/* Changed from png_byte to png_uint_32 at version 1.2.0 */

-   png_uint_32 mng_features_permitted;

-#endif

-

-/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   png_byte filter_type;

-#endif

-

-/* New members added in libpng-1.2.0 */

-

-/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */

-#ifdef PNG_USER_MEM_SUPPORTED

-   png_voidp mem_ptr;             /* user supplied struct for mem functions */

-   png_malloc_ptr malloc_fn;      /* function for allocating memory */

-   png_free_ptr free_fn;          /* function for freeing memory */

-#endif

-

-/* New member added in libpng-1.0.13 and 1.2.0 */

-   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */

-

-#ifdef PNG_READ_QUANTIZE_SUPPORTED

-/* The following three members were added at version 1.0.14 and 1.2.4 */

-   png_bytep quantize_sort;          /* working sort array */

-   png_bytep index_to_palette;       /* where the original index currently is

-                                        in the palette */

-   png_bytep palette_to_index;       /* which original index points to this

-                                         palette color */

-#endif

-

-/* New members added in libpng-1.0.16 and 1.2.6 */

-   png_byte compression_type;

-

-#ifdef PNG_USER_LIMITS_SUPPORTED

-   png_uint_32 user_width_max;

-   png_uint_32 user_height_max;

-

-   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown

-    * chunks that can be stored (0 means unlimited).

-    */

-   png_uint_32 user_chunk_cache_max;

-

-   /* Total memory that a zTXt, sPLT, iTXt, iCCP, or unknown chunk

-    * can occupy when decompressed.  0 means unlimited.

-    */

-   png_alloc_size_t user_chunk_malloc_max;

-#endif

-

-/* New member added in libpng-1.0.25 and 1.2.17 */

-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

-   /* Temporary storage for unknown chunk that the library doesn't recognize,

-    * used while reading the chunk.

-    */

-   png_unknown_chunk unknown_chunk;

-#endif

-

-/* New member added in libpng-1.2.26 */

-  png_size_t old_big_row_buf_size;

-

-#ifdef PNG_READ_SUPPORTED

-/* New member added in libpng-1.2.30 */

-  png_bytep        read_buffer;      /* buffer for reading chunk data */

-  png_alloc_size_t read_buffer_size; /* current size of the buffer */

-#endif

-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED

-  uInt             IDAT_read_size;   /* limit on read buffer size for IDAT */

-#endif

-

-#ifdef PNG_IO_STATE_SUPPORTED

-/* New member added in libpng-1.4.0 */

-   png_uint_32 io_state;

-#endif

-

-/* New member added in libpng-1.5.6 */

-   png_bytep big_prev_row;

-

-/* New member added in libpng-1.5.7 */

-   void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,

-      png_bytep row, png_const_bytep prev_row);

-

-#ifdef PNG_READ_SUPPORTED

-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)

-   png_colorspace   colorspace;

-#endif

-#endif

-};

-#endif /* PNGSTRUCT_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngtest.c b/plugins/AdvaImg/src/LibPNG/pngtest.c
deleted file mode 100644
index e56cbaeefa..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngtest.c
+++ /dev/null
@@ -1,2156 +0,0 @@
-

-/* pngtest.c - a simple test program to test libpng

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This program reads in a PNG image, writes it out again, and then

- * compares the two files.  If the files are identical, this shows that

- * the basic chunk handling, filtering, and (de)compression code is working

- * properly.  It does not currently test all of the transforms, although

- * it probably should.

- *

- * The program will report "FAIL" in certain legitimate cases:

- * 1) when the compression level or filter selection method is changed.

- * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.

- * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks

- *    exist in the input file.

- * 4) others not listed here...

- * In these cases, it is best to check with another tool such as "pngcheck"

- * to see what the differences between the two files are.

- *

- * If a filename is given on the command-line, then this file is used

- * for the input, rather than the default "pngtest.png".  This allows

- * testing a wide variety of files easily.  You can also test a number

- * of files at once by typing "pngtest -m file1.png file2.png ..."

- */

-

-#define _POSIX_SOURCE 1

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-/* Defined so I can write to a file on gui/windowing platforms */

-/*  #define STDERR stderr  */

-#define STDERR stdout   /* For DOS */

-

-#include "png.h"

-

-/* Known chunks that exist in pngtest.png must be supported or pngtest will fail

- * simply as a result of re-ordering them.  This may be fixed in 1.7

- *

- * pngtest allocates a single row buffer for each row and overwrites it,

- * therefore if the write side doesn't support the writing of interlaced images

- * nothing can be done for an interlaced image (and the code below will fail

- * horribly trying to write extra data after writing garbage).

- */

-#if defined PNG_READ_SUPPORTED && /* else nothing can be done */\

-   defined PNG_READ_bKGD_SUPPORTED &&\

-   defined PNG_READ_cHRM_SUPPORTED &&\

-   defined PNG_READ_gAMA_SUPPORTED &&\

-   defined PNG_READ_oFFs_SUPPORTED &&\

-   defined PNG_READ_pCAL_SUPPORTED &&\

-   defined PNG_READ_pHYs_SUPPORTED &&\

-   defined PNG_READ_sBIT_SUPPORTED &&\

-   defined PNG_READ_sCAL_SUPPORTED &&\

-   defined PNG_READ_sRGB_SUPPORTED &&\

-   defined PNG_READ_sPLT_SUPPORTED &&\

-   defined PNG_READ_tEXt_SUPPORTED &&\

-   defined PNG_READ_tIME_SUPPORTED &&\

-   defined PNG_READ_zTXt_SUPPORTED &&\

-   (defined PNG_WRITE_INTERLACING_SUPPORTED || PNG_LIBPNG_VER >= 10700)

-

-#ifdef PNG_ZLIB_HEADER

-#  include PNG_ZLIB_HEADER /* defined by pnglibconf.h from 1.7 */

-#else

-#  include "zlib.h"

-#endif

-

-/* Copied from pngpriv.h but only used in error messages below. */

-#ifndef PNG_ZBUF_SIZE

-#  define PNG_ZBUF_SIZE 8192

-#endif

-#define FCLOSE(file) fclose(file)

-

-#ifndef PNG_STDIO_SUPPORTED

-typedef FILE                * png_FILE_p;

-#endif

-

-/* Makes pngtest verbose so we can find problems. */

-#ifndef PNG_DEBUG

-#  define PNG_DEBUG 0

-#endif

-

-#if PNG_DEBUG > 1

-#  define pngtest_debug(m)        ((void)fprintf(stderr, m "\n"))

-#  define pngtest_debug1(m,p1)    ((void)fprintf(stderr, m "\n", p1))

-#  define pngtest_debug2(m,p1,p2) ((void)fprintf(stderr, m "\n", p1, p2))

-#else

-#  define pngtest_debug(m)        ((void)0)

-#  define pngtest_debug1(m,p1)    ((void)0)

-#  define pngtest_debug2(m,p1,p2) ((void)0)

-#endif

-

-#if !PNG_DEBUG

-#  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */

-#endif

-

-#ifndef PNG_UNUSED

-#  define PNG_UNUSED(param) (void)param;

-#endif

-

-/* Turn on CPU timing

-#define PNGTEST_TIMING

-*/

-

-#ifndef PNG_FLOATING_POINT_SUPPORTED

-#undef PNGTEST_TIMING

-#endif

-

-#ifdef PNGTEST_TIMING

-static float t_start, t_stop, t_decode, t_encode, t_misc;

-#include <time.h>

-#endif

-

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-#define PNG_tIME_STRING_LENGTH 29

-static int tIME_chunk_present = 0;

-static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";

-

-#if PNG_LIBPNG_VER < 10619

-#define png_convert_to_rfc1123_buffer(ts, t) tIME_to_str(read_ptr, ts, t)

-

-static int

-tIME_to_str(png_structp png_ptr, png_charp ts, png_const_timep t)

-{

-   png_const_charp str = png_convert_to_rfc1123(png_ptr, t);

-

-   if (str == NULL)

-       return 0;

-

-   strcpy(ts, str);

-   return 1;

-}

-#endif /* older libpng */

-#endif

-

-static int verbose = 0;

-static int strict = 0;

-static int relaxed = 0;

-static int xfail = 0;

-static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */

-static int error_count = 0; /* count calls to png_error */

-static int warning_count = 0; /* count calls to png_warning */

-

-/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */

-#ifndef png_jmpbuf

-#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf

-#endif

-

-/* Defines for unknown chunk handling if required. */

-#ifndef PNG_HANDLE_CHUNK_ALWAYS

-#  define PNG_HANDLE_CHUNK_ALWAYS       3

-#endif

-#ifndef PNG_HANDLE_CHUNK_IF_SAFE

-#  define PNG_HANDLE_CHUNK_IF_SAFE      2

-#endif

-

-/* Utility to save typing/errors, the argument must be a name */

-#define MEMZERO(var) ((void)memset(&var, 0, sizeof var))

-

-/* Example of using row callbacks to make a simple progress meter */

-static int status_pass = 1;

-static int status_dots_requested = 0;

-static int status_dots = 1;

-

-static void PNGCBAPI

-read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)

-{

-   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)

-      return;

-

-   if (status_pass != pass)

-   {

-      fprintf(stdout, "\n Pass %d: ", pass);

-      status_pass = pass;

-      status_dots = 31;

-   }

-

-   status_dots--;

-

-   if (status_dots == 0)

-   {

-      fprintf(stdout, "\n         ");

-      status_dots=30;

-   }

-

-   fprintf(stdout, "r");

-}

-

-#ifdef PNG_WRITE_SUPPORTED

-static void PNGCBAPI

-write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)

-{

-   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)

-      return;

-

-   fprintf(stdout, "w");

-}

-#endif

-

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-/* Example of using a user transform callback (doesn't do anything at present).

- */

-static void PNGCBAPI

-read_user_callback(png_structp png_ptr, png_row_infop row_info, png_bytep data)

-{

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(row_info)

-   PNG_UNUSED(data)

-}

-#endif

-

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-/* Example of using user transform callback (we don't transform anything,

- * but merely count the zero samples)

- */

-

-static png_uint_32 zero_samples;

-

-static void PNGCBAPI

-count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)

-{

-   png_bytep dp = data;

-   if (png_ptr == NULL)

-      return;

-

-   /* Contents of row_info:

-    *  png_uint_32 width      width of row

-    *  png_uint_32 rowbytes   number of bytes in row

-    *  png_byte color_type    color type of pixels

-    *  png_byte bit_depth     bit depth of samples

-    *  png_byte channels      number of channels (1-4)

-    *  png_byte pixel_depth   bits per pixel (depth*channels)

-    */

-

-   /* Counts the number of zero samples (or zero pixels if color_type is 3 */

-

-   if (row_info->color_type == 0 || row_info->color_type == 3)

-   {

-      int pos = 0;

-      png_uint_32 n, nstop;

-

-      for (n = 0, nstop=row_info->width; n<nstop; n++)

-      {

-         if (row_info->bit_depth == 1)

-         {

-            if (((*dp << pos++ ) & 0x80) == 0)

-               zero_samples++;

-

-            if (pos == 8)

-            {

-               pos = 0;

-               dp++;

-            }

-         }

-

-         if (row_info->bit_depth == 2)

-         {

-            if (((*dp << (pos+=2)) & 0xc0) == 0)

-               zero_samples++;

-

-            if (pos == 8)

-            {

-               pos = 0;

-               dp++;

-            }

-         }

-

-         if (row_info->bit_depth == 4)

-         {

-            if (((*dp << (pos+=4)) & 0xf0) == 0)

-               zero_samples++;

-

-            if (pos == 8)

-            {

-               pos = 0;

-               dp++;

-            }

-         }

-

-         if (row_info->bit_depth == 8)

-            if (*dp++ == 0)

-               zero_samples++;

-

-         if (row_info->bit_depth == 16)

-         {

-            if ((*dp | *(dp+1)) == 0)

-               zero_samples++;

-            dp+=2;

-         }

-      }

-   }

-   else /* Other color types */

-   {

-      png_uint_32 n, nstop;

-      int channel;

-      int color_channels = row_info->channels;

-      if (row_info->color_type > 3)

-         color_channels--;

-

-      for (n = 0, nstop=row_info->width; n<nstop; n++)

-      {

-         for (channel = 0; channel < color_channels; channel++)

-         {

-            if (row_info->bit_depth == 8)

-               if (*dp++ == 0)

-                  zero_samples++;

-

-            if (row_info->bit_depth == 16)

-            {

-               if ((*dp | *(dp+1)) == 0)

-                  zero_samples++;

-

-               dp+=2;

-            }

-         }

-         if (row_info->color_type > 3)

-         {

-            dp++;

-            if (row_info->bit_depth == 16)

-               dp++;

-         }

-      }

-   }

-}

-#endif /* WRITE_USER_TRANSFORM */

-

-#ifndef PNG_STDIO_SUPPORTED

-/* START of code to validate stdio-free compilation */

-/* These copies of the default read/write functions come from pngrio.c and

- * pngwio.c.  They allow "don't include stdio" testing of the library.

- * This is the function that does the actual reading of data.  If you are

- * not reading from a standard C stream, you should create a replacement

- * read_data function and use it at run time with png_set_read_fn(), rather

- * than changing the library.

- */

-

-#ifdef PNG_IO_STATE_SUPPORTED

-void

-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,

-    png_uint_32 io_op);

-void

-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,

-    png_uint_32 io_op)

-{

-   png_uint_32 io_state = png_get_io_state(png_ptr);

-   int err = 0;

-

-   /* Check if the current operation (reading / writing) is as expected. */

-   if ((io_state & PNG_IO_MASK_OP) != io_op)

-      png_error(png_ptr, "Incorrect operation in I/O state");

-

-   /* Check if the buffer size specific to the current location

-    * (file signature / header / data / crc) is as expected.

-    */

-   switch (io_state & PNG_IO_MASK_LOC)

-   {

-   case PNG_IO_SIGNATURE:

-      if (data_length > 8)

-         err = 1;

-      break;

-   case PNG_IO_CHUNK_HDR:

-      if (data_length != 8)

-         err = 1;

-      break;

-   case PNG_IO_CHUNK_DATA:

-      break;  /* no restrictions here */

-   case PNG_IO_CHUNK_CRC:

-      if (data_length != 4)

-         err = 1;

-      break;

-   default:

-      err = 1;  /* uninitialized */

-   }

-   if (err != 0)

-      png_error(png_ptr, "Bad I/O state or buffer size");

-}

-#endif

-

-static void PNGCBAPI

-pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)

-{

-   png_size_t check = 0;

-   png_voidp io_ptr;

-

-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t

-    * instead of an int, which is what fread() actually returns.

-    */

-   io_ptr = png_get_io_ptr(png_ptr);

-   if (io_ptr != NULL)

-   {

-      check = fread(data, 1, length, (png_FILE_p)io_ptr);

-   }

-

-   if (check != length)

-   {

-      png_error(png_ptr, "Read Error");

-   }

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);

-#endif

-}

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-static void PNGCBAPI

-pngtest_flush(png_structp png_ptr)

-{

-   /* Do nothing; fflush() is said to be just a waste of energy. */

-   PNG_UNUSED(png_ptr)   /* Stifle compiler warning */

-}

-#endif

-

-/* This is the function that does the actual writing of data.  If you are

- * not writing to a standard C stream, you should create a replacement

- * write_data function and use it at run time with png_set_write_fn(), rather

- * than changing the library.

- */

-static void PNGCBAPI

-pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)

-{

-   png_size_t check;

-

-   check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));

-

-   if (check != length)

-   {

-      png_error(png_ptr, "Write Error");

-   }

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);

-#endif

-}

-#endif /* !STDIO */

-

-/* This function is called when there is a warning, but the library thinks

- * it can continue anyway.  Replacement functions don't have to do anything

- * here if you don't want to.  In the default configuration, png_ptr is

- * not used, but it is passed in case it may be useful.

- */

-typedef struct

-{

-   PNG_CONST char *file_name;

-}  pngtest_error_parameters;

-

-static void PNGCBAPI

-pngtest_warning(png_structp png_ptr, png_const_charp message)

-{

-   PNG_CONST char *name = "UNKNOWN (ERROR!)";

-   pngtest_error_parameters *test =

-      (pngtest_error_parameters*)png_get_error_ptr(png_ptr);

-

-   ++warning_count;

-

-   if (test != NULL && test->file_name != NULL)

-      name = test->file_name;

-

-   fprintf(STDERR, "\n%s: libpng warning: %s\n", name, message);

-}

-

-/* This is the default error handling function.  Note that replacements for

- * this function MUST NOT RETURN, or the program will likely crash.  This

- * function is used by default, or if the program supplies NULL for the

- * error function pointer in png_set_error_fn().

- */

-static void PNGCBAPI

-pngtest_error(png_structp png_ptr, png_const_charp message)

-{

-   ++error_count;

-

-   pngtest_warning(png_ptr, message);

-   /* We can return because png_error calls the default handler, which is

-    * actually OK in this case.

-    */

-}

-

-/* END of code to validate stdio-free compilation */

-

-/* START of code to validate memory allocation and deallocation */

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-

-/* Allocate memory.  For reasonable files, size should never exceed

- * 64K.  However, zlib may allocate more than 64K if you don't tell

- * it not to.  See zconf.h and png.h for more information.  zlib does

- * need to allocate exactly 64K, so whatever you call here must

- * have the ability to do that.

- *

- * This piece of code can be compiled to validate max 64K allocations

- * by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K.

- */

-typedef struct memory_information

-{

-   png_alloc_size_t          size;

-   png_voidp                 pointer;

-   struct memory_information *next;

-} memory_information;

-typedef memory_information *memory_infop;

-

-static memory_infop pinformation = NULL;

-static int current_allocation = 0;

-static int maximum_allocation = 0;

-static int total_allocation = 0;

-static int num_allocations = 0;

-

-png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,

-    png_alloc_size_t size));

-void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));

-

-png_voidp

-PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)

-{

-

-   /* png_malloc has already tested for NULL; png_create_struct calls

-    * png_debug_malloc directly, with png_ptr == NULL which is OK

-    */

-

-   if (size == 0)

-      return (NULL);

-

-   /* This calls the library allocator twice, once to get the requested

-      buffer and once to get a new free list entry. */

-   {

-      /* Disable malloc_fn and free_fn */

-      memory_infop pinfo;

-      png_set_mem_fn(png_ptr, NULL, NULL, NULL);

-      pinfo = (memory_infop)png_malloc(png_ptr,

-          (sizeof *pinfo));

-      pinfo->size = size;

-      current_allocation += size;

-      total_allocation += size;

-      num_allocations ++;

-

-      if (current_allocation > maximum_allocation)

-         maximum_allocation = current_allocation;

-

-      pinfo->pointer = png_malloc(png_ptr, size);

-      /* Restore malloc_fn and free_fn */

-

-      png_set_mem_fn(png_ptr,

-          NULL, png_debug_malloc, png_debug_free);

-

-      if (size != 0 && pinfo->pointer == NULL)

-      {

-         current_allocation -= size;

-         total_allocation -= size;

-         png_error(png_ptr,

-           "out of memory in pngtest->png_debug_malloc");

-      }

-

-      pinfo->next = pinformation;

-      pinformation = pinfo;

-      /* Make sure the caller isn't assuming zeroed memory. */

-      memset(pinfo->pointer, 0xdd, pinfo->size);

-

-      if (verbose != 0)

-         printf("png_malloc %lu bytes at %p\n", (unsigned long)size,

-             pinfo->pointer);

-

-      return (png_voidp)(pinfo->pointer);

-   }

-}

-

-/* Free a pointer.  It is removed from the list at the same time. */

-void PNGCBAPI

-png_debug_free(png_structp png_ptr, png_voidp ptr)

-{

-   if (png_ptr == NULL)

-      fprintf(STDERR, "NULL pointer to png_debug_free.\n");

-

-   if (ptr == 0)

-   {

-#if 0 /* This happens all the time. */

-      fprintf(STDERR, "WARNING: freeing NULL pointer\n");

-#endif

-      return;

-   }

-

-   /* Unlink the element from the list. */

-   if (pinformation != NULL)

-   {

-      memory_infop *ppinfo = &pinformation;

-

-      for (;;)

-      {

-         memory_infop pinfo = *ppinfo;

-

-         if (pinfo->pointer == ptr)

-         {

-            *ppinfo = pinfo->next;

-            current_allocation -= pinfo->size;

-            if (current_allocation < 0)

-               fprintf(STDERR, "Duplicate free of memory\n");

-            /* We must free the list element too, but first kill

-               the memory that is to be freed. */

-            memset(ptr, 0x55, pinfo->size);

-            free(pinfo);

-            pinfo = NULL;

-            break;

-         }

-

-         if (pinfo->next == NULL)

-         {

-            fprintf(STDERR, "Pointer %p not found\n", ptr);

-            break;

-         }

-

-         ppinfo = &pinfo->next;

-      }

-   }

-

-   /* Finally free the data. */

-   if (verbose != 0)

-      printf("Freeing %p\n", ptr);

-

-   if (ptr != NULL)

-      free(ptr);

-   ptr = NULL;

-}

-#endif /* USER_MEM && DEBUG */

-/* END of code to test memory allocation/deallocation */

-

-

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-/* Demonstration of user chunk support of the sTER and vpAg chunks */

-

-/* (sTER is a public chunk not yet known by libpng.  vpAg is a private

-chunk used in ImageMagick to store "virtual page" size).  */

-

-static struct user_chunk_data

-{

-   png_const_infop info_ptr;

-   png_uint_32     vpAg_width, vpAg_height;

-   png_byte        vpAg_units;

-   png_byte        sTER_mode;

-   int             location[2];

-}

-user_chunk_data;

-

-/* Used for location and order; zero means nothing. */

-#define have_sTER   0x01

-#define have_vpAg   0x02

-#define before_PLTE 0x10

-#define before_IDAT 0x20

-#define after_IDAT  0x40

-

-static void

-init_callback_info(png_const_infop info_ptr)

-{

-   MEMZERO(user_chunk_data);

-   user_chunk_data.info_ptr = info_ptr;

-}

-

-static int

-set_location(png_structp png_ptr, struct user_chunk_data *data, int what)

-{

-   int location;

-

-   if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0)

-      return 0; /* already have one of these */

-

-   /* Find where we are (the code below zeroes info_ptr to indicate that the

-    * chunks before the first IDAT have been read.)

-    */

-   if (data->info_ptr == NULL) /* after IDAT */

-      location = what | after_IDAT;

-

-   else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0)

-      location = what | before_IDAT;

-

-   else

-      location = what | before_PLTE;

-

-   if (data->location[0] == 0)

-      data->location[0] = location;

-

-   else

-      data->location[1] = location;

-

-   return 1; /* handled */

-}

-

-static int PNGCBAPI

-read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)

-{

-   struct user_chunk_data *my_user_chunk_data =

-      (struct user_chunk_data*)png_get_user_chunk_ptr(png_ptr);

-

-   if (my_user_chunk_data == NULL)

-      png_error(png_ptr, "lost user chunk pointer");

-

-   /* Return one of the following:

-    *    return (-n);  chunk had an error

-    *    return (0);  did not recognize

-    *    return (n);  success

-    *

-    * The unknown chunk structure contains the chunk data:

-    * png_byte name[5];

-    * png_byte *data;

-    * png_size_t size;

-    *

-    * Note that libpng has already taken care of the CRC handling.

-    */

-

-   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */

-       chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */

-      {

-         /* Found sTER chunk */

-         if (chunk->size != 1)

-            return (-1); /* Error return */

-

-         if (chunk->data[0] != 0 && chunk->data[0] != 1)

-            return (-1);  /* Invalid mode */

-

-         if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0)

-         {

-            my_user_chunk_data->sTER_mode=chunk->data[0];

-            return (1);

-         }

-

-         else

-            return (0); /* duplicate sTER - give it to libpng */

-      }

-

-   if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */

-       chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */

-      return (0); /* Did not recognize */

-

-   /* Found ImageMagick vpAg chunk */

-

-   if (chunk->size != 9)

-      return (-1); /* Error return */

-

-   if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0)

-      return (0);  /* duplicate vpAg */

-

-   my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data);

-   my_user_chunk_data->vpAg_height = png_get_uint_31(png_ptr, chunk->data + 4);

-   my_user_chunk_data->vpAg_units = chunk->data[8];

-

-   return (1);

-}

-

-#ifdef PNG_WRITE_SUPPORTED

-static void

-write_sTER_chunk(png_structp write_ptr)

-{

-   png_byte sTER[5] = {115,  84,  69,  82, '\0'};

-

-   if (verbose != 0)

-      fprintf(STDERR, "\n stereo mode = %d\n", user_chunk_data.sTER_mode);

-

-   png_write_chunk(write_ptr, sTER, &user_chunk_data.sTER_mode, 1);

-}

-

-static void

-write_vpAg_chunk(png_structp write_ptr)

-{

-   png_byte vpAg[5] = {118, 112,  65, 103, '\0'};

-

-   png_byte vpag_chunk_data[9];

-

-   if (verbose != 0)

-      fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n",

-          (unsigned long)user_chunk_data.vpAg_width,

-          (unsigned long)user_chunk_data.vpAg_height,

-          user_chunk_data.vpAg_units);

-

-   png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width);

-   png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height);

-   vpag_chunk_data[8] = user_chunk_data.vpAg_units;

-   png_write_chunk(write_ptr, vpAg, vpag_chunk_data, 9);

-}

-

-static void

-write_chunks(png_structp write_ptr, int location)

-{

-   int i;

-

-   /* Notice that this preserves the original chunk order, however chunks

-    * intercepted by the callback will be written *after* chunks passed to

-    * libpng.  This will actually reverse a pair of sTER chunks or a pair of

-    * vpAg chunks, resulting in an error later.  This is not worth worrying

-    * about - the chunks should not be duplicated!

-    */

-   for (i=0; i<2; ++i)

-   {

-      if (user_chunk_data.location[i] == (location | have_sTER))

-         write_sTER_chunk(write_ptr);

-

-      else if (user_chunk_data.location[i] == (location | have_vpAg))

-         write_vpAg_chunk(write_ptr);

-   }

-}

-#endif /* WRITE */

-#else /* !READ_USER_CHUNKS */

-#  define write_chunks(pp,loc) ((void)0)

-#endif

-/* END of code to demonstrate user chunk support */

-

-/* START of code to check that libpng has the required text support; this only

- * checks for the write support because if read support is missing the chunk

- * will simply not be reported back to pngtest.

- */

-#ifdef PNG_TEXT_SUPPORTED

-static void

-pngtest_check_text_support(png_structp png_ptr, png_textp text_ptr,

-    int num_text)

-{

-   while (num_text > 0)

-   {

-      switch (text_ptr[--num_text].compression)

-      {

-         case PNG_TEXT_COMPRESSION_NONE:

-            break;

-

-         case PNG_TEXT_COMPRESSION_zTXt:

-#           ifndef PNG_WRITE_zTXt_SUPPORTED

-               ++unsupported_chunks;

-               /* In libpng 1.7 this now does an app-error, so stop it: */

-               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;

-#           endif

-            break;

-

-         case PNG_ITXT_COMPRESSION_NONE:

-         case PNG_ITXT_COMPRESSION_zTXt:

-#           ifndef PNG_WRITE_iTXt_SUPPORTED

-               ++unsupported_chunks;

-               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;

-#           endif

-            break;

-

-         default:

-            /* This is an error */

-            png_error(png_ptr, "invalid text chunk compression field");

-            break;

-      }

-   }

-}

-#endif

-/* END of code to check that libpng has the required text support */

-

-/* Test one file */

-static int

-test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)

-{

-   static png_FILE_p fpin;

-   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */

-   pngtest_error_parameters error_parameters;

-   png_structp read_ptr;

-   png_infop read_info_ptr, end_info_ptr;

-#ifdef PNG_WRITE_SUPPORTED

-   png_structp write_ptr;

-   png_infop write_info_ptr;

-   png_infop write_end_info_ptr;

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   int interlace_preserved = 1;

-#endif /* WRITE_FILTER */

-#else /* !WRITE */

-   png_structp write_ptr = NULL;

-   png_infop write_info_ptr = NULL;

-   png_infop write_end_info_ptr = NULL;

-#endif /* !WRITE */

-   png_bytep row_buf;

-   png_uint_32 y;

-   png_uint_32 width, height;

-   volatile int num_passes;

-   int pass;

-   int bit_depth, color_type;

-

-   row_buf = NULL;

-   error_parameters.file_name = inname;

-

-   if ((fpin = fopen(inname, "rb")) == NULL)

-   {

-      fprintf(STDERR, "Could not find input file %s\n", inname);

-      return (1);

-   }

-

-   if ((fpout = fopen(outname, "wb")) == NULL)

-   {

-      fprintf(STDERR, "Could not open output file %s\n", outname);

-      FCLOSE(fpin);

-      return (1);

-   }

-

-   pngtest_debug("Allocating read and write structures");

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-   read_ptr =

-       png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,

-       NULL, NULL, NULL, png_debug_malloc, png_debug_free);

-#else

-   read_ptr =

-       png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

-#endif

-   png_set_error_fn(read_ptr, &error_parameters, pngtest_error,

-       pngtest_warning);

-

-#ifdef PNG_WRITE_SUPPORTED

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-   write_ptr =

-       png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,

-       NULL, NULL, NULL, png_debug_malloc, png_debug_free);

-#else

-   write_ptr =

-       png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

-#endif

-   png_set_error_fn(write_ptr, &error_parameters, pngtest_error,

-       pngtest_warning);

-#endif

-   pngtest_debug("Allocating read_info, write_info and end_info structures");

-   read_info_ptr = png_create_info_struct(read_ptr);

-   end_info_ptr = png_create_info_struct(read_ptr);

-#ifdef PNG_WRITE_SUPPORTED

-   write_info_ptr = png_create_info_struct(write_ptr);

-   write_end_info_ptr = png_create_info_struct(write_ptr);

-#endif

-

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-   init_callback_info(read_info_ptr);

-   png_set_read_user_chunk_fn(read_ptr, &user_chunk_data,

-       read_user_chunk_callback);

-#endif

-

-#ifdef PNG_SETJMP_SUPPORTED

-   pngtest_debug("Setting jmpbuf for read struct");

-   if (setjmp(png_jmpbuf(read_ptr)))

-   {

-      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);

-      png_free(read_ptr, row_buf);

-      row_buf = NULL;

-      if (verbose != 0)

-        fprintf(STDERR, "   destroy read structs\n");

-      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);

-#ifdef PNG_WRITE_SUPPORTED

-      if (verbose != 0)

-        fprintf(STDERR, "   destroy write structs\n");

-      png_destroy_info_struct(write_ptr, &write_end_info_ptr);

-      png_destroy_write_struct(&write_ptr, &write_info_ptr);

-#endif

-      FCLOSE(fpin);

-      FCLOSE(fpout);

-      return (1);

-   }

-

-#ifdef PNG_WRITE_SUPPORTED

-   pngtest_debug("Setting jmpbuf for write struct");

-

-   if (setjmp(png_jmpbuf(write_ptr)))

-   {

-      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);

-      if (verbose != 0)

-        fprintf(STDERR, "   destroying read structs\n");

-      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);

-      if (verbose != 0)

-        fprintf(STDERR, "   destroying write structs\n");

-      png_destroy_info_struct(write_ptr, &write_end_info_ptr);

-      png_destroy_write_struct(&write_ptr, &write_info_ptr);

-      FCLOSE(fpin);

-      FCLOSE(fpout);

-      return (1);

-   }

-#endif

-#endif

-

-#ifdef PNG_BENIGN_ERRORS_SUPPORTED

-   if (strict != 0)

-   {

-      /* Treat png_benign_error() as errors on read */

-      png_set_benign_errors(read_ptr, 0);

-

-# ifdef PNG_WRITE_SUPPORTED

-      /* Treat them as errors on write */

-      png_set_benign_errors(write_ptr, 0);

-# endif

-

-      /* if strict is not set, then app warnings and errors are treated as

-       * warnings in release builds, but not in unstable builds; this can be

-       * changed with '--relaxed'.

-       */

-   }

-

-   else if (relaxed != 0)

-   {

-      /* Allow application (pngtest) errors and warnings to pass */

-      png_set_benign_errors(read_ptr, 1);

-

-      /* Turn off CRC checking while reading */

-      png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);

-

-#ifdef PNG_IGNORE_ADLER32

-      /* Turn off ADLER32 checking while reading */

-      png_set_option(read_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);

-#endif

-

-# ifdef PNG_WRITE_SUPPORTED

-      png_set_benign_errors(write_ptr, 1);

-# endif

-

-   }

-#endif /* BENIGN_ERRORS */

-

-   pngtest_debug("Initializing input and output streams");

-#ifdef PNG_STDIO_SUPPORTED

-   png_init_io(read_ptr, fpin);

-#  ifdef PNG_WRITE_SUPPORTED

-   png_init_io(write_ptr, fpout);

-#  endif

-#else

-   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);

-#  ifdef PNG_WRITE_SUPPORTED

-   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,

-#    ifdef PNG_WRITE_FLUSH_SUPPORTED

-       pngtest_flush);

-#    else

-       NULL);

-#    endif

-#  endif

-#endif

-

-   if (status_dots_requested == 1)

-   {

-#ifdef PNG_WRITE_SUPPORTED

-      png_set_write_status_fn(write_ptr, write_row_callback);

-#endif

-      png_set_read_status_fn(read_ptr, read_row_callback);

-   }

-

-   else

-   {

-#ifdef PNG_WRITE_SUPPORTED

-      png_set_write_status_fn(write_ptr, NULL);

-#endif

-      png_set_read_status_fn(read_ptr, NULL);

-   }

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-   png_set_read_user_transform_fn(read_ptr, read_user_callback);

-#endif

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-   zero_samples = 0;

-   png_set_write_user_transform_fn(write_ptr, count_zero_samples);

-#endif

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-   /* Preserve all the unknown chunks, if possible.  If this is disabled then,

-    * even if the png_{get,set}_unknown_chunks stuff is enabled, we can't use

-    * libpng to *save* the unknown chunks on read (because we can't switch the

-    * save option on!)

-    *

-    * Notice that if SET_UNKNOWN_CHUNKS is *not* supported read will discard all

-    * unknown chunks and write will write them all.

-    */

-#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED

-   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,

-       NULL, 0);

-#endif

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,

-       NULL, 0);

-#endif

-#endif

-

-   pngtest_debug("Reading info struct");

-   png_read_info(read_ptr, read_info_ptr);

-

-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

-   /* This is a bit of a hack; there is no obvious way in the callback function

-    * to determine that the chunks before the first IDAT have been read, so

-    * remove the info_ptr (which is only used to determine position relative to

-    * PLTE) here to indicate that we are after the IDAT.

-    */

-   user_chunk_data.info_ptr = NULL;

-#endif

-

-   pngtest_debug("Transferring info struct");

-   {

-      int interlace_type, compression_type, filter_type;

-

-      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,

-          &color_type, &interlace_type, &compression_type, &filter_type) != 0)

-      {

-         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,

-             color_type, interlace_type, compression_type, filter_type);

-         /* num_passes may not be available below if interlace support is not

-          * provided by libpng for both read and write.

-          */

-         switch (interlace_type)

-         {

-            case PNG_INTERLACE_NONE:

-               num_passes = 1;

-               break;

-

-            case PNG_INTERLACE_ADAM7:

-               num_passes = 7;

-               break;

-

-            default:

-               png_error(read_ptr, "invalid interlace type");

-               /*NOT REACHED*/

-         }

-      }

-

-      else

-         png_error(read_ptr, "png_get_IHDR failed");

-   }

-#ifdef PNG_FIXED_POINT_SUPPORTED

-#ifdef PNG_cHRM_SUPPORTED

-   {

-      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,

-          blue_y;

-

-      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,

-          &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)

-      {

-         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,

-             red_y, green_x, green_y, blue_x, blue_y);

-      }

-   }

-#endif

-#ifdef PNG_gAMA_SUPPORTED

-   {

-      png_fixed_point gamma;

-

-      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0)

-         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);

-   }

-#endif

-#else /* Use floating point versions */

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-#ifdef PNG_cHRM_SUPPORTED

-   {

-      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,

-          blue_y;

-

-      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,

-          &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)

-      {

-         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,

-             red_y, green_x, green_y, blue_x, blue_y);

-      }

-   }

-#endif

-#ifdef PNG_gAMA_SUPPORTED

-   {

-      double gamma;

-

-      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0)

-         png_set_gAMA(write_ptr, write_info_ptr, gamma);

-   }

-#endif

-#endif /* Floating point */

-#endif /* Fixed point */

-#ifdef PNG_iCCP_SUPPORTED

-   {

-      png_charp name;

-      png_bytep profile;

-      png_uint_32 proflen;

-      int compression_type;

-

-      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,

-          &profile, &proflen) != 0)

-      {

-         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,

-             profile, proflen);

-      }

-   }

-#endif

-#ifdef PNG_sRGB_SUPPORTED

-   {

-      int intent;

-

-      if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0)

-         png_set_sRGB(write_ptr, write_info_ptr, intent);

-   }

-#endif

-   {

-      png_colorp palette;

-      int num_palette;

-

-      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0)

-         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);

-   }

-#ifdef PNG_bKGD_SUPPORTED

-   {

-      png_color_16p background;

-

-      if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0)

-      {

-         png_set_bKGD(write_ptr, write_info_ptr, background);

-      }

-   }

-#endif

-#ifdef PNG_READ_eXIf_SUPPORTED

-   {

-      png_bytep exif=NULL;

-      png_uint_32 exif_length;

-

-      if (png_get_eXIf_1(read_ptr, read_info_ptr, &exif_length, &exif) != 0)

-      {

-         if (exif_length > 1)

-            fprintf(STDERR," eXIf type %c%c, %lu bytes\n",exif[0],exif[1],

-               (unsigned long)exif_length);

-# ifdef PNG_WRITE_eXIf_SUPPORTED

-         png_set_eXIf_1(write_ptr, write_info_ptr, exif_length, exif);

-# endif

-      }

-   }

-#endif

-#ifdef PNG_hIST_SUPPORTED

-   {

-      png_uint_16p hist;

-

-      if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0)

-         png_set_hIST(write_ptr, write_info_ptr, hist);

-   }

-#endif

-#ifdef PNG_oFFs_SUPPORTED

-   {

-      png_int_32 offset_x, offset_y;

-      int unit_type;

-

-      if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,

-          &unit_type) != 0)

-      {

-         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);

-      }

-   }

-#endif

-#ifdef PNG_pCAL_SUPPORTED

-   {

-      png_charp purpose, units;

-      png_charpp params;

-      png_int_32 X0, X1;

-      int type, nparams;

-

-      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,

-          &nparams, &units, &params) != 0)

-      {

-         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,

-             nparams, units, params);

-      }

-   }

-#endif

-#ifdef PNG_pHYs_SUPPORTED

-   {

-      png_uint_32 res_x, res_y;

-      int unit_type;

-

-      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y,

-          &unit_type) != 0)

-         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);

-   }

-#endif

-#ifdef PNG_sBIT_SUPPORTED

-   {

-      png_color_8p sig_bit;

-

-      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0)

-         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);

-   }

-#endif

-#ifdef PNG_sCAL_SUPPORTED

-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \

-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)

-   {

-      int unit;

-      double scal_width, scal_height;

-

-      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,

-          &scal_height) != 0)

-      {

-         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);

-      }

-   }

-#else

-#ifdef PNG_FIXED_POINT_SUPPORTED

-   {

-      int unit;

-      png_charp scal_width, scal_height;

-

-      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,

-           &scal_height) != 0)

-      {

-         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,

-             scal_height);

-      }

-   }

-#endif

-#endif

-#endif

-

-#ifdef PNG_sPLT_SUPPORTED

-   {

-       png_sPLT_tp entries;

-

-       int num_entries = (int) png_get_sPLT(read_ptr, read_info_ptr, &entries);

-       if (num_entries)

-       {

-           png_set_sPLT(write_ptr, write_info_ptr, entries, num_entries);

-       }

-   }

-#endif

-

-#ifdef PNG_TEXT_SUPPORTED

-   {

-      png_textp text_ptr;

-      int num_text;

-

-      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)

-      {

-         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);

-

-         pngtest_check_text_support(read_ptr, text_ptr, num_text);

-

-         if (verbose != 0)

-         {

-            int i;

-

-            fprintf(STDERR,"\n");

-            for (i=0; i<num_text; i++)

-            {

-               fprintf(STDERR,"   Text compression[%d]=%d\n",

-                   i, text_ptr[i].compression);

-            }

-         }

-

-         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);

-      }

-   }

-#endif

-#ifdef PNG_tIME_SUPPORTED

-   {

-      png_timep mod_time;

-

-      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0)

-      {

-         png_set_tIME(write_ptr, write_info_ptr, mod_time);

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)

-            tIME_string[(sizeof tIME_string) - 1] = '\0';

-

-         else

-         {

-            strncpy(tIME_string, "*** invalid time ***", (sizeof tIME_string));

-            tIME_string[(sizeof tIME_string) - 1] = '\0';

-         }

-

-         tIME_chunk_present++;

-#endif /* TIME_RFC1123 */

-      }

-   }

-#endif

-#ifdef PNG_tRNS_SUPPORTED

-   {

-      png_bytep trans_alpha;

-      int num_trans;

-      png_color_16p trans_color;

-

-      if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,

-          &trans_color) != 0)

-      {

-         int sample_max = (1 << bit_depth);

-         /* libpng doesn't reject a tRNS chunk with out-of-range samples */

-         if (!((color_type == PNG_COLOR_TYPE_GRAY &&

-             (int)trans_color->gray > sample_max) ||

-             (color_type == PNG_COLOR_TYPE_RGB &&

-             ((int)trans_color->red > sample_max ||

-             (int)trans_color->green > sample_max ||

-             (int)trans_color->blue > sample_max))))

-            png_set_tRNS(write_ptr, write_info_ptr, trans_alpha, num_trans,

-               trans_color);

-      }

-   }

-#endif

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-   {

-      png_unknown_chunkp unknowns;

-      int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,

-          &unknowns);

-

-      if (num_unknowns != 0)

-      {

-         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,

-             num_unknowns);

-#if PNG_LIBPNG_VER < 10600

-         /* Copy the locations from the read_info_ptr.  The automatically

-          * generated locations in write_end_info_ptr are wrong prior to 1.6.0

-          * because they are reset from the write pointer (removed in 1.6.0).

-          */

-         {

-            int i;

-            for (i = 0; i < num_unknowns; i++)

-              png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,

-                  unknowns[i].location);

-         }

-#endif

-      }

-   }

-#endif

-

-#ifdef PNG_WRITE_SUPPORTED

-   pngtest_debug("Writing info struct");

-

-   /* Write the info in two steps so that if we write the 'unknown' chunks here

-    * they go to the correct place.

-    */

-   png_write_info_before_PLTE(write_ptr, write_info_ptr);

-

-   write_chunks(write_ptr, before_PLTE); /* before PLTE */

-

-   png_write_info(write_ptr, write_info_ptr);

-

-   write_chunks(write_ptr, before_IDAT); /* after PLTE */

-

-   png_write_info(write_ptr, write_end_info_ptr);

-

-   write_chunks(write_ptr, after_IDAT); /* after IDAT */

-

-#ifdef PNG_COMPRESSION_COMPAT

-   /* Test the 'compatibility' setting here, if it is available. */

-   png_set_compression(write_ptr, PNG_COMPRESSION_COMPAT);

-#endif

-#endif

-

-#ifdef SINGLE_ROWBUF_ALLOC

-   pngtest_debug("Allocating row buffer...");

-   row_buf = (png_bytep)png_malloc(read_ptr,

-       png_get_rowbytes(read_ptr, read_info_ptr));

-

-   pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);

-#endif /* SINGLE_ROWBUF_ALLOC */

-   pngtest_debug("Writing row data");

-

-#if defined(PNG_READ_INTERLACING_SUPPORTED) &&\

-   defined(PNG_WRITE_INTERLACING_SUPPORTED)

-   /* Both must be defined for libpng to be able to handle the interlace,

-    * otherwise it gets handled below by simply reading and writing the passes

-    * directly.

-    */

-   if (png_set_interlace_handling(read_ptr) != num_passes)

-      png_error(write_ptr,

-          "png_set_interlace_handling(read): wrong pass count ");

-   if (png_set_interlace_handling(write_ptr) != num_passes)

-      png_error(write_ptr,

-          "png_set_interlace_handling(write): wrong pass count ");

-#else /* png_set_interlace_handling not called on either read or write */

-#  define calc_pass_height

-#endif /* not using libpng interlace handling */

-

-#ifdef PNGTEST_TIMING

-   t_stop = (float)clock();

-   t_misc += (t_stop - t_start);

-   t_start = t_stop;

-#endif

-   for (pass = 0; pass < num_passes; pass++)

-   {

-#     ifdef calc_pass_height

-         png_uint_32 pass_height;

-

-         if (num_passes == 7) /* interlaced */

-         {

-            if (PNG_PASS_COLS(width, pass) > 0)

-               pass_height = PNG_PASS_ROWS(height, pass);

-

-            else

-               pass_height = 0;

-         }

-

-         else /* not interlaced */

-            pass_height = height;

-#     else

-#        define pass_height height

-#     endif

-

-      pngtest_debug1("Writing row data for pass %d", pass);

-      for (y = 0; y < pass_height; y++)

-      {

-#ifndef SINGLE_ROWBUF_ALLOC

-         pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);

-

-         row_buf = (png_bytep)png_malloc(read_ptr,

-             png_get_rowbytes(read_ptr, read_info_ptr));

-

-         pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,

-             (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));

-

-#endif /* !SINGLE_ROWBUF_ALLOC */

-         png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);

-

-#ifdef PNG_WRITE_SUPPORTED

-#ifdef PNGTEST_TIMING

-         t_stop = (float)clock();

-         t_decode += (t_stop - t_start);

-         t_start = t_stop;

-#endif

-         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);

-#ifdef PNGTEST_TIMING

-         t_stop = (float)clock();

-         t_encode += (t_stop - t_start);

-         t_start = t_stop;

-#endif

-#endif /* WRITE */

-

-#ifndef SINGLE_ROWBUF_ALLOC

-         pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);

-         png_free(read_ptr, row_buf);

-         row_buf = NULL;

-#endif /* !SINGLE_ROWBUF_ALLOC */

-      }

-   }

-

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-#  ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

-      png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);

-#  endif

-#  ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-      png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);

-#  endif

-#endif

-

-   pngtest_debug("Reading and writing end_info data");

-

-   png_read_end(read_ptr, end_info_ptr);

-#ifdef PNG_TEXT_SUPPORTED

-   {

-      png_textp text_ptr;

-      int num_text;

-

-      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)

-      {

-         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);

-

-         pngtest_check_text_support(read_ptr, text_ptr, num_text);

-

-         if (verbose != 0)

-         {

-            int i;

-

-            fprintf(STDERR,"\n");

-            for (i=0; i<num_text; i++)

-            {

-               fprintf(STDERR,"   Text compression[%d]=%d\n",

-                   i, text_ptr[i].compression);

-            }

-         }

-

-         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);

-      }

-   }

-#endif

-#ifdef PNG_READ_eXIf_SUPPORTED

-   {

-      png_bytep exif=NULL;

-      png_uint_32 exif_length;

-

-      if (png_get_eXIf_1(read_ptr, end_info_ptr, &exif_length, &exif) != 0)

-      {

-         if (exif_length > 1)

-            fprintf(STDERR," eXIf type %c%c, %lu bytes\n",exif[0],exif[1],

-               (unsigned long)exif_length);

-# ifdef PNG_WRITE_eXIf_SUPPORTED

-         png_set_eXIf_1(write_ptr, write_end_info_ptr, exif_length, exif);

-# endif

-      }

-   }

-#endif

-#ifdef PNG_tIME_SUPPORTED

-   {

-      png_timep mod_time;

-

-      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0)

-      {

-         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)

-            tIME_string[(sizeof tIME_string) - 1] = '\0';

-

-         else

-         {

-            strncpy(tIME_string, "*** invalid time ***", sizeof tIME_string);

-            tIME_string[(sizeof tIME_string)-1] = '\0';

-         }

-

-         tIME_chunk_present++;

-#endif /* TIME_RFC1123 */

-      }

-   }

-#endif

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-   {

-      png_unknown_chunkp unknowns;

-      int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,

-          &unknowns);

-

-      if (num_unknowns != 0)

-      {

-         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,

-             num_unknowns);

-#if PNG_LIBPNG_VER < 10600

-         /* Copy the locations from the read_info_ptr.  The automatically

-          * generated locations in write_end_info_ptr are wrong prior to 1.6.0

-          * because they are reset from the write pointer (removed in 1.6.0).

-          */

-         {

-            int i;

-            for (i = 0; i < num_unknowns; i++)

-              png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,

-                  unknowns[i].location);

-         }

-#endif

-      }

-   }

-#endif

-

-#ifdef PNG_WRITE_SUPPORTED

-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-   /* Normally one would use Z_DEFAULT_STRATEGY for text compression.

-    * This is here just to make pngtest replicate the results from libpng

-    * versions prior to 1.5.4, and to test this new API.

-    */

-   png_set_text_compression_strategy(write_ptr, Z_FILTERED);

-#endif

-

-   /* When the unknown vpAg/sTER chunks are written by pngtest the only way to

-    * do it is to write them *before* calling png_write_end.  When unknown

-    * chunks are written by libpng, however, they are written just before IEND.

-    * There seems to be no way round this, however vpAg/sTER are not expected

-    * after IDAT.

-    */

-   write_chunks(write_ptr, after_IDAT);

-

-   png_write_end(write_ptr, write_end_info_ptr);

-#endif

-

-#ifdef PNG_EASY_ACCESS_SUPPORTED

-   if (verbose != 0)

-   {

-      png_uint_32 iwidth, iheight;

-      iwidth = png_get_image_width(write_ptr, write_info_ptr);

-      iheight = png_get_image_height(write_ptr, write_info_ptr);

-      fprintf(STDERR, "\n Image width = %lu, height = %lu\n",

-          (unsigned long)iwidth, (unsigned long)iheight);

-   }

-#endif

-

-   pngtest_debug("Destroying data structs");

-#ifdef SINGLE_ROWBUF_ALLOC

-   pngtest_debug("destroying row_buf for read_ptr");

-   png_free(read_ptr, row_buf);

-   row_buf = NULL;

-#endif /* SINGLE_ROWBUF_ALLOC */

-   pngtest_debug("destroying read_ptr, read_info_ptr, end_info_ptr");

-   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);

-#ifdef PNG_WRITE_SUPPORTED

-   pngtest_debug("destroying write_end_info_ptr");

-   png_destroy_info_struct(write_ptr, &write_end_info_ptr);

-   pngtest_debug("destroying write_ptr, write_info_ptr");

-   png_destroy_write_struct(&write_ptr, &write_info_ptr);

-#endif

-   pngtest_debug("Destruction complete.");

-

-   FCLOSE(fpin);

-   FCLOSE(fpout);

-

-   /* Summarize any warnings or errors and in 'strict' mode fail the test.

-    * Unsupported chunks can result in warnings, in that case ignore the strict

-    * setting, otherwise fail the test on warnings as well as errors.

-    */

-   if (error_count > 0)

-   {

-      /* We don't really expect to get here because of the setjmp handling

-       * above, but this is safe.

-       */

-      fprintf(STDERR, "\n  %s: %d libpng errors found (%d warnings)",

-          inname, error_count, warning_count);

-

-      if (strict != 0)

-         return (1);

-   }

-

-#  ifdef PNG_WRITE_SUPPORTED

-      /* If there is no write support nothing was written! */

-      else if (unsupported_chunks > 0)

-      {

-         fprintf(STDERR, "\n  %s: unsupported chunks (%d)%s",

-             inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");

-      }

-#  endif

-

-   else if (warning_count > 0)

-   {

-      fprintf(STDERR, "\n  %s: %d libpng warnings found",

-          inname, warning_count);

-

-      if (strict != 0)

-         return (1);

-   }

-

-   pngtest_debug("Opening files for comparison");

-   if ((fpin = fopen(inname, "rb")) == NULL)

-   {

-      fprintf(STDERR, "Could not find file %s\n", inname);

-      return (1);

-   }

-

-   if ((fpout = fopen(outname, "rb")) == NULL)

-   {

-      fprintf(STDERR, "Could not find file %s\n", outname);

-      FCLOSE(fpin);

-      return (1);

-   }

-

-#if defined (PNG_WRITE_SUPPORTED) /* else nothing was written */ &&\

-    defined (PNG_WRITE_FILTER_SUPPORTED)

-   if (interlace_preserved != 0) /* else the files will be changed */

-   {

-      for (;;)

-      {

-         static int wrote_question = 0;

-         png_size_t num_in, num_out;

-         char inbuf[256], outbuf[256];

-

-         num_in = fread(inbuf, 1, sizeof inbuf, fpin);

-         num_out = fread(outbuf, 1, sizeof outbuf, fpout);

-

-         if (num_in != num_out)

-         {

-            fprintf(STDERR, "\nFiles %s and %s are of a different size\n",

-                inname, outname);

-

-            if (wrote_question == 0 && unsupported_chunks == 0)

-            {

-               fprintf(STDERR,

-                   "   Was %s written with the same maximum IDAT"

-                   " chunk size (%d bytes),",

-                   inname, PNG_ZBUF_SIZE);

-               fprintf(STDERR,

-                   "\n   filtering heuristic (libpng default), compression");

-               fprintf(STDERR,

-                   " level (zlib default),\n   and zlib version (%s)?\n\n",

-                   ZLIB_VERSION);

-               wrote_question = 1;

-            }

-

-            FCLOSE(fpin);

-            FCLOSE(fpout);

-

-            if (strict != 0 && unsupported_chunks == 0)

-              return (1);

-

-            else

-              return (0);

-         }

-

-         if (num_in == 0)

-            break;

-

-         if (memcmp(inbuf, outbuf, num_in))

-         {

-            fprintf(STDERR, "\nFiles %s and %s are different\n", inname,

-                outname);

-

-            if (wrote_question == 0 && unsupported_chunks == 0)

-            {

-               fprintf(STDERR,

-                   "   Was %s written with the same maximum"

-                   " IDAT chunk size (%d bytes),",

-                    inname, PNG_ZBUF_SIZE);

-               fprintf(STDERR,

-                   "\n   filtering heuristic (libpng default), compression");

-               fprintf(STDERR,

-                   " level (zlib default),\n   and zlib version (%s)?\n\n",

-                 ZLIB_VERSION);

-               wrote_question = 1;

-            }

-

-            FCLOSE(fpin);

-            FCLOSE(fpout);

-

-            /* NOTE: the unsupported_chunks escape is permitted here because

-             * unsupported text chunk compression will result in the compression

-             * mode being changed (to NONE) yet, in the test case, the result

-             * can be exactly the same size!

-             */

-            if (strict != 0 && unsupported_chunks == 0)

-              return (1);

-

-            else

-              return (0);

-         }

-      }

-   }

-#endif /* WRITE && WRITE_FILTER */

-

-   FCLOSE(fpin);

-   FCLOSE(fpout);

-

-   return (0);

-}

-

-/* Input and output filenames */

-#ifdef RISCOS

-static PNG_CONST char *inname = "pngtest/png";

-static PNG_CONST char *outname = "pngout/png";

-#else

-static PNG_CONST char *inname = "pngtest.png";

-static PNG_CONST char *outname = "pngout.png";

-#endif

-

-int

-main(int argc, char *argv[])

-{

-   int multiple = 0;

-   int ierror = 0;

-

-   png_structp dummy_ptr;

-

-   fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);

-   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);

-   fprintf(STDERR, "%s", png_get_copyright(NULL));

-   /* Show the version of libpng used in building the library */

-   fprintf(STDERR, " library (%lu):%s",

-       (unsigned long)png_access_version_number(),

-       png_get_header_version(NULL));

-

-   /* Show the version of libpng used in building the application */

-   fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,

-       PNG_HEADER_VERSION_STRING);

-

-   /* Do some consistency checking on the memory allocation settings, I'm

-    * not sure this matters, but it is nice to know, the first of these

-    * tests should be impossible because of the way the macros are set

-    * in pngconf.h

-    */

-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)

-      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");

-#endif

-   /* I think the following can happen. */

-#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)

-      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");

-#endif

-

-   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))

-   {

-      fprintf(STDERR,

-          "Warning: versions are different between png.h and png.c\n");

-      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);

-      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);

-      ++ierror;

-   }

-

-   if (argc > 1)

-   {

-      if (strcmp(argv[1], "-m") == 0)

-      {

-         multiple = 1;

-         status_dots_requested = 0;

-      }

-

-      else if (strcmp(argv[1], "-mv") == 0 ||

-               strcmp(argv[1], "-vm") == 0 )

-      {

-         multiple = 1;

-         verbose = 1;

-         status_dots_requested = 1;

-      }

-

-      else if (strcmp(argv[1], "-v") == 0)

-      {

-         verbose = 1;

-         status_dots_requested = 1;

-         inname = argv[2];

-      }

-

-      else if (strcmp(argv[1], "--strict") == 0)

-      {

-         status_dots_requested = 0;

-         verbose = 1;

-         inname = argv[2];

-         strict++;

-         relaxed = 0;

-         multiple=1;

-      }

-

-      else if (strcmp(argv[1], "--relaxed") == 0)

-      {

-         status_dots_requested = 0;

-         verbose = 1;

-         inname = argv[2];

-         strict = 0;

-         relaxed++;

-         multiple=1;

-      }

-      else if (strcmp(argv[1], "--xfail") == 0)

-      {

-         status_dots_requested = 0;

-         verbose = 1;

-         inname = argv[2];

-         strict = 0;

-         xfail++;

-         relaxed++;

-         multiple=1;

-      }

-

-      else

-      {

-         inname = argv[1];

-         status_dots_requested = 0;

-      }

-   }

-

-   if (multiple == 0 && argc == 3 + verbose)

-      outname = argv[2 + verbose];

-

-   if ((multiple == 0 && argc > 3 + verbose) ||

-       (multiple != 0 && argc < 2))

-   {

-      fprintf(STDERR,

-          "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",

-          argv[0], argv[0]);

-      fprintf(STDERR,

-          "  reads/writes one PNG file (without -m) or multiple files (-m)\n");

-      fprintf(STDERR,

-          "  with -m %s is used as a temporary file\n", outname);

-      exit(1);

-   }

-

-   if (multiple != 0)

-   {

-      int i;

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-      int allocation_now = current_allocation;

-#endif

-      for (i=2; i<argc; ++i)

-      {

-         int kerror;

-         fprintf(STDERR, "\n Testing %s:", argv[i]);

-#if PNG_DEBUG > 0

-         fprintf(STDERR, "\n");

-#endif

-         kerror = test_one_file(argv[i], outname);

-         if (kerror == 0)

-         {

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-            fprintf(STDERR, "\n PASS (%lu zero samples)\n",

-                (unsigned long)zero_samples);

-#else

-            fprintf(STDERR, " PASS\n");

-#endif

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-            if (tIME_chunk_present != 0)

-               fprintf(STDERR, " tIME = %s\n", tIME_string);

-

-            tIME_chunk_present = 0;

-#endif /* TIME_RFC1123 */

-         }

-

-         else

-         {

-            if (xfail)

-              fprintf(STDERR, " XFAIL\n");

-            else

-            {

-              fprintf(STDERR, " FAIL\n");

-              ierror += kerror;

-            }

-         }

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-         if (allocation_now != current_allocation)

-            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",

-                current_allocation - allocation_now);

-

-         if (current_allocation != 0)

-         {

-            memory_infop pinfo = pinformation;

-

-            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",

-                current_allocation);

-

-            while (pinfo != NULL)

-            {

-               fprintf(STDERR, " %lu bytes at %p\n",

-                   (unsigned long)pinfo->size,

-                   pinfo->pointer);

-               pinfo = pinfo->next;

-            }

-         }

-#endif

-      }

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-         fprintf(STDERR, " Current memory allocation: %10d bytes\n",

-             current_allocation);

-         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",

-             maximum_allocation);

-         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",

-             total_allocation);

-         fprintf(STDERR, "     Number of allocations: %10d\n",

-             num_allocations);

-#endif

-   }

-

-   else

-   {

-      int i;

-      for (i = 0; i<3; ++i)

-      {

-         int kerror;

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-         int allocation_now = current_allocation;

-#endif

-         if (i == 1)

-            status_dots_requested = 1;

-

-         else if (verbose == 0)

-            status_dots_requested = 0;

-

-         if (i == 0 || verbose == 1 || ierror != 0)

-         {

-            fprintf(STDERR, "\n Testing %s:", inname);

-#if PNG_DEBUG > 0

-            fprintf(STDERR, "\n");

-#endif

-         }

-

-         kerror = test_one_file(inname, outname);

-

-         if (kerror == 0)

-         {

-            if (verbose == 1 || i == 2)

-            {

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-                fprintf(STDERR, "\n PASS (%lu zero samples)\n",

-                    (unsigned long)zero_samples);

-#else

-                fprintf(STDERR, " PASS\n");

-#endif

-#ifdef PNG_TIME_RFC1123_SUPPORTED

-             if (tIME_chunk_present != 0)

-                fprintf(STDERR, " tIME = %s\n", tIME_string);

-#endif /* TIME_RFC1123 */

-            }

-         }

-

-         else

-         {

-            if (verbose == 0 && i != 2)

-            {

-               fprintf(STDERR, "\n Testing %s:", inname);

-#if PNG_DEBUG > 0

-               fprintf(STDERR, "\n");

-#endif

-            }

-

-            if (xfail)

-              fprintf(STDERR, " XFAIL\n");

-            else

-            {

-              fprintf(STDERR, " FAIL\n");

-              ierror += kerror;

-            }

-         }

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-         if (allocation_now != current_allocation)

-             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",

-                 current_allocation - allocation_now);

-

-         if (current_allocation != 0)

-         {

-             memory_infop pinfo = pinformation;

-

-             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",

-                 current_allocation);

-

-             while (pinfo != NULL)

-             {

-                fprintf(STDERR, " %lu bytes at %p\n",

-                    (unsigned long)pinfo->size, pinfo->pointer);

-                pinfo = pinfo->next;

-             }

-          }

-#endif

-       }

-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

-       fprintf(STDERR, " Current memory allocation: %10d bytes\n",

-           current_allocation);

-       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",

-           maximum_allocation);

-       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",

-           total_allocation);

-       fprintf(STDERR, "     Number of allocations: %10d\n",

-           num_allocations);

-#endif

-   }

-

-#ifdef PNGTEST_TIMING

-   t_stop = (float)clock();

-   t_misc += (t_stop - t_start);

-   t_start = t_stop;

-   fprintf(STDERR, " CPU time used = %.3f seconds",

-       (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);

-   fprintf(STDERR, " (decoding %.3f,\n",

-       t_decode/(float)CLOCKS_PER_SEC);

-   fprintf(STDERR, "        encoding %.3f ,",

-       t_encode/(float)CLOCKS_PER_SEC);

-   fprintf(STDERR, " other %.3f seconds)\n\n",

-       t_misc/(float)CLOCKS_PER_SEC);

-#endif

-

-   if (ierror == 0)

-      fprintf(STDERR, " libpng passes test\n");

-

-   else

-      fprintf(STDERR, " libpng FAILS test\n");

-

-   dummy_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

-   fprintf(STDERR, " Default limits:\n");

-   fprintf(STDERR, "  width_max  = %lu\n",

-       (unsigned long) png_get_user_width_max(dummy_ptr));

-   fprintf(STDERR, "  height_max = %lu\n",

-       (unsigned long) png_get_user_height_max(dummy_ptr));

-   if (png_get_chunk_cache_max(dummy_ptr) == 0)

-      fprintf(STDERR, "  cache_max  = unlimited\n");

-   else

-      fprintf(STDERR, "  cache_max  = %lu\n",

-          (unsigned long) png_get_chunk_cache_max(dummy_ptr));

-   if (png_get_chunk_malloc_max(dummy_ptr) == 0)

-      fprintf(STDERR, "  malloc_max = unlimited\n");

-   else

-      fprintf(STDERR, "  malloc_max = %lu\n",

-          (unsigned long) png_get_chunk_malloc_max(dummy_ptr));

-   png_destroy_read_struct(&dummy_ptr, NULL, NULL);

-

-   return (int)(ierror != 0);

-}

-#else

-int

-main(void)

-{

-   fprintf(STDERR,

-       " test ignored because libpng was not built with read support\n");

-   /* And skip this test */

-   return PNG_LIBPNG_VER < 10600 ? 0 : 77;

-}

-#endif

-

-/* Generate a compiler error if there is an old png.h in the search path. */

-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;

diff --git a/plugins/AdvaImg/src/LibPNG/pngtrans.c b/plugins/AdvaImg/src/LibPNG/pngtrans.c
deleted file mode 100644
index 1dad1d7a5e..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngtrans.c
+++ /dev/null
@@ -1,864 +0,0 @@
-

-/* pngtrans.c - transforms the data in a row (used by both readers and writers)

- *

- * Last changed in libpng 1.6.33 [September 28, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-

-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

-

-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)

-/* Turn on BGR-to-RGB mapping */

-void PNGAPI

-png_set_bgr(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_bgr");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_BGR;

-}

-#endif

-

-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)

-/* Turn on 16-bit byte swapping */

-void PNGAPI

-png_set_swap(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_swap");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (png_ptr->bit_depth == 16)

-      png_ptr->transformations |= PNG_SWAP_BYTES;

-}

-#endif

-

-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)

-/* Turn on pixel packing */

-void PNGAPI

-png_set_packing(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_packing");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (png_ptr->bit_depth < 8)

-   {

-      png_ptr->transformations |= PNG_PACK;

-#     ifdef PNG_WRITE_SUPPORTED

-         png_ptr->usr_bit_depth = 8;

-#     endif

-   }

-}

-#endif

-

-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)

-/* Turn on packed pixel swapping */

-void PNGAPI

-png_set_packswap(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_packswap");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (png_ptr->bit_depth < 8)

-      png_ptr->transformations |= PNG_PACKSWAP;

-}

-#endif

-

-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)

-void PNGAPI

-png_set_shift(png_structrp png_ptr, png_const_color_8p true_bits)

-{

-   png_debug(1, "in png_set_shift");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_SHIFT;

-   png_ptr->shift = *true_bits;

-}

-#endif

-

-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \

-    defined(PNG_WRITE_INTERLACING_SUPPORTED)

-int PNGAPI

-png_set_interlace_handling(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_interlace handling");

-

-   if (png_ptr != 0 && png_ptr->interlaced != 0)

-   {

-      png_ptr->transformations |= PNG_INTERLACE;

-      return (7);

-   }

-

-   return (1);

-}

-#endif

-

-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)

-/* Add a filler byte on read, or remove a filler or alpha byte on write.

- * The filler type has changed in v0.95 to allow future 2-byte fillers

- * for 48-bit input data, as well as to avoid problems with some compilers

- * that don't like bytes as parameters.

- */

-void PNGAPI

-png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc)

-{

-   png_debug(1, "in png_set_filler");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* In libpng 1.6 it is possible to determine whether this is a read or write

-    * operation and therefore to do more checking here for a valid call.

-    */

-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)

-   {

-#     ifdef PNG_READ_FILLER_SUPPORTED

-         /* On read png_set_filler is always valid, regardless of the base PNG

-          * format, because other transformations can give a format where the

-          * filler code can execute (basically an 8 or 16-bit component RGB or G

-          * format.)

-          *

-          * NOTE: usr_channels is not used by the read code!  (This has led to

-          * confusion in the past.)  The filler is only used in the read code.

-          */

-         png_ptr->filler = (png_uint_16)filler;

-#     else

-         png_app_error(png_ptr, "png_set_filler not supported on read");

-         PNG_UNUSED(filler) /* not used in the write case */

-         return;

-#     endif

-   }

-

-   else /* write */

-   {

-#     ifdef PNG_WRITE_FILLER_SUPPORTED

-         /* On write the usr_channels parameter must be set correctly at the

-          * start to record the number of channels in the app-supplied data.

-          */

-         switch (png_ptr->color_type)

-         {

-            case PNG_COLOR_TYPE_RGB:

-               png_ptr->usr_channels = 4;

-               break;

-

-            case PNG_COLOR_TYPE_GRAY:

-               if (png_ptr->bit_depth >= 8)

-               {

-                  png_ptr->usr_channels = 2;

-                  break;

-               }

-

-               else

-               {

-                  /* There simply isn't any code in libpng to strip out bits

-                   * from bytes when the components are less than a byte in

-                   * size!

-                   */

-                  png_app_error(png_ptr,

-                      "png_set_filler is invalid for"

-                      " low bit depth gray output");

-                  return;

-               }

-

-            default:

-               png_app_error(png_ptr,

-                   "png_set_filler: inappropriate color type");

-               return;

-         }

-#     else

-         png_app_error(png_ptr, "png_set_filler not supported on write");

-         return;

-#     endif

-   }

-

-   /* Here on success - libpng supports the operation, set the transformation

-    * and the flag to say where the filler channel is.

-    */

-   png_ptr->transformations |= PNG_FILLER;

-

-   if (filler_loc == PNG_FILLER_AFTER)

-      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;

-

-   else

-      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;

-}

-

-/* Added to libpng-1.2.7 */

-void PNGAPI

-png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc)

-{

-   png_debug(1, "in png_set_add_alpha");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_set_filler(png_ptr, filler, filler_loc);

-   /* The above may fail to do anything. */

-   if ((png_ptr->transformations & PNG_FILLER) != 0)

-      png_ptr->transformations |= PNG_ADD_ALPHA;

-}

-

-#endif

-

-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \

-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)

-void PNGAPI

-png_set_swap_alpha(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_swap_alpha");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_SWAP_ALPHA;

-}

-#endif

-

-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \

-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)

-void PNGAPI

-png_set_invert_alpha(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_invert_alpha");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_INVERT_ALPHA;

-}

-#endif

-

-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)

-void PNGAPI

-png_set_invert_mono(png_structrp png_ptr)

-{

-   png_debug(1, "in png_set_invert_mono");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_INVERT_MONO;

-}

-

-/* Invert monochrome grayscale data */

-void /* PRIVATE */

-png_do_invert(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_invert");

-

-  /* This test removed from libpng version 1.0.13 and 1.2.0:

-   *   if (row_info->bit_depth == 1 &&

-   */

-   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)

-   {

-      png_bytep rp = row;

-      png_size_t i;

-      png_size_t istop = row_info->rowbytes;

-

-      for (i = 0; i < istop; i++)

-      {

-         *rp = (png_byte)(~(*rp));

-         rp++;

-      }

-   }

-

-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&

-      row_info->bit_depth == 8)

-   {

-      png_bytep rp = row;

-      png_size_t i;

-      png_size_t istop = row_info->rowbytes;

-

-      for (i = 0; i < istop; i += 2)

-      {

-         *rp = (png_byte)(~(*rp));

-         rp += 2;

-      }

-   }

-

-#ifdef PNG_16BIT_SUPPORTED

-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&

-      row_info->bit_depth == 16)

-   {

-      png_bytep rp = row;

-      png_size_t i;

-      png_size_t istop = row_info->rowbytes;

-

-      for (i = 0; i < istop; i += 4)

-      {

-         *rp = (png_byte)(~(*rp));

-         *(rp + 1) = (png_byte)(~(*(rp + 1)));

-         rp += 4;

-      }

-   }

-#endif

-}

-#endif

-

-#ifdef PNG_16BIT_SUPPORTED

-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)

-/* Swaps byte order on 16-bit depth images */

-void /* PRIVATE */

-png_do_swap(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_swap");

-

-   if (row_info->bit_depth == 16)

-   {

-      png_bytep rp = row;

-      png_uint_32 i;

-      png_uint_32 istop= row_info->width * row_info->channels;

-

-      for (i = 0; i < istop; i++, rp += 2)

-      {

-#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED

-         /* Feature added to libpng-1.6.11 for testing purposes, not

-          * enabled by default.

-          */

-         *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp);

-#else

-         png_byte t = *rp;

-         *rp = *(rp + 1);

-         *(rp + 1) = t;

-#endif

-      }

-   }

-}

-#endif

-#endif

-

-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)

-static PNG_CONST png_byte onebppswaptable[256] = {

-   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,

-   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,

-   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,

-   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,

-   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,

-   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,

-   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,

-   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,

-   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,

-   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,

-   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,

-   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,

-   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,

-   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,

-   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,

-   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,

-   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,

-   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,

-   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,

-   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,

-   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,

-   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,

-   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,

-   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,

-   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,

-   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,

-   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,

-   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,

-   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,

-   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,

-   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,

-   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF

-};

-

-static PNG_CONST png_byte twobppswaptable[256] = {

-   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,

-   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,

-   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,

-   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,

-   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,

-   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,

-   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,

-   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,

-   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,

-   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,

-   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,

-   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,

-   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,

-   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,

-   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,

-   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,

-   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,

-   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,

-   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,

-   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,

-   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,

-   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,

-   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,

-   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,

-   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,

-   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,

-   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,

-   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,

-   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,

-   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,

-   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,

-   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF

-};

-

-static PNG_CONST png_byte fourbppswaptable[256] = {

-   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,

-   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,

-   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,

-   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,

-   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,

-   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,

-   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,

-   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,

-   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,

-   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,

-   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,

-   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,

-   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,

-   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,

-   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,

-   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,

-   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,

-   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,

-   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,

-   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,

-   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,

-   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,

-   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,

-   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,

-   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,

-   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,

-   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,

-   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,

-   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,

-   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,

-   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,

-   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF

-};

-

-/* Swaps pixel packing order within bytes */

-void /* PRIVATE */

-png_do_packswap(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_packswap");

-

-   if (row_info->bit_depth < 8)

-   {

-      png_bytep rp;

-      png_const_bytep end, table;

-

-      end = row + row_info->rowbytes;

-

-      if (row_info->bit_depth == 1)

-         table = onebppswaptable;

-

-      else if (row_info->bit_depth == 2)

-         table = twobppswaptable;

-

-      else if (row_info->bit_depth == 4)

-         table = fourbppswaptable;

-

-      else

-         return;

-

-      for (rp = row; rp < end; rp++)

-         *rp = table[*rp];

-   }

-}

-#endif /* PACKSWAP || WRITE_PACKSWAP */

-

-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \

-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)

-/* Remove a channel - this used to be 'png_do_strip_filler' but it used a

- * somewhat weird combination of flags to determine what to do.  All the calls

- * to png_do_strip_filler are changed in 1.5.2 to call this instead with the

- * correct arguments.

- *

- * The routine isn't general - the channel must be the channel at the start or

- * end (not in the middle) of each pixel.

- */

-void /* PRIVATE */

-png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)

-{

-   png_bytep sp = row; /* source pointer */

-   png_bytep dp = row; /* destination pointer */

-   png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */

-

-   /* At the start sp will point to the first byte to copy and dp to where

-    * it is copied to.  ep always points just beyond the end of the row, so

-    * the loop simply copies (channels-1) channels until sp reaches ep.

-    *

-    * at_start:        0 -- convert AG, XG, ARGB, XRGB, AAGG, XXGG, etc.

-    *            nonzero -- convert GA, GX, RGBA, RGBX, GGAA, RRGGBBXX, etc.

-    */

-

-   /* GA, GX, XG cases */

-   if (row_info->channels == 2)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         if (at_start != 0) /* Skip initial filler */

-            ++sp;

-         else          /* Skip initial channel and, for sp, the filler */

-         {

-            sp += 2; ++dp;

-         }

-

-         /* For a 1 pixel wide image there is nothing to do */

-         while (sp < ep)

-         {

-            *dp++ = *sp; sp += 2;

-         }

-

-         row_info->pixel_depth = 8;

-      }

-

-      else if (row_info->bit_depth == 16)

-      {

-         if (at_start != 0) /* Skip initial filler */

-            sp += 2;

-         else          /* Skip initial channel and, for sp, the filler */

-         {

-            sp += 4; dp += 2;

-         }

-

-         while (sp < ep)

-         {

-            *dp++ = *sp++; *dp++ = *sp; sp += 3;

-         }

-

-         row_info->pixel_depth = 16;

-      }

-

-      else

-         return; /* bad bit depth */

-

-      row_info->channels = 1;

-

-      /* Finally fix the color type if it records an alpha channel */

-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-         row_info->color_type = PNG_COLOR_TYPE_GRAY;

-   }

-

-   /* RGBA, RGBX, XRGB cases */

-   else if (row_info->channels == 4)

-   {

-      if (row_info->bit_depth == 8)

-      {

-         if (at_start != 0) /* Skip initial filler */

-            ++sp;

-         else          /* Skip initial channels and, for sp, the filler */

-         {

-            sp += 4; dp += 3;

-         }

-

-         /* Note that the loop adds 3 to dp and 4 to sp each time. */

-         while (sp < ep)

-         {

-            *dp++ = *sp++; *dp++ = *sp++; *dp++ = *sp; sp += 2;

-         }

-

-         row_info->pixel_depth = 24;

-      }

-

-      else if (row_info->bit_depth == 16)

-      {

-         if (at_start != 0) /* Skip initial filler */

-            sp += 2;

-         else          /* Skip initial channels and, for sp, the filler */

-         {

-            sp += 8; dp += 6;

-         }

-

-         while (sp < ep)

-         {

-            /* Copy 6 bytes, skip 2 */

-            *dp++ = *sp++; *dp++ = *sp++;

-            *dp++ = *sp++; *dp++ = *sp++;

-            *dp++ = *sp++; *dp++ = *sp; sp += 3;

-         }

-

-         row_info->pixel_depth = 48;

-      }

-

-      else

-         return; /* bad bit depth */

-

-      row_info->channels = 3;

-

-      /* Finally fix the color type if it records an alpha channel */

-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-         row_info->color_type = PNG_COLOR_TYPE_RGB;

-   }

-

-   else

-      return; /* The filler channel has gone already */

-

-   /* Fix the rowbytes value. */

-   row_info->rowbytes = (png_size_t)(dp-row);

-}

-#endif

-

-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)

-/* Swaps red and blue bytes within a pixel */

-void /* PRIVATE */

-png_do_bgr(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_bgr");

-

-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      png_uint_32 row_width = row_info->width;

-      if (row_info->bit_depth == 8)

-      {

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-         {

-            png_bytep rp;

-            png_uint_32 i;

-

-            for (i = 0, rp = row; i < row_width; i++, rp += 3)

-            {

-               png_byte save = *rp;

-               *rp = *(rp + 2);

-               *(rp + 2) = save;

-            }

-         }

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-         {

-            png_bytep rp;

-            png_uint_32 i;

-

-            for (i = 0, rp = row; i < row_width; i++, rp += 4)

-            {

-               png_byte save = *rp;

-               *rp = *(rp + 2);

-               *(rp + 2) = save;

-            }

-         }

-      }

-

-#ifdef PNG_16BIT_SUPPORTED

-      else if (row_info->bit_depth == 16)

-      {

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-         {

-            png_bytep rp;

-            png_uint_32 i;

-

-            for (i = 0, rp = row; i < row_width; i++, rp += 6)

-            {

-               png_byte save = *rp;

-               *rp = *(rp + 4);

-               *(rp + 4) = save;

-               save = *(rp + 1);

-               *(rp + 1) = *(rp + 5);

-               *(rp + 5) = save;

-            }

-         }

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-         {

-            png_bytep rp;

-            png_uint_32 i;

-

-            for (i = 0, rp = row; i < row_width; i++, rp += 8)

-            {

-               png_byte save = *rp;

-               *rp = *(rp + 4);

-               *(rp + 4) = save;

-               save = *(rp + 1);

-               *(rp + 1) = *(rp + 5);

-               *(rp + 5) = save;

-            }

-         }

-      }

-#endif

-   }

-}

-#endif /* READ_BGR || WRITE_BGR */

-

-#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \

-    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)

-/* Added at libpng-1.5.10 */

-void /* PRIVATE */

-png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)

-{

-   if (png_ptr->num_palette < (1 << row_info->bit_depth) &&

-      png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */

-   {

-      /* Calculations moved outside switch in an attempt to stop different

-       * compiler warnings.  'padding' is in *bits* within the last byte, it is

-       * an 'int' because pixel_depth becomes an 'int' in the expression below,

-       * and this calculation is used because it avoids warnings that other

-       * forms produced on either GCC or MSVC.

-       */

-      int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);

-      png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1;

-

-      switch (row_info->bit_depth)

-      {

-         case 1:

-         {

-            /* in this case, all bytes must be 0 so we don't need

-             * to unpack the pixels except for the rightmost one.

-             */

-            for (; rp > png_ptr->row_buf; rp--)

-            {

-              if ((*rp >> padding) != 0)

-                 png_ptr->num_palette_max = 1;

-              padding = 0;

-            }

-

-            break;

-         }

-

-         case 2:

-         {

-            for (; rp > png_ptr->row_buf; rp--)

-            {

-              int i = ((*rp >> padding) & 0x03);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              i = (((*rp >> padding) >> 2) & 0x03);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              i = (((*rp >> padding) >> 4) & 0x03);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              i = (((*rp >> padding) >> 6) & 0x03);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              padding = 0;

-            }

-

-            break;

-         }

-

-         case 4:

-         {

-            for (; rp > png_ptr->row_buf; rp--)

-            {

-              int i = ((*rp >> padding) & 0x0f);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              i = (((*rp >> padding) >> 4) & 0x0f);

-

-              if (i > png_ptr->num_palette_max)

-                 png_ptr->num_palette_max = i;

-

-              padding = 0;

-            }

-

-            break;

-         }

-

-         case 8:

-         {

-            for (; rp > png_ptr->row_buf; rp--)

-            {

-               if (*rp > png_ptr->num_palette_max)

-                  png_ptr->num_palette_max = (int) *rp;

-            }

-

-            break;

-         }

-

-         default:

-            break;

-      }

-   }

-}

-#endif /* CHECK_FOR_INVALID_INDEX */

-

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \

-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED

-void PNGAPI

-png_set_user_transform_info(png_structrp png_ptr, png_voidp

-   user_transform_ptr, int user_transform_depth, int user_transform_channels)

-{

-   png_debug(1, "in png_set_user_transform_info");

-

-   if (png_ptr == NULL)

-      return;

-

-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&

-      (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)

-   {

-      png_app_error(png_ptr,

-          "info change after png_start_read_image or png_read_update_info");

-      return;

-   }

-#endif

-

-   png_ptr->user_transform_ptr = user_transform_ptr;

-   png_ptr->user_transform_depth = (png_byte)user_transform_depth;

-   png_ptr->user_transform_channels = (png_byte)user_transform_channels;

-}

-#endif

-

-/* This function returns a pointer to the user_transform_ptr associated with

- * the user transform functions.  The application should free any memory

- * associated with this pointer before png_write_destroy and png_read_destroy

- * are called.

- */

-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED

-png_voidp PNGAPI

-png_get_user_transform_ptr(png_const_structrp png_ptr)

-{

-   if (png_ptr == NULL)

-      return (NULL);

-

-   return png_ptr->user_transform_ptr;

-}

-#endif

-

-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED

-png_uint_32 PNGAPI

-png_get_current_row_number(png_const_structrp png_ptr)

-{

-   /* See the comments in png.h - this is the sub-image row when reading an

-    * interlaced image.

-    */

-   if (png_ptr != NULL)

-      return png_ptr->row_number;

-

-   return PNG_UINT_32_MAX; /* help the app not to fail silently */

-}

-

-png_byte PNGAPI

-png_get_current_pass_number(png_const_structrp png_ptr)

-{

-   if (png_ptr != NULL)

-      return png_ptr->pass;

-   return 8; /* invalid */

-}

-#endif /* USER_TRANSFORM_INFO */

-#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */

-#endif /* READ || WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngwio.c b/plugins/AdvaImg/src/LibPNG/pngwio.c
deleted file mode 100644
index 28194b6fc6..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngwio.c
+++ /dev/null
@@ -1,168 +0,0 @@
-

-/* pngwio.c - functions for data output

- *

- * Last changed in libpng 1.6.24 [August 4, 2016]

- * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * This file provides a location for all output.  Users who need

- * special handling are expected to write functions that have the same

- * arguments as these and perform similar functions, but that possibly

- * use different output methods.  Note that you shouldn't change these

- * functions, but rather write replacement functions and then change

- * them at run time with png_set_write_fn(...).

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_WRITE_SUPPORTED

-

-/* Write the data to whatever output you are using.  The default routine

- * writes to a file pointer.  Note that this routine sometimes gets called

- * with very small lengths, so you should implement some kind of simple

- * buffering if you are using unbuffered writes.  This should never be asked

- * to write more than 64K on a 16-bit machine.

- */

-

-void /* PRIVATE */

-png_write_data(png_structrp png_ptr, png_const_bytep data, png_size_t length)

-{

-   /* NOTE: write_data_fn must not change the buffer! */

-   if (png_ptr->write_data_fn != NULL )

-      (*(png_ptr->write_data_fn))(png_ptr, png_constcast(png_bytep,data),

-          length);

-

-   else

-      png_error(png_ptr, "Call to NULL write function");

-}

-

-#ifdef PNG_STDIO_SUPPORTED

-/* This is the function that does the actual writing of data.  If you are

- * not writing to a standard C stream, you should create a replacement

- * write_data function and use it at run time with png_set_write_fn(), rather

- * than changing the library.

- */

-void PNGCBAPI

-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)

-{

-   png_size_t check;

-

-   if (png_ptr == NULL)

-      return;

-

-   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));

-

-   if (check != length)

-      png_error(png_ptr, "Write Error");

-}

-#endif

-

-/* This function is called to output any data pending writing (normally

- * to disk).  After png_flush is called, there should be no data pending

- * writing in any buffers.

- */

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-void /* PRIVATE */

-png_flush(png_structrp png_ptr)

-{

-   if (png_ptr->output_flush_fn != NULL)

-      (*(png_ptr->output_flush_fn))(png_ptr);

-}

-

-#  ifdef PNG_STDIO_SUPPORTED

-void PNGCBAPI

-png_default_flush(png_structp png_ptr)

-{

-   png_FILE_p io_ptr;

-

-   if (png_ptr == NULL)

-      return;

-

-   io_ptr = png_voidcast(png_FILE_p, (png_ptr->io_ptr));

-   fflush(io_ptr);

-}

-#  endif

-#endif

-

-/* This function allows the application to supply new output functions for

- * libpng if standard C streams aren't being used.

- *

- * This function takes as its arguments:

- * png_ptr       - pointer to a png output data structure

- * io_ptr        - pointer to user supplied structure containing info about

- *                 the output functions.  May be NULL.

- * write_data_fn - pointer to a new output function that takes as its

- *                 arguments a pointer to a png_struct, a pointer to

- *                 data to be written, and a 32-bit unsigned int that is

- *                 the number of bytes to be written.  The new write

- *                 function should call png_error(png_ptr, "Error msg")

- *                 to exit and output any fatal error messages.  May be

- *                 NULL, in which case libpng's default function will

- *                 be used.

- * flush_data_fn - pointer to a new flush function that takes as its

- *                 arguments a pointer to a png_struct.  After a call to

- *                 the flush function, there should be no data in any buffers

- *                 or pending transmission.  If the output method doesn't do

- *                 any buffering of output, a function prototype must still be

- *                 supplied although it doesn't have to do anything.  If

- *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile

- *                 time, output_flush_fn will be ignored, although it must be

- *                 supplied for compatibility.  May be NULL, in which case

- *                 libpng's default function will be used, if

- *                 PNG_WRITE_FLUSH_SUPPORTED is defined.  This is not

- *                 a good idea if io_ptr does not point to a standard

- *                 *FILE structure.

- */

-void PNGAPI

-png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,

-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->io_ptr = io_ptr;

-

-#ifdef PNG_STDIO_SUPPORTED

-   if (write_data_fn != NULL)

-      png_ptr->write_data_fn = write_data_fn;

-

-   else

-      png_ptr->write_data_fn = png_default_write_data;

-#else

-   png_ptr->write_data_fn = write_data_fn;

-#endif

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-#  ifdef PNG_STDIO_SUPPORTED

-

-   if (output_flush_fn != NULL)

-      png_ptr->output_flush_fn = output_flush_fn;

-

-   else

-      png_ptr->output_flush_fn = png_default_flush;

-

-#  else

-   png_ptr->output_flush_fn = output_flush_fn;

-#  endif

-#else

-   PNG_UNUSED(output_flush_fn)

-#endif /* WRITE_FLUSH */

-

-#ifdef PNG_READ_SUPPORTED

-   /* It is an error to read while writing a png file */

-   if (png_ptr->read_data_fn != NULL)

-   {

-      png_ptr->read_data_fn = NULL;

-

-      png_warning(png_ptr,

-          "Can't set both read_data_fn and write_data_fn in the"

-          " same structure");

-   }

-#endif

-}

-#endif /* WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngwrite.c b/plugins/AdvaImg/src/LibPNG/pngwrite.c
deleted file mode 100644
index 1eefbe686e..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngwrite.c
+++ /dev/null
@@ -1,2396 +0,0 @@
-

-/* pngwrite.c - general routines to write a PNG file

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED

-#  include <errno.h>

-#endif /* SIMPLIFIED_WRITE_STDIO */

-

-#ifdef PNG_WRITE_SUPPORTED

-

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-/* Write out all the unknown chunks for the current given location */

-static void

-write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,

-    unsigned int where)

-{

-   if (info_ptr->unknown_chunks_num != 0)

-   {

-      png_const_unknown_chunkp up;

-

-      png_debug(5, "writing extra chunks");

-

-      for (up = info_ptr->unknown_chunks;

-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;

-           ++up)

-         if ((up->location & where) != 0)

-      {

-         /* If per-chunk unknown chunk handling is enabled use it, otherwise

-          * just write the chunks the application has set.

-          */

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-         int keep = png_handle_as_unknown(png_ptr, up->name);

-

-         /* NOTE: this code is radically different from the read side in the

-          * matter of handling an ancillary unknown chunk.  In the read side

-          * the default behavior is to discard it, in the code below the default

-          * behavior is to write it.  Critical chunks are, however, only

-          * written if explicitly listed or if the default is set to write all

-          * unknown chunks.

-          *

-          * The default handling is also slightly weird - it is not possible to

-          * stop the writing of all unsafe-to-copy chunks!

-          *

-          * TODO: REVIEW: this would seem to be a bug.

-          */

-         if (keep != PNG_HANDLE_CHUNK_NEVER &&

-             ((up->name[3] & 0x20) /* safe-to-copy overrides everything */ ||

-              keep == PNG_HANDLE_CHUNK_ALWAYS ||

-              (keep == PNG_HANDLE_CHUNK_AS_DEFAULT &&

-               png_ptr->unknown_default == PNG_HANDLE_CHUNK_ALWAYS)))

-#endif

-         {

-            /* TODO: review, what is wrong with a zero length unknown chunk? */

-            if (up->size == 0)

-               png_warning(png_ptr, "Writing zero-length unknown chunk");

-

-            png_write_chunk(png_ptr, up->name, up->data, up->size);

-         }

-      }

-   }

-}

-#endif /* WRITE_UNKNOWN_CHUNKS */

-

-/* Writes all the PNG information.  This is the suggested way to use the

- * library.  If you have a new chunk to add, make a function to write it,

- * and put it in the correct location here.  If you want the chunk written

- * after the image data, put it in png_write_end().  I strongly encourage

- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing

- * the chunk, as that will keep the code from breaking if you want to just

- * write a plain PNG file.  If you have long comments, I suggest writing

- * them in png_write_end(), and compressing them.

- */

-void PNGAPI

-png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)

-{

-   png_debug(1, "in png_write_info_before_PLTE");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)

-   {

-      /* Write PNG signature */

-      png_write_sig(png_ptr);

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \

-          png_ptr->mng_features_permitted != 0)

-      {

-         png_warning(png_ptr,

-             "MNG features are not allowed in a PNG datastream");

-         png_ptr->mng_features_permitted = 0;

-      }

-#endif

-

-      /* Write IHDR information. */

-      png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,

-          info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,

-          info_ptr->filter_type,

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-          info_ptr->interlace_type

-#else

-          0

-#endif

-         );

-

-      /* The rest of these check to see if the valid field has the appropriate

-       * flag set, and if it does, writes the chunk.

-       *

-       * 1.6.0: COLORSPACE support controls the writing of these chunks too, and

-       * the chunks will be written if the WRITE routine is there and

-       * information * is available in the COLORSPACE. (See

-       * png_colorspace_sync_info in png.c for where the valid flags get set.)

-       *

-       * Under certain circumstances the colorspace can be invalidated without

-       * syncing the info_struct 'valid' flags; this happens if libpng detects

-       * an error and calls png_error while the color space is being set, yet

-       * the application continues writing the PNG.  So check the 'invalid'

-       * flag here too.

-       */

-#ifdef PNG_GAMMA_SUPPORTED

-#  ifdef PNG_WRITE_gAMA_SUPPORTED

-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&

-          (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&

-          (info_ptr->valid & PNG_INFO_gAMA) != 0)

-         png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);

-#  endif

-#endif

-

-#ifdef PNG_COLORSPACE_SUPPORTED

-      /* Write only one of sRGB or an ICC profile.  If a profile was supplied

-       * and it matches one of the known sRGB ones issue a warning.

-       */

-#  ifdef PNG_WRITE_iCCP_SUPPORTED

-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&

-             (info_ptr->valid & PNG_INFO_iCCP) != 0)

-         {

-#    ifdef PNG_WRITE_sRGB_SUPPORTED

-               if ((info_ptr->valid & PNG_INFO_sRGB) != 0)

-                  png_app_warning(png_ptr,

-                      "profile matches sRGB but writing iCCP instead");

-#     endif

-

-            png_write_iCCP(png_ptr, info_ptr->iccp_name,

-                info_ptr->iccp_profile);

-         }

-#     ifdef PNG_WRITE_sRGB_SUPPORTED

-         else

-#     endif

-#  endif

-

-#  ifdef PNG_WRITE_sRGB_SUPPORTED

-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&

-             (info_ptr->valid & PNG_INFO_sRGB) != 0)

-            png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);

-#  endif /* WRITE_sRGB */

-#endif /* COLORSPACE */

-

-#ifdef PNG_WRITE_sBIT_SUPPORTED

-         if ((info_ptr->valid & PNG_INFO_sBIT) != 0)

-            png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);

-#endif

-

-#ifdef PNG_COLORSPACE_SUPPORTED

-#  ifdef PNG_WRITE_cHRM_SUPPORTED

-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&

-             (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&

-             (info_ptr->valid & PNG_INFO_cHRM) != 0)

-            png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);

-#  endif

-#endif

-

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-         write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);

-#endif

-

-      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;

-   }

-}

-

-void PNGAPI

-png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)

-{

-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)

-   int i;

-#endif

-

-   png_debug(1, "in png_write_info");

-

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   png_write_info_before_PLTE(png_ptr, info_ptr);

-

-   if ((info_ptr->valid & PNG_INFO_PLTE) != 0)

-      png_write_PLTE(png_ptr, info_ptr->palette,

-          (png_uint_32)info_ptr->num_palette);

-

-   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      png_error(png_ptr, "Valid palette required for paletted images");

-

-#ifdef PNG_WRITE_tRNS_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_tRNS) !=0)

-   {

-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED

-      /* Invert the alpha channel (in tRNS) */

-      if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 &&

-          info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         int j, jend;

-

-         jend = info_ptr->num_trans;

-         if (jend > PNG_MAX_PALETTE_LENGTH)

-            jend = PNG_MAX_PALETTE_LENGTH;

-

-         for (j = 0; j<jend; ++j)

-            info_ptr->trans_alpha[j] =

-               (png_byte)(255 - info_ptr->trans_alpha[j]);

-      }

-#endif

-      png_write_tRNS(png_ptr, info_ptr->trans_alpha, &(info_ptr->trans_color),

-          info_ptr->num_trans, info_ptr->color_type);

-   }

-#endif

-#ifdef PNG_WRITE_bKGD_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_bKGD) != 0)

-      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);

-#endif

-

-#ifdef PNG_WRITE_eXIf_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_eXIf) != 0)

-      png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);

-#endif

-

-#ifdef PNG_WRITE_hIST_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_hIST) != 0)

-      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);

-#endif

-

-#ifdef PNG_WRITE_oFFs_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_oFFs) != 0)

-      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,

-          info_ptr->offset_unit_type);

-#endif

-

-#ifdef PNG_WRITE_pCAL_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_pCAL) != 0)

-      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,

-          info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,

-          info_ptr->pcal_units, info_ptr->pcal_params);

-#endif

-

-#ifdef PNG_WRITE_sCAL_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_sCAL) != 0)

-      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,

-          info_ptr->scal_s_width, info_ptr->scal_s_height);

-#endif /* sCAL */

-

-#ifdef PNG_WRITE_pHYs_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_pHYs) != 0)

-      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,

-          info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);

-#endif /* pHYs */

-

-#ifdef PNG_WRITE_tIME_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_tIME) != 0)

-   {

-      png_write_tIME(png_ptr, &(info_ptr->mod_time));

-      png_ptr->mode |= PNG_WROTE_tIME;

-   }

-#endif /* tIME */

-

-#ifdef PNG_WRITE_sPLT_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_sPLT) != 0)

-      for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)

-         png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);

-#endif /* sPLT */

-

-#ifdef PNG_WRITE_TEXT_SUPPORTED

-   /* Check to see if we need to write text chunks */

-   for (i = 0; i < info_ptr->num_text; i++)

-   {

-      png_debug2(2, "Writing header text chunk %d, type %d", i,

-          info_ptr->text[i].compression);

-      /* An internationalized chunk? */

-      if (info_ptr->text[i].compression > 0)

-      {

-#ifdef PNG_WRITE_iTXt_SUPPORTED

-         /* Write international chunk */

-         png_write_iTXt(png_ptr,

-             info_ptr->text[i].compression,

-             info_ptr->text[i].key,

-             info_ptr->text[i].lang,

-             info_ptr->text[i].lang_key,

-             info_ptr->text[i].text);

-         /* Mark this chunk as written */

-         if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)

-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;

-         else

-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;

-#else

-         png_warning(png_ptr, "Unable to write international text");

-#endif

-      }

-

-      /* If we want a compressed text chunk */

-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)

-      {

-#ifdef PNG_WRITE_zTXt_SUPPORTED

-         /* Write compressed chunk */

-         png_write_zTXt(png_ptr, info_ptr->text[i].key,

-             info_ptr->text[i].text, info_ptr->text[i].compression);

-         /* Mark this chunk as written */

-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;

-#else

-         png_warning(png_ptr, "Unable to write compressed text");

-#endif

-      }

-

-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)

-      {

-#ifdef PNG_WRITE_tEXt_SUPPORTED

-         /* Write uncompressed chunk */

-         png_write_tEXt(png_ptr, info_ptr->text[i].key,

-             info_ptr->text[i].text,

-             0);

-         /* Mark this chunk as written */

-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;

-#else

-         /* Can't get here */

-         png_warning(png_ptr, "Unable to write uncompressed text");

-#endif

-      }

-   }

-#endif /* tEXt */

-

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-   write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_PLTE);

-#endif

-}

-

-/* Writes the end of the PNG file.  If you don't want to write comments or

- * time information, you can pass NULL for info.  If you already wrote these

- * in png_write_info(), do not write them again here.  If you have long

- * comments, I suggest writing them here, and compressing them.

- */

-void PNGAPI

-png_write_end(png_structrp png_ptr, png_inforp info_ptr)

-{

-   png_debug(1, "in png_write_end");

-

-   if (png_ptr == NULL)

-      return;

-

-   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)

-      png_error(png_ptr, "No IDATs written into file");

-

-#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   if (png_ptr->num_palette_max > png_ptr->num_palette)

-      png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");

-#endif

-

-   /* See if user wants us to write information chunks */

-   if (info_ptr != NULL)

-   {

-#ifdef PNG_WRITE_TEXT_SUPPORTED

-      int i; /* local index variable */

-#endif

-#ifdef PNG_WRITE_tIME_SUPPORTED

-      /* Check to see if user has supplied a time chunk */

-      if ((info_ptr->valid & PNG_INFO_tIME) != 0 &&

-          (png_ptr->mode & PNG_WROTE_tIME) == 0)

-         png_write_tIME(png_ptr, &(info_ptr->mod_time));

-

-#endif

-#ifdef PNG_WRITE_TEXT_SUPPORTED

-      /* Loop through comment chunks */

-      for (i = 0; i < info_ptr->num_text; i++)

-      {

-         png_debug2(2, "Writing trailer text chunk %d, type %d", i,

-             info_ptr->text[i].compression);

-         /* An internationalized chunk? */

-         if (info_ptr->text[i].compression > 0)

-         {

-#ifdef PNG_WRITE_iTXt_SUPPORTED

-            /* Write international chunk */

-            png_write_iTXt(png_ptr,

-                info_ptr->text[i].compression,

-                info_ptr->text[i].key,

-                info_ptr->text[i].lang,

-                info_ptr->text[i].lang_key,

-                info_ptr->text[i].text);

-            /* Mark this chunk as written */

-            if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)

-               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;

-            else

-               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;

-#else

-            png_warning(png_ptr, "Unable to write international text");

-#endif

-         }

-

-         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)

-         {

-#ifdef PNG_WRITE_zTXt_SUPPORTED

-            /* Write compressed chunk */

-            png_write_zTXt(png_ptr, info_ptr->text[i].key,

-                info_ptr->text[i].text, info_ptr->text[i].compression);

-            /* Mark this chunk as written */

-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;

-#else

-            png_warning(png_ptr, "Unable to write compressed text");

-#endif

-         }

-

-         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)

-         {

-#ifdef PNG_WRITE_tEXt_SUPPORTED

-            /* Write uncompressed chunk */

-            png_write_tEXt(png_ptr, info_ptr->text[i].key,

-                info_ptr->text[i].text, 0);

-            /* Mark this chunk as written */

-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;

-#else

-            png_warning(png_ptr, "Unable to write uncompressed text");

-#endif

-         }

-      }

-#endif

-

-#ifdef PNG_WRITE_eXIf_SUPPORTED

-   if ((info_ptr->valid & PNG_INFO_eXIf) != 0)

-      png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);

-#endif

-

-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

-      write_unknown_chunks(png_ptr, info_ptr, PNG_AFTER_IDAT);

-#endif

-   }

-

-   png_ptr->mode |= PNG_AFTER_IDAT;

-

-   /* Write end of PNG file */

-   png_write_IEND(png_ptr);

-

-   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,

-    * and restored again in libpng-1.2.30, may cause some applications that

-    * do not set png_ptr->output_flush_fn to crash.  If your application

-    * experiences a problem, please try building libpng with

-    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to

-    * png-mng-implement at lists.sf.net .

-    */

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED

-   png_flush(png_ptr);

-#  endif

-#endif

-}

-

-#ifdef PNG_CONVERT_tIME_SUPPORTED

-void PNGAPI

-png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm * ttime)

-{

-   png_debug(1, "in png_convert_from_struct_tm");

-

-   ptime->year = (png_uint_16)(1900 + ttime->tm_year);

-   ptime->month = (png_byte)(ttime->tm_mon + 1);

-   ptime->day = (png_byte)ttime->tm_mday;

-   ptime->hour = (png_byte)ttime->tm_hour;

-   ptime->minute = (png_byte)ttime->tm_min;

-   ptime->second = (png_byte)ttime->tm_sec;

-}

-

-void PNGAPI

-png_convert_from_time_t(png_timep ptime, time_t ttime)

-{

-   struct tm *tbuf;

-

-   png_debug(1, "in png_convert_from_time_t");

-

-   tbuf = gmtime(&ttime);

-   png_convert_from_struct_tm(ptime, tbuf);

-}

-#endif

-

-/* Initialize png_ptr structure, and allocate any memory needed */

-PNG_FUNCTION(png_structp,PNGAPI

-png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)

-{

-#ifndef PNG_USER_MEM_SUPPORTED

-   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,

-       error_fn, warn_fn, NULL, NULL, NULL);

-#else

-   return png_create_write_struct_2(user_png_ver, error_ptr, error_fn,

-       warn_fn, NULL, NULL, NULL);

-}

-

-/* Alternate initialize png_ptr structure, and allocate any memory needed */

-PNG_FUNCTION(png_structp,PNGAPI

-png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,

-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,

-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)

-{

-   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,

-       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);

-#endif /* USER_MEM */

-   if (png_ptr != NULL)

-   {

-      /* Set the zlib control values to defaults; they can be overridden by the

-       * application after the struct has been created.

-       */

-      png_ptr->zbuffer_size = PNG_ZBUF_SIZE;

-

-      /* The 'zlib_strategy' setting is irrelevant because png_default_claim in

-       * pngwutil.c defaults it according to whether or not filters will be

-       * used, and ignores this setting.

-       */

-      png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;

-      png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;

-      png_ptr->zlib_mem_level = 8;

-      png_ptr->zlib_window_bits = 15;

-      png_ptr->zlib_method = 8;

-

-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED

-      png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;

-      png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;

-      png_ptr->zlib_text_mem_level = 8;

-      png_ptr->zlib_text_window_bits = 15;

-      png_ptr->zlib_text_method = 8;

-#endif /* WRITE_COMPRESSED_TEXT */

-

-      /* This is a highly dubious configuration option; by default it is off,

-       * but it may be appropriate for private builds that are testing

-       * extensions not conformant to the current specification, or of

-       * applications that must not fail to write at all costs!

-       */

-#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED

-      /* In stable builds only warn if an application error can be completely

-       * handled.

-       */

-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;

-#endif

-

-      /* App warnings are warnings in release (or release candidate) builds but

-       * are errors during development.

-       */

-#if PNG_RELEASE_BUILD

-      png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;

-#endif

-

-      /* TODO: delay this, it can be done in png_init_io() (if the app doesn't

-       * do it itself) avoiding setting the default function if it is not

-       * required.

-       */

-      png_set_write_fn(png_ptr, NULL, NULL, NULL);

-   }

-

-   return png_ptr;

-}

-

-

-/* Write a few rows of image data.  If the image is interlaced,

- * either you will have to write the 7 sub images, or, if you

- * have called png_set_interlace_handling(), you will have to

- * "write" the image seven times.

- */

-void PNGAPI

-png_write_rows(png_structrp png_ptr, png_bytepp row,

-    png_uint_32 num_rows)

-{

-   png_uint_32 i; /* row counter */

-   png_bytepp rp; /* row pointer */

-

-   png_debug(1, "in png_write_rows");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* Loop through the rows */

-   for (i = 0, rp = row; i < num_rows; i++, rp++)

-   {

-      png_write_row(png_ptr, *rp);

-   }

-}

-

-/* Write the image.  You only need to call this function once, even

- * if you are writing an interlaced image.

- */

-void PNGAPI

-png_write_image(png_structrp png_ptr, png_bytepp image)

-{

-   png_uint_32 i; /* row index */

-   int pass, num_pass; /* pass variables */

-   png_bytepp rp; /* points to current row */

-

-   if (png_ptr == NULL)

-      return;

-

-   png_debug(1, "in png_write_image");

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* Initialize interlace handling.  If image is not interlaced,

-    * this will set pass to 1

-    */

-   num_pass = png_set_interlace_handling(png_ptr);

-#else

-   num_pass = 1;

-#endif

-   /* Loop through passes */

-   for (pass = 0; pass < num_pass; pass++)

-   {

-      /* Loop through image */

-      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)

-      {

-         png_write_row(png_ptr, *rp);

-      }

-   }

-}

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-/* Performs intrapixel differencing  */

-static void

-png_do_write_intrapixel(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_write_intrapixel");

-

-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      int bytes_per_pixel;

-      png_uint_32 row_width = row_info->width;

-      if (row_info->bit_depth == 8)

-      {

-         png_bytep rp;

-         png_uint_32 i;

-

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-            bytes_per_pixel = 3;

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-            bytes_per_pixel = 4;

-

-         else

-            return;

-

-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)

-         {

-            *(rp)     = (png_byte)(*rp       - *(rp + 1));

-            *(rp + 2) = (png_byte)(*(rp + 2) - *(rp + 1));

-         }

-      }

-

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-      else if (row_info->bit_depth == 16)

-      {

-         png_bytep rp;

-         png_uint_32 i;

-

-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)

-            bytes_per_pixel = 6;

-

-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-            bytes_per_pixel = 8;

-

-         else

-            return;

-

-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)

-         {

-            png_uint_32 s0   = (png_uint_32)(*(rp    ) << 8) | *(rp + 1);

-            png_uint_32 s1   = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);

-            png_uint_32 s2   = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);

-            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);

-            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);

-            *(rp    ) = (png_byte)(red >> 8);

-            *(rp + 1) = (png_byte)red;

-            *(rp + 4) = (png_byte)(blue >> 8);

-            *(rp + 5) = (png_byte)blue;

-         }

-      }

-#endif /* WRITE_16BIT */

-   }

-}

-#endif /* MNG_FEATURES */

-

-/* Called by user to write a row of image data */

-void PNGAPI

-png_write_row(png_structrp png_ptr, png_const_bytep row)

-{

-   /* 1.5.6: moved from png_struct to be a local structure: */

-   png_row_info row_info;

-

-   if (png_ptr == NULL)

-      return;

-

-   png_debug2(1, "in png_write_row (row %u, pass %d)",

-       png_ptr->row_number, png_ptr->pass);

-

-   /* Initialize transformations and other stuff if first time */

-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)

-   {

-      /* Make sure we wrote the header info */

-      if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)

-         png_error(png_ptr,

-             "png_write_info was never called before png_write_row");

-

-      /* Check for transforms that have been set but were defined out */

-#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)

-      if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)

-         png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");

-#endif

-

-#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)

-      if ((png_ptr->transformations & PNG_FILLER) != 0)

-         png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");

-#endif

-#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \

-    defined(PNG_READ_PACKSWAP_SUPPORTED)

-      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-         png_warning(png_ptr,

-             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");

-#endif

-

-#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)

-      if ((png_ptr->transformations & PNG_PACK) != 0)

-         png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");

-#endif

-

-#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)

-      if ((png_ptr->transformations & PNG_SHIFT) != 0)

-         png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");

-#endif

-

-#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)

-      if ((png_ptr->transformations & PNG_BGR) != 0)

-         png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");

-#endif

-

-#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)

-      if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)

-         png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");

-#endif

-

-      png_write_start_row(png_ptr);

-   }

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* If interlaced and not interested in row, return */

-   if (png_ptr->interlaced != 0 &&

-       (png_ptr->transformations & PNG_INTERLACE) != 0)

-   {

-      switch (png_ptr->pass)

-      {

-         case 0:

-            if ((png_ptr->row_number & 0x07) != 0)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 1:

-            if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 2:

-            if ((png_ptr->row_number & 0x07) != 4)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 3:

-            if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 4:

-            if ((png_ptr->row_number & 0x03) != 2)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 5:

-            if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         case 6:

-            if ((png_ptr->row_number & 0x01) == 0)

-            {

-               png_write_finish_row(png_ptr);

-               return;

-            }

-            break;

-

-         default: /* error: ignore it */

-            break;

-      }

-   }

-#endif

-

-   /* Set up row info for transformations */

-   row_info.color_type = png_ptr->color_type;

-   row_info.width = png_ptr->usr_width;

-   row_info.channels = png_ptr->usr_channels;

-   row_info.bit_depth = png_ptr->usr_bit_depth;

-   row_info.pixel_depth = (png_byte)(row_info.bit_depth * row_info.channels);

-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);

-

-   png_debug1(3, "row_info->color_type = %d", row_info.color_type);

-   png_debug1(3, "row_info->width = %u", row_info.width);

-   png_debug1(3, "row_info->channels = %d", row_info.channels);

-   png_debug1(3, "row_info->bit_depth = %d", row_info.bit_depth);

-   png_debug1(3, "row_info->pixel_depth = %d", row_info.pixel_depth);

-   png_debug1(3, "row_info->rowbytes = %lu", (unsigned long)row_info.rowbytes);

-

-   /* Copy user's row into buffer, leaving room for filter byte. */

-   memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* Handle interlacing */

-   if (png_ptr->interlaced && png_ptr->pass < 6 &&

-       (png_ptr->transformations & PNG_INTERLACE) != 0)

-   {

-      png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);

-      /* This should always get caught above, but still ... */

-      if (row_info.width == 0)

-      {

-         png_write_finish_row(png_ptr);

-         return;

-      }

-   }

-#endif

-

-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED

-   /* Handle other transformations */

-   if (png_ptr->transformations != 0)

-      png_do_write_transformations(png_ptr, &row_info);

-#endif

-

-   /* At this point the row_info pixel depth must match the 'transformed' depth,

-    * which is also the output depth.

-    */

-   if (row_info.pixel_depth != png_ptr->pixel_depth ||

-       row_info.pixel_depth != png_ptr->transformed_pixel_depth)

-      png_error(png_ptr, "internal write transform logic error");

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   /* Write filter_method 64 (intrapixel differencing) only if

-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and

-    * 2. Libpng did not write a PNG signature (this filter_method is only

-    *    used in PNG datastreams that are embedded in MNG datastreams) and

-    * 3. The application called png_permit_mng_features with a mask that

-    *    included PNG_FLAG_MNG_FILTER_64 and

-    * 4. The filter_method is 64 and

-    * 5. The color_type is RGB or RGBA

-    */

-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&

-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))

-   {

-      /* Intrapixel differencing */

-      png_do_write_intrapixel(&row_info, png_ptr->row_buf + 1);

-   }

-#endif

-

-/* Added at libpng-1.5.10 */

-#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED

-   /* Check for out-of-range palette index */

-   if (row_info.color_type == PNG_COLOR_TYPE_PALETTE &&

-       png_ptr->num_palette_max >= 0)

-      png_do_check_palette_indexes(png_ptr, &row_info);

-#endif

-

-   /* Find a filter if necessary, filter the row and write it out. */

-   png_write_find_filter(png_ptr, &row_info);

-

-   if (png_ptr->write_row_fn != NULL)

-      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);

-}

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-/* Set the automatic flush interval or 0 to turn flushing off */

-void PNGAPI

-png_set_flush(png_structrp png_ptr, int nrows)

-{

-   png_debug(1, "in png_set_flush");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->flush_dist = (nrows < 0 ? 0 : (png_uint_32)nrows);

-}

-

-/* Flush the current output buffers now */

-void PNGAPI

-png_write_flush(png_structrp png_ptr)

-{

-   png_debug(1, "in png_write_flush");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* We have already written out all of the data */

-   if (png_ptr->row_number >= png_ptr->num_rows)

-      return;

-

-   png_compress_IDAT(png_ptr, NULL, 0, Z_SYNC_FLUSH);

-   png_ptr->flush_rows = 0;

-   png_flush(png_ptr);

-}

-#endif /* WRITE_FLUSH */

-

-/* Free any memory used in png_ptr struct without freeing the struct itself. */

-static void

-png_write_destroy(png_structrp png_ptr)

-{

-   png_debug(1, "in png_write_destroy");

-

-   /* Free any memory zlib uses */

-   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)

-      deflateEnd(&png_ptr->zstream);

-

-   /* Free our memory.  png_free checks NULL for us. */

-   png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);

-   png_free(png_ptr, png_ptr->row_buf);

-   png_ptr->row_buf = NULL;

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   png_free(png_ptr, png_ptr->prev_row);

-   png_free(png_ptr, png_ptr->try_row);

-   png_free(png_ptr, png_ptr->tst_row);

-   png_ptr->prev_row = NULL;

-   png_ptr->try_row = NULL;

-   png_ptr->tst_row = NULL;

-#endif

-

-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

-   png_free(png_ptr, png_ptr->chunk_list);

-   png_ptr->chunk_list = NULL;

-#endif

-

-   /* The error handling and memory handling information is left intact at this

-    * point: the jmp_buf may still have to be freed.  See png_destroy_png_struct

-    * for how this happens.

-    */

-}

-

-/* Free all memory used by the write.

- * In libpng 1.6.0 this API changed quietly to no longer accept a NULL value for

- * *png_ptr_ptr.  Prior to 1.6.0 it would accept such a value and it would free

- * the passed in info_structs but it would quietly fail to free any of the data

- * inside them.  In 1.6.0 it quietly does nothing (it has to be quiet because it

- * has no png_ptr.)

- */

-void PNGAPI

-png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)

-{

-   png_debug(1, "in png_destroy_write_struct");

-

-   if (png_ptr_ptr != NULL)

-   {

-      png_structrp png_ptr = *png_ptr_ptr;

-

-      if (png_ptr != NULL) /* added in libpng 1.6.0 */

-      {

-         png_destroy_info_struct(png_ptr, info_ptr_ptr);

-

-         *png_ptr_ptr = NULL;

-         png_write_destroy(png_ptr);

-         png_destroy_png_struct(png_ptr);

-      }

-   }

-}

-

-/* Allow the application to select one or more row filters to use. */

-void PNGAPI

-png_set_filter(png_structrp png_ptr, int method, int filters)

-{

-   png_debug(1, "in png_set_filter");

-

-   if (png_ptr == NULL)

-      return;

-

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&

-       (method == PNG_INTRAPIXEL_DIFFERENCING))

-      method = PNG_FILTER_TYPE_BASE;

-

-#endif

-   if (method == PNG_FILTER_TYPE_BASE)

-   {

-      switch (filters & (PNG_ALL_FILTERS | 0x07))

-      {

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-         case 5:

-         case 6:

-         case 7: png_app_error(png_ptr, "Unknown row filter for method 0");

-#endif /* WRITE_FILTER */

-            /* FALLTHROUGH */

-         case PNG_FILTER_VALUE_NONE:

-            png_ptr->do_filter = PNG_FILTER_NONE; break;

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-         case PNG_FILTER_VALUE_SUB:

-            png_ptr->do_filter = PNG_FILTER_SUB; break;

-

-         case PNG_FILTER_VALUE_UP:

-            png_ptr->do_filter = PNG_FILTER_UP; break;

-

-         case PNG_FILTER_VALUE_AVG:

-            png_ptr->do_filter = PNG_FILTER_AVG; break;

-

-         case PNG_FILTER_VALUE_PAETH:

-            png_ptr->do_filter = PNG_FILTER_PAETH; break;

-

-         default:

-            png_ptr->do_filter = (png_byte)filters; break;

-#else

-         default:

-            png_app_error(png_ptr, "Unknown row filter for method 0");

-#endif /* WRITE_FILTER */

-      }

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-      /* If we have allocated the row_buf, this means we have already started

-       * with the image and we should have allocated all of the filter buffers

-       * that have been selected.  If prev_row isn't already allocated, then

-       * it is too late to start using the filters that need it, since we

-       * will be missing the data in the previous row.  If an application

-       * wants to start and stop using particular filters during compression,

-       * it should start out with all of the filters, and then remove them

-       * or add them back after the start of compression.

-       *

-       * NOTE: this is a nasty constraint on the code, because it means that the

-       * prev_row buffer must be maintained even if there are currently no

-       * 'prev_row' requiring filters active.

-       */

-      if (png_ptr->row_buf != NULL)

-      {

-         int num_filters;

-         png_alloc_size_t buf_size;

-

-         /* Repeat the checks in png_write_start_row; 1 pixel high or wide

-          * images cannot benefit from certain filters.  If this isn't done here

-          * the check below will fire on 1 pixel high images.

-          */

-         if (png_ptr->height == 1)

-            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);

-

-         if (png_ptr->width == 1)

-            filters &= ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);

-

-         if ((filters & (PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH)) != 0

-            && png_ptr->prev_row == NULL)

-         {

-            /* This is the error case, however it is benign - the previous row

-             * is not available so the filter can't be used.  Just warn here.

-             */

-            png_app_warning(png_ptr,

-                "png_set_filter: UP/AVG/PAETH cannot be added after start");

-            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);

-         }

-

-         num_filters = 0;

-

-         if (filters & PNG_FILTER_SUB)

-            num_filters++;

-

-         if (filters & PNG_FILTER_UP)

-            num_filters++;

-

-         if (filters & PNG_FILTER_AVG)

-            num_filters++;

-

-         if (filters & PNG_FILTER_PAETH)

-            num_filters++;

-

-         /* Allocate needed row buffers if they have not already been

-          * allocated.

-          */

-         buf_size = PNG_ROWBYTES(png_ptr->usr_channels * png_ptr->usr_bit_depth,

-             png_ptr->width) + 1;

-

-         if (png_ptr->try_row == NULL)

-            png_ptr->try_row = png_voidcast(png_bytep,

-                png_malloc(png_ptr, buf_size));

-

-         if (num_filters > 1)

-         {

-            if (png_ptr->tst_row == NULL)

-               png_ptr->tst_row = png_voidcast(png_bytep,

-                   png_malloc(png_ptr, buf_size));

-         }

-      }

-      png_ptr->do_filter = (png_byte)filters;

-#endif

-   }

-   else

-      png_error(png_ptr, "Unknown custom filter method");

-}

-

-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */

-/* Provide floating and fixed point APIs */

-#ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method,

-    int num_weights, png_const_doublep filter_weights,

-    png_const_doublep filter_costs)

-{

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(heuristic_method)

-   PNG_UNUSED(num_weights)

-   PNG_UNUSED(filter_weights)

-   PNG_UNUSED(filter_costs)

-}

-#endif /* FLOATING_POINT */

-

-#ifdef PNG_FIXED_POINT_SUPPORTED

-void PNGAPI

-png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,

-    int num_weights, png_const_fixed_point_p filter_weights,

-    png_const_fixed_point_p filter_costs)

-{

-   PNG_UNUSED(png_ptr)

-   PNG_UNUSED(heuristic_method)

-   PNG_UNUSED(num_weights)

-   PNG_UNUSED(filter_weights)

-   PNG_UNUSED(filter_costs)

-}

-#endif /* FIXED_POINT */

-#endif /* WRITE_WEIGHTED_FILTER */

-

-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED

-void PNGAPI

-png_set_compression_level(png_structrp png_ptr, int level)

-{

-   png_debug(1, "in png_set_compression_level");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->zlib_level = level;

-}

-

-void PNGAPI

-png_set_compression_mem_level(png_structrp png_ptr, int mem_level)

-{

-   png_debug(1, "in png_set_compression_mem_level");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->zlib_mem_level = mem_level;

-}

-

-void PNGAPI

-png_set_compression_strategy(png_structrp png_ptr, int strategy)

-{

-   png_debug(1, "in png_set_compression_strategy");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* The flag setting here prevents the libpng dynamic selection of strategy.

-    */

-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;

-   png_ptr->zlib_strategy = strategy;

-}

-

-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a

- * smaller value of window_bits if it can do so safely.

- */

-void PNGAPI

-png_set_compression_window_bits(png_structrp png_ptr, int window_bits)

-{

-   if (png_ptr == NULL)

-      return;

-

-   /* Prior to 1.6.0 this would warn but then set the window_bits value. This

-    * meant that negative window bits values could be selected that would cause

-    * libpng to write a non-standard PNG file with raw deflate or gzip

-    * compressed IDAT or ancillary chunks.  Such files can be read and there is

-    * no warning on read, so this seems like a very bad idea.

-    */

-   if (window_bits > 15)

-   {

-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");

-      window_bits = 15;

-   }

-

-   else if (window_bits < 8)

-   {

-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");

-      window_bits = 8;

-   }

-

-   png_ptr->zlib_window_bits = window_bits;

-}

-

-void PNGAPI

-png_set_compression_method(png_structrp png_ptr, int method)

-{

-   png_debug(1, "in png_set_compression_method");

-

-   if (png_ptr == NULL)

-      return;

-

-   /* This would produce an invalid PNG file if it worked, but it doesn't and

-    * deflate will fault it, so it is harmless to just warn here.

-    */

-   if (method != 8)

-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");

-

-   png_ptr->zlib_method = method;

-}

-#endif /* WRITE_CUSTOMIZE_COMPRESSION */

-

-/* The following were added to libpng-1.5.4 */

-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-void PNGAPI

-png_set_text_compression_level(png_structrp png_ptr, int level)

-{

-   png_debug(1, "in png_set_text_compression_level");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->zlib_text_level = level;

-}

-

-void PNGAPI

-png_set_text_compression_mem_level(png_structrp png_ptr, int mem_level)

-{

-   png_debug(1, "in png_set_text_compression_mem_level");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->zlib_text_mem_level = mem_level;

-}

-

-void PNGAPI

-png_set_text_compression_strategy(png_structrp png_ptr, int strategy)

-{

-   png_debug(1, "in png_set_text_compression_strategy");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->zlib_text_strategy = strategy;

-}

-

-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a

- * smaller value of window_bits if it can do so safely.

- */

-void PNGAPI

-png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)

-{

-   if (png_ptr == NULL)

-      return;

-

-   if (window_bits > 15)

-   {

-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");

-      window_bits = 15;

-   }

-

-   else if (window_bits < 8)

-   {

-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");

-      window_bits = 8;

-   }

-

-   png_ptr->zlib_text_window_bits = window_bits;

-}

-

-void PNGAPI

-png_set_text_compression_method(png_structrp png_ptr, int method)

-{

-   png_debug(1, "in png_set_text_compression_method");

-

-   if (png_ptr == NULL)

-      return;

-

-   if (method != 8)

-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");

-

-   png_ptr->zlib_text_method = method;

-}

-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */

-/* end of API added to libpng-1.5.4 */

-

-void PNGAPI

-png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)

-{

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->write_row_fn = write_row_fn;

-}

-

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-void PNGAPI

-png_set_write_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr

-    write_user_transform_fn)

-{

-   png_debug(1, "in png_set_write_user_transform_fn");

-

-   if (png_ptr == NULL)

-      return;

-

-   png_ptr->transformations |= PNG_USER_TRANSFORM;

-   png_ptr->write_user_transform_fn = write_user_transform_fn;

-}

-#endif

-

-

-#ifdef PNG_INFO_IMAGE_SUPPORTED

-void PNGAPI

-png_write_png(png_structrp png_ptr, png_inforp info_ptr,

-    int transforms, voidp params)

-{

-   if (png_ptr == NULL || info_ptr == NULL)

-      return;

-

-   if ((info_ptr->valid & PNG_INFO_IDAT) == 0)

-   {

-      png_app_error(png_ptr, "no rows for png_write_image to write");

-      return;

-   }

-

-   /* Write the file header information. */

-   png_write_info(png_ptr, info_ptr);

-

-   /* ------ these transformations don't touch the info structure ------- */

-

-   /* Invert monochrome pixels */

-   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)

-#ifdef PNG_WRITE_INVERT_SUPPORTED

-      png_set_invert_mono(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");

-#endif

-

-   /* Shift the pixels up to a legal bit depth and fill in

-    * as appropriate to correctly scale the image.

-    */

-   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)

-#ifdef PNG_WRITE_SHIFT_SUPPORTED

-      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)

-         png_set_shift(png_ptr, &info_ptr->sig_bit);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");

-#endif

-

-   /* Pack pixels into bytes */

-   if ((transforms & PNG_TRANSFORM_PACKING) != 0)

-#ifdef PNG_WRITE_PACK_SUPPORTED

-      png_set_packing(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");

-#endif

-

-   /* Swap location of alpha bytes from ARGB to RGBA */

-   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)

-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED

-      png_set_swap_alpha(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");

-#endif

-

-   /* Remove a filler (X) from XRGB/RGBX/AG/GA into to convert it into

-    * RGB, note that the code expects the input color type to be G or RGB; no

-    * alpha channel.

-    */

-   if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER|

-       PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0)

-   {

-#ifdef PNG_WRITE_FILLER_SUPPORTED

-      if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0)

-      {

-         if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)

-            png_app_error(png_ptr,

-                "PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported");

-

-         /* Continue if ignored - this is the pre-1.6.10 behavior */

-         png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);

-      }

-

-      else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)

-         png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported");

-#endif

-   }

-

-   /* Flip BGR pixels to RGB */

-   if ((transforms & PNG_TRANSFORM_BGR) != 0)

-#ifdef PNG_WRITE_BGR_SUPPORTED

-      png_set_bgr(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");

-#endif

-

-   /* Swap bytes of 16-bit files to most significant byte first */

-   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)

-#ifdef PNG_WRITE_SWAP_SUPPORTED

-      png_set_swap(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");

-#endif

-

-   /* Swap bits of 1-bit, 2-bit, 4-bit packed pixel formats */

-   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)

-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED

-      png_set_packswap(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");

-#endif

-

-   /* Invert the alpha channel from opacity to transparency */

-   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)

-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED

-      png_set_invert_alpha(png_ptr);

-#else

-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");

-#endif

-

-   /* ----------------------- end of transformations ------------------- */

-

-   /* Write the bits */

-   png_write_image(png_ptr, info_ptr->row_pointers);

-

-   /* It is REQUIRED to call this to finish writing the rest of the file */

-   png_write_end(png_ptr, info_ptr);

-

-   PNG_UNUSED(params)

-}

-#endif

-

-

-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED

-/* Initialize the write structure - general purpose utility. */

-static int

-png_image_write_init(png_imagep image)

-{

-   png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, image,

-       png_safe_error, png_safe_warning);

-

-   if (png_ptr != NULL)

-   {

-      png_infop info_ptr = png_create_info_struct(png_ptr);

-

-      if (info_ptr != NULL)

-      {

-         png_controlp control = png_voidcast(png_controlp,

-             png_malloc_warn(png_ptr, (sizeof *control)));

-

-         if (control != NULL)

-         {

-            memset(control, 0, (sizeof *control));

-

-            control->png_ptr = png_ptr;

-            control->info_ptr = info_ptr;

-            control->for_write = 1;

-

-            image->opaque = control;

-            return 1;

-         }

-

-         /* Error clean up */

-         png_destroy_info_struct(png_ptr, &info_ptr);

-      }

-

-      png_destroy_write_struct(&png_ptr, NULL);

-   }

-

-   return png_image_error(image, "png_image_write_: out of memory");

-}

-

-/* Arguments to png_image_write_main: */

-typedef struct

-{

-   /* Arguments: */

-   png_imagep      image;

-   png_const_voidp buffer;

-   png_int_32      row_stride;

-   png_const_voidp colormap;

-   int             convert_to_8bit;

-   /* Local variables: */

-   png_const_voidp first_row;

-   ptrdiff_t       row_bytes;

-   png_voidp       local_row;

-   /* Byte count for memory writing */

-   png_bytep        memory;

-   png_alloc_size_t memory_bytes; /* not used for STDIO */

-   png_alloc_size_t output_bytes; /* running total */

-} png_image_write_control;

-

-/* Write png_uint_16 input to a 16-bit PNG; the png_ptr has already been set to

- * do any necessary byte swapping.  The component order is defined by the

- * png_image format value.

- */

-static int

-png_write_image_16bit(png_voidp argument)

-{

-   png_image_write_control *display = png_voidcast(png_image_write_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-

-   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,

-       display->first_row);

-   png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);

-   png_uint_16p row_end;

-   const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?

-       3 : 1;

-   int aindex = 0;

-   png_uint_32 y = image->height;

-

-   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)

-   {

-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED

-      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)

-      {

-         aindex = -1;

-         ++input_row; /* To point to the first component */

-         ++output_row;

-      }

-         else

-            aindex = (int)channels;

-#     else

-         aindex = (int)channels;

-#     endif

-   }

-

-   else

-      png_error(png_ptr, "png_write_image: internal call error");

-

-   /* Work out the output row end and count over this, note that the increment

-    * above to 'row' means that row_end can actually be beyond the end of the

-    * row; this is correct.

-    */

-   row_end = output_row + image->width * (channels+1);

-

-   for (; y > 0; --y)

-   {

-      png_const_uint_16p in_ptr = input_row;

-      png_uint_16p out_ptr = output_row;

-

-      while (out_ptr < row_end)

-      {

-         const png_uint_16 alpha = in_ptr[aindex];

-         png_uint_32 reciprocal = 0;

-         int c;

-

-         out_ptr[aindex] = alpha;

-

-         /* Calculate a reciprocal.  The correct calculation is simply

-          * component/alpha*65535 << 15. (I.e. 15 bits of precision); this

-          * allows correct rounding by adding .5 before the shift.  'reciprocal'

-          * is only initialized when required.

-          */

-         if (alpha > 0 && alpha < 65535)

-            reciprocal = ((0xffff<<15)+(alpha>>1))/alpha;

-

-         c = (int)channels;

-         do /* always at least one channel */

-         {

-            png_uint_16 component = *in_ptr++;

-

-            /* The following gives 65535 for an alpha of 0, which is fine,

-             * otherwise if 0/0 is represented as some other value there is more

-             * likely to be a discontinuity which will probably damage

-             * compression when moving from a fully transparent area to a

-             * nearly transparent one.  (The assumption here is that opaque

-             * areas tend not to be 0 intensity.)

-             */

-            if (component >= alpha)

-               component = 65535;

-

-            /* component<alpha, so component/alpha is less than one and

-             * component*reciprocal is less than 2^31.

-             */

-            else if (component > 0 && alpha < 65535)

-            {

-               png_uint_32 calc = component * reciprocal;

-               calc += 16384; /* round to nearest */

-               component = (png_uint_16)(calc >> 15);

-            }

-

-            *out_ptr++ = component;

-         }

-         while (--c > 0);

-

-         /* Skip to next component (skip the intervening alpha channel) */

-         ++in_ptr;

-         ++out_ptr;

-      }

-

-      png_write_row(png_ptr, png_voidcast(png_const_bytep, display->local_row));

-      input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));

-   }

-

-   return 1;

-}

-

-/* Given 16-bit input (1 to 4 channels) write 8-bit output.  If an alpha channel

- * is present it must be removed from the components, the components are then

- * written in sRGB encoding.  No components are added or removed.

- *

- * Calculate an alpha reciprocal to reverse pre-multiplication.  As above the

- * calculation can be done to 15 bits of accuracy; however, the output needs to

- * be scaled in the range 0..255*65535, so include that scaling here.

- */

-#   define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)

-

-static png_byte

-png_unpremultiply(png_uint_32 component, png_uint_32 alpha,

-    png_uint_32 reciprocal/*from the above macro*/)

-{

-   /* The following gives 1.0 for an alpha of 0, which is fine, otherwise if 0/0

-    * is represented as some other value there is more likely to be a

-    * discontinuity which will probably damage compression when moving from a

-    * fully transparent area to a nearly transparent one.  (The assumption here

-    * is that opaque areas tend not to be 0 intensity.)

-    *

-    * There is a rounding problem here; if alpha is less than 128 it will end up

-    * as 0 when scaled to 8 bits.  To avoid introducing spurious colors into the

-    * output change for this too.

-    */

-   if (component >= alpha || alpha < 128)

-      return 255;

-

-   /* component<alpha, so component/alpha is less than one and

-    * component*reciprocal is less than 2^31.

-    */

-   else if (component > 0)

-   {

-      /* The test is that alpha/257 (rounded) is less than 255, the first value

-       * that becomes 255 is 65407.

-       * NOTE: this must agree with the PNG_DIV257 macro (which must, therefore,

-       * be exact!)  [Could also test reciprocal != 0]

-       */

-      if (alpha < 65407)

-      {

-         component *= reciprocal;

-         component += 64; /* round to nearest */

-         component >>= 7;

-      }

-

-      else

-         component *= 255;

-

-      /* Convert the component to sRGB. */

-      return (png_byte)PNG_sRGB_FROM_LINEAR(component);

-   }

-

-   else

-      return 0;

-}

-

-static int

-png_write_image_8bit(png_voidp argument)

-{

-   png_image_write_control *display = png_voidcast(png_image_write_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-

-   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,

-       display->first_row);

-   png_bytep output_row = png_voidcast(png_bytep, display->local_row);

-   png_uint_32 y = image->height;

-   const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?

-       3 : 1;

-

-   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)

-   {

-      png_bytep row_end;

-      int aindex;

-

-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED

-      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)

-      {

-         aindex = -1;

-         ++input_row; /* To point to the first component */

-         ++output_row;

-      }

-

-      else

-#   endif

-      aindex = (int)channels;

-

-      /* Use row_end in place of a loop counter: */

-      row_end = output_row + image->width * (channels+1);

-

-      for (; y > 0; --y)

-      {

-         png_const_uint_16p in_ptr = input_row;

-         png_bytep out_ptr = output_row;

-

-         while (out_ptr < row_end)

-         {

-            png_uint_16 alpha = in_ptr[aindex];

-            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);

-            png_uint_32 reciprocal = 0;

-            int c;

-

-            /* Scale and write the alpha channel. */

-            out_ptr[aindex] = alphabyte;

-

-            if (alphabyte > 0 && alphabyte < 255)

-               reciprocal = UNP_RECIPROCAL(alpha);

-

-            c = (int)channels;

-            do /* always at least one channel */

-               *out_ptr++ = png_unpremultiply(*in_ptr++, alpha, reciprocal);

-            while (--c > 0);

-

-            /* Skip to next component (skip the intervening alpha channel) */

-            ++in_ptr;

-            ++out_ptr;

-         } /* while out_ptr < row_end */

-

-         png_write_row(png_ptr, png_voidcast(png_const_bytep,

-             display->local_row));

-         input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));

-      } /* while y */

-   }

-

-   else

-   {

-      /* No alpha channel, so the row_end really is the end of the row and it

-       * is sufficient to loop over the components one by one.

-       */

-      png_bytep row_end = output_row + image->width * channels;

-

-      for (; y > 0; --y)

-      {

-         png_const_uint_16p in_ptr = input_row;

-         png_bytep out_ptr = output_row;

-

-         while (out_ptr < row_end)

-         {

-            png_uint_32 component = *in_ptr++;

-

-            component *= 255;

-            *out_ptr++ = (png_byte)PNG_sRGB_FROM_LINEAR(component);

-         }

-

-         png_write_row(png_ptr, output_row);

-         input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));

-      }

-   }

-

-   return 1;

-}

-

-static void

-png_image_set_PLTE(png_image_write_control *display)

-{

-   const png_imagep image = display->image;

-   const void *cmap = display->colormap;

-   const int entries = image->colormap_entries > 256 ? 256 :

-       (int)image->colormap_entries;

-

-   /* NOTE: the caller must check for cmap != NULL and entries != 0 */

-   const png_uint_32 format = image->format;

-   const unsigned int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);

-

-#   if defined(PNG_FORMAT_BGR_SUPPORTED) &&\

-      defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED)

-      const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 &&

-          (format & PNG_FORMAT_FLAG_ALPHA) != 0;

-#   else

-#     define afirst 0

-#   endif

-

-#   ifdef PNG_FORMAT_BGR_SUPPORTED

-      const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;

-#   else

-#     define bgr 0

-#   endif

-

-   int i, num_trans;

-   png_color palette[256];

-   png_byte tRNS[256];

-

-   memset(tRNS, 255, (sizeof tRNS));

-   memset(palette, 0, (sizeof palette));

-

-   for (i=num_trans=0; i<entries; ++i)

-   {

-      /* This gets automatically converted to sRGB with reversal of the

-       * pre-multiplication if the color-map has an alpha channel.

-       */

-      if ((format & PNG_FORMAT_FLAG_LINEAR) != 0)

-      {

-         png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);

-

-         entry += (unsigned int)i * channels;

-

-         if ((channels & 1) != 0) /* no alpha */

-         {

-            if (channels >= 3) /* RGB */

-            {

-               palette[i].blue = (png_byte)PNG_sRGB_FROM_LINEAR(255 *

-                   entry[(2 ^ bgr)]);

-               palette[i].green = (png_byte)PNG_sRGB_FROM_LINEAR(255 *

-                   entry[1]);

-               palette[i].red = (png_byte)PNG_sRGB_FROM_LINEAR(255 *

-                   entry[bgr]);

-            }

-

-            else /* Gray */

-               palette[i].blue = palette[i].red = palette[i].green =

-                  (png_byte)PNG_sRGB_FROM_LINEAR(255 * *entry);

-         }

-

-         else /* alpha */

-         {

-            png_uint_16 alpha = entry[afirst ? 0 : channels-1];

-            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);

-            png_uint_32 reciprocal = 0;

-

-            /* Calculate a reciprocal, as in the png_write_image_8bit code above

-             * this is designed to produce a value scaled to 255*65535 when

-             * divided by 128 (i.e. asr 7).

-             */

-            if (alphabyte > 0 && alphabyte < 255)

-               reciprocal = (((0xffff*0xff)<<7)+(alpha>>1))/alpha;

-

-            tRNS[i] = alphabyte;

-            if (alphabyte < 255)

-               num_trans = i+1;

-

-            if (channels >= 3) /* RGB */

-            {

-               palette[i].blue = png_unpremultiply(entry[afirst + (2 ^ bgr)],

-                   alpha, reciprocal);

-               palette[i].green = png_unpremultiply(entry[afirst + 1], alpha,

-                   reciprocal);

-               palette[i].red = png_unpremultiply(entry[afirst + bgr], alpha,

-                   reciprocal);

-            }

-

-            else /* gray */

-               palette[i].blue = palette[i].red = palette[i].green =

-                   png_unpremultiply(entry[afirst], alpha, reciprocal);

-         }

-      }

-

-      else /* Color-map has sRGB values */

-      {

-         png_const_bytep entry = png_voidcast(png_const_bytep, cmap);

-

-         entry += (unsigned int)i * channels;

-

-         switch (channels)

-         {

-            case 4:

-               tRNS[i] = entry[afirst ? 0 : 3];

-               if (tRNS[i] < 255)

-                  num_trans = i+1;

-               /* FALLTHROUGH */

-            case 3:

-               palette[i].blue = entry[afirst + (2 ^ bgr)];

-               palette[i].green = entry[afirst + 1];

-               palette[i].red = entry[afirst + bgr];

-               break;

-

-            case 2:

-               tRNS[i] = entry[1 ^ afirst];

-               if (tRNS[i] < 255)

-                  num_trans = i+1;

-               /* FALLTHROUGH */

-            case 1:

-               palette[i].blue = palette[i].red = palette[i].green =

-                  entry[afirst];

-               break;

-

-            default:

-               break;

-         }

-      }

-   }

-

-#   ifdef afirst

-#     undef afirst

-#   endif

-#   ifdef bgr

-#     undef bgr

-#   endif

-

-   png_set_PLTE(image->opaque->png_ptr, image->opaque->info_ptr, palette,

-       entries);

-

-   if (num_trans > 0)

-      png_set_tRNS(image->opaque->png_ptr, image->opaque->info_ptr, tRNS,

-          num_trans, NULL);

-

-   image->colormap_entries = (png_uint_32)entries;

-}

-

-static int

-png_image_write_main(png_voidp argument)

-{

-   png_image_write_control *display = png_voidcast(png_image_write_control*,

-       argument);

-   png_imagep image = display->image;

-   png_structrp png_ptr = image->opaque->png_ptr;

-   png_inforp info_ptr = image->opaque->info_ptr;

-   png_uint_32 format = image->format;

-

-   /* The following four ints are actually booleans */

-   int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);

-   int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */

-   int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);

-   int write_16bit = linear && (display->convert_to_8bit == 0);

-

-#   ifdef PNG_BENIGN_ERRORS_SUPPORTED

-      /* Make sure we error out on any bad situation */

-      png_set_benign_errors(png_ptr, 0/*error*/);

-#   endif

-

-   /* Default the 'row_stride' parameter if required, also check the row stride

-    * and total image size to ensure that they are within the system limits.

-    */

-   {

-      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);

-

-      if (image->width <= 0x7fffffffU/channels) /* no overflow */

-      {

-         png_uint_32 check;

-         const png_uint_32 png_row_stride = image->width * channels;

-

-         if (display->row_stride == 0)

-            display->row_stride = (png_int_32)/*SAFE*/png_row_stride;

-

-         if (display->row_stride < 0)

-            check = (png_uint_32)(-display->row_stride);

-

-         else

-            check = (png_uint_32)display->row_stride;

-

-         if (check >= png_row_stride)

-         {

-            /* Now check for overflow of the image buffer calculation; this

-             * limits the whole image size to 32 bits for API compatibility with

-             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.

-             */

-            if (image->height > 0xffffffffU/png_row_stride)

-               png_error(image->opaque->png_ptr, "memory image too large");

-         }

-

-         else

-            png_error(image->opaque->png_ptr, "supplied row stride too small");

-      }

-

-      else

-         png_error(image->opaque->png_ptr, "image row stride too large");

-   }

-

-   /* Set the required transforms then write the rows in the correct order. */

-   if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)

-   {

-      if (display->colormap != NULL && image->colormap_entries > 0)

-      {

-         png_uint_32 entries = image->colormap_entries;

-

-         png_set_IHDR(png_ptr, info_ptr, image->width, image->height,

-             entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),

-             PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,

-             PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

-

-         png_image_set_PLTE(display);

-      }

-

-      else

-         png_error(image->opaque->png_ptr,

-             "no color-map for color-mapped image");

-   }

-

-   else

-      png_set_IHDR(png_ptr, info_ptr, image->width, image->height,

-          write_16bit ? 16 : 8,

-          ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +

-          ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),

-          PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

-

-   /* Counter-intuitively the data transformations must be called *after*

-    * png_write_info, not before as in the read code, but the 'set' functions

-    * must still be called before.  Just set the color space information, never

-    * write an interlaced image.

-    */

-

-   if (write_16bit != 0)

-   {

-      /* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */

-      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR);

-

-      if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)

-         png_set_cHRM_fixed(png_ptr, info_ptr,

-             /* color      x       y */

-             /* white */ 31270, 32900,

-             /* red   */ 64000, 33000,

-             /* green */ 30000, 60000,

-             /* blue  */ 15000,  6000

-         );

-   }

-

-   else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)

-      png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);

-

-   /* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit

-    * space must still be gamma encoded.

-    */

-   else

-      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);

-

-   /* Write the file header. */

-   png_write_info(png_ptr, info_ptr);

-

-   /* Now set up the data transformations (*after* the header is written),

-    * remove the handled transformations from the 'format' flags for checking.

-    *

-    * First check for a little endian system if writing 16-bit files.

-    */

-   if (write_16bit != 0)

-   {

-      PNG_CONST png_uint_16 le = 0x0001;

-

-      if ((*(png_const_bytep) & le) != 0)

-         png_set_swap(png_ptr);

-   }

-

-#   ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED

-      if ((format & PNG_FORMAT_FLAG_BGR) != 0)

-      {

-         if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0)

-            png_set_bgr(png_ptr);

-         format &= ~PNG_FORMAT_FLAG_BGR;

-      }

-#   endif

-

-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED

-      if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)

-      {

-         if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0)

-            png_set_swap_alpha(png_ptr);

-         format &= ~PNG_FORMAT_FLAG_AFIRST;

-      }

-#   endif

-

-   /* If there are 16 or fewer color-map entries we wrote a lower bit depth

-    * above, but the application data is still byte packed.

-    */

-   if (colormap != 0 && image->colormap_entries <= 16)

-      png_set_packing(png_ptr);

-

-   /* That should have handled all (both) the transforms. */

-   if ((format & ~(png_uint_32)(PNG_FORMAT_FLAG_COLOR | PNG_FORMAT_FLAG_LINEAR |

-         PNG_FORMAT_FLAG_ALPHA | PNG_FORMAT_FLAG_COLORMAP)) != 0)

-      png_error(png_ptr, "png_write_image: unsupported transformation");

-

-   {

-      png_const_bytep row = png_voidcast(png_const_bytep, display->buffer);

-      ptrdiff_t row_bytes = display->row_stride;

-

-      if (linear != 0)

-         row_bytes *= (sizeof (png_uint_16));

-

-      if (row_bytes < 0)

-         row += (image->height-1) * (-row_bytes);

-

-      display->first_row = row;

-      display->row_bytes = row_bytes;

-   }

-

-   /* Apply 'fast' options if the flag is set. */

-   if ((image->flags & PNG_IMAGE_FLAG_FAST) != 0)

-   {

-      png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_NO_FILTERS);

-      /* NOTE: determined by experiment using pngstest, this reflects some

-       * balance between the time to write the image once and the time to read

-       * it about 50 times.  The speed-up in pngstest was about 10-20% of the

-       * total (user) time on a heavily loaded system.

-       */

-#   ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED

-      png_set_compression_level(png_ptr, 3);

-#   endif

-   }

-

-   /* Check for the cases that currently require a pre-transform on the row

-    * before it is written.  This only applies when the input is 16-bit and

-    * either there is an alpha channel or it is converted to 8-bit.

-    */

-   if ((linear != 0 && alpha != 0 ) ||

-       (colormap == 0 && display->convert_to_8bit != 0))

-   {

-      png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,

-          png_get_rowbytes(png_ptr, info_ptr)));

-      int result;

-

-      display->local_row = row;

-      if (write_16bit != 0)

-         result = png_safe_execute(image, png_write_image_16bit, display);

-      else

-         result = png_safe_execute(image, png_write_image_8bit, display);

-      display->local_row = NULL;

-

-      png_free(png_ptr, row);

-

-      /* Skip the 'write_end' on error: */

-      if (result == 0)

-         return 0;

-   }

-

-   /* Otherwise this is the case where the input is in a format currently

-    * supported by the rest of the libpng write code; call it directly.

-    */

-   else

-   {

-      png_const_bytep row = png_voidcast(png_const_bytep, display->first_row);

-      ptrdiff_t row_bytes = display->row_bytes;

-      png_uint_32 y = image->height;

-

-      for (; y > 0; --y)

-      {

-         png_write_row(png_ptr, row);

-         row += row_bytes;

-      }

-   }

-

-   png_write_end(png_ptr, info_ptr);

-   return 1;

-}

-

-

-static void (PNGCBAPI

-image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,

-    png_size_t size)

-{

-   png_image_write_control *display = png_voidcast(png_image_write_control*,

-       png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);

-   const png_alloc_size_t ob = display->output_bytes;

-

-   /* Check for overflow; this should never happen: */

-   if (size <= ((png_alloc_size_t)-1) - ob)

-   {

-      /* I don't think libpng ever does this, but just in case: */

-      if (size > 0)

-      {

-         if (display->memory_bytes >= ob+size) /* writing */

-            memcpy(display->memory+ob, data, size);

-

-         /* Always update the size: */

-         display->output_bytes = ob+size;

-      }

-   }

-

-   else

-      png_error(png_ptr, "png_image_write_to_memory: PNG too big");

-}

-

-static void (PNGCBAPI

-image_memory_flush)(png_structp png_ptr)

-{

-   PNG_UNUSED(png_ptr)

-}

-

-static int

-png_image_write_memory(png_voidp argument)

-{

-   png_image_write_control *display = png_voidcast(png_image_write_control*,

-       argument);

-

-   /* The rest of the memory-specific init and write_main in an error protected

-    * environment.  This case needs to use callbacks for the write operations

-    * since libpng has no built in support for writing to memory.

-    */

-   png_set_write_fn(display->image->opaque->png_ptr, display/*io_ptr*/,

-       image_memory_write, image_memory_flush);

-

-   return png_image_write_main(display);

-}

-

-int PNGAPI

-png_image_write_to_memory(png_imagep image, void *memory,

-    png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8bit,

-    const void *buffer, png_int_32 row_stride, const void *colormap)

-{

-   /* Write the image to the given buffer, or count the bytes if it is NULL */

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (memory_bytes != NULL && buffer != NULL)

-      {

-         /* This is to give the caller an easier error detection in the NULL

-          * case and guard against uninitialized variable problems:

-          */

-         if (memory == NULL)

-            *memory_bytes = 0;

-

-         if (png_image_write_init(image) != 0)

-         {

-            png_image_write_control display;

-            int result;

-

-            memset(&display, 0, (sizeof display));

-            display.image = image;

-            display.buffer = buffer;

-            display.row_stride = row_stride;

-            display.colormap = colormap;

-            display.convert_to_8bit = convert_to_8bit;

-            display.memory = png_voidcast(png_bytep, memory);

-            display.memory_bytes = *memory_bytes;

-            display.output_bytes = 0;

-

-            result = png_safe_execute(image, png_image_write_memory, &display);

-            png_image_free(image);

-

-            /* write_memory returns true even if we ran out of buffer. */

-            if (result)

-            {

-               /* On out-of-buffer this function returns '0' but still updates

-                * memory_bytes:

-                */

-               if (memory != NULL && display.output_bytes > *memory_bytes)

-                  result = 0;

-

-               *memory_bytes = display.output_bytes;

-            }

-

-            return result;

-         }

-

-         else

-            return 0;

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_write_to_memory: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_write_to_memory: incorrect PNG_IMAGE_VERSION");

-

-   else

-      return 0;

-}

-

-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED

-int PNGAPI

-png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,

-    const void *buffer, png_int_32 row_stride, const void *colormap)

-{

-   /* Write the image to the given (FILE*). */

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (file != NULL && buffer != NULL)

-      {

-         if (png_image_write_init(image) != 0)

-         {

-            png_image_write_control display;

-            int result;

-

-            /* This is slightly evil, but png_init_io doesn't do anything other

-             * than this and we haven't changed the standard IO functions so

-             * this saves a 'safe' function.

-             */

-            image->opaque->png_ptr->io_ptr = file;

-

-            memset(&display, 0, (sizeof display));

-            display.image = image;

-            display.buffer = buffer;

-            display.row_stride = row_stride;

-            display.colormap = colormap;

-            display.convert_to_8bit = convert_to_8bit;

-

-            result = png_safe_execute(image, png_image_write_main, &display);

-            png_image_free(image);

-            return result;

-         }

-

-         else

-            return 0;

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_write_to_stdio: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");

-

-   else

-      return 0;

-}

-

-int PNGAPI

-png_image_write_to_file(png_imagep image, const char *file_name,

-    int convert_to_8bit, const void *buffer, png_int_32 row_stride,

-    const void *colormap)

-{

-   /* Write the image to the named file. */

-   if (image != NULL && image->version == PNG_IMAGE_VERSION)

-   {

-      if (file_name != NULL && buffer != NULL)

-      {

-         FILE *fp = fopen(file_name, "wb");

-

-         if (fp != NULL)

-         {

-            if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,

-                row_stride, colormap) != 0)

-            {

-               int error; /* from fflush/fclose */

-

-               /* Make sure the file is flushed correctly. */

-               if (fflush(fp) == 0 && ferror(fp) == 0)

-               {

-                  if (fclose(fp) == 0)

-                     return 1;

-

-                  error = errno; /* from fclose */

-               }

-

-               else

-               {

-                  error = errno; /* from fflush or ferror */

-                  (void)fclose(fp);

-               }

-

-               (void)remove(file_name);

-               /* The image has already been cleaned up; this is just used to

-                * set the error (because the original write succeeded).

-                */

-               return png_image_error(image, strerror(error));

-            }

-

-            else

-            {

-               /* Clean up: just the opened file. */

-               (void)fclose(fp);

-               (void)remove(file_name);

-               return 0;

-            }

-         }

-

-         else

-            return png_image_error(image, strerror(errno));

-      }

-

-      else

-         return png_image_error(image,

-             "png_image_write_to_file: invalid argument");

-   }

-

-   else if (image != NULL)

-      return png_image_error(image,

-          "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");

-

-   else

-      return 0;

-}

-#endif /* SIMPLIFIED_WRITE_STDIO */

-#endif /* SIMPLIFIED_WRITE */

-#endif /* WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngwtran.c b/plugins/AdvaImg/src/LibPNG/pngwtran.c
deleted file mode 100644
index 922abb5c74..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngwtran.c
+++ /dev/null
@@ -1,576 +0,0 @@
-

-/* pngwtran.c - transforms the data in a row for PNG writers

- *

- * Last changed in libpng 1.6.26 [October 20, 2016]

- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_WRITE_SUPPORTED

-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED

-

-#ifdef PNG_WRITE_PACK_SUPPORTED

-/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The

- * row_info bit depth should be 8 (one pixel per byte).  The channels

- * should be 1 (this only happens on grayscale and paletted images).

- */

-static void

-png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)

-{

-   png_debug(1, "in png_do_pack");

-

-   if (row_info->bit_depth == 8 &&

-      row_info->channels == 1)

-   {

-      switch ((int)bit_depth)

-      {

-         case 1:

-         {

-            png_bytep sp, dp;

-            int mask, v;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            sp = row;

-            dp = row;

-            mask = 0x80;

-            v = 0;

-

-            for (i = 0; i < row_width; i++)

-            {

-               if (*sp != 0)

-                  v |= mask;

-

-               sp++;

-

-               if (mask > 1)

-                  mask >>= 1;

-

-               else

-               {

-                  mask = 0x80;

-                  *dp = (png_byte)v;

-                  dp++;

-                  v = 0;

-               }

-            }

-

-            if (mask != 0x80)

-               *dp = (png_byte)v;

-

-            break;

-         }

-

-         case 2:

-         {

-            png_bytep sp, dp;

-            unsigned int shift;

-            int v;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            sp = row;

-            dp = row;

-            shift = 6;

-            v = 0;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_byte value;

-

-               value = (png_byte)(*sp & 0x03);

-               v |= (value << shift);

-

-               if (shift == 0)

-               {

-                  shift = 6;

-                  *dp = (png_byte)v;

-                  dp++;

-                  v = 0;

-               }

-

-               else

-                  shift -= 2;

-

-               sp++;

-            }

-

-            if (shift != 6)

-               *dp = (png_byte)v;

-

-            break;

-         }

-

-         case 4:

-         {

-            png_bytep sp, dp;

-            unsigned int shift;

-            int v;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            sp = row;

-            dp = row;

-            shift = 4;

-            v = 0;

-

-            for (i = 0; i < row_width; i++)

-            {

-               png_byte value;

-

-               value = (png_byte)(*sp & 0x0f);

-               v |= (value << shift);

-

-               if (shift == 0)

-               {

-                  shift = 4;

-                  *dp = (png_byte)v;

-                  dp++;

-                  v = 0;

-               }

-

-               else

-                  shift -= 4;

-

-               sp++;

-            }

-

-            if (shift != 4)

-               *dp = (png_byte)v;

-

-            break;

-         }

-

-         default:

-            break;

-      }

-

-      row_info->bit_depth = (png_byte)bit_depth;

-      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,

-          row_info->width);

-   }

-}

-#endif

-

-#ifdef PNG_WRITE_SHIFT_SUPPORTED

-/* Shift pixel values to take advantage of whole range.  Pass the

- * true number of bits in bit_depth.  The row should be packed

- * according to row_info->bit_depth.  Thus, if you had a row of

- * bit depth 4, but the pixels only had values from 0 to 7, you

- * would pass 3 as bit_depth, and this routine would translate the

- * data to 0 to 15.

- */

-static void

-png_do_shift(png_row_infop row_info, png_bytep row,

-    png_const_color_8p bit_depth)

-{

-   png_debug(1, "in png_do_shift");

-

-   if (row_info->color_type != PNG_COLOR_TYPE_PALETTE)

-   {

-      int shift_start[4], shift_dec[4];

-      unsigned int channels = 0;

-

-      if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)

-      {

-         shift_start[channels] = row_info->bit_depth - bit_depth->red;

-         shift_dec[channels] = bit_depth->red;

-         channels++;

-

-         shift_start[channels] = row_info->bit_depth - bit_depth->green;

-         shift_dec[channels] = bit_depth->green;

-         channels++;

-

-         shift_start[channels] = row_info->bit_depth - bit_depth->blue;

-         shift_dec[channels] = bit_depth->blue;

-         channels++;

-      }

-

-      else

-      {

-         shift_start[channels] = row_info->bit_depth - bit_depth->gray;

-         shift_dec[channels] = bit_depth->gray;

-         channels++;

-      }

-

-      if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)

-      {

-         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;

-         shift_dec[channels] = bit_depth->alpha;

-         channels++;

-      }

-

-      /* With low row depths, could only be grayscale, so one channel */

-      if (row_info->bit_depth < 8)

-      {

-         png_bytep bp = row;

-         png_size_t i;

-         unsigned int mask;

-         png_size_t row_bytes = row_info->rowbytes;

-

-         if (bit_depth->gray == 1 && row_info->bit_depth == 2)

-            mask = 0x55;

-

-         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)

-            mask = 0x11;

-

-         else

-            mask = 0xff;

-

-         for (i = 0; i < row_bytes; i++, bp++)

-         {

-            int j;

-            unsigned int v, out;

-

-            v = *bp;

-            out = 0;

-

-            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])

-            {

-               if (j > 0)

-                  out |= v << j;

-

-               else

-                  out |= (v >> (-j)) & mask;

-            }

-

-            *bp = (png_byte)(out & 0xff);

-         }

-      }

-

-      else if (row_info->bit_depth == 8)

-      {

-         png_bytep bp = row;

-         png_uint_32 i;

-         png_uint_32 istop = channels * row_info->width;

-

-         for (i = 0; i < istop; i++, bp++)

-         {

-

-            const unsigned int c = i%channels;

-            int j;

-            unsigned int v, out;

-

-            v = *bp;

-            out = 0;

-

-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])

-            {

-               if (j > 0)

-                  out |= v << j;

-

-               else

-                  out |= v >> (-j);

-            }

-

-            *bp = (png_byte)(out & 0xff);

-         }

-      }

-

-      else

-      {

-         png_bytep bp;

-         png_uint_32 i;

-         png_uint_32 istop = channels * row_info->width;

-

-         for (bp = row, i = 0; i < istop; i++)

-         {

-            const unsigned int c = i%channels;

-            int j;

-            unsigned int value, v;

-

-            v = png_get_uint_16(bp);

-            value = 0;

-

-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])

-            {

-               if (j > 0)

-                  value |= v << j;

-

-               else

-                  value |= v >> (-j);

-            }

-            *bp++ = (png_byte)((value >> 8) & 0xff);

-            *bp++ = (png_byte)(value & 0xff);

-         }

-      }

-   }

-}

-#endif

-

-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED

-static void

-png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_write_swap_alpha");

-

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This converts from ARGB to RGBA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               png_byte save = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = save;

-            }

-         }

-

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         else

-         {

-            /* This converts from AARRGGBB to RRGGBBAA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               png_byte save[2];

-               save[0] = *(sp++);

-               save[1] = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = save[0];

-               *(dp++) = save[1];

-            }

-         }

-#endif /* WRITE_16BIT */

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This converts from AG to GA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               png_byte save = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = save;

-            }

-         }

-

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         else

-         {

-            /* This converts from AAGG to GGAA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               png_byte save[2];

-               save[0] = *(sp++);

-               save[1] = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = save[0];

-               *(dp++) = save[1];

-            }

-         }

-#endif /* WRITE_16BIT */

-      }

-   }

-}

-#endif

-

-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED

-static void

-png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)

-{

-   png_debug(1, "in png_do_write_invert_alpha");

-

-   {

-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This inverts the alpha channel in RGBA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               /* Does nothing

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               */

-               sp+=3; dp = sp;

-               *dp = (png_byte)(255 - *(sp++));

-            }

-         }

-

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         else

-         {

-            /* This inverts the alpha channel in RRGGBBAA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               /* Does nothing

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               */

-               sp+=6; dp = sp;

-               *(dp++) = (png_byte)(255 - *(sp++));

-               *dp     = (png_byte)(255 - *(sp++));

-            }

-         }

-#endif /* WRITE_16BIT */

-      }

-

-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)

-      {

-         if (row_info->bit_depth == 8)

-         {

-            /* This inverts the alpha channel in GA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               *(dp++) = *(sp++);

-               *(dp++) = (png_byte)(255 - *(sp++));

-            }

-         }

-

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         else

-         {

-            /* This inverts the alpha channel in GGAA */

-            png_bytep sp, dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            for (i = 0, sp = dp = row; i < row_width; i++)

-            {

-               /* Does nothing

-               *(dp++) = *(sp++);

-               *(dp++) = *(sp++);

-               */

-               sp+=2; dp = sp;

-               *(dp++) = (png_byte)(255 - *(sp++));

-               *dp     = (png_byte)(255 - *(sp++));

-            }

-         }

-#endif /* WRITE_16BIT */

-      }

-   }

-}

-#endif

-

-/* Transform the data according to the user's wishes.  The order of

- * transformations is significant.

- */

-void /* PRIVATE */

-png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)

-{

-   png_debug(1, "in png_do_write_transformations");

-

-   if (png_ptr == NULL)

-      return;

-

-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)

-      if (png_ptr->write_user_transform_fn != NULL)

-         (*(png_ptr->write_user_transform_fn)) /* User write transform

-                                                 function */

-             (png_ptr,  /* png_ptr */

-             row_info,  /* row_info: */

-                /*  png_uint_32 width;       width of row */

-                /*  png_size_t rowbytes;     number of bytes in row */

-                /*  png_byte color_type;     color type of pixels */

-                /*  png_byte bit_depth;      bit depth of samples */

-                /*  png_byte channels;       number of channels (1-4) */

-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */

-             png_ptr->row_buf + 1);      /* start of pixel data for row */

-#endif

-

-#ifdef PNG_WRITE_FILLER_SUPPORTED

-   if ((png_ptr->transformations & PNG_FILLER) != 0)

-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,

-          !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));

-#endif

-

-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)

-      png_do_packswap(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_WRITE_PACK_SUPPORTED

-   if ((png_ptr->transformations & PNG_PACK) != 0)

-      png_do_pack(row_info, png_ptr->row_buf + 1,

-          (png_uint_32)png_ptr->bit_depth);

-#endif

-

-#ifdef PNG_WRITE_SWAP_SUPPORTED

-#  ifdef PNG_16BIT_SUPPORTED

-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)

-      png_do_swap(row_info, png_ptr->row_buf + 1);

-#  endif

-#endif

-

-#ifdef PNG_WRITE_SHIFT_SUPPORTED

-   if ((png_ptr->transformations & PNG_SHIFT) != 0)

-      png_do_shift(row_info, png_ptr->row_buf + 1,

-           &(png_ptr->shift));

-#endif

-

-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)

-      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED

-   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)

-      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_WRITE_BGR_SUPPORTED

-   if ((png_ptr->transformations & PNG_BGR) != 0)

-      png_do_bgr(row_info, png_ptr->row_buf + 1);

-#endif

-

-#ifdef PNG_WRITE_INVERT_SUPPORTED

-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)

-      png_do_invert(row_info, png_ptr->row_buf + 1);

-#endif

-}

-#endif /* WRITE_TRANSFORMS */

-#endif /* WRITE */

diff --git a/plugins/AdvaImg/src/LibPNG/pngwutil.c b/plugins/AdvaImg/src/LibPNG/pngwutil.c
deleted file mode 100644
index d536c9e6fb..0000000000
--- a/plugins/AdvaImg/src/LibPNG/pngwutil.c
+++ /dev/null
@@ -1,2784 +0,0 @@
-

-/* pngwutil.c - utilities to write a PNG file

- *

- * Last changed in libpng 1.6.32 [August 24, 2017]

- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- */

-

-#include "pngpriv.h"

-

-#ifdef PNG_WRITE_SUPPORTED

-

-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED

-/* Place a 32-bit number into a buffer in PNG byte order.  We work

- * with unsigned numbers for convenience, although one supported

- * ancillary chunk uses signed (two's complement) numbers.

- */

-void PNGAPI

-png_save_uint_32(png_bytep buf, png_uint_32 i)

-{

-   buf[0] = (png_byte)((i >> 24) & 0xffU);

-   buf[1] = (png_byte)((i >> 16) & 0xffU);

-   buf[2] = (png_byte)((i >>  8) & 0xffU);

-   buf[3] = (png_byte)( i        & 0xffU);

-}

-

-/* Place a 16-bit number into a buffer in PNG byte order.

- * The parameter is declared unsigned int, not png_uint_16,

- * just to avoid potential problems on pre-ANSI C compilers.

- */

-void PNGAPI

-png_save_uint_16(png_bytep buf, unsigned int i)

-{

-   buf[0] = (png_byte)((i >> 8) & 0xffU);

-   buf[1] = (png_byte)( i       & 0xffU);

-}

-#endif

-

-/* Simple function to write the signature.  If we have already written

- * the magic bytes of the signature, or more likely, the PNG stream is

- * being embedded into another stream and doesn't need its own signature,

- * we should call png_set_sig_bytes() to tell libpng how many of the

- * bytes have already been written.

- */

-void PNGAPI

-png_write_sig(png_structrp png_ptr)

-{

-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   /* Inform the I/O callback that the signature is being written */

-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_SIGNATURE;

-#endif

-

-   /* Write the rest of the 8 byte signature */

-   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],

-       (png_size_t)(8 - png_ptr->sig_bytes));

-

-   if (png_ptr->sig_bytes < 3)

-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;

-}

-

-/* Write the start of a PNG chunk.  The type is the chunk type.

- * The total_length is the sum of the lengths of all the data you will be

- * passing in png_write_chunk_data().

- */

-static void

-png_write_chunk_header(png_structrp png_ptr, png_uint_32 chunk_name,

-    png_uint_32 length)

-{

-   png_byte buf[8];

-

-#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)

-   PNG_CSTRING_FROM_CHUNK(buf, chunk_name);

-   png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length);

-#endif

-

-   if (png_ptr == NULL)

-      return;

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   /* Inform the I/O callback that the chunk header is being written.

-    * PNG_IO_CHUNK_HDR requires a single I/O call.

-    */

-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;

-#endif

-

-   /* Write the length and the chunk name */

-   png_save_uint_32(buf, length);

-   png_save_uint_32(buf + 4, chunk_name);

-   png_write_data(png_ptr, buf, 8);

-

-   /* Put the chunk name into png_ptr->chunk_name */

-   png_ptr->chunk_name = chunk_name;

-

-   /* Reset the crc and run it over the chunk name */

-   png_reset_crc(png_ptr);

-

-   png_calculate_crc(png_ptr, buf + 4, 4);

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   /* Inform the I/O callback that chunk data will (possibly) be written.

-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.

-    */

-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;

-#endif

-}

-

-void PNGAPI

-png_write_chunk_start(png_structrp png_ptr, png_const_bytep chunk_string,

-    png_uint_32 length)

-{

-   png_write_chunk_header(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), length);

-}

-

-/* Write the data of a PNG chunk started with png_write_chunk_header().

- * Note that multiple calls to this function are allowed, and that the

- * sum of the lengths from these calls *must* add up to the total_length

- * given to png_write_chunk_header().

- */

-void PNGAPI

-png_write_chunk_data(png_structrp png_ptr, png_const_bytep data,

-    png_size_t length)

-{

-   /* Write the data, and run the CRC over it */

-   if (png_ptr == NULL)

-      return;

-

-   if (data != NULL && length > 0)

-   {

-      png_write_data(png_ptr, data, length);

-

-      /* Update the CRC after writing the data,

-       * in case the user I/O routine alters it.

-       */

-      png_calculate_crc(png_ptr, data, length);

-   }

-}

-

-/* Finish a chunk started with png_write_chunk_header(). */

-void PNGAPI

-png_write_chunk_end(png_structrp png_ptr)

-{

-   png_byte buf[4];

-

-   if (png_ptr == NULL) return;

-

-#ifdef PNG_IO_STATE_SUPPORTED

-   /* Inform the I/O callback that the chunk CRC is being written.

-    * PNG_IO_CHUNK_CRC requires a single I/O function call.

-    */

-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;

-#endif

-

-   /* Write the crc in a single operation */

-   png_save_uint_32(buf, png_ptr->crc);

-

-   png_write_data(png_ptr, buf, (png_size_t)4);

-}

-

-/* Write a PNG chunk all at once.  The type is an array of ASCII characters

- * representing the chunk name.  The array must be at least 4 bytes in

- * length, and does not need to be null terminated.  To be safe, pass the

- * pre-defined chunk names here, and if you need a new one, define it

- * where the others are defined.  The length is the length of the data.

- * All the data must be present.  If that is not possible, use the

- * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()

- * functions instead.

- */

-static void

-png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,

-    png_const_bytep data, png_size_t length)

-{

-   if (png_ptr == NULL)

-      return;

-

-   /* On 64-bit architectures 'length' may not fit in a png_uint_32. */

-   if (length > PNG_UINT_31_MAX)

-      png_error(png_ptr, "length exceeds PNG maximum");

-

-   png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length);

-   png_write_chunk_data(png_ptr, data, length);

-   png_write_chunk_end(png_ptr);

-}

-

-/* This is the API that calls the internal function above. */

-void PNGAPI

-png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,

-    png_const_bytep data, png_size_t length)

-{

-   png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,

-       length);

-}

-

-/* This is used below to find the size of an image to pass to png_deflate_claim,

- * so it only needs to be accurate if the size is less than 16384 bytes (the

- * point at which a lower LZ window size can be used.)

- */

-static png_alloc_size_t

-png_image_size(png_structrp png_ptr)

-{

-   /* Only return sizes up to the maximum of a png_uint_32; do this by limiting

-    * the width and height used to 15 bits.

-    */

-   png_uint_32 h = png_ptr->height;

-

-   if (png_ptr->rowbytes < 32768 && h < 32768)

-   {

-      if (png_ptr->interlaced != 0)

-      {

-         /* Interlacing makes the image larger because of the replication of

-          * both the filter byte and the padding to a byte boundary.

-          */

-         png_uint_32 w = png_ptr->width;

-         unsigned int pd = png_ptr->pixel_depth;

-         png_alloc_size_t cb_base;

-         int pass;

-

-         for (cb_base=0, pass=0; pass<=6; ++pass)

-         {

-            png_uint_32 pw = PNG_PASS_COLS(w, pass);

-

-            if (pw > 0)

-               cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass);

-         }

-

-         return cb_base;

-      }

-

-      else

-         return (png_ptr->rowbytes+1) * h;

-   }

-

-   else

-      return 0xffffffffU;

-}

-

-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

-   /* This is the code to hack the first two bytes of the deflate stream (the

-    * deflate header) to correct the windowBits value to match the actual data

-    * size.  Note that the second argument is the *uncompressed* size but the

-    * first argument is the *compressed* data (and it must be deflate

-    * compressed.)

-    */

-static void

-optimize_cmf(png_bytep data, png_alloc_size_t data_size)

-{

-   /* Optimize the CMF field in the zlib stream.  The resultant zlib stream is

-    * still compliant to the stream specification.

-    */

-   if (data_size <= 16384) /* else windowBits must be 15 */

-   {

-      unsigned int z_cmf = data[0];  /* zlib compression method and flags */

-

-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)

-      {

-         unsigned int z_cinfo;

-         unsigned int half_z_window_size;

-

-         z_cinfo = z_cmf >> 4;

-         half_z_window_size = 1U << (z_cinfo + 7);

-

-         if (data_size <= half_z_window_size) /* else no change */

-         {

-            unsigned int tmp;

-

-            do

-            {

-               half_z_window_size >>= 1;

-               --z_cinfo;

-            }

-            while (z_cinfo > 0 && data_size <= half_z_window_size);

-

-            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);

-

-            data[0] = (png_byte)z_cmf;

-            tmp = data[1] & 0xe0;

-            tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;

-            data[1] = (png_byte)tmp;

-         }

-      }

-   }

-}

-#endif /* WRITE_OPTIMIZE_CMF */

-

-/* Initialize the compressor for the appropriate type of compression. */

-static int

-png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,

-    png_alloc_size_t data_size)

-{

-   if (png_ptr->zowner != 0)

-   {

-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)

-      char msg[64];

-

-      PNG_STRING_FROM_CHUNK(msg, owner);

-      msg[4] = ':';

-      msg[5] = ' ';

-      PNG_STRING_FROM_CHUNK(msg+6, png_ptr->zowner);

-      /* So the message that results is "<chunk> using zstream"; this is an

-       * internal error, but is very useful for debugging.  i18n requirements

-       * are minimal.

-       */

-      (void)png_safecat(msg, (sizeof msg), 10, " using zstream");

-#endif

-#if PNG_RELEASE_BUILD

-         png_warning(png_ptr, msg);

-

-         /* Attempt sane error recovery */

-         if (png_ptr->zowner == png_IDAT) /* don't steal from IDAT */

-         {

-            png_ptr->zstream.msg = PNGZ_MSG_CAST("in use by IDAT");

-            return Z_STREAM_ERROR;

-         }

-

-         png_ptr->zowner = 0;

-#else

-         png_error(png_ptr, msg);

-#endif

-   }

-

-   {

-      int level = png_ptr->zlib_level;

-      int method = png_ptr->zlib_method;

-      int windowBits = png_ptr->zlib_window_bits;

-      int memLevel = png_ptr->zlib_mem_level;

-      int strategy; /* set below */

-      int ret; /* zlib return code */

-

-      if (owner == png_IDAT)

-      {

-         if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)

-            strategy = png_ptr->zlib_strategy;

-

-         else if (png_ptr->do_filter != PNG_FILTER_NONE)

-            strategy = PNG_Z_DEFAULT_STRATEGY;

-

-         else

-            strategy = PNG_Z_DEFAULT_NOFILTER_STRATEGY;

-      }

-

-      else

-      {

-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

-            level = png_ptr->zlib_text_level;

-            method = png_ptr->zlib_text_method;

-            windowBits = png_ptr->zlib_text_window_bits;

-            memLevel = png_ptr->zlib_text_mem_level;

-            strategy = png_ptr->zlib_text_strategy;

-#else

-            /* If customization is not supported the values all come from the

-             * IDAT values except for the strategy, which is fixed to the

-             * default.  (This is the pre-1.6.0 behavior too, although it was

-             * implemented in a very different way.)

-             */

-            strategy = Z_DEFAULT_STRATEGY;

-#endif

-      }

-

-      /* Adjust 'windowBits' down if larger than 'data_size'; to stop this

-       * happening just pass 32768 as the data_size parameter.  Notice that zlib

-       * requires an extra 262 bytes in the window in addition to the data to be

-       * able to see the whole of the data, so if data_size+262 takes us to the

-       * next windowBits size we need to fix up the value later.  (Because even

-       * though deflate needs the extra window, inflate does not!)

-       */

-      if (data_size <= 16384)

-      {

-         /* IMPLEMENTATION NOTE: this 'half_window_size' stuff is only here to

-          * work round a Microsoft Visual C misbehavior which, contrary to C-90,

-          * widens the result of the following shift to 64-bits if (and,

-          * apparently, only if) it is used in a test.

-          */

-         unsigned int half_window_size = 1U << (windowBits-1);

-

-         while (data_size + 262 <= half_window_size)

-         {

-            half_window_size >>= 1;

-            --windowBits;

-         }

-      }

-

-      /* Check against the previous initialized values, if any. */

-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 &&

-         (png_ptr->zlib_set_level != level ||

-         png_ptr->zlib_set_method != method ||

-         png_ptr->zlib_set_window_bits != windowBits ||

-         png_ptr->zlib_set_mem_level != memLevel ||

-         png_ptr->zlib_set_strategy != strategy))

-      {

-         if (deflateEnd(&png_ptr->zstream) != Z_OK)

-            png_warning(png_ptr, "deflateEnd failed (ignored)");

-

-         png_ptr->flags &= ~PNG_FLAG_ZSTREAM_INITIALIZED;

-      }

-

-      /* For safety clear out the input and output pointers (currently zlib

-       * doesn't use them on Init, but it might in the future).

-       */

-      png_ptr->zstream.next_in = NULL;

-      png_ptr->zstream.avail_in = 0;

-      png_ptr->zstream.next_out = NULL;

-      png_ptr->zstream.avail_out = 0;

-

-      /* Now initialize if required, setting the new parameters, otherwise just

-       * do a simple reset to the previous parameters.

-       */

-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)

-         ret = deflateReset(&png_ptr->zstream);

-

-      else

-      {

-         ret = deflateInit2(&png_ptr->zstream, level, method, windowBits,

-             memLevel, strategy);

-

-         if (ret == Z_OK)

-            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;

-      }

-

-      /* The return code is from either deflateReset or deflateInit2; they have

-       * pretty much the same set of error codes.

-       */

-      if (ret == Z_OK)

-         png_ptr->zowner = owner;

-

-      else

-         png_zstream_error(png_ptr, ret);

-

-      return ret;

-   }

-}

-

-/* Clean up (or trim) a linked list of compression buffers. */

-void /* PRIVATE */

-png_free_buffer_list(png_structrp png_ptr, png_compression_bufferp *listp)

-{

-   png_compression_bufferp list = *listp;

-

-   if (list != NULL)

-   {

-      *listp = NULL;

-

-      do

-      {

-         png_compression_bufferp next = list->next;

-

-         png_free(png_ptr, list);

-         list = next;

-      }

-      while (list != NULL);

-   }

-}

-

-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED

-/* This pair of functions encapsulates the operation of (a) compressing a

- * text string, and (b) issuing it later as a series of chunk data writes.

- * The compression_state structure is shared context for these functions

- * set up by the caller to allow access to the relevant local variables.

- *

- * compression_buffer (new in 1.6.0) is just a linked list of zbuffer_size

- * temporary buffers.  From 1.6.0 it is retained in png_struct so that it will

- * be correctly freed in the event of a write error (previous implementations

- * just leaked memory.)

- */

-typedef struct

-{

-   png_const_bytep      input;        /* The uncompressed input data */

-   png_alloc_size_t     input_len;    /* Its length */

-   png_uint_32          output_len;   /* Final compressed length */

-   png_byte             output[1024]; /* First block of output */

-} compression_state;

-

-static void

-png_text_compress_init(compression_state *comp, png_const_bytep input,

-    png_alloc_size_t input_len)

-{

-   comp->input = input;

-   comp->input_len = input_len;

-   comp->output_len = 0;

-}

-

-/* Compress the data in the compression state input */

-static int

-png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,

-    compression_state *comp, png_uint_32 prefix_len)

-{

-   int ret;

-

-   /* To find the length of the output it is necessary to first compress the

-    * input. The result is buffered rather than using the two-pass algorithm

-    * that is used on the inflate side; deflate is assumed to be slower and a

-    * PNG writer is assumed to have more memory available than a PNG reader.

-    *

-    * IMPLEMENTATION NOTE: the zlib API deflateBound() can be used to find an

-    * upper limit on the output size, but it is always bigger than the input

-    * size so it is likely to be more efficient to use this linked-list

-    * approach.

-    */

-   ret = png_deflate_claim(png_ptr, chunk_name, comp->input_len);

-

-   if (ret != Z_OK)

-      return ret;

-

-   /* Set up the compression buffers, we need a loop here to avoid overflowing a

-    * uInt.  Use ZLIB_IO_MAX to limit the input.  The output is always limited

-    * by the output buffer size, so there is no need to check that.  Since this

-    * is ANSI-C we know that an 'int', hence a uInt, is always at least 16 bits

-    * in size.

-    */

-   {

-      png_compression_bufferp *end = &png_ptr->zbuffer_list;

-      png_alloc_size_t input_len = comp->input_len; /* may be zero! */

-      png_uint_32 output_len;

-

-      /* zlib updates these for us: */

-      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(comp->input);

-      png_ptr->zstream.avail_in = 0; /* Set below */

-      png_ptr->zstream.next_out = comp->output;

-      png_ptr->zstream.avail_out = (sizeof comp->output);

-

-      output_len = png_ptr->zstream.avail_out;

-

-      do

-      {

-         uInt avail_in = ZLIB_IO_MAX;

-

-         if (avail_in > input_len)

-            avail_in = (uInt)input_len;

-

-         input_len -= avail_in;

-

-         png_ptr->zstream.avail_in = avail_in;

-

-         if (png_ptr->zstream.avail_out == 0)

-         {

-            png_compression_buffer *next;

-

-            /* Chunk data is limited to 2^31 bytes in length, so the prefix

-             * length must be counted here.

-             */

-            if (output_len + prefix_len > PNG_UINT_31_MAX)

-            {

-               ret = Z_MEM_ERROR;

-               break;

-            }

-

-            /* Need a new (malloc'ed) buffer, but there may be one present

-             * already.

-             */

-            next = *end;

-            if (next == NULL)

-            {

-               next = png_voidcast(png_compression_bufferp, png_malloc_base

-                  (png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));

-

-               if (next == NULL)

-               {

-                  ret = Z_MEM_ERROR;

-                  break;

-               }

-

-               /* Link in this buffer (so that it will be freed later) */

-               next->next = NULL;

-               *end = next;

-            }

-

-            png_ptr->zstream.next_out = next->output;

-            png_ptr->zstream.avail_out = png_ptr->zbuffer_size;

-            output_len += png_ptr->zstream.avail_out;

-

-            /* Move 'end' to the next buffer pointer. */

-            end = &next->next;

-         }

-

-         /* Compress the data */

-         ret = deflate(&png_ptr->zstream,

-             input_len > 0 ? Z_NO_FLUSH : Z_FINISH);

-

-         /* Claw back input data that was not consumed (because avail_in is

-          * reset above every time round the loop).

-          */

-         input_len += png_ptr->zstream.avail_in;

-         png_ptr->zstream.avail_in = 0; /* safety */

-      }

-      while (ret == Z_OK);

-

-      /* There may be some space left in the last output buffer. This needs to

-       * be subtracted from output_len.

-       */

-      output_len -= png_ptr->zstream.avail_out;

-      png_ptr->zstream.avail_out = 0; /* safety */

-      comp->output_len = output_len;

-

-      /* Now double check the output length, put in a custom message if it is

-       * too long.  Otherwise ensure the z_stream::msg pointer is set to

-       * something.

-       */

-      if (output_len + prefix_len >= PNG_UINT_31_MAX)

-      {

-         png_ptr->zstream.msg = PNGZ_MSG_CAST("compressed data too long");

-         ret = Z_MEM_ERROR;

-      }

-

-      else

-         png_zstream_error(png_ptr, ret);

-

-      /* Reset zlib for another zTXt/iTXt or image data */

-      png_ptr->zowner = 0;

-

-      /* The only success case is Z_STREAM_END, input_len must be 0; if not this

-       * is an internal error.

-       */

-      if (ret == Z_STREAM_END && input_len == 0)

-      {

-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

-         /* Fix up the deflate header, if required */

-         optimize_cmf(comp->output, comp->input_len);

-#endif

-         /* But Z_OK is returned, not Z_STREAM_END; this allows the claim

-          * function above to return Z_STREAM_END on an error (though it never

-          * does in the current versions of zlib.)

-          */

-         return Z_OK;

-      }

-

-      else

-         return ret;

-   }

-}

-

-/* Ship the compressed text out via chunk writes */

-static void

-png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp)

-{

-   png_uint_32 output_len = comp->output_len;

-   png_const_bytep output = comp->output;

-   png_uint_32 avail = (sizeof comp->output);

-   png_compression_buffer *next = png_ptr->zbuffer_list;

-

-   for (;;)

-   {

-      if (avail > output_len)

-         avail = output_len;

-

-      png_write_chunk_data(png_ptr, output, avail);

-

-      output_len -= avail;

-

-      if (output_len == 0 || next == NULL)

-         break;

-

-      avail = png_ptr->zbuffer_size;

-      output = next->output;

-      next = next->next;

-   }

-

-   /* This is an internal error; 'next' must have been NULL! */

-   if (output_len > 0)

-      png_error(png_ptr, "error writing ancillary chunked compressed data");

-}

-#endif /* WRITE_COMPRESSED_TEXT */

-

-/* Write the IHDR chunk, and update the png_struct with the necessary

- * information.  Note that the rest of this code depends upon this

- * information being correct.

- */

-void /* PRIVATE */

-png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,

-    int bit_depth, int color_type, int compression_type, int filter_type,

-    int interlace_type)

-{

-   png_byte buf[13]; /* Buffer to store the IHDR info */

-   int is_invalid_depth;

-

-   png_debug(1, "in png_write_IHDR");

-

-   /* Check that we have valid input data from the application info */

-   switch (color_type)

-   {

-      case PNG_COLOR_TYPE_GRAY:

-         switch (bit_depth)

-         {

-            case 1:

-            case 2:

-            case 4:

-            case 8:

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-            case 16:

-#endif

-               png_ptr->channels = 1; break;

-

-            default:

-               png_error(png_ptr,

-                   "Invalid bit depth for grayscale image");

-         }

-         break;

-

-      case PNG_COLOR_TYPE_RGB:

-         is_invalid_depth = (bit_depth != 8);

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);

-#endif

-         if (is_invalid_depth)

-            png_error(png_ptr, "Invalid bit depth for RGB image");

-

-         png_ptr->channels = 3;

-         break;

-

-      case PNG_COLOR_TYPE_PALETTE:

-         switch (bit_depth)

-         {

-            case 1:

-            case 2:

-            case 4:

-            case 8:

-               png_ptr->channels = 1;

-               break;

-

-            default:

-               png_error(png_ptr, "Invalid bit depth for paletted image");

-         }

-         break;

-

-      case PNG_COLOR_TYPE_GRAY_ALPHA:

-         is_invalid_depth = (bit_depth != 8);

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);

-#endif

-         if (is_invalid_depth)

-            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");

-

-         png_ptr->channels = 2;

-         break;

-

-      case PNG_COLOR_TYPE_RGB_ALPHA:

-         is_invalid_depth = (bit_depth != 8);

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);

-#endif

-         if (is_invalid_depth)

-            png_error(png_ptr, "Invalid bit depth for RGBA image");

-

-         png_ptr->channels = 4;

-         break;

-

-      default:

-         png_error(png_ptr, "Invalid image color type specified");

-   }

-

-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)

-   {

-      png_warning(png_ptr, "Invalid compression type specified");

-      compression_type = PNG_COMPRESSION_TYPE_BASE;

-   }

-

-   /* Write filter_method 64 (intrapixel differencing) only if

-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and

-    * 2. Libpng did not write a PNG signature (this filter_method is only

-    *    used in PNG datastreams that are embedded in MNG datastreams) and

-    * 3. The application called png_permit_mng_features with a mask that

-    *    included PNG_FLAG_MNG_FILTER_64 and

-    * 4. The filter_method is 64 and

-    * 5. The color_type is RGB or RGBA

-    */

-   if (

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&

-       ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&

-       (color_type == PNG_COLOR_TYPE_RGB ||

-        color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&

-       (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&

-#endif

-       filter_type != PNG_FILTER_TYPE_BASE)

-   {

-      png_warning(png_ptr, "Invalid filter type specified");

-      filter_type = PNG_FILTER_TYPE_BASE;

-   }

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   if (interlace_type != PNG_INTERLACE_NONE &&

-       interlace_type != PNG_INTERLACE_ADAM7)

-   {

-      png_warning(png_ptr, "Invalid interlace type specified");

-      interlace_type = PNG_INTERLACE_ADAM7;

-   }

-#else

-   interlace_type=PNG_INTERLACE_NONE;

-#endif

-

-   /* Save the relevant information */

-   png_ptr->bit_depth = (png_byte)bit_depth;

-   png_ptr->color_type = (png_byte)color_type;

-   png_ptr->interlaced = (png_byte)interlace_type;

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-   png_ptr->filter_type = (png_byte)filter_type;

-#endif

-   png_ptr->compression_type = (png_byte)compression_type;

-   png_ptr->width = width;

-   png_ptr->height = height;

-

-   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);

-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);

-   /* Set the usr info, so any transformations can modify it */

-   png_ptr->usr_width = png_ptr->width;

-   png_ptr->usr_bit_depth = png_ptr->bit_depth;

-   png_ptr->usr_channels = png_ptr->channels;

-

-   /* Pack the header information into the buffer */

-   png_save_uint_32(buf, width);

-   png_save_uint_32(buf + 4, height);

-   buf[8] = (png_byte)bit_depth;

-   buf[9] = (png_byte)color_type;

-   buf[10] = (png_byte)compression_type;

-   buf[11] = (png_byte)filter_type;

-   buf[12] = (png_byte)interlace_type;

-

-   /* Write the chunk */

-   png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);

-

-   if ((png_ptr->do_filter) == PNG_NO_FILTERS)

-   {

-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||

-          png_ptr->bit_depth < 8)

-         png_ptr->do_filter = PNG_FILTER_NONE;

-

-      else

-         png_ptr->do_filter = PNG_ALL_FILTERS;

-   }

-

-   png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */

-}

-

-/* Write the palette.  We are careful not to trust png_color to be in the

- * correct order for PNG, so people can redefine it to any convenient

- * structure.

- */

-void /* PRIVATE */

-png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,

-    png_uint_32 num_pal)

-{

-   png_uint_32 max_palette_length, i;

-   png_const_colorp pal_ptr;

-   png_byte buf[3];

-

-   png_debug(1, "in png_write_PLTE");

-

-   max_palette_length = (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?

-      (1 << png_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;

-

-   if ((

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-       (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 &&

-#endif

-       num_pal == 0) || num_pal > max_palette_length)

-   {

-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

-      {

-         png_error(png_ptr, "Invalid number of colors in palette");

-      }

-

-      else

-      {

-         png_warning(png_ptr, "Invalid number of colors in palette");

-         return;

-      }

-   }

-

-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)

-   {

-      png_warning(png_ptr,

-          "Ignoring request to write a PLTE chunk in grayscale PNG");

-

-      return;

-   }

-

-   png_ptr->num_palette = (png_uint_16)num_pal;

-   png_debug1(3, "num_palette = %d", png_ptr->num_palette);

-

-   png_write_chunk_header(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));

-#ifdef PNG_POINTER_INDEXING_SUPPORTED

-

-   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)

-   {

-      buf[0] = pal_ptr->red;

-      buf[1] = pal_ptr->green;

-      buf[2] = pal_ptr->blue;

-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);

-   }

-

-#else

-   /* This is a little slower but some buggy compilers need to do this

-    * instead

-    */

-   pal_ptr=palette;

-

-   for (i = 0; i < num_pal; i++)

-   {

-      buf[0] = pal_ptr[i].red;

-      buf[1] = pal_ptr[i].green;

-      buf[2] = pal_ptr[i].blue;

-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);

-   }

-

-#endif

-   png_write_chunk_end(png_ptr);

-   png_ptr->mode |= PNG_HAVE_PLTE;

-}

-

-/* This is similar to png_text_compress, above, except that it does not require

- * all of the data at once and, instead of buffering the compressed result,

- * writes it as IDAT chunks.  Unlike png_text_compress it *can* png_error out

- * because it calls the write interface.  As a result it does its own error

- * reporting and does not return an error code.  In the event of error it will

- * just call png_error.  The input data length may exceed 32-bits.  The 'flush'

- * parameter is exactly the same as that to deflate, with the following

- * meanings:

- *

- * Z_NO_FLUSH: normal incremental output of compressed data

- * Z_SYNC_FLUSH: do a SYNC_FLUSH, used by png_write_flush

- * Z_FINISH: this is the end of the input, do a Z_FINISH and clean up

- *

- * The routine manages the acquire and release of the png_ptr->zstream by

- * checking and (at the end) clearing png_ptr->zowner; it does some sanity

- * checks on the 'mode' flags while doing this.

- */

-void /* PRIVATE */

-png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,

-    png_alloc_size_t input_len, int flush)

-{

-   if (png_ptr->zowner != png_IDAT)

-   {

-      /* First time.   Ensure we have a temporary buffer for compression and

-       * trim the buffer list if it has more than one entry to free memory.

-       * If 'WRITE_COMPRESSED_TEXT' is not set the list will never have been

-       * created at this point, but the check here is quick and safe.

-       */

-      if (png_ptr->zbuffer_list == NULL)

-      {

-         png_ptr->zbuffer_list = png_voidcast(png_compression_bufferp,

-             png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));

-         png_ptr->zbuffer_list->next = NULL;

-      }

-

-      else

-         png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list->next);

-

-      /* It is a terminal error if we can't claim the zstream. */

-      if (png_deflate_claim(png_ptr, png_IDAT, png_image_size(png_ptr)) != Z_OK)

-         png_error(png_ptr, png_ptr->zstream.msg);

-

-      /* The output state is maintained in png_ptr->zstream, so it must be

-       * initialized here after the claim.

-       */

-      png_ptr->zstream.next_out = png_ptr->zbuffer_list->output;

-      png_ptr->zstream.avail_out = png_ptr->zbuffer_size;

-   }

-

-   /* Now loop reading and writing until all the input is consumed or an error

-    * terminates the operation.  The _out values are maintained across calls to

-    * this function, but the input must be reset each time.

-    */

-   png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);

-   png_ptr->zstream.avail_in = 0; /* set below */

-   for (;;)

-   {

-      int ret;

-

-      /* INPUT: from the row data */

-      uInt avail = ZLIB_IO_MAX;

-

-      if (avail > input_len)

-         avail = (uInt)input_len; /* safe because of the check */

-

-      png_ptr->zstream.avail_in = avail;

-      input_len -= avail;

-

-      ret = deflate(&png_ptr->zstream, input_len > 0 ? Z_NO_FLUSH : flush);

-

-      /* Include as-yet unconsumed input */

-      input_len += png_ptr->zstream.avail_in;

-      png_ptr->zstream.avail_in = 0;

-

-      /* OUTPUT: write complete IDAT chunks when avail_out drops to zero. Note

-       * that these two zstream fields are preserved across the calls, therefore

-       * there is no need to set these up on entry to the loop.

-       */

-      if (png_ptr->zstream.avail_out == 0)

-      {

-         png_bytep data = png_ptr->zbuffer_list->output;

-         uInt size = png_ptr->zbuffer_size;

-

-         /* Write an IDAT containing the data then reset the buffer.  The

-          * first IDAT may need deflate header optimization.

-          */

-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

-            if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&

-                png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)

-               optimize_cmf(data, png_image_size(png_ptr));

-#endif

-

-         if (size > 0)

-            png_write_complete_chunk(png_ptr, png_IDAT, data, size);

-         png_ptr->mode |= PNG_HAVE_IDAT;

-

-         png_ptr->zstream.next_out = data;

-         png_ptr->zstream.avail_out = size;

-

-         /* For SYNC_FLUSH or FINISH it is essential to keep calling zlib with

-          * the same flush parameter until it has finished output, for NO_FLUSH

-          * it doesn't matter.

-          */

-         if (ret == Z_OK && flush != Z_NO_FLUSH)

-            continue;

-      }

-

-      /* The order of these checks doesn't matter much; it just affects which

-       * possible error might be detected if multiple things go wrong at once.

-       */

-      if (ret == Z_OK) /* most likely return code! */

-      {

-         /* If all the input has been consumed then just return.  If Z_FINISH

-          * was used as the flush parameter something has gone wrong if we get

-          * here.

-          */

-         if (input_len == 0)

-         {

-            if (flush == Z_FINISH)

-               png_error(png_ptr, "Z_OK on Z_FINISH with output space");

-

-            return;

-         }

-      }

-

-      else if (ret == Z_STREAM_END && flush == Z_FINISH)

-      {

-         /* This is the end of the IDAT data; any pending output must be

-          * flushed.  For small PNG files we may still be at the beginning.

-          */

-         png_bytep data = png_ptr->zbuffer_list->output;

-         uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out;

-

-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

-         if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&

-             png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)

-            optimize_cmf(data, png_image_size(png_ptr));

-#endif

-

-         if (size > 0)

-            png_write_complete_chunk(png_ptr, png_IDAT, data, size);

-         png_ptr->zstream.avail_out = 0;

-         png_ptr->zstream.next_out = NULL;

-         png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;

-

-         png_ptr->zowner = 0; /* Release the stream */

-         return;

-      }

-

-      else

-      {

-         /* This is an error condition. */

-         png_zstream_error(png_ptr, ret);

-         png_error(png_ptr, png_ptr->zstream.msg);

-      }

-   }

-}

-

-/* Write an IEND chunk */

-void /* PRIVATE */

-png_write_IEND(png_structrp png_ptr)

-{

-   png_debug(1, "in png_write_IEND");

-

-   png_write_complete_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);

-   png_ptr->mode |= PNG_HAVE_IEND;

-}

-

-#ifdef PNG_WRITE_gAMA_SUPPORTED

-/* Write a gAMA chunk */

-void /* PRIVATE */

-png_write_gAMA_fixed(png_structrp png_ptr, png_fixed_point file_gamma)

-{

-   png_byte buf[4];

-

-   png_debug(1, "in png_write_gAMA");

-

-   /* file_gamma is saved in 1/100,000ths */

-   png_save_uint_32(buf, (png_uint_32)file_gamma);

-   png_write_complete_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);

-}

-#endif

-

-#ifdef PNG_WRITE_sRGB_SUPPORTED

-/* Write a sRGB chunk */

-void /* PRIVATE */

-png_write_sRGB(png_structrp png_ptr, int srgb_intent)

-{

-   png_byte buf[1];

-

-   png_debug(1, "in png_write_sRGB");

-

-   if (srgb_intent >= PNG_sRGB_INTENT_LAST)

-      png_warning(png_ptr,

-          "Invalid sRGB rendering intent specified");

-

-   buf[0]=(png_byte)srgb_intent;

-   png_write_complete_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);

-}

-#endif

-

-#ifdef PNG_WRITE_iCCP_SUPPORTED

-/* Write an iCCP chunk */

-void /* PRIVATE */

-png_write_iCCP(png_structrp png_ptr, png_const_charp name,

-    png_const_bytep profile)

-{

-   png_uint_32 name_len;

-   png_uint_32 profile_len;

-   png_byte new_name[81]; /* 1 byte for the compression byte */

-   compression_state comp;

-   png_uint_32 temp;

-

-   png_debug(1, "in png_write_iCCP");

-

-   /* These are all internal problems: the profile should have been checked

-    * before when it was stored.

-    */

-   if (profile == NULL)

-      png_error(png_ptr, "No profile for iCCP chunk"); /* internal error */

-

-   profile_len = png_get_uint_32(profile);

-

-   if (profile_len < 132)

-      png_error(png_ptr, "ICC profile too short");

-

-   temp = (png_uint_32) (*(profile+8));

-   if (temp > 3 && (profile_len & 0x03))

-      png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)");

-

-   {

-      png_uint_32 embedded_profile_len = png_get_uint_32(profile);

-

-      if (profile_len != embedded_profile_len)

-         png_error(png_ptr, "Profile length does not match profile");

-   }

-

-   name_len = png_check_keyword(png_ptr, name, new_name);

-

-   if (name_len == 0)

-      png_error(png_ptr, "iCCP: invalid keyword");

-

-   new_name[++name_len] = PNG_COMPRESSION_TYPE_BASE;

-

-   /* Make sure we include the NULL after the name and the compression type */

-   ++name_len;

-

-   png_text_compress_init(&comp, profile, profile_len);

-

-   /* Allow for keyword terminator and compression byte */

-   if (png_text_compress(png_ptr, png_iCCP, &comp, name_len) != Z_OK)

-      png_error(png_ptr, png_ptr->zstream.msg);

-

-   png_write_chunk_header(png_ptr, png_iCCP, name_len + comp.output_len);

-

-   png_write_chunk_data(png_ptr, new_name, name_len);

-

-   png_write_compressed_data_out(png_ptr, &comp);

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_sPLT_SUPPORTED

-/* Write a sPLT chunk */

-void /* PRIVATE */

-png_write_sPLT(png_structrp png_ptr, png_const_sPLT_tp spalette)

-{

-   png_uint_32 name_len;

-   png_byte new_name[80];

-   png_byte entrybuf[10];

-   png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);

-   png_size_t palette_size = entry_size * (png_size_t)spalette->nentries;

-   png_sPLT_entryp ep;

-#ifndef PNG_POINTER_INDEXING_SUPPORTED

-   int i;

-#endif

-

-   png_debug(1, "in png_write_sPLT");

-

-   name_len = png_check_keyword(png_ptr, spalette->name, new_name);

-

-   if (name_len == 0)

-      png_error(png_ptr, "sPLT: invalid keyword");

-

-   /* Make sure we include the NULL after the name */

-   png_write_chunk_header(png_ptr, png_sPLT,

-       (png_uint_32)(name_len + 2 + palette_size));

-

-   png_write_chunk_data(png_ptr, (png_bytep)new_name,

-       (png_size_t)(name_len + 1));

-

-   png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);

-

-   /* Loop through each palette entry, writing appropriately */

-#ifdef PNG_POINTER_INDEXING_SUPPORTED

-   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)

-   {

-      if (spalette->depth == 8)

-      {

-         entrybuf[0] = (png_byte)ep->red;

-         entrybuf[1] = (png_byte)ep->green;

-         entrybuf[2] = (png_byte)ep->blue;

-         entrybuf[3] = (png_byte)ep->alpha;

-         png_save_uint_16(entrybuf + 4, ep->frequency);

-      }

-

-      else

-      {

-         png_save_uint_16(entrybuf + 0, ep->red);

-         png_save_uint_16(entrybuf + 2, ep->green);

-         png_save_uint_16(entrybuf + 4, ep->blue);

-         png_save_uint_16(entrybuf + 6, ep->alpha);

-         png_save_uint_16(entrybuf + 8, ep->frequency);

-      }

-

-      png_write_chunk_data(png_ptr, entrybuf, entry_size);

-   }

-#else

-   ep=spalette->entries;

-   for (i = 0; i>spalette->nentries; i++)

-   {

-      if (spalette->depth == 8)

-      {

-         entrybuf[0] = (png_byte)ep[i].red;

-         entrybuf[1] = (png_byte)ep[i].green;

-         entrybuf[2] = (png_byte)ep[i].blue;

-         entrybuf[3] = (png_byte)ep[i].alpha;

-         png_save_uint_16(entrybuf + 4, ep[i].frequency);

-      }

-

-      else

-      {

-         png_save_uint_16(entrybuf + 0, ep[i].red);

-         png_save_uint_16(entrybuf + 2, ep[i].green);

-         png_save_uint_16(entrybuf + 4, ep[i].blue);

-         png_save_uint_16(entrybuf + 6, ep[i].alpha);

-         png_save_uint_16(entrybuf + 8, ep[i].frequency);

-      }

-

-      png_write_chunk_data(png_ptr, entrybuf, entry_size);

-   }

-#endif

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_sBIT_SUPPORTED

-/* Write the sBIT chunk */

-void /* PRIVATE */

-png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)

-{

-   png_byte buf[4];

-   png_size_t size;

-

-   png_debug(1, "in png_write_sBIT");

-

-   /* Make sure we don't depend upon the order of PNG_COLOR_8 */

-   if ((color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      png_byte maxbits;

-

-      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :

-          png_ptr->usr_bit_depth);

-

-      if (sbit->red == 0 || sbit->red > maxbits ||

-          sbit->green == 0 || sbit->green > maxbits ||

-          sbit->blue == 0 || sbit->blue > maxbits)

-      {

-         png_warning(png_ptr, "Invalid sBIT depth specified");

-         return;

-      }

-

-      buf[0] = sbit->red;

-      buf[1] = sbit->green;

-      buf[2] = sbit->blue;

-      size = 3;

-   }

-

-   else

-   {

-      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)

-      {

-         png_warning(png_ptr, "Invalid sBIT depth specified");

-         return;

-      }

-

-      buf[0] = sbit->gray;

-      size = 1;

-   }

-

-   if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)

-   {

-      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)

-      {

-         png_warning(png_ptr, "Invalid sBIT depth specified");

-         return;

-      }

-

-      buf[size++] = sbit->alpha;

-   }

-

-   png_write_complete_chunk(png_ptr, png_sBIT, buf, size);

-}

-#endif

-

-#ifdef PNG_WRITE_cHRM_SUPPORTED

-/* Write the cHRM chunk */

-void /* PRIVATE */

-png_write_cHRM_fixed(png_structrp png_ptr, const png_xy *xy)

-{

-   png_byte buf[32];

-

-   png_debug(1, "in png_write_cHRM");

-

-   /* Each value is saved in 1/100,000ths */

-   png_save_int_32(buf,      xy->whitex);

-   png_save_int_32(buf +  4, xy->whitey);

-

-   png_save_int_32(buf +  8, xy->redx);

-   png_save_int_32(buf + 12, xy->redy);

-

-   png_save_int_32(buf + 16, xy->greenx);

-   png_save_int_32(buf + 20, xy->greeny);

-

-   png_save_int_32(buf + 24, xy->bluex);

-   png_save_int_32(buf + 28, xy->bluey);

-

-   png_write_complete_chunk(png_ptr, png_cHRM, buf, 32);

-}

-#endif

-

-#ifdef PNG_WRITE_tRNS_SUPPORTED

-/* Write the tRNS chunk */

-void /* PRIVATE */

-png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,

-    png_const_color_16p tran, int num_trans, int color_type)

-{

-   png_byte buf[6];

-

-   png_debug(1, "in png_write_tRNS");

-

-   if (color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)

-      {

-         png_app_warning(png_ptr,

-             "Invalid number of transparent colors specified");

-         return;

-      }

-

-      /* Write the chunk out as it is */

-      png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,

-          (png_size_t)num_trans);

-   }

-

-   else if (color_type == PNG_COLOR_TYPE_GRAY)

-   {

-      /* One 16-bit value */

-      if (tran->gray >= (1 << png_ptr->bit_depth))

-      {

-         png_app_warning(png_ptr,

-             "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");

-

-         return;

-      }

-

-      png_save_uint_16(buf, tran->gray);

-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);

-   }

-

-   else if (color_type == PNG_COLOR_TYPE_RGB)

-   {

-      /* Three 16-bit values */

-      png_save_uint_16(buf, tran->red);

-      png_save_uint_16(buf + 2, tran->green);

-      png_save_uint_16(buf + 4, tran->blue);

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)

-#else

-      if ((buf[0] | buf[2] | buf[4]) != 0)

-#endif

-      {

-         png_app_warning(png_ptr,

-             "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");

-         return;

-      }

-

-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);

-   }

-

-   else

-   {

-      png_app_warning(png_ptr, "Can't write tRNS with an alpha channel");

-   }

-}

-#endif

-

-#ifdef PNG_WRITE_bKGD_SUPPORTED

-/* Write the background chunk */

-void /* PRIVATE */

-png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)

-{

-   png_byte buf[6];

-

-   png_debug(1, "in png_write_bKGD");

-

-   if (color_type == PNG_COLOR_TYPE_PALETTE)

-   {

-      if (

-#ifdef PNG_MNG_FEATURES_SUPPORTED

-          (png_ptr->num_palette != 0 ||

-          (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) &&

-#endif

-         back->index >= png_ptr->num_palette)

-      {

-         png_warning(png_ptr, "Invalid background palette index");

-         return;

-      }

-

-      buf[0] = back->index;

-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);

-   }

-

-   else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)

-   {

-      png_save_uint_16(buf, back->red);

-      png_save_uint_16(buf + 2, back->green);

-      png_save_uint_16(buf + 4, back->blue);

-#ifdef PNG_WRITE_16BIT_SUPPORTED

-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)

-#else

-      if ((buf[0] | buf[2] | buf[4]) != 0)

-#endif

-      {

-         png_warning(png_ptr,

-             "Ignoring attempt to write 16-bit bKGD chunk "

-             "when bit_depth is 8");

-

-         return;

-      }

-

-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);

-   }

-

-   else

-   {

-      if (back->gray >= (1 << png_ptr->bit_depth))

-      {

-         png_warning(png_ptr,

-             "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");

-

-         return;

-      }

-

-      png_save_uint_16(buf, back->gray);

-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);

-   }

-}

-#endif

-

-#ifdef PNG_WRITE_eXIf_SUPPORTED

-/* Write the Exif data */

-void /* PRIVATE */

-png_write_eXIf(png_structrp png_ptr, png_bytep exif, int num_exif)

-{

-   int i;

-   png_byte buf[1];

-

-   png_debug(1, "in png_write_eXIf");

-

-   png_write_chunk_header(png_ptr, png_eXIf, (png_uint_32)(num_exif));

-

-   for (i = 0; i < num_exif; i++)

-   {

-      buf[0] = exif[i];

-      png_write_chunk_data(png_ptr, buf, (png_size_t)1);

-   }

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_hIST_SUPPORTED

-/* Write the histogram */

-void /* PRIVATE */

-png_write_hIST(png_structrp png_ptr, png_const_uint_16p hist, int num_hist)

-{

-   int i;

-   png_byte buf[3];

-

-   png_debug(1, "in png_write_hIST");

-

-   if (num_hist > (int)png_ptr->num_palette)

-   {

-      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,

-          png_ptr->num_palette);

-

-      png_warning(png_ptr, "Invalid number of histogram entries specified");

-      return;

-   }

-

-   png_write_chunk_header(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));

-

-   for (i = 0; i < num_hist; i++)

-   {

-      png_save_uint_16(buf, hist[i]);

-      png_write_chunk_data(png_ptr, buf, (png_size_t)2);

-   }

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_tEXt_SUPPORTED

-/* Write a tEXt chunk */

-void /* PRIVATE */

-png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,

-    png_size_t text_len)

-{

-   png_uint_32 key_len;

-   png_byte new_key[80];

-

-   png_debug(1, "in png_write_tEXt");

-

-   key_len = png_check_keyword(png_ptr, key, new_key);

-

-   if (key_len == 0)

-      png_error(png_ptr, "tEXt: invalid keyword");

-

-   if (text == NULL || *text == '\0')

-      text_len = 0;

-

-   else

-      text_len = strlen(text);

-

-   if (text_len > PNG_UINT_31_MAX - (key_len+1))

-      png_error(png_ptr, "tEXt: text too long");

-

-   /* Make sure we include the 0 after the key */

-   png_write_chunk_header(png_ptr, png_tEXt,

-       (png_uint_32)/*checked above*/(key_len + text_len + 1));

-   /*

-    * We leave it to the application to meet PNG-1.0 requirements on the

-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of

-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.

-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.

-    */

-   png_write_chunk_data(png_ptr, new_key, key_len + 1);

-

-   if (text_len != 0)

-      png_write_chunk_data(png_ptr, (png_const_bytep)text, text_len);

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_zTXt_SUPPORTED

-/* Write a compressed text chunk */

-void /* PRIVATE */

-png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,

-    int compression)

-{

-   png_uint_32 key_len;

-   png_byte new_key[81];

-   compression_state comp;

-

-   png_debug(1, "in png_write_zTXt");

-

-   if (compression == PNG_TEXT_COMPRESSION_NONE)

-   {

-      png_write_tEXt(png_ptr, key, text, 0);

-      return;

-   }

-

-   if (compression != PNG_TEXT_COMPRESSION_zTXt)

-      png_error(png_ptr, "zTXt: invalid compression type");

-

-   key_len = png_check_keyword(png_ptr, key, new_key);

-

-   if (key_len == 0)

-      png_error(png_ptr, "zTXt: invalid keyword");

-

-   /* Add the compression method and 1 for the keyword separator. */

-   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;

-   ++key_len;

-

-   /* Compute the compressed data; do it now for the length */

-   png_text_compress_init(&comp, (png_const_bytep)text,

-       text == NULL ? 0 : strlen(text));

-

-   if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK)

-      png_error(png_ptr, png_ptr->zstream.msg);

-

-   /* Write start of chunk */

-   png_write_chunk_header(png_ptr, png_zTXt, key_len + comp.output_len);

-

-   /* Write key */

-   png_write_chunk_data(png_ptr, new_key, key_len);

-

-   /* Write the compressed data */

-   png_write_compressed_data_out(png_ptr, &comp);

-

-   /* Close the chunk */

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_iTXt_SUPPORTED

-/* Write an iTXt chunk */

-void /* PRIVATE */

-png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,

-    png_const_charp lang, png_const_charp lang_key, png_const_charp text)

-{

-   png_uint_32 key_len, prefix_len;

-   png_size_t lang_len, lang_key_len;

-   png_byte new_key[82];

-   compression_state comp;

-

-   png_debug(1, "in png_write_iTXt");

-

-   key_len = png_check_keyword(png_ptr, key, new_key);

-

-   if (key_len == 0)

-      png_error(png_ptr, "iTXt: invalid keyword");

-

-   /* Set the compression flag */

-   switch (compression)

-   {

-      case PNG_ITXT_COMPRESSION_NONE:

-      case PNG_TEXT_COMPRESSION_NONE:

-         compression = new_key[++key_len] = 0; /* no compression */

-         break;

-

-      case PNG_TEXT_COMPRESSION_zTXt:

-      case PNG_ITXT_COMPRESSION_zTXt:

-         compression = new_key[++key_len] = 1; /* compressed */

-         break;

-

-      default:

-         png_error(png_ptr, "iTXt: invalid compression");

-   }

-

-   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;

-   ++key_len; /* for the keywod separator */

-

-   /* We leave it to the application to meet PNG-1.0 requirements on the

-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of

-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG, however,

-    * specifies that the text is UTF-8 and this really doesn't require any

-    * checking.

-    *

-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.

-    *

-    * TODO: validate the language tag correctly (see the spec.)

-    */

-   if (lang == NULL) lang = ""; /* empty language is valid */

-   lang_len = strlen(lang)+1;

-   if (lang_key == NULL) lang_key = ""; /* may be empty */

-   lang_key_len = strlen(lang_key)+1;

-   if (text == NULL) text = ""; /* may be empty */

-

-   prefix_len = key_len;

-   if (lang_len > PNG_UINT_31_MAX-prefix_len)

-      prefix_len = PNG_UINT_31_MAX;

-   else

-      prefix_len = (png_uint_32)(prefix_len + lang_len);

-

-   if (lang_key_len > PNG_UINT_31_MAX-prefix_len)

-      prefix_len = PNG_UINT_31_MAX;

-   else

-      prefix_len = (png_uint_32)(prefix_len + lang_key_len);

-

-   png_text_compress_init(&comp, (png_const_bytep)text, strlen(text));

-

-   if (compression != 0)

-   {

-      if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)

-         png_error(png_ptr, png_ptr->zstream.msg);

-   }

-

-   else

-   {

-      if (comp.input_len > PNG_UINT_31_MAX-prefix_len)

-         png_error(png_ptr, "iTXt: uncompressed text too long");

-

-      /* So the string will fit in a chunk: */

-      comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;

-   }

-

-   png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);

-

-   png_write_chunk_data(png_ptr, new_key, key_len);

-

-   png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);

-

-   png_write_chunk_data(png_ptr, (png_const_bytep)lang_key, lang_key_len);

-

-   if (compression != 0)

-      png_write_compressed_data_out(png_ptr, &comp);

-

-   else

-      png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.output_len);

-

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_oFFs_SUPPORTED

-/* Write the oFFs chunk */

-void /* PRIVATE */

-png_write_oFFs(png_structrp png_ptr, png_int_32 x_offset, png_int_32 y_offset,

-    int unit_type)

-{

-   png_byte buf[9];

-

-   png_debug(1, "in png_write_oFFs");

-

-   if (unit_type >= PNG_OFFSET_LAST)

-      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");

-

-   png_save_int_32(buf, x_offset);

-   png_save_int_32(buf + 4, y_offset);

-   buf[8] = (png_byte)unit_type;

-

-   png_write_complete_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);

-}

-#endif

-#ifdef PNG_WRITE_pCAL_SUPPORTED

-/* Write the pCAL chunk (described in the PNG extensions document) */

-void /* PRIVATE */

-png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,

-    png_int_32 X1, int type, int nparams, png_const_charp units,

-    png_charpp params)

-{

-   png_uint_32 purpose_len;

-   png_size_t units_len, total_len;

-   png_size_tp params_len;

-   png_byte buf[10];

-   png_byte new_purpose[80];

-   int i;

-

-   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);

-

-   if (type >= PNG_EQUATION_LAST)

-      png_error(png_ptr, "Unrecognized equation type for pCAL chunk");

-

-   purpose_len = png_check_keyword(png_ptr, purpose, new_purpose);

-

-   if (purpose_len == 0)

-      png_error(png_ptr, "pCAL: invalid keyword");

-

-   ++purpose_len; /* terminator */

-

-   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);

-   units_len = strlen(units) + (nparams == 0 ? 0 : 1);

-   png_debug1(3, "pCAL units length = %d", (int)units_len);

-   total_len = purpose_len + units_len + 10;

-

-   params_len = (png_size_tp)png_malloc(png_ptr,

-       (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (png_size_t))));

-

-   /* Find the length of each parameter, making sure we don't count the

-    * null terminator for the last parameter.

-    */

-   for (i = 0; i < nparams; i++)

-   {

-      params_len[i] = strlen(params[i]) + (i == nparams - 1 ? 0 : 1);

-      png_debug2(3, "pCAL parameter %d length = %lu", i,

-          (unsigned long)params_len[i]);

-      total_len += params_len[i];

-   }

-

-   png_debug1(3, "pCAL total length = %d", (int)total_len);

-   png_write_chunk_header(png_ptr, png_pCAL, (png_uint_32)total_len);

-   png_write_chunk_data(png_ptr, new_purpose, purpose_len);

-   png_save_int_32(buf, X0);

-   png_save_int_32(buf + 4, X1);

-   buf[8] = (png_byte)type;

-   buf[9] = (png_byte)nparams;

-   png_write_chunk_data(png_ptr, buf, (png_size_t)10);

-   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);

-

-   for (i = 0; i < nparams; i++)

-   {

-      png_write_chunk_data(png_ptr, (png_const_bytep)params[i], params_len[i]);

-   }

-

-   png_free(png_ptr, params_len);

-   png_write_chunk_end(png_ptr);

-}

-#endif

-

-#ifdef PNG_WRITE_sCAL_SUPPORTED

-/* Write the sCAL chunk */

-void /* PRIVATE */

-png_write_sCAL_s(png_structrp png_ptr, int unit, png_const_charp width,

-    png_const_charp height)

-{

-   png_byte buf[64];

-   png_size_t wlen, hlen, total_len;

-

-   png_debug(1, "in png_write_sCAL_s");

-

-   wlen = strlen(width);

-   hlen = strlen(height);

-   total_len = wlen + hlen + 2;

-

-   if (total_len > 64)

-   {

-      png_warning(png_ptr, "Can't write sCAL (buffer too small)");

-      return;

-   }

-

-   buf[0] = (png_byte)unit;

-   memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */

-   memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */

-

-   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);

-   png_write_complete_chunk(png_ptr, png_sCAL, buf, total_len);

-}

-#endif

-

-#ifdef PNG_WRITE_pHYs_SUPPORTED

-/* Write the pHYs chunk */

-void /* PRIVATE */

-png_write_pHYs(png_structrp png_ptr, png_uint_32 x_pixels_per_unit,

-    png_uint_32 y_pixels_per_unit,

-    int unit_type)

-{

-   png_byte buf[9];

-

-   png_debug(1, "in png_write_pHYs");

-

-   if (unit_type >= PNG_RESOLUTION_LAST)

-      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");

-

-   png_save_uint_32(buf, x_pixels_per_unit);

-   png_save_uint_32(buf + 4, y_pixels_per_unit);

-   buf[8] = (png_byte)unit_type;

-

-   png_write_complete_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);

-}

-#endif

-

-#ifdef PNG_WRITE_tIME_SUPPORTED

-/* Write the tIME chunk.  Use either png_convert_from_struct_tm()

- * or png_convert_from_time_t(), or fill in the structure yourself.

- */

-void /* PRIVATE */

-png_write_tIME(png_structrp png_ptr, png_const_timep mod_time)

-{

-   png_byte buf[7];

-

-   png_debug(1, "in png_write_tIME");

-

-   if (mod_time->month  > 12 || mod_time->month  < 1 ||

-       mod_time->day    > 31 || mod_time->day    < 1 ||

-       mod_time->hour   > 23 || mod_time->second > 60)

-   {

-      png_warning(png_ptr, "Invalid time specified for tIME chunk");

-      return;

-   }

-

-   png_save_uint_16(buf, mod_time->year);

-   buf[2] = mod_time->month;

-   buf[3] = mod_time->day;

-   buf[4] = mod_time->hour;

-   buf[5] = mod_time->minute;

-   buf[6] = mod_time->second;

-

-   png_write_complete_chunk(png_ptr, png_tIME, buf, (png_size_t)7);

-}

-#endif

-

-/* Initializes the row writing capability of libpng */

-void /* PRIVATE */

-png_write_start_row(png_structrp png_ptr)

-{

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   /* Start of interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};

-

-   /* Offset to next interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};

-#endif

-

-   png_alloc_size_t buf_size;

-   int usr_pixel_depth;

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   png_byte filters;

-#endif

-

-   png_debug(1, "in png_write_start_row");

-

-   usr_pixel_depth = png_ptr->usr_channels * png_ptr->usr_bit_depth;

-   buf_size = PNG_ROWBYTES(usr_pixel_depth, png_ptr->width) + 1;

-

-   /* 1.5.6: added to allow checking in the row write code. */

-   png_ptr->transformed_pixel_depth = png_ptr->pixel_depth;

-   png_ptr->maximum_pixel_depth = (png_byte)usr_pixel_depth;

-

-   /* Set up row buffer */

-   png_ptr->row_buf = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));

-

-   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   filters = png_ptr->do_filter;

-

-   if (png_ptr->height == 1)

-      filters &= 0xff & ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);

-

-   if (png_ptr->width == 1)

-      filters &= 0xff & ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);

-

-   if (filters == 0)

-      filters = PNG_FILTER_NONE;

-

-   png_ptr->do_filter = filters;

-

-   if (((filters & (PNG_FILTER_SUB | PNG_FILTER_UP | PNG_FILTER_AVG |

-       PNG_FILTER_PAETH)) != 0) && png_ptr->try_row == NULL)

-   {

-      int num_filters = 0;

-

-      png_ptr->try_row = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));

-

-      if (filters & PNG_FILTER_SUB)

-         num_filters++;

-

-      if (filters & PNG_FILTER_UP)

-         num_filters++;

-

-      if (filters & PNG_FILTER_AVG)

-         num_filters++;

-

-      if (filters & PNG_FILTER_PAETH)

-         num_filters++;

-

-      if (num_filters > 1)

-         png_ptr->tst_row = png_voidcast(png_bytep, png_malloc(png_ptr,

-             buf_size));

-   }

-

-   /* We only need to keep the previous row if we are using one of the following

-    * filters.

-    */

-   if ((filters & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)

-      png_ptr->prev_row = png_voidcast(png_bytep,

-          png_calloc(png_ptr, buf_size));

-#endif /* WRITE_FILTER */

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* If interlaced, we need to set up width and height of pass */

-   if (png_ptr->interlaced != 0)

-   {

-      if ((png_ptr->transformations & PNG_INTERLACE) == 0)

-      {

-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -

-             png_pass_ystart[0]) / png_pass_yinc[0];

-

-         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -

-             png_pass_start[0]) / png_pass_inc[0];

-      }

-

-      else

-      {

-         png_ptr->num_rows = png_ptr->height;

-         png_ptr->usr_width = png_ptr->width;

-      }

-   }

-

-   else

-#endif

-   {

-      png_ptr->num_rows = png_ptr->height;

-      png_ptr->usr_width = png_ptr->width;

-   }

-}

-

-/* Internal use only.  Called when finished processing a row of data. */

-void /* PRIVATE */

-png_write_finish_row(png_structrp png_ptr)

-{

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   /* Start of interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};

-

-   /* Offset to next interlace block in the y direction */

-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};

-#endif

-

-   png_debug(1, "in png_write_finish_row");

-

-   /* Next row */

-   png_ptr->row_number++;

-

-   /* See if we are done */

-   if (png_ptr->row_number < png_ptr->num_rows)

-      return;

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-   /* If interlaced, go to next pass */

-   if (png_ptr->interlaced != 0)

-   {

-      png_ptr->row_number = 0;

-      if ((png_ptr->transformations & PNG_INTERLACE) != 0)

-      {

-         png_ptr->pass++;

-      }

-

-      else

-      {

-         /* Loop until we find a non-zero width or height pass */

-         do

-         {

-            png_ptr->pass++;

-

-            if (png_ptr->pass >= 7)

-               break;

-

-            png_ptr->usr_width = (png_ptr->width +

-                png_pass_inc[png_ptr->pass] - 1 -

-                png_pass_start[png_ptr->pass]) /

-                png_pass_inc[png_ptr->pass];

-

-            png_ptr->num_rows = (png_ptr->height +

-                png_pass_yinc[png_ptr->pass] - 1 -

-                png_pass_ystart[png_ptr->pass]) /

-                png_pass_yinc[png_ptr->pass];

-

-            if ((png_ptr->transformations & PNG_INTERLACE) != 0)

-               break;

-

-         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);

-

-      }

-

-      /* Reset the row above the image for the next pass */

-      if (png_ptr->pass < 7)

-      {

-         if (png_ptr->prev_row != NULL)

-            memset(png_ptr->prev_row, 0,

-                (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*

-                png_ptr->usr_bit_depth, png_ptr->width)) + 1);

-

-         return;

-      }

-   }

-#endif

-

-   /* If we get here, we've just written the last row, so we need

-      to flush the compressor */

-   png_compress_IDAT(png_ptr, NULL, 0, Z_FINISH);

-}

-

-#ifdef PNG_WRITE_INTERLACING_SUPPORTED

-/* Pick out the correct pixels for the interlace pass.

- * The basic idea here is to go through the row with a source

- * pointer and a destination pointer (sp and dp), and copy the

- * correct pixels for the pass.  As the row gets compacted,

- * sp will always be >= dp, so we should never overwrite anything.

- * See the default: case for the easiest code to understand.

- */

-void /* PRIVATE */

-png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)

-{

-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */

-

-   /* Start of interlace block */

-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};

-

-   /* Offset to next interlace block */

-   static PNG_CONST png_byte  png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};

-

-   png_debug(1, "in png_do_write_interlace");

-

-   /* We don't have to do anything on the last pass (6) */

-   if (pass < 6)

-   {

-      /* Each pixel depth is handled separately */

-      switch (row_info->pixel_depth)

-      {

-         case 1:

-         {

-            png_bytep sp;

-            png_bytep dp;

-            unsigned int shift;

-            int d;

-            int value;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            dp = row;

-            d = 0;

-            shift = 7;

-

-            for (i = png_pass_start[pass]; i < row_width;

-               i += png_pass_inc[pass])

-            {

-               sp = row + (png_size_t)(i >> 3);

-               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;

-               d |= (value << shift);

-

-               if (shift == 0)

-               {

-                  shift = 7;

-                  *dp++ = (png_byte)d;

-                  d = 0;

-               }

-

-               else

-                  shift--;

-

-            }

-            if (shift != 7)

-               *dp = (png_byte)d;

-

-            break;

-         }

-

-         case 2:

-         {

-            png_bytep sp;

-            png_bytep dp;

-            unsigned int shift;

-            int d;

-            int value;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            dp = row;

-            shift = 6;

-            d = 0;

-

-            for (i = png_pass_start[pass]; i < row_width;

-               i += png_pass_inc[pass])

-            {

-               sp = row + (png_size_t)(i >> 2);

-               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;

-               d |= (value << shift);

-

-               if (shift == 0)

-               {

-                  shift = 6;

-                  *dp++ = (png_byte)d;

-                  d = 0;

-               }

-

-               else

-                  shift -= 2;

-            }

-            if (shift != 6)

-               *dp = (png_byte)d;

-

-            break;

-         }

-

-         case 4:

-         {

-            png_bytep sp;

-            png_bytep dp;

-            unsigned int shift;

-            int d;

-            int value;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-

-            dp = row;

-            shift = 4;

-            d = 0;

-            for (i = png_pass_start[pass]; i < row_width;

-                i += png_pass_inc[pass])

-            {

-               sp = row + (png_size_t)(i >> 1);

-               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;

-               d |= (value << shift);

-

-               if (shift == 0)

-               {

-                  shift = 4;

-                  *dp++ = (png_byte)d;

-                  d = 0;

-               }

-

-               else

-                  shift -= 4;

-            }

-            if (shift != 4)

-               *dp = (png_byte)d;

-

-            break;

-         }

-

-         default:

-         {

-            png_bytep sp;

-            png_bytep dp;

-            png_uint_32 i;

-            png_uint_32 row_width = row_info->width;

-            png_size_t pixel_bytes;

-

-            /* Start at the beginning */

-            dp = row;

-

-            /* Find out how many bytes each pixel takes up */

-            pixel_bytes = (row_info->pixel_depth >> 3);

-

-            /* Loop through the row, only looking at the pixels that matter */

-            for (i = png_pass_start[pass]; i < row_width;

-               i += png_pass_inc[pass])

-            {

-               /* Find out where the original pixel is */

-               sp = row + (png_size_t)i * pixel_bytes;

-

-               /* Move the pixel */

-               if (dp != sp)

-                  memcpy(dp, sp, pixel_bytes);

-

-               /* Next pixel */

-               dp += pixel_bytes;

-            }

-            break;

-         }

-      }

-      /* Set new row width */

-      row_info->width = (row_info->width +

-          png_pass_inc[pass] - 1 -

-          png_pass_start[pass]) /

-          png_pass_inc[pass];

-

-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,

-          row_info->width);

-   }

-}

-#endif

-

-

-/* This filters the row, chooses which filter to use, if it has not already

- * been specified by the application, and then writes the row out with the

- * chosen filter.

- */

-static void /* PRIVATE */

-png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,

-    png_size_t row_bytes);

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-static png_size_t /* PRIVATE */

-png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes, const png_size_t lmins)

-{

-   png_bytep rp, dp, lp;

-   png_size_t i;

-   png_size_t sum = 0;

-   unsigned int v;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;

-        i++, rp++, dp++)

-   {

-      v = *dp = *rp;

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-   }

-

-   for (lp = png_ptr->row_buf + 1; i < row_bytes;

-      i++, rp++, lp++, dp++)

-   {

-      v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-

-      if (sum > lmins)  /* We are already worse, don't continue. */

-        break;

-   }

-

-   return (sum);

-}

-

-static void /* PRIVATE */

-png_setup_sub_row_only(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes)

-{

-   png_bytep rp, dp, lp;

-   png_size_t i;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;

-        i++, rp++, dp++)

-   {

-      *dp = *rp;

-   }

-

-   for (lp = png_ptr->row_buf + 1; i < row_bytes;

-      i++, rp++, lp++, dp++)

-   {

-      *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);

-   }

-}

-

-static png_size_t /* PRIVATE */

-png_setup_up_row(png_structrp png_ptr, const png_size_t row_bytes,

-    const png_size_t lmins)

-{

-   png_bytep rp, dp, pp;

-   png_size_t i;

-   png_size_t sum = 0;

-   unsigned int v;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < row_bytes;

-       i++, rp++, pp++, dp++)

-   {

-      v = *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-

-      if (sum > lmins)  /* We are already worse, don't continue. */

-        break;

-   }

-

-   return (sum);

-}

-static void /* PRIVATE */

-png_setup_up_row_only(png_structrp png_ptr, const png_size_t row_bytes)

-{

-   png_bytep rp, dp, pp;

-   png_size_t i;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < row_bytes;

-       i++, rp++, pp++, dp++)

-   {

-      *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);

-   }

-}

-

-static png_size_t /* PRIVATE */

-png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes, const png_size_t lmins)

-{

-   png_bytep rp, dp, pp, lp;

-   png_uint_32 i;

-   png_size_t sum = 0;

-   unsigned int v;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < bpp; i++)

-   {

-      v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);

-

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-   }

-

-   for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)

-   {

-      v = *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))

-          & 0xff);

-

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-

-      if (sum > lmins)  /* We are already worse, don't continue. */

-        break;

-   }

-

-   return (sum);

-}

-static void /* PRIVATE */

-png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes)

-{

-   png_bytep rp, dp, pp, lp;

-   png_uint_32 i;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < bpp; i++)

-   {

-      *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);

-   }

-

-   for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)

-   {

-      *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))

-          & 0xff);

-   }

-}

-

-static png_size_t /* PRIVATE */

-png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes, const png_size_t lmins)

-{

-   png_bytep rp, dp, pp, cp, lp;

-   png_size_t i;

-   png_size_t sum = 0;

-   unsigned int v;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < bpp; i++)

-   {

-      v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);

-

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-   }

-

-   for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;

-        i++)

-   {

-      int a, b, c, pa, pb, pc, p;

-

-      b = *pp++;

-      c = *cp++;

-      a = *lp++;

-

-      p = b - c;

-      pc = a - c;

-

-#ifdef PNG_USE_ABS

-      pa = abs(p);

-      pb = abs(pc);

-      pc = abs(p + pc);

-#else

-      pa = p < 0 ? -p : p;

-      pb = pc < 0 ? -pc : pc;

-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;

-#endif

-

-      p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;

-

-      v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);

-

-#ifdef PNG_USE_ABS

-      sum += 128 - abs((int)v - 128);

-#else

-      sum += (v < 128) ? v : 256 - v;

-#endif

-

-      if (sum > lmins)  /* We are already worse, don't continue. */

-        break;

-   }

-

-   return (sum);

-}

-static void /* PRIVATE */

-png_setup_paeth_row_only(png_structrp png_ptr, const png_uint_32 bpp,

-    const png_size_t row_bytes)

-{

-   png_bytep rp, dp, pp, cp, lp;

-   png_size_t i;

-

-   png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;

-

-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,

-       pp = png_ptr->prev_row + 1; i < bpp; i++)

-   {

-      *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);

-   }

-

-   for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;

-        i++)

-   {

-      int a, b, c, pa, pb, pc, p;

-

-      b = *pp++;

-      c = *cp++;

-      a = *lp++;

-

-      p = b - c;

-      pc = a - c;

-

-#ifdef PNG_USE_ABS

-      pa = abs(p);

-      pb = abs(pc);

-      pc = abs(p + pc);

-#else

-      pa = p < 0 ? -p : p;

-      pb = pc < 0 ? -pc : pc;

-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;

-#endif

-

-      p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;

-

-      *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);

-   }

-}

-#endif /* WRITE_FILTER */

-

-void /* PRIVATE */

-png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)

-{

-#ifndef PNG_WRITE_FILTER_SUPPORTED

-   png_write_filtered_row(png_ptr, png_ptr->row_buf, row_info->rowbytes+1);

-#else

-   unsigned int filter_to_do = png_ptr->do_filter;

-   png_bytep row_buf;

-   png_bytep best_row;

-   png_uint_32 bpp;

-   png_size_t mins;

-   png_size_t row_bytes = row_info->rowbytes;

-

-   png_debug(1, "in png_write_find_filter");

-

-   /* Find out how many bytes offset each pixel is */

-   bpp = (row_info->pixel_depth + 7) >> 3;

-

-   row_buf = png_ptr->row_buf;

-   mins = PNG_SIZE_MAX - 256/* so we can detect potential overflow of the

-                               running sum */;

-

-   /* The prediction method we use is to find which method provides the

-    * smallest value when summing the absolute values of the distances

-    * from zero, using anything >= 128 as negative numbers.  This is known

-    * as the "minimum sum of absolute differences" heuristic.  Other

-    * heuristics are the "weighted minimum sum of absolute differences"

-    * (experimental and can in theory improve compression), and the "zlib

-    * predictive" method (not implemented yet), which does test compressions

-    * of lines using different filter methods, and then chooses the

-    * (series of) filter(s) that give minimum compressed data size (VERY

-    * computationally expensive).

-    *

-    * GRR 980525:  consider also

-    *

-    *   (1) minimum sum of absolute differences from running average (i.e.,

-    *       keep running sum of non-absolute differences & count of bytes)

-    *       [track dispersion, too?  restart average if dispersion too large?]

-    *

-    *  (1b) minimum sum of absolute differences from sliding average, probably

-    *       with window size <= deflate window (usually 32K)

-    *

-    *   (2) minimum sum of squared differences from zero or running average

-    *       (i.e., ~ root-mean-square approach)

-    */

-

-

-   /* We don't need to test the 'no filter' case if this is the only filter

-    * that has been chosen, as it doesn't actually do anything to the data.

-    */

-   best_row = png_ptr->row_buf;

-

-   if (PNG_SIZE_MAX/128 <= row_bytes)

-   {

-      /* Overflow can occur in the calculation, just select the lowest set

-       * filter.

-       */

-      filter_to_do &= 0U-filter_to_do;

-   }

-   else if ((filter_to_do & PNG_FILTER_NONE) != 0 &&

-         filter_to_do != PNG_FILTER_NONE)

-   {

-      /* Overflow not possible and multiple filters in the list, including the

-       * 'none' filter.

-       */

-      png_bytep rp;

-      png_size_t sum = 0;

-      png_size_t i;

-      unsigned int v;

-

-      {

-         for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)

-         {

-            v = *rp;

-#ifdef PNG_USE_ABS

-            sum += 128 - abs((int)v - 128);

-#else

-            sum += (v < 128) ? v : 256 - v;

-#endif

-         }

-      }

-

-      mins = sum;

-   }

-

-   /* Sub filter */

-   if (filter_to_do == PNG_FILTER_SUB)

-   /* It's the only filter so no testing is needed */

-   {

-      png_setup_sub_row_only(png_ptr, bpp, row_bytes);

-      best_row = png_ptr->try_row;

-   }

-

-   else if ((filter_to_do & PNG_FILTER_SUB) != 0)

-   {

-      png_size_t sum;

-      png_size_t lmins = mins;

-

-      sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins);

-

-      if (sum < mins)

-      {

-         mins = sum;

-         best_row = png_ptr->try_row;

-         if (png_ptr->tst_row != NULL)

-         {

-            png_ptr->try_row = png_ptr->tst_row;

-            png_ptr->tst_row = best_row;

-         }

-      }

-   }

-

-   /* Up filter */

-   if (filter_to_do == PNG_FILTER_UP)

-   {

-      png_setup_up_row_only(png_ptr, row_bytes);

-      best_row = png_ptr->try_row;

-   }

-

-   else if ((filter_to_do & PNG_FILTER_UP) != 0)

-   {

-      png_size_t sum;

-      png_size_t lmins = mins;

-

-      sum = png_setup_up_row(png_ptr, row_bytes, lmins);

-

-      if (sum < mins)

-      {

-         mins = sum;

-         best_row = png_ptr->try_row;

-         if (png_ptr->tst_row != NULL)

-         {

-            png_ptr->try_row = png_ptr->tst_row;

-            png_ptr->tst_row = best_row;

-         }

-      }

-   }

-

-   /* Avg filter */

-   if (filter_to_do == PNG_FILTER_AVG)

-   {

-      png_setup_avg_row_only(png_ptr, bpp, row_bytes);

-      best_row = png_ptr->try_row;

-   }

-

-   else if ((filter_to_do & PNG_FILTER_AVG) != 0)

-   {

-      png_size_t sum;

-      png_size_t lmins = mins;

-

-      sum= png_setup_avg_row(png_ptr, bpp, row_bytes, lmins);

-

-      if (sum < mins)

-      {

-         mins = sum;

-         best_row = png_ptr->try_row;

-         if (png_ptr->tst_row != NULL)

-         {

-            png_ptr->try_row = png_ptr->tst_row;

-            png_ptr->tst_row = best_row;

-         }

-      }

-   }

-

-   /* Paeth filter */

-   if (filter_to_do == PNG_FILTER_PAETH)

-   {

-      png_setup_paeth_row_only(png_ptr, bpp, row_bytes);

-      best_row = png_ptr->try_row;

-   }

-

-   else if ((filter_to_do & PNG_FILTER_PAETH) != 0)

-   {

-      png_size_t sum;

-      png_size_t lmins = mins;

-

-      sum = png_setup_paeth_row(png_ptr, bpp, row_bytes, lmins);

-

-      if (sum < mins)

-      {

-         best_row = png_ptr->try_row;

-         if (png_ptr->tst_row != NULL)

-         {

-            png_ptr->try_row = png_ptr->tst_row;

-            png_ptr->tst_row = best_row;

-         }

-      }

-   }

-

-   /* Do the actual writing of the filtered row data from the chosen filter. */

-   png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);

-

-#endif /* WRITE_FILTER */

-}

-

-

-/* Do the actual writing of a previously filtered row. */

-static void

-png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,

-    png_size_t full_row_length/*includes filter byte*/)

-{

-   png_debug(1, "in png_write_filtered_row");

-

-   png_debug1(2, "filter = %d", filtered_row[0]);

-

-   png_compress_IDAT(png_ptr, filtered_row, full_row_length, Z_NO_FLUSH);

-

-#ifdef PNG_WRITE_FILTER_SUPPORTED

-   /* Swap the current and previous rows */

-   if (png_ptr->prev_row != NULL)

-   {

-      png_bytep tptr;

-

-      tptr = png_ptr->prev_row;

-      png_ptr->prev_row = png_ptr->row_buf;

-      png_ptr->row_buf = tptr;

-   }

-#endif /* WRITE_FILTER */

-

-   /* Finish row - updates counters and flushes zlib if last row */

-   png_write_finish_row(png_ptr);

-

-#ifdef PNG_WRITE_FLUSH_SUPPORTED

-   png_ptr->flush_rows++;

-

-   if (png_ptr->flush_dist > 0 &&

-       png_ptr->flush_rows >= png_ptr->flush_dist)

-   {

-      png_write_flush(png_ptr);

-   }

-#endif /* WRITE_FLUSH */

-}

-#endif /* WRITE */

diff --git a/plugins/AdvaImg/src/MapIntrospector.h b/plugins/AdvaImg/src/MapIntrospector.h
deleted file mode 100644
index 091ba68b26..0000000000
--- a/plugins/AdvaImg/src/MapIntrospector.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// ==========================================================
-// STL MapIntrospector class
-//
-// Design and implementation by
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef MAPINTROSPECTOR_H_
-#define MAPINTROSPECTOR_H_
-
-// we need at least one C++ header included, 
-// that defines the C++ Standard Library's version macro, 
-// that is used below to identify the library.
-#include <cstdlib>
-
-/**
-Class MapIntrospector - STL std::map Introspector
-
-The MapIntrospector is a helper class used to calculate or estimate part
-of the internal memory footprint of a std::map, that is the memory used
-by N entries, where N is provided as an argument. This class is used by
-function FreeImage_GetMemorySize, which aims to get the total memory
-usage for a FreeImage bitmap.
-
-The type argument _Maptype must take the type of the std::map to be
-introspected.
-
-This class accounts for 'internal' memory per entry only, that is, the
-size returned does neither include the actual size of the std::map class
-itself, nor does it include the size of referenced keys and values (also
-the actual bytes required for std::string type keys or values are not
-counted). For example, the total memory usage should be something like:
-
-typedef std::map<std::string, double> DBLMAP
-DBLMAP MyMap;
-
-int total_size = sizeof(DBLMAP) + MapIntrospector<DBLMAP>::GetNodesMemorySize(MyMap.size())
-for (DBLMAP::iterator i = MyMap->begin(); i != MyMap->end(); i++) {
- std::string key = i->first;
- total_size += key.capacity();
-}
-
-So, basically, this class' task is to get the (constant) number of bytes
-per entry, which is multiplied by N (parameter node_count) and returned
-in method GetNodesMemorySize. Since this heavily depends on the actually
-used C++ Standard Library, this class must be implemented specifically
-for each C++ Standard Library.
-
-At current, there is an implementation available for these C++ Standard
-Libraries:
-
-- Microsoft C++ Standard Library
-- GNU Standard C++ Library v3, libstdc++-v3
-- LLVM "libc++" C++ Standard Library (untested)
-- Unknown C++ Standard Library
-
-Volunteers for testing as well as for providing support for other/new
-libraries are welcome.
-
-The 'Unknown C++ Standard Library' case is used if no other known C++
-Standard Library was detected. It uses a typical _Node structure to
-declare an estimated memory consumption for a node.
-*/
-
-#if defined(_CPPLIB_VER)	// Microsoft C++ Standard Library
-/**
- The Microsoft C++ Standard Library uses the protected structure _Node
- of class std::_Tree_nod to represent a node. This class is used by
- std::_Tree, the base class of std::map. So, since std::map is derived
- from std::_Tree (and _Node is protected), we can get access to this
- structure by deriving from std::map.
-
- Additionally, the Microsoft C++ Standard Library uses a separately
- allocated end node for its balanced red-black tree so, actually, there
- are size() + 1 nodes present in memory.
-
- With all that in place, the total memory for all nodes in std::map
- is simply (node_count + 1) * sizeof(_Node).
-*/
-template<class _Maptype>
-class MapIntrospector: private _Maptype {
-public:
-	static size_t GetNodesMemorySize(size_t node_count) {
-		return (node_count + 1) * sizeof(_Node);
-	}
-};
-
-#elif defined(__GLIBCXX__)	// GNU Standard C++ Library v3, libstdc++-v3
-/**
- The GNU Standard C++ Library v3 uses structure std::_Rb_tree_node<_Val>,
- which is publicly declared in the standard namespace. Its value type
- _Val is actually the map's value_type std::map::value_type.
-
- So, the total memory for all nodes in std::map is simply
- node_count * sizeof(std::_Rb_tree_node<_Val>), _Val being the map's
- value_type.
-*/
-template<class _Maptype>
-class MapIntrospector {
-private:
-	typedef typename _Maptype::value_type _Val;
-
-public:
-	static size_t GetNodesMemorySize(size_t node_count) {
-		return node_count * sizeof(std::_Rb_tree_node<_Val>);
-	}
-};
-
-#elif defined(_LIBCPP_VERSION)	// "libc++" C++ Standard Library (LLVM)
-/*
- The "libc++" C++ Standard Library uses structure
- std::__tree_node<_Val, void*> for regular nodes and one instance of
- structure std::__tree_end_node<void*> for end nodes, which both are
- publicly declared in the standard namespace. Its value type _Val is
- actually the map's value_type std::map::value_type.
-
- So, the total memory for all nodes in std::map is simply
- node_count * sizeof(std::__tree_node<_Val, void*>)
- + sizeof(std::__tree_end_node<void*>).
- 
- REMARK: this implementation is not yet tested!
-*/
-template<class _Maptype>
-class MapIntrospector {
-private:
-	typedef typename _Maptype::value_type _Val;
-
-public:
-	static size_t GetNodesMemorySize(size_t node_count) {
-		return node_count * sizeof(std::__tree_node<_Val, void*>) + sizeof(std::__tree_end_node<void*>);
-	}
-};
-
-//#elif defined(_ADD_YOUR_CPP_STD_LIBRARY_HERE_)
-
-#else							// Unknown C++ Standard Library
-/**
- If we do not know the actual C++ Standard Library and so, have no
- access to any internal types, we can just make some assumptions about
- the implementation and memory usage.
-
- However, all implementations will probably be based on a balanced
- red-black tree, will also store the map's value_type in each node and
- need some extra information like the node's color. For a binary tree,
- at least two pointers, one for left and one for right are required.
- Since it is handy, many implementations also have a parent pointer.
-
- We let the compiler calculate the size of the above mentioned items by
- using a fake structure. By using a real structure (in contrast to just
- adding numbers/bytes) we'll get correct pointer sizes as well as any
- padding applied for free.
-*/
-template<class _Maptype>
-class MapIntrospector {
-private:
-	/* Define some handy typedefs to build up the structure. */
-
-	/**
-	 Each node will likely store the value_type of the mapping,
-	 that is a std::pair<_Key, _Value>.
-	*/
-	typedef typename _Maptype::value_type _Val;
-
-	/**
-	 We will need some pointers, since std::map is likely implemented
-	 as a balanced red-black tree.
-	*/
-	typedef void*                         _Ptr;
-
-	/**
-	 Space for some extra information (like the node's color).
-	 An int should be sufficient.
-	*/
-	typedef int                           _Ext;
-
-	/* The memory required for each node will likely look like this
-	 structure. We will just multiply sizeof(_Node) by the number
-	 of nodes to get the total memory of all nodes. By using the
-	 size of the structure, we will also take care of the compiler's
-	 default padding.
-	*/
-	typedef struct {
-		_Ptr _parent_node;
-		_Ptr _left_node;
-		_Ptr _right_node;
-		_Val _value;
-		_Ext _extra_info;
-	} _Node;
-
-public:
-	static size_t GetNodesMemorySize(size_t node_count) {
-		return node_count * sizeof(_Node);
-	}
-};
-
-#endif // Standard C++ Library
-
-#endif // MAPINTROSPECTOR_H_
diff --git a/plugins/AdvaImg/src/Metadata/Exif.cpp b/plugins/AdvaImg/src/Metadata/Exif.cpp
deleted file mode 100644
index 35d83c4dbc..0000000000
--- a/plugins/AdvaImg/src/Metadata/Exif.cpp
+++ /dev/null
@@ -1,1253 +0,0 @@
-// ==========================================================
-// Metadata functions implementation
-// Exif metadata model
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// Based on the following implementations:
-// - metadata-extractor : http://www.drewnoakes.com/code/exif/
-// - jhead : http://www.sentex.net/~mwandel/jhead/
-// - ImageMagick : http://www.imagemagick.org/
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-
-// ==========================================================
-// Exif JPEG routines
-// ==========================================================
-
-#define EXIF_NUM_FORMATS  12
-
-#define TAG_EXIF_OFFSET			0x8769	// Exif IFD Pointer
-#define TAG_GPS_OFFSET			0x8825	// GPS Info IFD Pointer
-#define TAG_INTEROP_OFFSET		0xA005	// Interoperability IFD Pointer
-#define TAG_MAKER_NOTE			0x927C	// Maker note
-
-// CANON cameras have some funny bespoke fields that need further processing...
-#define TAG_CANON_CAMERA_STATE_0x01	0x0001		// tags under tag 0x001 (CameraSettings)
-#define TAG_CANON_CAMERA_STATE_0x02	0x0002		// tags under tag 0x002 (FocalLength)
-#define TAG_CANON_CAMERA_STATE_0x04	0x0004		// tags under tag 0x004 (ShotInfo)
-#define TAG_CANON_CAMERA_STATE_0x12	0x0012		// tags under tag 0x012 (AFInfo)
-#define TAG_CANON_CAMERA_STATE_0xA0	0x00A0		// tags under tag 0x0A0 (ProcessingInfo)
-#define TAG_CANON_CAMERA_STATE_0xE0	0x00E0		// tags under tag 0x0E0 (SensorInfo)
-
-
-// =====================================================================
-// Reimplementation of strnicmp (it is not supported on some systems)
-// =====================================================================
-
-/**
-Compare characters of two strings without regard to case.
-@param s1 Null-terminated string to compare.
-@param s2 Null-terminated string to compare.
-@param len Number of characters to compare
-@return Returns 0 if s1 substring identical to s2 substring
-*/
-static int 
-FreeImage_strnicmp(const char *s1, const char *s2, size_t len) {
-	unsigned char c1, c2;
-
-	if(!s1 || !s2) return -1;
-
-	c1 = 0;	c2 = 0;
-	if(len) {
-		do {
-			c1 = *s1; c2 = *s2;
-			s1++; s2++;
-			if (!c1)
-				break;
-			if (!c2)
-				break;
-			if (c1 == c2)
-				continue;
-			c1 = (BYTE)tolower(c1);
-			c2 = (BYTE)tolower(c2);
-			if (c1 != c2)
-				break;
-		} while (--len);
-	}
-	return (int)c1 - (int)c2;
-}
-
-
-// ----------------------------------------------------------
-//   Little Endian / Big Endian io routines
-// ----------------------------------------------------------
-
-static short 
-ReadInt16(BOOL msb_order, const void *buffer) {
-	short value;
-
-	if(msb_order) {
-		value = (short)((((BYTE*) buffer)[0] << 8) | ((BYTE*) buffer)[1]);
-		return value;
-    }
-	value = (short)((((BYTE*) buffer)[1] << 8) | ((BYTE*) buffer)[0]);
-	return value;
-}
-
-static LONG 
-ReadInt32(BOOL msb_order, const void *buffer) {
-	LONG value;
-
-	if(msb_order) {
-		value = (LONG)((((BYTE*) buffer)[0] << 24) | (((BYTE*) buffer)[1] << 16) | (((BYTE*) buffer)[2] << 8) | (((BYTE*) buffer)[3]));
-		return value;
-    }
-	value = (LONG)((((BYTE*) buffer)[3] << 24) | (((BYTE*) buffer)[2] << 16) | (((BYTE*) buffer)[1] << 8 ) | (((BYTE*) buffer)[0]));
-	return value;
-}
-
-static WORD 
-ReadUint16(BOOL msb_order, const void *buffer) {
-	WORD value;
-	
-	if(msb_order) {
-		value = (WORD) ((((BYTE*) buffer)[0] << 8) | ((BYTE*) buffer)[1]);
-		return value;
-    }
-	value = (WORD) ((((BYTE*) buffer)[1] << 8) | ((BYTE*) buffer)[0]);
-	return value;
-}
-
-static DWORD 
-ReadUint32(BOOL msb_order, const void *buffer) {
-	return ((DWORD) ReadInt32(msb_order, buffer) & 0xFFFFFFFF);
-}
-
-// ----------------------------------------------------------
-//   Exif JPEG markers routines
-// ----------------------------------------------------------
-
-/**
-Process a IFD offset
-Returns the offset and the metadata model for this tag
-*/
-static void 
-processIFDOffset(FITAG *tag, const char *pval, BOOL msb_order, DWORD *subdirOffset, TagLib::MDMODEL *md_model) {
-	// get the IFD offset
-	*subdirOffset = ReadUint32(msb_order, pval);
-
-	// select a tag info table
-	switch(FreeImage_GetTagID(tag)) {
-		case TAG_EXIF_OFFSET:
-			*md_model = TagLib::EXIF_EXIF;
-			break;
-		case TAG_GPS_OFFSET:
-			*md_model = TagLib::EXIF_GPS;
-			break;
-		case TAG_INTEROP_OFFSET:
-			*md_model = TagLib::EXIF_INTEROP;
-			break;
-	}
-}
-
-/**
-Process a maker note IFD offset
-Returns the offset and the metadata model for this tag
-*/
-static void 
-processMakerNote(FIBITMAP *dib, const char *pval, BOOL msb_order, DWORD *subdirOffset, TagLib::MDMODEL *md_model) {
-	FITAG *tagMake = NULL;
-
-	*subdirOffset = 0;
-	*md_model = TagLib::UNKNOWN;
-
-	// Determine the camera model and makernote format
-	// WARNING: note that Maker may be NULL sometimes so check its value before using it
-	// (NULL pointer checking is done by FreeImage_strnicmp)
-	FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "Make", &tagMake);
-	const char *Maker = (char*)FreeImage_GetTagValue(tagMake);
-
-	if((memcmp("OLYMP\x00\x01", pval, 7) == 0) || (memcmp("OLYMP\x00\x02", pval, 7) == 0) || (memcmp("EPSON", pval, 5) == 0) || (memcmp("AGFA", pval, 4) == 0)) {
-		// Olympus Type 1 Makernote
-		// Epson and Agfa use Olympus maker note standard, 
-		// see: http://www.ozhiker.com/electronics/pjmt/jpeg_info/
-		*md_model = TagLib::EXIF_MAKERNOTE_OLYMPUSTYPE1;
-		*subdirOffset = 8;
-	} 
-	else if(memcmp("OLYMPUS\x00\x49\x49\x03\x00", pval, 12) == 0) {
-		// Olympus Type 2 Makernote
-		// !!! NOT YET SUPPORTED !!!
-		*subdirOffset = 0;
-		*md_model = TagLib::UNKNOWN;
-	}
-	else if(memcmp("Nikon", pval, 5) == 0) {
-		/* There are two scenarios here:
-		 * Type 1:
-		 * :0000: 4E 69 6B 6F 6E 00 01 00-05 00 02 00 02 00 06 00 Nikon...........
-		 * :0010: 00 00 EC 02 00 00 03 00-03 00 01 00 00 00 06 00 ................
-		 * Type 3:
-		 * :0000: 4E 69 6B 6F 6E 00 02 00-00 00 4D 4D 00 2A 00 00 Nikon....MM.*...
-		 * :0010: 00 08 00 1E 00 01 00 07-00 00 00 04 30 32 30 30 ............0200
-		 */
-		if (pval[6] == 1) {
-			// Nikon type 1 Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_NIKONTYPE1;
-			*subdirOffset = 8;
-        } else if (pval[6] == 2) {
-            // Nikon type 3 Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_NIKONTYPE3;
-			*subdirOffset = 18;
-        } else {
-			// Unsupported makernote data ignored
-			*subdirOffset = 0;
-			*md_model = TagLib::UNKNOWN;
-		}
-	} else if(Maker && (FreeImage_strnicmp("NIKON", Maker, 5) == 0)) {
-		// Nikon type 2 Makernote
-		*md_model = TagLib::EXIF_MAKERNOTE_NIKONTYPE2;
-		*subdirOffset = 0;
-    } else if(Maker && (FreeImage_strnicmp("Canon", Maker, 5) == 0)) {
-        // Canon Makernote
-		*md_model = TagLib::EXIF_MAKERNOTE_CANON;
-		*subdirOffset = 0;		
-    } else if(Maker && (FreeImage_strnicmp("Casio", Maker, 5) == 0)) {
-        // Casio Makernote
-		if(memcmp("QVC\x00\x00\x00", pval, 6) == 0) {
-			// Casio Type 2 Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_CASIOTYPE2;
-			*subdirOffset = 6;
-		} else {
-			// Casio Type 1 Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_CASIOTYPE1;
-			*subdirOffset = 0;
-		}
-	} else if ((memcmp("FUJIFILM", pval, 8) == 0) || (Maker && (FreeImage_strnicmp("Fujifilm", Maker, 8) == 0))) {
-        // Fujifile Makernote
-		// Fujifilm's Makernote always use little-endian order altough the Exif section maybe in little-endian order or in big-endian order. 
-		// If msb_order == TRUE, the Makernote won't be read: 
-		// the value of ifdStart will be 0x0c000000 instead of 0x0000000c and the MakerNote section will be discarded later
-		// in jpeg_read_exif_dir because the IFD is too high
-		*md_model = TagLib::EXIF_MAKERNOTE_FUJIFILM;
-        DWORD ifdStart = ReadUint32(msb_order, pval + 8);
-		*subdirOffset = ifdStart;
-    }
-	else if(memcmp("KYOCERA\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x00\x00\x00", pval, 22) == 0) {
-		*md_model = TagLib::EXIF_MAKERNOTE_KYOCERA;
-		*subdirOffset = 22;
-	}
-	else if(Maker && (FreeImage_strnicmp("Minolta", Maker, 7) == 0)) {
-		// Minolta maker note
-		*md_model = TagLib::EXIF_MAKERNOTE_MINOLTA;
-		*subdirOffset = 0;
-	}
-	else if(memcmp("Panasonic\x00\x00\x00", pval, 12) == 0) {
-		// Panasonic maker note
-		*md_model = TagLib::EXIF_MAKERNOTE_PANASONIC;
-		*subdirOffset = 12;
-	}
-	else if(Maker && (FreeImage_strnicmp("LEICA", Maker, 5) == 0)) {
-		// Leica maker note
-		if(memcmp("LEICA\x00\x00\x00", pval, 8) == 0) {
-			// not yet supported makernote data ignored
-			*subdirOffset = 0;
-			*md_model = TagLib::UNKNOWN;
-		}
-	}
-	else if(Maker && ((FreeImage_strnicmp("Pentax", Maker, 6) == 0) || (FreeImage_strnicmp("Asahi", Maker, 5) == 0))) {
-		// Pentax maker note
-		if(memcmp("AOC\x00", pval, 4) == 0) {
-			// Type 2 Pentax Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_PENTAX;
-			*subdirOffset = 6;
-		} else {
-			// Type 1 Pentax Makernote
-			*md_model = TagLib::EXIF_MAKERNOTE_ASAHI;
-			*subdirOffset = 0;
-		}
-	}	
-	else if((memcmp("SONY CAM\x20\x00\x00\x00", pval, 12) == 0) || (memcmp("SONY DSC\x20\x00\x00\x00", pval, 12) == 0)) {
-		*md_model = TagLib::EXIF_MAKERNOTE_SONY;
-		*subdirOffset = 12;
-	}
-	else if((memcmp("SIGMA\x00\x00\x00", pval, 8) == 0) || (memcmp("FOVEON\x00\x00", pval, 8) == 0)) {
-		FITAG *tagModel = NULL;
-		FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "Model", &tagModel);
-		const char *Model = (char*)FreeImage_GetTagValue(tagModel);
-		if(Model && (memcmp("SIGMA SD1\x00", Model, 10) == 0)) {
-			// Sigma SD1 maker note
-			*subdirOffset = 10;
-			*md_model = TagLib::EXIF_MAKERNOTE_SIGMA_SD1;
-		} else {
-			// Sigma / Foveon makernote
-			*subdirOffset = 10;
-			*md_model = TagLib::EXIF_MAKERNOTE_SIGMA_FOVEON;
-		}
-	}
-}
-
-/**
-Process a Canon maker note tag. 
-A single Canon tag may contain many other tags within.
-*/
-static BOOL 
-processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) {
-	char defaultKey[16];
-	DWORD startIndex = 0;
-	TagLib& s = TagLib::instance();
-
-	WORD tag_id = FreeImage_GetTagID(tag);
-
-	int subTagTypeBase = 0;
-
-	switch(tag_id) {
-		case TAG_CANON_CAMERA_STATE_0x01:
-			subTagTypeBase = 0xC100;
-			startIndex = 1;
-			break;
-		case TAG_CANON_CAMERA_STATE_0x02:
-			subTagTypeBase = 0xC200;
-			startIndex = 0;
-			break;
-		case TAG_CANON_CAMERA_STATE_0x04:
-			subTagTypeBase = 0xC400;
-			startIndex = 1;
-			break;
-		case TAG_CANON_CAMERA_STATE_0x12:
-			subTagTypeBase = 0x1200;
-			startIndex = 0;
-			break;
-		case TAG_CANON_CAMERA_STATE_0xA0:
-			subTagTypeBase = 0xCA00;
-			startIndex = 1;
-			break;
-		case TAG_CANON_CAMERA_STATE_0xE0:
-			subTagTypeBase = 0xCE00;
-			startIndex = 1;
-			break;
-
-		default:
-		{
-			// process as a normal tag
-
-			// get the tag key and description
-			const char *key = s.getTagFieldName(TagLib::EXIF_MAKERNOTE_CANON, tag_id, defaultKey);
-			FreeImage_SetTagKey(tag, key);
-			const char *description = s.getTagDescription(TagLib::EXIF_MAKERNOTE_CANON, tag_id);
-			FreeImage_SetTagDescription(tag, description);
-
-			// store the tag
-			if(key) {
-				FreeImage_SetMetadata(FIMD_EXIF_MAKERNOTE, dib, key, tag);
-			}
-
-			return TRUE;
-		}
-		break;
-
-	}
-
-	WORD *pvalue = (WORD*)FreeImage_GetTagValue(tag);
-
-	// create a tag
-	FITAG *canonTag = FreeImage_CreateTag();
-	if(!canonTag) return FALSE;
-
-	// we intentionally skip the first array member (if needed)
-    for (DWORD i = startIndex; i < FreeImage_GetTagCount(tag); i++) {
-
-		tag_id = (WORD)(subTagTypeBase + i);
-
-		FreeImage_SetTagID(canonTag, tag_id);
-		FreeImage_SetTagType(canonTag, FIDT_SHORT);
-		FreeImage_SetTagCount(canonTag, 1);
-		FreeImage_SetTagLength(canonTag, 2);
-		FreeImage_SetTagValue(canonTag, &pvalue[i]);
-
-		// get the tag key and description
-		const char *key = s.getTagFieldName(TagLib::EXIF_MAKERNOTE_CANON, tag_id, defaultKey);
-		FreeImage_SetTagKey(canonTag, key);
-		const char *description = s.getTagDescription(TagLib::EXIF_MAKERNOTE_CANON, tag_id);
-		FreeImage_SetTagDescription(canonTag, description);
-
-		// store the tag
-		if(key) {
-			FreeImage_SetMetadata(FIMD_EXIF_MAKERNOTE, dib, key, canonTag);
-		}
-	}
-
-	// delete the tag
-	FreeImage_DeleteTag(canonTag);
-
-	return TRUE;
-}
-
-/**
-Process a standard Exif tag
-*/
-static void 
-processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MDMODEL md_model) {
-	char defaultKey[16];
-	int n;
-	DWORD i;
-
-	// allocate a buffer to store the tag value
-	BYTE *exif_value = (BYTE*)malloc(FreeImage_GetTagLength(tag) * sizeof(BYTE));
-	if(NULL == exif_value) {
-		// out of memory ...
-		return;
-	}
-	memset(exif_value, 0, FreeImage_GetTagLength(tag) * sizeof(BYTE));
-
-	// get the tag value
-	switch(FreeImage_GetTagType(tag)) {
-
-		case FIDT_SHORT:
-		{
-			WORD *value = (WORD*)&exif_value[0];
-			for(i = 0; i < FreeImage_GetTagCount(tag); i++) {
-				value[i] = ReadUint16(msb_order, pval + i * sizeof(WORD));
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_SSHORT:
-		{
-			short *value = (short*)&exif_value[0];
-			for(i = 0; i < FreeImage_GetTagCount(tag); i++) {
-				value[i] = ReadInt16(msb_order, pval + i * sizeof(short));
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_LONG:
-		{
-			DWORD *value = (DWORD*)&exif_value[0];
-			for(i = 0; i < FreeImage_GetTagCount(tag); i++) {
-				value[i] = ReadUint32(msb_order, pval + i * sizeof(DWORD));
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_SLONG:
-		{
-			LONG *value = (LONG*)&exif_value[0];
-			for(i = 0; i < FreeImage_GetTagCount(tag); i++) {
-				value[i] = ReadInt32(msb_order, pval + i * sizeof(LONG));
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_RATIONAL:
-		{
-			n = sizeof(DWORD);
-
-			DWORD *value = (DWORD*)&exif_value[0];						
-			for(i = 0; i < 2 * FreeImage_GetTagCount(tag); i++) {
-				// read a sequence of (numerator, denominator)
-				value[i] = ReadUint32(msb_order, n*i + (char*)pval);
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_SRATIONAL:
-		{
-			n = sizeof(LONG);
-
-			LONG *value = (LONG*)&exif_value[0];
-			for(i = 0; i < 2 * FreeImage_GetTagCount(tag); i++) {
-				// read a sequence of (numerator, denominator)
-				value[i] = ReadInt32(msb_order, n*i + (char*)pval);
-			}
-			FreeImage_SetTagValue(tag, value);
-			break;
-		}
-		case FIDT_BYTE:
-		case FIDT_ASCII:
-		case FIDT_SBYTE:
-		case FIDT_UNDEFINED:
-		case FIDT_FLOAT:
-		case FIDT_DOUBLE:
-		default:
-			FreeImage_SetTagValue(tag, pval);
-			break;
-	}
-
-	if(md_model == TagLib::EXIF_MAKERNOTE_CANON) {
-		// A single Canon tag can have multiple values within
-		processCanonMakerNoteTag(dib, tag);
-	}
-	else {
-		TagLib& s = TagLib::instance();
-
-		WORD tag_id = FreeImage_GetTagID(tag);
-
-		// get the tag key and description
-		const char *key = s.getTagFieldName(md_model, tag_id, defaultKey);
-		FreeImage_SetTagKey(tag, key);
-		const char *description = s.getTagDescription(md_model, tag_id);
-		FreeImage_SetTagDescription(tag, description);
-
-		// store the tag
-		if(key) {
-			FreeImage_SetMetadata(s.getFreeImageModel(md_model), dib, key, tag);
-		}
-	}
-	
-
-	// free the temporary buffer
-	free(exif_value);
-
-}
-
-/**
-Process Exif directory
-
-@param dib Input FIBITMAP
-@param tiffp Pointer to the TIFF header
-@param dwOffsetIfd0 Offset to the 0th IFD (first IFD)
-@param dwLength Length of the Exif file
-@param dwProfileOffset File offset to be used when reading 'offset/value' tags
-@param msb_order Endianness order of the Exif file (TRUE if big-endian, FALSE if little-endian)
-@param starting_md_model Metadata model of the IFD (should be TagLib::EXIF_MAIN for a jpeg)
-@return Returns TRUE if sucessful, returns FALSE otherwise
-*/
-static BOOL 
-jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, DWORD dwOffsetIfd0, DWORD dwLength, DWORD dwProfileOffset, BOOL msb_order, TagLib::MDMODEL starting_md_model) {
-	WORD de, nde;
-
-	std::stack<WORD>			destack;	// directory entries stack
-	std::stack<const BYTE*>		ifdstack;	// IFD stack
-	std::stack<TagLib::MDMODEL>	modelstack; // metadata model stack
-
-	// Keep a list of already visited IFD to avoid stack overflows 
-	// when recursive/cyclic directory structures exist. 
-	// This kind of recursive Exif file was encountered with Kodak images coming from 
-	// KODAK PROFESSIONAL DCS Photo Desk JPEG Export v3.2 W
-	std::map<DWORD, int> visitedIFD;
-
-	/*
-	"An Image File Directory (IFD) consists of a 2-byte count of the number of directory
-	entries (i.e. the number of fields), followed by a sequence of 12-byte field
-	entries, followed by a 4-byte offset of the next IFD (or 0 if none)."
-	The "next IFD" (1st IFD) is the thumbnail.
-	*/
-	#define DIR_ENTRY_ADDR(_start, _entry) (_start + 2 + (12 * _entry))
-
-	// set the metadata model to Exif
-
-	TagLib::MDMODEL md_model = starting_md_model;
-
-	// set the pointer to the first IFD (0th IFD) and follow it were it leads.
-
-	const BYTE *ifd0th = (BYTE*)tiffp + (size_t)dwOffsetIfd0;
-
-	const BYTE *ifdp = ifd0th;
-
-	de = 0;
-
-	do {
-		// if there is anything on the stack then pop it off
-		if(!destack.empty()) {
-			ifdp		= ifdstack.top();	ifdstack.pop();
-			de			= destack.top();	destack.pop();
-			md_model	= modelstack.top();	modelstack.pop();
-		}
-
-		// remember that we've visited this directory and entry so that we don't visit it again later
-		DWORD visited = (DWORD)( (((size_t)ifdp & 0xFFFF) << 16) | (size_t)de );
-		if(visitedIFD.find(visited) != visitedIFD.end()) {
-			continue;
-		} else {
-			visitedIFD[visited] = 1;	// processed
-		}
-
-		// determine how many entries there are in the current IFD
-		nde = ReadUint16(msb_order, ifdp);
-		if (((size_t)(ifdp - tiffp) + 12 * nde) > (size_t)dwLength) {
-			// suspicious IFD offset, ignore
-			continue;
-		}
-
-		for(; de < nde; de++) {
-			char *pde = NULL;	// pointer to the directory entry
-			char *pval = NULL;	// pointer to the tag value
-			
-			// create a tag
-			FITAG *tag = FreeImage_CreateTag();
-			if(!tag) return FALSE;
-
-			// point to the directory entry
-			pde = (char*) DIR_ENTRY_ADDR(ifdp, de);
-
-			// get the tag ID
-			WORD tag_id = ReadUint16(msb_order, pde);
-			FreeImage_SetTagID(tag, tag_id);
-
-			// get the tag type
-			WORD tag_type = (WORD)ReadUint16(msb_order, pde + 2);
-            if((tag_type - 1) >= EXIF_NUM_FORMATS) {
-                // a problem occured : delete the tag (not free'd after)
-			    FreeImage_DeleteTag(tag);
-				// break out of the for loop
-				break;
-            }
-			FreeImage_SetTagType(tag, (FREE_IMAGE_MDTYPE)tag_type);
-
-			// get number of components
-			DWORD tag_count = ReadUint32(msb_order, pde + 4);
-			FreeImage_SetTagCount(tag, tag_count);
-
-            // check that tag length (size of the tag value in bytes) will fit in a DWORD
-            unsigned tag_data_width = FreeImage_TagDataWidth(FreeImage_GetTagType(tag));
-            if (tag_data_width != 0 && FreeImage_GetTagCount(tag) > ~(DWORD)0 / tag_data_width) {
-                FreeImage_DeleteTag(tag);
-                // jump to next entry
-                continue;
-            }
-			FreeImage_SetTagLength(tag, FreeImage_GetTagCount(tag) * tag_data_width);
-
-			if(FreeImage_GetTagLength(tag) <= 4) {
-				// 4 bytes or less and value is in the dir entry itself
-				pval = pde + 8;
-			} else {
-				// if its bigger than 4 bytes, the directory entry contains an offset				
-				DWORD offset_value = ReadUint32(msb_order, pde + 8);
-				// the offset can be relative to tiffp or to an external reference (see JPEG-XR)
-				if(dwProfileOffset) {
-					offset_value -= dwProfileOffset;
-				}
-				// first check if offset exceeds buffer, at this stage FreeImage_GetTagLength may return invalid data
-				if(offset_value > dwLength) {
-					// a problem occured : delete the tag (not free'd after)
-					FreeImage_DeleteTag(tag);
-					// jump to next entry
-					continue;
-				}
-				// now check that length does not exceed the buffer size
-				if(FreeImage_GetTagLength(tag) > dwLength - offset_value){
-					// a problem occured : delete the tag (not free'd after)
-					FreeImage_DeleteTag(tag);
-					// jump to next entry
-					continue;
-				}
-				pval = (char*)(tiffp + offset_value);
-			}
-
-			// check for a IFD offset
-			BOOL isIFDOffset = FALSE;
-			switch(FreeImage_GetTagID(tag)) {
-				case TAG_EXIF_OFFSET:
-				case TAG_GPS_OFFSET:
-				case TAG_INTEROP_OFFSET:
-				case TAG_MAKER_NOTE:
-					isIFDOffset = TRUE;
-					break;
-			}
-			if(isIFDOffset)	{
-				DWORD sub_offset = 0;
-				TagLib::MDMODEL next_mdmodel = md_model;
-				const BYTE *next_ifd = ifdp;
-				
-				// get offset and metadata model
-				if (FreeImage_GetTagID(tag) == TAG_MAKER_NOTE) {
-					processMakerNote(dib, pval, msb_order, &sub_offset, &next_mdmodel);
-					next_ifd = (BYTE*)pval + sub_offset;
-				} else {
-					processIFDOffset(tag, pval, msb_order, &sub_offset, &next_mdmodel);
-					next_ifd = (BYTE*)tiffp + sub_offset;
-				}
-
-				if((sub_offset < dwLength) && (next_mdmodel != TagLib::UNKNOWN)) {
-					// push our current directory state onto the stack
-					ifdstack.push(ifdp);
-					// jump to the next entry
-					de++;
-					destack.push(de);
-
-					// push our current metadata model
-					modelstack.push(md_model);
-
-					// push new state onto of stack to cause a jump
-					ifdstack.push(next_ifd);
-					destack.push(0);
-
-					// select a new metadata model
-					modelstack.push(next_mdmodel);
-					
-					// delete the tag as it won't be stored nor deleted in the for() loop
-					FreeImage_DeleteTag(tag);
-					
-					break; // break out of the for loop
-				}
-				else {
-					// unsupported camera model, canon maker tag or something unknown
-					// process as a standard tag
-					processExifTag(dib, tag, pval, msb_order, md_model);
-				}			
-
-			} else {
-				// process as a standard tag
-				processExifTag(dib, tag, pval, msb_order, md_model);
-			}
-			
-			// delete the tag
-			FreeImage_DeleteTag(tag);
-
-        } // for(nde)
-
-		// additional thumbnail data is skipped
-
-    } while (!destack.empty()); 
-
-	//
-	// --- handle thumbnail data ---
-	//
-
-	const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
-	
-	DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
-	if((next_offset == 0) || (next_offset >= dwLength)) {
-		return TRUE; //< no thumbnail
-	}
-	
-	const BYTE* const ifd1st = (BYTE*)tiffp + next_offset;
-	const WORD entriesCount1st = ReadUint16(msb_order, ifd1st);
-	
-	unsigned thCompression = 0;
-	unsigned thOffset = 0; 
-	unsigned thSize = 0; 
-	
-	for(int e = 0; e < entriesCount1st; e++) {
-
-		// point to the directory entry
-		const BYTE* base = DIR_ENTRY_ADDR(ifd1st, e);
-		
-		// check for buffer overflow
-		const size_t remaining = (size_t)base + 12 - (size_t)tiffp;
-		if(remaining >= dwLength) {
-			// bad IFD1 directory, ignore it
-			return FALSE;
-		}
-
-		// get the tag ID
-		WORD tag = ReadUint16(msb_order, base);
-		// get the tag type
-		/*WORD type = */ReadUint16(msb_order, base + sizeof(WORD));
-		// get number of components
-		/*DWORD count = */ReadUint32(msb_order, base + sizeof(WORD) + sizeof(WORD));
-		// get the tag value
-		DWORD offset = ReadUint32(msb_order, base + sizeof(WORD) + sizeof(WORD) + sizeof(DWORD));
-
-		switch(tag) {
-			case TAG_COMPRESSION:
-				// Tiff Compression Tag (should be COMPRESSION_OJPEG (6), but is not always respected)
-				thCompression = offset;
-				break;
-			case TAG_JPEG_INTERCHANGE_FORMAT:
-				// Tiff JPEGInterchangeFormat Tag
-				thOffset = offset;
-				break;
-			case TAG_JPEG_INTERCHANGE_FORMAT_LENGTH:
-				// Tiff JPEGInterchangeFormatLength Tag
-				thSize = offset;
-				break;
-			// ### X and Y Resolution ignored, orientation ignored
-			case TAG_X_RESOLUTION:		// XResolution
-			case TAG_Y_RESOLUTION:		// YResolution
-			case TAG_RESOLUTION_UNIT:	// ResolutionUnit
-			case TAG_ORIENTATION:		// Orientation
-				break;
-			default:
-				break;
-		}
-	}
-	
-	if(/*thCompression != 6 ||*/ thOffset == 0 || thSize == 0) {
-		return TRUE;
-	}
-	
-	if(thOffset + thSize > dwLength) {
-		return TRUE;
-	}
-	
-	// load the thumbnail
-
-	const BYTE *thLocation = tiffp + thOffset;
-	
-	FIMEMORY* hmem = FreeImage_OpenMemory(const_cast<BYTE*>(thLocation), thSize);
-	FIBITMAP* thumbnail = FreeImage_LoadFromMemory(FIF_JPEG, hmem);
-	FreeImage_CloseMemory(hmem);
-	
-	// store the thumbnail
-	FreeImage_SetThumbnail(dib, thumbnail);
-	// then delete it
-	FreeImage_Unload(thumbnail);
-
-	return TRUE;
-}
-
-// --------------------------------------------------------------------------
-
-/**
-Read and decode JPEG_APP1 marker (Exif profile)
-@param dib Input FIBITMAP
-@param data Pointer to the APP1 marker
-@param length APP1 marker length
-@return Returns TRUE if successful, FALSE otherwise
-*/
-BOOL  
-jpeg_read_exif_profile(FIBITMAP *dib, const BYTE *data, unsigned length) {
-    // marker identifying string for Exif = "Exif\0\0"
-    BYTE exif_signature[6] = { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
-	BYTE lsb_first[4] = { 0x49, 0x49, 0x2A, 0x00 };		// Classic TIFF signature - little-endian order
-	BYTE msb_first[4] = { 0x4D, 0x4D, 0x00, 0x2A };		// Classic TIFF signature - big-endian order
-
-	// profile size is up to 32-bit
-	DWORD dwProfileLength = (DWORD)length;
-	BYTE *pbProfile = (BYTE*)data;
-
-	// verify the identifying string
-	if(memcmp(exif_signature, pbProfile, sizeof(exif_signature)) == 0) {
-		// This is an Exif profile
-		// should contain a TIFF header with up to 2 IFDs (IFD stands for 'Image File Directory')
-		// 0th IFD : the image attributes, 1st IFD : may be used for thumbnail
-
-		pbProfile += sizeof(exif_signature);
-		dwProfileLength -= sizeof(exif_signature);
-
-		// read the TIFF header (8 bytes)
-
-		// check the endianess order
-		
-		BOOL bBigEndian = TRUE;
-
-		if(memcmp(pbProfile, lsb_first, sizeof(lsb_first)) == 0) {
-			// Exif section is in little-endian order
-			bBigEndian = FALSE;
-		} else {
-			if(memcmp(pbProfile, msb_first, sizeof(msb_first)) == 0) {
-				// Exif section is in big-endian order
-				bBigEndian = TRUE;
-			} else {
-				// Invalid Exif alignment marker
-				return FALSE;
-			}
-		}
-
-		// this is the offset to the first IFD (Image File Directory)
-		DWORD dwFirstOffset = ReadUint32(bBigEndian, pbProfile + 4);
-		if (dwFirstOffset > dwProfileLength) {
-			// bad Exif data
-			return FALSE;
-		}
-
-		/*
-		Note: as FreeImage 3.14.0, this test is no longer needed for images with similar suspicious offset
-		=> tested with Pentax Optio 230, FujiFilm SP-2500 and Canon EOS 300D
-		if (dwFirstOffset < 8 || dwFirstOffset > 16) {
-			// This is usually set to 8
-			// but PENTAX Optio 230 has it set differently, and uses it as offset. 
-			FreeImage_OutputMessageProc(FIF_JPEG, "Exif: Suspicious offset of first IFD value");
-			return FALSE;
-		}
-		*/
-
-		// process Exif directories, starting with Exif-TIFF IFD
-		return jpeg_read_exif_dir(dib, pbProfile, dwFirstOffset, dwProfileLength, 0, bBigEndian, TagLib::EXIF_MAIN);
-	}
-
-	return FALSE;
-}
-
-// ==========================================================
-// Exif JPEG helper routines
-// ==========================================================
-
-/**
-Read JPEG_APP1 marker (Exif profile)
-@param dib Input FIBITMAP
-@param dataptr Pointer to the APP1 marker
-@param datalen APP1 marker length
-@return Returns TRUE if successful, FALSE otherwise
-*/
-BOOL  
-jpeg_read_exif_profile_raw(FIBITMAP *dib, const BYTE *profile, unsigned length) {
-    // marker identifying string for Exif = "Exif\0\0"
-    BYTE exif_signature[6] = { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
-
-	// verify the identifying string
-	if(memcmp(exif_signature, profile, sizeof(exif_signature)) != 0) {
-		// not an Exif profile
-		return FALSE;
-	}
-
-	// create a tag
-	FITAG *tag = FreeImage_CreateTag();
-	if(tag) {
-		FreeImage_SetTagKey(tag, g_TagLib_ExifRawFieldName);
-		FreeImage_SetTagLength(tag, (DWORD)length);
-		FreeImage_SetTagCount(tag, (DWORD)length);
-		FreeImage_SetTagType(tag, FIDT_BYTE);
-		FreeImage_SetTagValue(tag, profile);
-
-		// store the tag
-		FreeImage_SetMetadata(FIMD_EXIF_RAW, dib, FreeImage_GetTagKey(tag), tag);
-
-		// destroy the tag
-		FreeImage_DeleteTag(tag);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// ==========================================================
-// Exif JPEG-XR helper routines
-// ==========================================================
-
-/**
-Read and decode JPEG-XR Exif IFD
-@param dib Input FIBITMAP
-@param profile Pointer to the Exif marker
-@param length Exif marker length
-@param file_offset Reference offset in the original file of each tag value whose length is > 4
-@return Returns TRUE if successful, FALSE otherwise
-*/
-BOOL  
-jpegxr_read_exif_profile(FIBITMAP *dib, const BYTE *profile, unsigned length, unsigned file_offset) {
-	// assume Little Endian order
-	BOOL bBigEndian = FALSE;
-	
-	// process Exif specific IFD
-	return jpeg_read_exif_dir(dib, profile, 0, length, file_offset, bBigEndian, TagLib::EXIF_EXIF);
-}
-
-/**
-Read and decode JPEG-XR Exif-GPS IFD
-@param dib Input FIBITMAP
-@param profile Pointer to the Exif-GPS profile
-@param length Exif-GPS profile length
-@param file_offset Reference offset in the original file of each tag value whose length is > 4
-@return Returns TRUE if successful, FALSE otherwise
-*/
-BOOL  
-jpegxr_read_exif_gps_profile(FIBITMAP *dib, const BYTE *profile, unsigned length, unsigned file_offset) {
-	// assume Little Endian order
-	BOOL bBigEndian = FALSE;
-	
-	// process Exif GPS IFD
-	return jpeg_read_exif_dir(dib, profile, 0, length, file_offset, bBigEndian, TagLib::EXIF_GPS);
-}
-
-// ==========================================================
-// Exif common helper routines
-// ==========================================================
-
-/**
-Rotate a dib according to Exif info
-@param dib Input / Output dib to rotate
-@see PluginJPEG.cpp
-*/
-void 
-RotateExif(FIBITMAP **dib) {
-	// check for Exif rotation
-	if(FreeImage_GetMetadataCount(FIMD_EXIF_MAIN, *dib)) {
-		FIBITMAP *rotated = NULL;
-		// process Exif rotation
-		FITAG *tag = NULL;
-		FreeImage_GetMetadata(FIMD_EXIF_MAIN, *dib, "Orientation", &tag);
-		if((tag != NULL) && (FreeImage_GetTagID(tag) == TAG_ORIENTATION)) {
-			const WORD orientation = *((WORD *)FreeImage_GetTagValue(tag));
-			switch (orientation) {
-				case 1:		// "top, left side" => 0°
-					break;
-				case 2:		// "top, right side" => flip left-right
-					FreeImage_FlipHorizontal(*dib);
-					break;
-				case 3:		// "bottom, right side" => -180°
-					rotated = FreeImage_Rotate(*dib, 180);
-					FreeImage_Unload(*dib);
-					*dib = rotated;
-					break;
-				case 4:		// "bottom, left side" => flip up-down
-					FreeImage_FlipVertical(*dib);
-					break;
-				case 5:		// "left side, top" => +90° + flip up-down
-					rotated = FreeImage_Rotate(*dib, 90);
-					FreeImage_Unload(*dib);
-					*dib = rotated;
-					FreeImage_FlipVertical(*dib);
-					break;
-				case 6:		// "right side, top" => -90°
-					rotated = FreeImage_Rotate(*dib, -90);
-					FreeImage_Unload(*dib);
-					*dib = rotated;
-					break;
-				case 7:		// "right side, bottom" => -90° + flip up-down
-					rotated = FreeImage_Rotate(*dib, -90);
-					FreeImage_Unload(*dib);
-					*dib = rotated;
-					FreeImage_FlipVertical(*dib);
-					break;
-				case 8:		// "left side, bottom" => +90°
-					rotated = FreeImage_Rotate(*dib, 90);
-					FreeImage_Unload(*dib);
-					*dib = rotated;
-					break;
-				default:
-					break;
-			}
-		}
-	}
-}
-
-// ==========================================================
-// Exif TIFF JPEG-XR helper routines
-// ==========================================================
-
-class PredicateTagIDCompare {
-public:
-	bool operator()(FITAG *a, FITAG *b) {
-		WORD tag_id_a = FreeImage_GetTagID(a);
-		WORD tag_id_b = FreeImage_GetTagID(b);
-		return (tag_id_a < tag_id_b);
-	}
-};
-
-/**
-Write a metadata model as a TIF IFD to a FIMEMORY handle.
-The entries in the TIF IFD are sorted in ascending order by tag id.	
-The last entry is written as 0 (4 bytes) which means no more IFD to follow. 
-Supported metadata models are
-<ul>
-<li>FIMD_EXIF_MAIN
-<li>FIMD_EXIF_EXIF
-<li>FIMD_EXIF_GPS
-<li>FIMD_EXIF_INTEROP
-</ul>
-The end of the buffer is filled with 4 bytes equal to 0 (end of IFD offset)
-
-@param dib Input FIBITMAP
-@param md_model Metadata model to write
-@param hmem Memory handle
-@return Returns TRUE if successful, FALSE otherwise
-@see tiff_get_ifd_profile
-*/
-static BOOL
-tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) {
-	FITAG *tag = NULL;
-	FIMETADATA *mdhandle = NULL;
-	std::vector<FITAG*> vTagList;
-	TagLib::MDMODEL internal_md_model;
-
-	DWORD ifd_offset = 0;	// WORD-aligned IFD value offset
-
-	const BYTE empty_byte = 0;
-
-	// start of the file
-	const long start_of_file = FreeImage_TellMemory(hmem);
-
-	// get the metadata count
-	unsigned metadata_count = FreeImage_GetMetadataCount(md_model, dib);
-	if(metadata_count == 0) {
-		return FALSE;
-	}
-
-	TagLib& s = TagLib::instance();
-
-	// check for supported metadata models
-	switch(md_model) {
-		case FIMD_EXIF_MAIN:
-			internal_md_model = TagLib::EXIF_MAIN;
-			break;
-		case FIMD_EXIF_EXIF:
-			internal_md_model = TagLib::EXIF_EXIF;
-			break;
-		case FIMD_EXIF_GPS:
-			internal_md_model = TagLib::EXIF_GPS;
-			break;
-		case FIMD_EXIF_INTEROP:
-			internal_md_model = TagLib::EXIF_INTEROP;
-			break;
-		default:
-			return FALSE;
-	}
-
-	try {
-		// 1) according to the TIFF specifications, 
-		// the entries in a TIF IFD must be sorted in ascending order by tag id
-
-		// store the tags into a vector
-		vTagList.reserve(metadata_count);
-		mdhandle = FreeImage_FindFirstMetadata(md_model, dib, &tag);
-		if(mdhandle) {
-			// parse the tags and store them inside vTagList
-			do {
-				// rewrite the tag id using FreeImage internal database
-				// (in case the tag id is wrong or missing)
-				const char *key = FreeImage_GetTagKey(tag);
-				int tag_id = s.getTagID(internal_md_model, key);
-				if(tag_id != -1) {
-					// this is a known tag, set the tag ID
-					FreeImage_SetTagID(tag, (WORD)tag_id);
-					// record the tag
-					vTagList.push_back(tag);
-				}
-				// else ignore this tag
-			} while(FreeImage_FindNextMetadata(mdhandle, &tag));
-
-			FreeImage_FindCloseMetadata(mdhandle);
-
-			// sort the vector by tag id
-			std::sort(vTagList.begin(), vTagList.end(), PredicateTagIDCompare());
-
-			// update the metadata_count
-			metadata_count = (unsigned)vTagList.size();
-
-		} else {
-			throw(1);
-		}
-
-		// 2) prepare the place for each IFD entries.
-
-		/*
-		An Image File Directory (IFD) consists of a 2-byte count of the number of directory entries (i.e., the number of fields), 
-		followed by a sequence of 12-byte field entries, 
-		followed by a 4-byte offset of the next IFD (or 0 if none). Do not forget to write the 4 bytes of 0 after the last IFD.
-		*/
-
-		{		
-			// prepare place for 2 bytes for number of entries + 12 bytes for each entry
-			unsigned ifd_size = 2 + 12 * metadata_count;
-			FreeImage_WriteMemory(&empty_byte, 1, ifd_size, hmem);
-			// record the offset used to write values > 4-bytes
-			ifd_offset = FreeImage_TellMemory(hmem);
-			// rewind
-			FreeImage_SeekMemory(hmem, start_of_file, SEEK_SET);
-		}
-
-		// 3) write each IFD entry in tag id ascending order
-
-		// number of directory entries
-		WORD nde = (WORD)metadata_count;
-		FreeImage_WriteMemory(&nde, 1, 2, hmem);
-
-		// for each entry ...
-		for(unsigned i = 0; i < metadata_count; i++) {
-			FITAG *tag = vTagList[i];
-			// tag id
-			WORD tag_id = FreeImage_GetTagID(tag);
-			FreeImage_WriteMemory(&tag_id, 1, 2, hmem);
-			// tag type (compliant with TIFF specification)
-			WORD tag_type = (WORD)FreeImage_GetTagType(tag);
-			FreeImage_WriteMemory(&tag_type, 1, 2, hmem);
-			// tag count
-			DWORD tag_count = FreeImage_GetTagCount(tag);
-			FreeImage_WriteMemory(&tag_count, 1, 4, hmem);
-			// tag value or offset (results are in BYTE's units)
-			unsigned tag_length = FreeImage_GetTagLength(tag);
-			if(tag_length <= 4) {
-				// 4 bytes or less, write the value (left justified)
-				const BYTE *tag_value = (BYTE*)FreeImage_GetTagValue(tag);
-				FreeImage_WriteMemory(tag_value, 1, tag_length, hmem);
-				for(unsigned k = tag_length; k < 4; k++) {
-					FreeImage_WriteMemory(&empty_byte, 1, 1, hmem);
-				}
-			} else {
-				// write an offset
-				FreeImage_WriteMemory(&ifd_offset, 1, 4, hmem);
-				// write the value
-				long current_position = FreeImage_TellMemory(hmem);
-				FreeImage_SeekMemory(hmem, ifd_offset, SEEK_SET);
-				FreeImage_WriteMemory(FreeImage_GetTagValue(tag), 1, tag_length, hmem);
-				if(tag_length & 1) {
-					// align to the next WORD boundary
-					FreeImage_WriteMemory(&empty_byte, 1, 1, hmem);
-				}
-				// next offset to use
-				ifd_offset = FreeImage_TellMemory(hmem);
-				// rewind
-				FreeImage_SeekMemory(hmem, current_position, SEEK_SET);
-			}
-		}
-
-		// end-of-IFD or next IFD (0 == none)
-		FreeImage_SeekMemory(hmem, ifd_offset, SEEK_SET);
-		FreeImage_WriteMemory(&empty_byte, 1, 4, hmem);
-
-		return TRUE;
-	}
-	catch(int) {
-		return FALSE;
-	}
-}
-
-/**
-Write a metadata model as a TIF IFD, returns the IFD as a buffer.
-The buffer is allocated by the function and must be freed by the caller, using 'free'.
-@param dib Input FIBITMAP
-@param md_model Metadata model to write
-@param ppbProfile Returned buffer
-@param uProfileLength Returned buffer size
-@return Returns TRUE if successful, FALSE otherwise
-@see tiff_write_ifd
-*/
-BOOL
-tiff_get_ifd_profile(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, BYTE **ppbProfile, unsigned *uProfileLength) {
-	FIMEMORY *hmem = NULL;
-
-	try {
-		// open a memory stream
-		hmem = FreeImage_OpenMemory(NULL, 0);
-		if(!hmem) {
-			throw(1);
-		}
-
-		// write the metadata model as a TIF IFD
-		BOOL bResult = tiff_write_ifd(dib, md_model, hmem);
-
-		if(bResult) {
-			BYTE *data = NULL;
-			DWORD size_in_bytes = 0;
-
-			// get a pointer to the stream buffer
-			FreeImage_AcquireMemory(hmem, &data, &size_in_bytes);
-			
-			// (re-)allocate output buffer
-			BYTE *pbProfile = *ppbProfile;
-			pbProfile = (BYTE*)realloc(pbProfile, size_in_bytes);
-			if(!pbProfile) {
-				throw(1);
-			} else {
-				// copy IFD
-				memcpy(pbProfile, data, size_in_bytes);
-				*ppbProfile = pbProfile;
-				*uProfileLength = size_in_bytes;
-			}
-		}
-
-		// free the memory stream
-		FreeImage_CloseMemory(hmem);
-
-		return bResult;
-
-	} catch(int) {
-		FreeImage_CloseMemory(hmem);
-		return FALSE;
-	}
-}
diff --git a/plugins/AdvaImg/src/Metadata/FIRational.cpp b/plugins/AdvaImg/src/Metadata/FIRational.cpp
deleted file mode 100644
index 4213840bb1..0000000000
--- a/plugins/AdvaImg/src/Metadata/FIRational.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// ==========================================================
-// Helper class for rational numbers
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FIRational.h"
-
-/// Initialize and normalize a rational number
-void FIRational::initialize(LONG n, LONG d) {
-	if(d) {
-		_numerator = n;
-		_denominator = d;
-		// normalize rational
-		normalize();
-	} else {
-		_numerator = 0;
-		_denominator = 0;
-	}
-}
-
-/// Default constructor
-FIRational::FIRational() {
-	_numerator = 0;
-	_denominator = 0;
-}
-
-/// Constructor with longs
-FIRational::FIRational(LONG n, LONG d) {
-	initialize(n, d);
-}
-
-/// Constructor with FITAG
-FIRational::FIRational(const FITAG *tag) {
-	switch(FreeImage_GetTagType((FITAG*)tag)) {
-		case FIDT_RATIONAL:		// 64-bit unsigned fraction 
-		{
-			DWORD *pvalue = (DWORD*)FreeImage_GetTagValue((FITAG*)tag);
-			initialize((LONG)pvalue[0], (LONG)pvalue[1]);
-			break;
-		}
-
-		case FIDT_SRATIONAL:	// 64-bit signed fraction 
-		{
-			LONG *pvalue = (LONG*)FreeImage_GetTagValue((FITAG*)tag);
-			initialize((LONG)pvalue[0], (LONG)pvalue[1]);
-			break;
-		}
-	}
-}
-
-FIRational::FIRational(float value) {
-	if (value == (float)((LONG)value)) {
-	   _numerator = (LONG)value;
-	   _denominator = 1L;
-	} else {
-		int k, count;
-		LONG n[4];
-
-		float x = fabs(value);
-		int sign = (value > 0) ? 1 : -1;
-
-		// make a continued-fraction expansion of x
-		count = -1;
-		for(k = 0; k < 4; k++) {
-			n[k] = (LONG)floor(x);
-			count++;
-			x -= (float)n[k];
-			if(x == 0) break;
-			x = 1 / x;
-		}
-		// compute the rational
-		_numerator = 1;
-		_denominator = n[count];
-
-		for(int i = count - 1; i >= 0; i--) {
-			if(n[i] == 0) break;
-			LONG _num = (n[i] * _numerator + _denominator);
-			LONG _den = _numerator;
-			_numerator = _num;
-			_denominator = _den;
-		}
-		_numerator *= sign;
-	}
-}
-
-/// Copy constructor
-FIRational::FIRational (const FIRational& r) {
-	initialize(r._numerator, r._denominator);
-}
-
-/// Destructor
-FIRational::~FIRational() {
-}
-
-/// Assignement operator
-FIRational& FIRational::operator=(FIRational& r) {
-	if(this != &r) {
-		initialize(r._numerator, r._denominator);
-	}
-	return *this;
-}
-
-/// Get the numerator
-LONG FIRational::getNumerator() {
-	return _numerator;
-}
-
-/// Get the denominator
-LONG FIRational::getDenominator() {
-	return _denominator;
-}
-
-/// Calculate GCD
-LONG FIRational::gcd(LONG a, LONG b) {
-	LONG temp;
-	while (b) {		// While non-zero value
-		temp = b;	// Save current value
-		b = a % b;	// Assign remainder of division
-		a = temp;	// Copy old value
-	}
-	return a;		// Return GCD of numbers
-}
-
-/// Normalize numerator / denominator 
-void FIRational::normalize() {
-	if (_numerator != 1 && _denominator != 1) {	// Is there something to do?
-		 // Calculate GCD
-		LONG common = gcd(_numerator, _denominator);
-		if (common != 1) { // If GCD is not one			
-			_numerator /= common;	// Calculate new numerator
-			_denominator /= common;	// Calculate new denominator
-		}
-	}
-	if(_denominator < 0) {	// If sign is in denominator
-		_numerator *= -1;	// Multiply num and den by -1
-		_denominator *= -1;	// To keep sign in numerator
-	}
-}
-
-/// Checks if this rational number is an Integer, either positive or negative
-BOOL FIRational::isInteger() {
-	if(_denominator == 1 || (_denominator != 0 && (_numerator % _denominator == 0)) || (_denominator == 0 && _numerator == 0))
-		return TRUE;
-	return FALSE;
-}
-
-/// Convert as "numerator/denominator"
-std::string FIRational::toString() {
-	std::ostringstream s;
-	if(isInteger()) {
-		s << intValue();
-	} else {
-		s << _numerator << "/" << _denominator;
-	}
-	return s.str();
-}
-
-
diff --git a/plugins/AdvaImg/src/Metadata/FIRational.h b/plugins/AdvaImg/src/Metadata/FIRational.h
deleted file mode 100644
index 4fe2a6305a..0000000000
--- a/plugins/AdvaImg/src/Metadata/FIRational.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// ==========================================================
-// Helper class for rational numbers
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef FIRATIONAL_H
-#define FIRATIONAL_H
-
-/**
-Helper class to deal with rational numbers. 
-NB: LONG data type is assumed to be a signed 32-bit number. 
-*/
-class FIRational {
-private:
-	/// numerator
-	LONG _numerator;
-	/// denominator
-	LONG _denominator;
-
-public:
-	/// Default constructor
-	FIRational();
-
-	/// Constructor with longs
-	FIRational(LONG n, LONG d = 1);
-
-	/// Constructor with FITAG
-	FIRational(const FITAG *tag);
-
-	/// Constructor with a float
-	FIRational(float value);
-
-	/// Copy constructor
-	FIRational (const FIRational& r);
-
-	/// Destructor
-	~FIRational();
-
-	/// Assignement operator
-	FIRational& operator=(FIRational& r);
-
-	/// Get the numerator
-	LONG getNumerator();
-
-	/// Get the denominator
-	LONG getDenominator();
-
-	/// Converts rational value by truncating towards zero
-	LONG truncate() {
-		// Return truncated rational
-		return _denominator ? (LONG) (_numerator / _denominator) : 0;
-	}
-
-	/**@name Implicit conversions */
-	//@{	
-	short shortValue() {
-		return (short)truncate();
-	}
-	int intValue() {
-		return (int)truncate();
-	}
-	LONG longValue() {
-		return (LONG)truncate();
-	}
-	float floatValue() {
-		return _denominator ? ((float)_numerator)/((float)_denominator) : 0;
-	}
-	double doubleValue() {
-		return _denominator ? ((double)_numerator)/((double)_denominator) : 0;
-	}
-	//@}
-
-	/// Checks if this rational number is an integer, either positive or negative
-	BOOL isInteger();
-
-	/// Convert as "numerator/denominator"
-	std::string toString();
-
-private:
-	/// Initialize and normalize a rational number
-	void initialize(LONG n, LONG d);
-
-	/// Calculate GCD
-	LONG gcd(LONG a, LONG b);
-	
-	/// Normalize numerator / denominator 
-	void normalize();
-
-};
-
-#endif // FIRATIONAL_H
-
diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp b/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp
deleted file mode 100644
index 1eba0ca007..0000000000
--- a/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-// ==========================================================
-// Tag manipulation functions
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-
-// --------------------------------------------------------------------------
-// FITAG header definition
-// --------------------------------------------------------------------------
-
-FI_STRUCT (FITAGHEADER) { 
-	char *key;			// tag field name
-	char *description;	// tag description
-	WORD id;			// tag ID
-	WORD type;			// tag data type (see FREE_IMAGE_MDTYPE)
-	DWORD count;		// number of components (in 'tag data types' units)
-	DWORD length;		// value length in bytes
-	void *value;		// tag value
-};
-
-// --------------------------------------------------------------------------
-// FITAG creation / destruction
-// --------------------------------------------------------------------------
-
-FITAG * DLL_CALLCONV 
-FreeImage_CreateTag() {
-	FITAG *tag = (FITAG *)malloc(sizeof(FITAG));
-
-	if (tag != NULL) {
-		unsigned tag_size = sizeof(FITAGHEADER); 
-		tag->data = (BYTE *)malloc(tag_size * sizeof(BYTE));
-		if (tag->data != NULL) {
-			memset(tag->data, 0, tag_size);
-			return tag;
-		}
-		free(tag);
-	}
-
-	return NULL;
-}
-
-void DLL_CALLCONV 
-FreeImage_DeleteTag(FITAG *tag) {
-	if (NULL != tag) {	
-		if (NULL != tag->data) {
-			FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-			// delete tag members
-			free(tag_header->key); 
-			free(tag_header->description); 
-			free(tag_header->value);
-			// delete the tag
-			free(tag->data);
-		}
-		// and the wrapper
-		free(tag);
-	}
-}
-
-FITAG * DLL_CALLCONV 
-FreeImage_CloneTag(FITAG *tag) {
-	if(!tag) return NULL;
-
-	// allocate a new tag
-	FITAG *clone = FreeImage_CreateTag();
-	if(!clone) return NULL;
-
-	try {
-		// copy the tag
-		FITAGHEADER *src_tag = (FITAGHEADER *)tag->data;
-		FITAGHEADER *dst_tag = (FITAGHEADER *)clone->data;
-
-		// tag ID
-		dst_tag->id = src_tag->id;
-		// tag key
-		if(src_tag->key) {
-			dst_tag->key = (char*)malloc((strlen(src_tag->key) + 1) * sizeof(char));
-			if(!dst_tag->key) {
-				throw FI_MSG_ERROR_MEMORY;
-			}
-			strcpy(dst_tag->key, src_tag->key);
-		}
-		// tag description
-		if(src_tag->description) {
-			dst_tag->description = (char*)malloc((strlen(src_tag->description) + 1) * sizeof(char));
-			if(!dst_tag->description) {
-				throw FI_MSG_ERROR_MEMORY;
-			}
-			strcpy(dst_tag->description, src_tag->description);
-		}
-		// tag data type
-		dst_tag->type = src_tag->type;
-		// tag count
-		dst_tag->count = src_tag->count;
-		// tag length
-		dst_tag->length = src_tag->length;
-		// tag value
-		switch(dst_tag->type) {
-			case FIDT_ASCII:
-				dst_tag->value = (BYTE*)malloc((src_tag->length + 1) * sizeof(BYTE));
-				if(!dst_tag->value) {
-					throw FI_MSG_ERROR_MEMORY;
-				}
-				memcpy(dst_tag->value, src_tag->value, src_tag->length);
-				((BYTE*)dst_tag->value)[src_tag->length] = 0;
-				break;
-			default:
-				dst_tag->value = (BYTE*)malloc(src_tag->length * sizeof(BYTE));
-				if(!dst_tag->value) {
-					throw FI_MSG_ERROR_MEMORY;
-				}
-				memcpy(dst_tag->value, src_tag->value, src_tag->length);
-				break;
-		}
-
-		return clone;
-
-	} catch(const char *message) {
-		FreeImage_DeleteTag(clone);
-		FreeImage_OutputMessageProc(FIF_UNKNOWN, message);
-		return NULL;
-	}
-}
-
-// --------------------------------------------------------------------------
-// FITAG getters / setters
-// --------------------------------------------------------------------------
-
-const char * DLL_CALLCONV 
-FreeImage_GetTagKey(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->key : 0;
-}
-
-const char * DLL_CALLCONV 
-FreeImage_GetTagDescription(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->description : 0;
-}
-
-WORD DLL_CALLCONV 
-FreeImage_GetTagID(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->id : 0;
-}
-
-FREE_IMAGE_MDTYPE DLL_CALLCONV 
-FreeImage_GetTagType(FITAG *tag) {
-	return tag ? (FREE_IMAGE_MDTYPE)(((FITAGHEADER *)tag->data)->type) : FIDT_NOTYPE;
-}
-
-DWORD DLL_CALLCONV 
-FreeImage_GetTagCount(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->count : 0;
-}
-
-DWORD DLL_CALLCONV 
-FreeImage_GetTagLength(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->length : 0;
-}
-
-const void *DLL_CALLCONV 
-FreeImage_GetTagValue(FITAG *tag) {
-	return tag ? ((FITAGHEADER *)tag->data)->value : 0;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagKey(FITAG *tag, const char *key) {
-	if(tag && key) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		if(tag_header->key) free(tag_header->key);
-		tag_header->key = (char*)malloc(strlen(key) + 1);
-		strcpy(tag_header->key, key);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagDescription(FITAG *tag, const char *description) {
-	if(tag && description) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		if(tag_header->description) free(tag_header->description);
-		tag_header->description = (char*)malloc(strlen(description) + 1);
-		strcpy(tag_header->description, description);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagID(FITAG *tag, WORD id) {
-	if(tag) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		tag_header->id = id;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type) {
-	if(tag) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		tag_header->type = (WORD)type;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagCount(FITAG *tag, DWORD count) {
-	if(tag) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		tag_header->count = count;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagLength(FITAG *tag, DWORD length) {
-	if(tag) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		tag_header->length = length;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL DLL_CALLCONV 
-FreeImage_SetTagValue(FITAG *tag, const void *value) {
-	if(tag && value) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		// first, check the tag
-		if(tag_header->count * FreeImage_TagDataWidth((FREE_IMAGE_MDTYPE)tag_header->type) != tag_header->length) {
-			// invalid data count ?
-			return FALSE;
-		}
-
-		if(tag_header->value) {
-			free(tag_header->value);
-		}
-
-		switch(tag_header->type) {
-			case FIDT_ASCII:
-			{
-				tag_header->value = (char*)malloc((tag_header->length + 1) * sizeof(char));
-				if(!tag_header->value) {
-					return FALSE;
-				}
-				char *src_data = (char*)value;
-				char *dst_data = (char*)tag_header->value;
-				for(DWORD i = 0; i < tag_header->length; i++) {
-					dst_data[i] = src_data[i];
-				}
-				dst_data[tag_header->length] = '\0';
-			}
-			break;
-
-			default:
-				tag_header->value = malloc(tag_header->length * sizeof(BYTE));
-				if(!tag_header->value) {
-					return FALSE;
-				}
-				memcpy(tag_header->value, value, tag_header->length);
-				break;
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-// --------------------------------------------------------------------------
-// FITAG internal helper functions
-// --------------------------------------------------------------------------
-
-unsigned 
-FreeImage_TagDataWidth(FREE_IMAGE_MDTYPE type) {
-	static const unsigned format_bytes[] = { 
-		0, // FIDT_NOTYPE	= 0,	// placeholder 
-		1, // FIDT_BYTE		= 1,	// 8-bit unsigned integer 
-		1, // FIDT_ASCII	= 2,	// 8-bit bytes w/ last byte null 
-		2, // FIDT_SHORT	= 3,	// 16-bit unsigned integer 
-		4, // FIDT_LONG		= 4,	// 32-bit unsigned integer 
-		8, // FIDT_RATIONAL	= 5,	// 64-bit unsigned fraction 
-		1, // FIDT_SBYTE	= 6,	// 8-bit signed integer 
-		1, // FIDT_UNDEFINED= 7,	// 8-bit untyped data 
-		2, // FIDT_SSHORT	= 8,	// 16-bit signed integer 
-		4, // FIDT_SLONG	= 9,	// 32-bit signed integer 
-		8, // FIDT_SRATIONAL= 10,	// 64-bit signed fraction 
-		4, // FIDT_FLOAT	= 11,	// 32-bit IEEE floating point 
-		8, // FIDT_DOUBLE	= 12,	// 64-bit IEEE floating point 
-		4, // FIDT_IFD		= 13,	// 32-bit unsigned integer (offset) 
-		4, // FIDT_PALETTE	= 14	// 32-bit RGBQUAD 
-		0, // placeholder (15)
-		8, // FIDT_LONG8	= 16,	// 64-bit unsigned integer 
-		8, // FIDT_SLONG8	= 17,	// 64-bit signed integer
-		8  // FIDT_IFD8		= 18	// 64-bit unsigned integer (offset)
-	};
-
-	  return (type < (sizeof(format_bytes)/sizeof(format_bytes[0]))) ?
-		  format_bytes[type] : 0;
-}
-
-size_t 
-FreeImage_GetTagMemorySize(FITAG *tag) {
-	size_t size = 0;
-	if (tag) {
-		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		size += sizeof(FITAG);
-		size += sizeof(FITAGHEADER);
-		if (tag_header->key) {
-			size += strlen(tag_header->key) + 1;
-		}
-		if (tag_header->description) {
-			size += strlen(tag_header->description) + 1;
-		}
-		if (tag_header->value) {
-			switch (tag_header->type) {
-				case FIDT_ASCII:
-					// for ASCII strings, the value of the count part of an ASCII tag entry includes the NULL.
-					// however, FreeImage adds another '\0' to be sure that this last character is present.
-					size += tag_header->length + 1;
-					break;
-				default:
-					size += tag_header->length;
-					break;
-			}
-		}
-	}
-	return size;
-}
diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.h b/plugins/AdvaImg/src/Metadata/FreeImageTag.h
deleted file mode 100644
index 5a6e4f99f6..0000000000
--- a/plugins/AdvaImg/src/Metadata/FreeImageTag.h
+++ /dev/null
@@ -1,499 +0,0 @@
-// ==========================================================
-// Tag manipulation functions
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef FREEIMAGETAG_H
-#define FREEIMAGETAG_H
-
-// ==========================================================
-// Exif JPEG tags
-// ==========================================================
-
-// ----------------------------------------------------------
-// TIFF Rev. 6.0 Attribute Information Used in Exif
-// ----------------------------------------------------------
-
-// Tags relating to image data structure
-
-#define TAG_IMAGE_WIDTH					0x0100
-#define TAG_IMAGE_HEIGHT				0x0101
-#define TAG_BITS_PER_SAMPLE				0x0102
-#define TAG_COMPRESSION					0x0103
-#define TAG_PHOTOMETRIC_INTERPRETATION	0x0106
-#define TAG_ORIENTATION					0x0112
-#define TAG_SAMPLES_PER_PIXEL			0x0115
-#define TAG_PLANAR_CONFIGURATION		0x011C
-#define TAG_YCBCR_SUBSAMPLING			0x0212
-#define TAG_YCBCR_POSITIONING			0x0213
-#define TAG_X_RESOLUTION				0x011A
-#define TAG_Y_RESOLUTION				0x011B
-#define TAG_RESOLUTION_UNIT				0x0128
-
-// LibTIF compression modes
-
-#define	    TAG_COMPRESSION_NONE		1	/* dump mode */
-#define	    TAG_COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
-#define	    TAG_COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
-#define     TAG_COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
-#define	    TAG_COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
-#define     TAG_COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
-#define	    TAG_COMPRESSION_LZW		5       /* Lempel-Ziv  & Welch */
-#define	    TAG_COMPRESSION_OJPEG		6	/* !6.0 JPEG */
-#define	    TAG_COMPRESSION_JPEG		7	/* %JPEG DCT compression */
-#define	    TAG_COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
-#define	    TAG_COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
-#define	    TAG_COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
-#define	    TAG_COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
-/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
-#define	    TAG_COMPRESSION_IT8CTPAD	32895   /* IT8 CT w/padding */
-#define	    TAG_COMPRESSION_IT8LW		32896   /* IT8 Linework RLE */
-#define	    TAG_COMPRESSION_IT8MP		32897   /* IT8 Monochrome picture */
-#define	    TAG_COMPRESSION_IT8BL		32898   /* IT8 Binary line art */
-/* compression codes 32908-32911 are reserved for Pixar */
-#define     TAG_COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
-#define	    TAG_COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
-#define	    TAG_COMPRESSION_DEFLATE		32946	/* Deflate compression */
-#define     TAG_COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression,
-						   as recognized by Adobe */
-/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
-#define     TAG_COMPRESSION_DCS             32947   /* Kodak DCS encoding */
-#define	    TAG_COMPRESSION_JBIG		34661	/* ISO JBIG */
-#define     TAG_COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
-#define     TAG_COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
-#define     TAG_COMPRESSION_JP2000          34712   /* Leadtools JPEG2000 */
-#define	    TAG_COMPRESSION_LZMA		34925	/* LZMA2 */
-
-// Tags relating to recording offset
-
-#define TAG_STRIP_OFFSETS					0x0111
-#define TAG_ROWS_PER_STRIP					0x0116
-#define TAG_STRIP_BYTE_COUNTS				0x0117
-#define TAG_JPEG_INTERCHANGE_FORMAT			0x0201
-#define TAG_JPEG_INTERCHANGE_FORMAT_LENGTH	0x0202
-
-// Tags relating to image data characteristics
-
-#define TAG_TRANSFER_FUNCTION		0x012D
-#define TAG_WHITE_POINT				0x013E
-#define TAG_PRIMARY_CHROMATICITIES	0x013F
-#define TAG_YCBCR_COEFFICIENTS		0x0211
-#define TAG_REFERENCE_BLACK_WHITE	0x0214
-
-// Other tags
-
-#define TAG_DATETIME 				0x0132
-#define TAG_IMAGE_DESCRIPTION 		0x010E
-#define TAG_MAKE 					0x010F
-#define TAG_MODEL 					0x0110
-#define TAG_SOFTWARE 				0x0131
-#define TAG_ARTIST 					0x013B
-#define TAG_COPYRIGHT 				0x8298
-
-// ----------------------------------------------------------
-// Exif IFD Attribute Information
-// ----------------------------------------------------------
-
-// Tags relating to version
-
-#define TAG_EXIF_VERSION 			0x9000
-#define TAG_FLASHPIX_VERSION 		0xA000
-
-// Tag relating to image data characteristics
-
-#define TAG_COLOR_SPACE 			0xA001
-
-// Tags relating to image configuration
-
-#define TAG_COMPONENTS_CONFIGURATION	0x9101
-#define TAG_COMPRESSED_BITS_PER_PIXEL	0x9102
-#define TAG_PIXEL_X_DIMENSION			0xA002
-#define TAG_PIXEL_Y_DIMENSION			0xA003
-
-// Tags relating to user information
-
-#define TAG_MARKER_NOTE		0x927C
-#define TAG_USER_COMMENT	0x9286
-    
-// Tag relating to related file information
-
-#define TAG_RELATED_SOUND_FILE			0xA004
-
-// Tags relating to date and time
-
-#define TAG_DATETIME_ORIGINAL			0x9003
-#define TAG_DATETIME_DIGITIZED			0x9004
-#define TAG_SUBSECOND_TIME				0x9290
-#define TAG_SUBSECOND_TIME_ORIGINAL		0x9291
-#define TAG_SUBSECOND_TIME_DIGITIZED	0x9292
-
-// Tags relating to picture-taking conditions
-
-#define TAG_EXPOSURE_TIME				0x829A
-#define TAG_FNUMBER						0x829D
-#define TAG_EXPOSURE_PROGRAM			0x8822
-#define TAG_SPECTRAL_SENSITIVITY		0x8824
-#define TAG_ISO_SPEED_RATINGS 			0x8827
-#define TAG_OECF						0x8828
-#define TAG_SHUTTER_SPEED_VALUE 		0x9201
-#define TAG_APERTURE_VALUE 				0x9202
-#define TAG_BRIGHTNESS_VALUE			0x9203
-#define TAG_EXPOSURE_BIAS_VALUE 		0x9204
-#define TAG_MAX_APERTURE_VALUE 			0x9205
-#define TAG_SUBJECT_DISTANCE			0x9206
-#define TAG_METERING_MODE				0x9207
-#define TAG_LIGHT_SOURCE				0x9208
-#define TAG_FLASH						0x9209
-#define TAG_FOCAL_LENGTH				0x920A
-#define TAG_SUBJECT_AREA				0x9214
-#define TAG_FLASH_ENERGY				0xA20B
-#define TAG_SPATIAL_FREQ_RESPONSE 		0xA20C
-#define TAG_FOCAL_PLANE_X_RES			0xA20E
-#define TAG_FOCAL_PLANE_Y_RES			0xA20F
-#define TAG_FOCAL_PLANE_UNIT			0xA210
-#define TAG_SUBJECT_LOCATION 			0xA214
-#define TAG_EXPOSURE_INDEX				0xA215
-#define TAG_SENSING_METHOD				0xA217
-#define TAG_FILE_SOURCE					0xA300
-#define TAG_SCENE_TYPE					0xA301
-#define TAG_CFA_PATTERN					0xA302
-#define TAG_CUSTOM_RENDERED				0xA401
-#define TAG_EXPOSURE_MODE				0xA402
-#define TAG_WHITE_BALANCE				0xA403
-#define TAG_DIGITAL_ZOOM_RATIO			0xA404
-#define TAG_FOCAL_LENGTH_IN_35MM_FILM	0xA405
-#define TAG_SCENE_CAPTURE_TYPE			0xA406
-#define TAG_GAIN_CONTROL				0xA407
-#define TAG_CONTRAST					0xA408
-#define TAG_SATURATION					0xA409
-#define TAG_SHARPNESS					0xA40A
-#define TAG_DEVICE_SETTING_DESCRIPTION	0xA40B
-#define TAG_SUBJECT_DISTANCE_RANGE		0xA40C
-
-// Other tags
-
-#define TAG_IMAGE_UNIQUE_ID				0xA420
-
-// ----------------------------------------------------------
-// GPS Attribute Information
-// ----------------------------------------------------------
-
-#define TAG_GPS_VERSION_ID				0x0000
-#define TAG_GPS_LATITUDE_REF			0x0001
-#define TAG_GPS_LATITUDE				0x0002
-#define TAG_GPS_LONGITUDE_REF			0x0003
-#define TAG_GPS_LONGITUDE				0x0004
-#define TAG_GPS_ALTITUDE_REF			0x0005
-#define TAG_GPS_ALTITUDE				0x0006
-#define TAG_GPS_TIME_STAMP				0x0007
-#define TAG_GPS_SATELLITES				0x0008
-#define TAG_GPS_STATUS					0x0009
-#define TAG_GPS_MEASURE_MODE			0x000A
-#define TAG_GPS_DOP						0x000B
-#define TAG_GPS_SPEED_REF				0x000C
-#define TAG_GPS_SPEED					0x000D
-#define TAG_GPS_TRACK_REF				0x000E
-#define TAG_GPS_TRACK					0x000F
-#define TAG_GPS_IMG_DIRECTION_REF		0x0010
-#define TAG_GPS_IMG_DIRECTION			0x0011
-#define TAG_GPS_MAP_DATUM				0x0012
-#define TAG_GPS_DEST_LATITUDE_REF		0x0013
-#define TAG_GPS_DEST_LATITUDE			0x0014
-#define TAG_GPS_DEST_LONGITUDE_REF		0x0015
-#define TAG_GPS_DEST_LONGITUDE			0x0016
-#define TAG_GPS_DEST_BEARING_REF		0x0017
-#define TAG_GPS_DEST_BEARING			0x0018
-#define TAG_GPS_DEST_DISTANCE_REF		0x0019
-#define TAG_GPS_DEST_DISTANCE			0x001A
-#define TAG_GPS_PROCESSING_METHOD		0x001B
-#define TAG_GPS_AREA_INFORMATION		0x001C
-#define TAG_GPS_DATE_STAMP				0x001D
-#define TAG_GPS_DIFFERENTIAL			0x001E
-
-// ==========================================================
-// IPTC/NAA tags
-// ==========================================================
-
-#define TAG_RECORD_VERSION					0x0200
-#define TAG_CAPTION							0x0278
-#define TAG_WRITER							0x027A
-#define TAG_HEADLINE						0x0269
-#define TAG_SPECIAL_INSTRUCTIONS			0x0228
-#define TAG_BY_LINE							0x0250
-#define TAG_BY_LINE_TITLE					0x0255
-#define TAG_CREDIT							0x026E
-#define TAG_SOURCE							0x0273
-#define TAG_OBJECT_NAME						0x0205
-#define TAG_DATE_CREATED					0x0237
-#define TAG_CITY							0x025A
-#define TAG_PROVINCE_OR_STATE				0x025F
-#define TAG_COUNTRY_OR_PRIMARY_LOCATION		0x0265
-#define TAG_ORIGINAL_TRANSMISSION_REFERENCE 0x0267
-#define TAG_CATEGORY						0x020F
-#define TAG_SUPPLEMENTAL_CATEGORIES			0x0214
-#define TAG_URGENCY							0x020A
-#define TAG_KEYWORDS						0x0219
-#define TAG_COPYRIGHT_NOTICE				0x0274
-#define TAG_RELEASE_DATE					0x021E
-#define TAG_RELEASE_TIME					0x0223
-#define TAG_TIME_CREATED					0x023C
-#define TAG_ORIGINATING_PROGRAM				0x0241
-
-// ==========================================================
-// GeoTIFF tags
-// ==========================================================
-
-// tags 33550 is a private tag registered to SoftDesk, Inc
-#define TIFFTAG_GEOPIXELSCALE		33550
-// tags 33920-33921 are private tags registered to Intergraph, Inc
-#define TIFFTAG_INTERGRAPH_MATRIX	33920
-#define TIFFTAG_GEOTIEPOINTS		33922
-// tags 34263-34264 are private tags registered to NASA-JPL Carto Group
-#define TIFFTAG_JPL_CARTO_IFD		34263
-#define TIFFTAG_GEOTRANSMATRIX		34264    /* New Matrix Tag replaces 33920 */
-// tags 34735-3438 are private tags registered to SPOT Image, Inc
-#define TIFFTAG_GEOKEYDIRECTORY		34735
-#define TIFFTAG_GEODOUBLEPARAMS		34736
-#define TIFFTAG_GEOASCIIPARAMS		34737
-
-// ==========================================================
-// FreeImage Animation tags
-// ==========================================================
-
-#define ANIMTAG_LOGICALWIDTH	0x0001
-#define ANIMTAG_LOGICALHEIGHT	0x0002
-#define ANIMTAG_GLOBALPALETTE	0x0003
-#define ANIMTAG_LOOP			0x0004
-#define ANIMTAG_FRAMELEFT		0x1001
-#define ANIMTAG_FRAMETOP		0x1002
-#define ANIMTAG_NOLOCALPALETTE	0x1003
-#define ANIMTAG_INTERLACED		0x1004
-#define ANIMTAG_FRAMETIME		0x1005
-#define ANIMTAG_DISPOSALMETHOD	0x1006
-
-// --------------------------------------------------------------------------
-// Helper functions to deal with the FITAG structure
-// --------------------------------------------------------------------------
-
-/**
-Describes the tag format descriptor
-Given a FREE_IMAGE_MDTYPE, calculate the size of this type in bytes unit
-@param type Tag data type
-@return Returns the size of the data type, in bytes
-@see FREE_IMAGE_MDTYPE
-*/
-unsigned FreeImage_TagDataWidth(FREE_IMAGE_MDTYPE type);
-
-/**
-Calculate the memory size required by a tag, including the size of the structure
-@param tag The tag to examine
-@return Retuns the memory size used by a tag
-*/
-size_t FreeImage_GetTagMemorySize(FITAG *tag);
-
-// --------------------------------------------------------------------------
-
-/**
-	Structure to hold a tag information
-*/
-typedef struct tagTagInfo {
-	WORD tag;			// Tag ID (required)
-	char *fieldname;	// Field name (required)
-	char *description;	// Field description (may be NULL)
-} TagInfo;
-
-
-/**
-Class to hold tag information (based on Meyers’ Singleton).<br>
-
-Sample usage :<br>
-<code>
-TagLib& s = TagLib::instance();
-TagInfo *tag_info = s.getTagInfo(EXIF_MAIN, 0x0100);
-</code>
-
-Note on multi-threaded applications : 
-
-The singleton pattern must be carefully constructed in multi-threaded applications. 
-If two threads are to execute the creation method at the same time when a singleton 
-does not yet exist, they both must check for an instance of the singleton and then 
-only one should create the new one.
-The classic solution to this problem is to use mutual exclusion on the class that 
-indicates that the object is being instantiated.
-The FreeImage solution is to instantiate the singleton before any other thread is launched, 
-i.e. inside the FreeImage_Initialise function (see Plugin.cpp). 
-*/
-
-class TagLib {
-public:
-
-	/**
-	internal tag info tables registered in TagLib
-	*/
-	enum MDMODEL {
-		UNKNOWN,
-		EXIF_MAIN, 
-		EXIF_EXIF, 
-		EXIF_GPS, 
-		EXIF_INTEROP,
-		EXIF_MAKERNOTE_CANON,
-		EXIF_MAKERNOTE_CASIOTYPE1,
-		EXIF_MAKERNOTE_CASIOTYPE2,
-		EXIF_MAKERNOTE_FUJIFILM,
-		EXIF_MAKERNOTE_KYOCERA,
-		EXIF_MAKERNOTE_MINOLTA,
-		EXIF_MAKERNOTE_NIKONTYPE1,
-		EXIF_MAKERNOTE_NIKONTYPE2,
-		EXIF_MAKERNOTE_NIKONTYPE3,
-		EXIF_MAKERNOTE_OLYMPUSTYPE1,
-		EXIF_MAKERNOTE_PANASONIC,
-		EXIF_MAKERNOTE_ASAHI,
-		EXIF_MAKERNOTE_PENTAX,
-		EXIF_MAKERNOTE_SONY,
-		EXIF_MAKERNOTE_SIGMA_SD1,
-		EXIF_MAKERNOTE_SIGMA_FOVEON,
-		IPTC,
-		GEOTIFF,
-		ANIMATION
-	};
-
-private:
-
-	typedef std::map<WORD, TagInfo*> TAGINFO;
-	typedef std::map<int, TAGINFO*>  TABLEMAP;
-
-	/// store hash tables for all known tag info tables
-	TABLEMAP _table_map;
-
-private:
-	/// Assignement operator (disabled)
-	void operator=(TagLib&);
-
-	/// Copy constructor (disabled)
-	TagLib(const TagLib&);
-	
-	/** 
-	Used in the constructor to initialize the tag tables
-	@param md_model Internal metadata model
-	@param tag_table Tag info table
-	@return Returns TRUE if successful, returns FALSE otherwise
-	*/
-	BOOL addMetadataModel(MDMODEL md_model, TagInfo *tag_table);
-
-public:
-	/**
-	Constructor (private)<br>
-	This is where the tag info tables are initialized.
-	@see addMetadataModel
-	*/
-	TagLib();
-	/// Destructor
-	~TagLib();
-
-	/**
-	@return Returns a reference to the TagLib instance
-	*/
-	static TagLib& instance();
-
-	/**
-	Given a tag ID, returns its TagInfo descriptor
-	@param md_model Internal metadata model
-	@param tagID tag ID
-	@return Returns the TagInfo descriptor if successful, returns NULL otherwise
-	*/
-	const TagInfo* getTagInfo(MDMODEL md_model, WORD tagID);
-
-	/**
-	Given a tag ID, returns its tag field name. 
-	When the tag is unknown and defaultKey is not NULL, a string such as "Tag 0x1234" is returned. 
-	This string is contained in the provided defaultKey buffer (assumed to be an array of at least 16 chars). 
-	@param md_model Internal metadata model
-	@param tagID tag ID
-	@param defaultKey Assumed to be an array of 16 chars. If not NULL, build a key for unknown tags
-	@return Returns the tag field name if successful, returns an 'unknown tag' string contained in defaultKey otherwise
-	*/
-	const char* getTagFieldName(MDMODEL md_model, WORD tagID, char *defaultKey);
-
-	/**
-	Given a tag ID, returns its description. 
-	When the tag has no description, a NULL value is returned.
-	@param md_model Internal metadata model
-	@param tagID tag ID
-	@return Returns the tag description if successful, returns NULL otherwise
-	*/
-	const char* getTagDescription(MDMODEL md_model, WORD tagID);
-
-	/**
-	Given a tag field name, returns its tag ID. 
-	When the tag doesn't exists, a value '-1' is returned.
-	@param md_model Internal metadata model
-	@param key tag field name
-	@return Returns the tag ID if successful, returns -1 otherwise
-	*/
-	int getTagID(MDMODEL md_model, const char *key);
-
-	/**
-	Perform a conversion between internal metadata models and FreeImage public metadata models
-	@param md_model Internal metadata model
-	*/
-	FREE_IMAGE_MDMODEL getFreeImageModel(MDMODEL model);
-
-};
-
-// --------------------------------------------------------------------------
-// Constant strings
-// --------------------------------------------------------------------------
-
-/// Name of the XMP field
-static const char *g_TagLib_XMPFieldName = "XMLPacket";
-
-/// Name of the Exif raw field
-static const char *g_TagLib_ExifRawFieldName = "ExifRaw";
-
-// --------------------------------------------------------------------------
-// Metadata routines
-// --------------------------------------------------------------------------
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// JPEG / JPEG-XR Exif profile (see Exif.cpp)
-// --------------------------------------------------------------------------
-BOOL jpeg_read_exif_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned datalen);
-BOOL jpeg_read_exif_profile_raw(FIBITMAP *dib, const BYTE *profile, unsigned length);
-BOOL jpegxr_read_exif_profile(FIBITMAP *dib, const BYTE *profile, unsigned length, unsigned file_offset);
-BOOL jpegxr_read_exif_gps_profile(FIBITMAP *dib, const BYTE *profile, unsigned length, unsigned file_offset);
-
-BOOL tiff_get_ifd_profile(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, BYTE **ppbProfile, unsigned *uProfileLength);
-
-
-// JPEG / TIFF IPTC profile (see IPTC.cpp)
-// --------------------------------------------------------------------------
-BOOL read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen);
-BOOL write_iptc_profile(FIBITMAP *dib, BYTE **profile, unsigned *profile_size);
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif // FREEIMAGETAG_H
-
-
diff --git a/plugins/AdvaImg/src/Metadata/IPTC.cpp b/plugins/AdvaImg/src/Metadata/IPTC.cpp
deleted file mode 100644
index 659d0b8bec..0000000000
--- a/plugins/AdvaImg/src/Metadata/IPTC.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-// ==========================================================
-// Metadata functions implementation
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-
-// ----------------------------------------------------------
-//   IPTC JPEG / TIFF markers routines
-// ----------------------------------------------------------
-
-static const char* IPTC_DELIMITER = ";";	// keywords/supplemental category delimiter
-/**
-	Read and decode IPTC binary data
-*/
-BOOL 
-read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) {
-	char defaultKey[16];
-	size_t length = datalen;
-	BYTE *profile = (BYTE*)dataptr;
-
-	const char *JPEG_AdobeCM_Tag = "Adobe_CM";
-
-	std::string Keywords;
-	std::string SupplementalCategory;
-
-	WORD tag_id;
-
-	if(!dataptr || (datalen == 0)) {
-		return FALSE;
-	}
-
-	if(datalen > 8) {
-		if(memcmp(JPEG_AdobeCM_Tag, dataptr, 8) == 0) {
-			// the "Adobe_CM" APP13 segment presumably contains color management information, 
-			// but the meaning of the data is currently unknown. 
-			// If anyone has an idea about what this means, please let me know.
-			return FALSE;
-		}
-	}
-
-
-	// create a tag
-
-	FITAG *tag = FreeImage_CreateTag();
-
-	TagLib& tag_lib = TagLib::instance();
-
-    // find start of the BIM portion of the binary data
-    size_t offset = 0;
-	while(offset < length - 1) {
-		if((profile[offset] == 0x1C) && (profile[offset+1] == 0x02))
-			break;
-		offset++;
-	}
-
-    // for each tag
-    while (offset < length) {
-
-        // identifies start of a tag
-        if (profile[offset] != 0x1c) {
-            break;
-        }
-        // we need at least five bytes left to read a tag
-        if ((offset + 5) >= length) {
-            break;
-        }
-
-        offset++;
-
-		int directoryType	= profile[offset++];
-        int tagType			= profile[offset++];;
-        int tagByteCount	= ((profile[offset] & 0xFF) << 8) | (profile[offset + 1] & 0xFF);
-        offset += 2;
-
-        if ((offset + tagByteCount) > length) {
-            // data for tag extends beyond end of iptc segment
-            break;
-        }
-
-		if(tagByteCount == 0) {
-			// go to next tag
-			continue;
-		}
-
-		// process the tag
-
-		tag_id = (WORD)(tagType | (directoryType << 8));
-
-		FreeImage_SetTagID(tag, tag_id);
-		FreeImage_SetTagLength(tag, tagByteCount);
-
-		// allocate a buffer to store the tag value
-		BYTE *iptc_value = (BYTE*)malloc((tagByteCount + 1) * sizeof(BYTE));
-		memset(iptc_value, 0, (tagByteCount + 1) * sizeof(BYTE));
-
-		// get the tag value
-
-		switch (tag_id) {
-			case TAG_RECORD_VERSION:
-			{
-				// short
-				FreeImage_SetTagType(tag, FIDT_SSHORT);
-				FreeImage_SetTagCount(tag, 1);
-				short *pvalue = (short*)&iptc_value[0];
-				*pvalue = (short)((profile[offset] << 8) | profile[offset + 1]);
-				FreeImage_SetTagValue(tag, pvalue);
-				break;
-			}
-
-			case TAG_RELEASE_DATE:
-			case TAG_DATE_CREATED:
-				// Date object
-			case TAG_RELEASE_TIME:
-			case TAG_TIME_CREATED:
-				// time
-			default:
-			{
-				// string
-				FreeImage_SetTagType(tag, FIDT_ASCII);
-				FreeImage_SetTagCount(tag, tagByteCount);
-				for(int i = 0; i < tagByteCount; i++) {
-					iptc_value[i] = profile[offset + i];
-				}
-				iptc_value[tagByteCount] = '\0';
-				FreeImage_SetTagValue(tag, (char*)&iptc_value[0]);
-				break;
-			}
-		}
-
-		if(tag_id == TAG_SUPPLEMENTAL_CATEGORIES) {
-			// concatenate the categories
-			if(SupplementalCategory.length() == 0) {
-				SupplementalCategory.append((char*)iptc_value);
-			} else {
-				SupplementalCategory.append(IPTC_DELIMITER);
-				SupplementalCategory.append((char*)iptc_value);
-			}
-		}
-		else if(tag_id == TAG_KEYWORDS) {
-			// concatenate the keywords
-			if(Keywords.length() == 0) {
-				Keywords.append((char*)iptc_value);
-			} else {
-				Keywords.append(IPTC_DELIMITER);
-				Keywords.append((char*)iptc_value);
-			}
-		}
-		else {
-			// get the tag key and description
-			const char *key = tag_lib.getTagFieldName(TagLib::IPTC, tag_id, defaultKey);
-			FreeImage_SetTagKey(tag, key);
-			const char *description = tag_lib.getTagDescription(TagLib::IPTC, tag_id);
-			FreeImage_SetTagDescription(tag, description);
-
-			// store the tag
-			if(key) {
-				FreeImage_SetMetadata(FIMD_IPTC, dib, key, tag);
-			}
-		}
-
-		free(iptc_value);
-
-        // next tag
-		offset += tagByteCount;
-
-    }
-
-	// store the 'keywords' tag
-	if(Keywords.length()) {
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagID(tag, TAG_KEYWORDS);
-		FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_KEYWORDS, defaultKey));
-		FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_KEYWORDS));
-		FreeImage_SetTagLength(tag, (DWORD)Keywords.length());
-		FreeImage_SetTagCount(tag, (DWORD)Keywords.length());
-		FreeImage_SetTagValue(tag, (char*)Keywords.c_str());
-		FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag);
-	}
-
-	// store the 'supplemental category' tag
-	if(SupplementalCategory.length()) {
-		FreeImage_SetTagType(tag, FIDT_ASCII);
-		FreeImage_SetTagID(tag, TAG_SUPPLEMENTAL_CATEGORIES);
-		FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES, defaultKey));
-		FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES));
-		FreeImage_SetTagLength(tag, (DWORD)SupplementalCategory.length());
-		FreeImage_SetTagCount(tag, (DWORD)SupplementalCategory.length());
-		FreeImage_SetTagValue(tag, (char*)SupplementalCategory.c_str());
-		FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag);
-	}
-
-	// delete the tag
-
-	FreeImage_DeleteTag(tag);
-
-	return TRUE;
-}
-
-// --------------------------------------------------------------------------
-
-static BYTE* 
-append_iptc_tag(BYTE *profile, unsigned *profile_size, WORD id, DWORD length, const void *value) {
-	BYTE *buffer = NULL;
-
-	// calculate the new buffer size
-	size_t buffer_size = (5 + *profile_size + length) * sizeof(BYTE);
-	buffer = (BYTE*)malloc(buffer_size);
-	if(!buffer)
-		return NULL;
-
-	// add the header
-	buffer[0] = 0x1C;
-	buffer[1] = 0x02;
-	// add the tag type
-	buffer[2] = (BYTE)(id & 0x00FF);
-	// add the tag length
-	buffer[3] = (BYTE)(length >> 8);
-	buffer[4] = (BYTE)(length & 0xFF);
-	// add the tag value
-	memcpy(buffer + 5, (BYTE*)value, length);
-	// append the previous profile
-	if(NULL == profile)	{
-		*profile_size = (5 + length);
-	}
-	else {
-		memcpy(buffer + 5 + length, profile, *profile_size);
-		*profile_size += (5 + length);
-		free(profile);
-	}
-	
-	return buffer;
-}
-
-/**
-Encode IPTC metadata into a binary buffer. 
-The buffer is allocated by the function and must be freed by the caller. 
-*/
-BOOL 
-write_iptc_profile(FIBITMAP *dib, BYTE **profile, unsigned *profile_size) {
-	FITAG *tag = NULL;
-	FIMETADATA *mdhandle = NULL;
-
-	BYTE *buffer = NULL;
-	unsigned buffer_size = 0;
-
-	// parse all IPTC tags and rebuild a IPTC profile
-	mdhandle = FreeImage_FindFirstMetadata(FIMD_IPTC, dib, &tag);
-
-	if(mdhandle) {
-		do {
-			WORD tag_id	= FreeImage_GetTagID(tag);
-
-			// append the tag to the profile
-
-			switch(tag_id) {
-				case TAG_RECORD_VERSION:
-					// ignore (already handled)
-					break;
-
-				case TAG_SUPPLEMENTAL_CATEGORIES:
-				case TAG_KEYWORDS:
-					if(FreeImage_GetTagType(tag) == FIDT_ASCII) {
-						std::string value = (const char*)FreeImage_GetTagValue(tag);
-
-						// split the tag value
-						std::vector<std::string> output;
-						std::string delimiter = IPTC_DELIMITER;		
-						
-						size_t offset = 0;
-						size_t delimiterIndex = 0;
-
-						delimiterIndex = value.find(delimiter, offset);
-						while (delimiterIndex != std::string::npos) {
-							output.push_back(value.substr(offset, delimiterIndex - offset));
-							offset += delimiterIndex - offset + delimiter.length();
-							delimiterIndex = value.find(delimiter, offset);
-						}
-						output.push_back(value.substr(offset));
-
-						// add as many tags as there are comma separated strings
-						for(int i = 0; i < (int)output.size(); i++) {
-							std::string& tag_value = output[i];
-							buffer = append_iptc_tag(buffer, &buffer_size, tag_id, (DWORD)tag_value.length(), tag_value.c_str());
-						}
-
-					}
-					break;
-
-				case TAG_URGENCY:
-					if(FreeImage_GetTagType(tag) == FIDT_ASCII) {
-						DWORD length = 1;	// keep the first octet only
-						buffer = append_iptc_tag(buffer, &buffer_size, tag_id, length, FreeImage_GetTagValue(tag));
-					}
-					break;
-
-				default:
-					if(FreeImage_GetTagType(tag) == FIDT_ASCII) {
-						DWORD length = FreeImage_GetTagLength(tag);	
-						buffer = append_iptc_tag(buffer, &buffer_size, tag_id, length, FreeImage_GetTagValue(tag));
-					}					
-					break;
-			}
-
-		} while(FreeImage_FindNextMetadata(mdhandle, &tag));
-		
-		FreeImage_FindCloseMetadata(mdhandle);
-
-		// add the DirectoryVersion tag
-		const short version = 0x0200;
-		buffer = append_iptc_tag(buffer, &buffer_size, TAG_RECORD_VERSION, sizeof(version), &version);
-		
-		*profile = buffer;
-		*profile_size = buffer_size;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/plugins/AdvaImg/src/Metadata/TagConversion.cpp b/plugins/AdvaImg/src/Metadata/TagConversion.cpp
deleted file mode 100644
index 1fb2b55f00..0000000000
--- a/plugins/AdvaImg/src/Metadata/TagConversion.cpp
+++ /dev/null
@@ -1,1094 +0,0 @@
-// ==========================================================
-// Tag to string conversion functions
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-#include "FIRational.h"
-
-#define MAX_TEXT_EXTENT	512
-
-/**
-Convert a tag to a C string
-*/
-static const char* 
-ConvertAnyTag(FITAG *tag) {
-	char format[MAX_TEXT_EXTENT];
-	static std::string buffer;
-	DWORD i;
-
-	if(!tag)
-		return NULL;
-
-	buffer.erase();
-	
-	// convert the tag value to a string buffer
-
-	FREE_IMAGE_MDTYPE tag_type = FreeImage_GetTagType(tag);
-	DWORD tag_count = FreeImage_GetTagCount(tag);
-
-	switch(tag_type) {
-		case FIDT_BYTE:		// N x 8-bit unsigned integer 
-		{
-			BYTE *pvalue = (BYTE*)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%ld",	(LONG) pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %ld",	(LONG) pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_SHORT:	// N x 16-bit unsigned integer 
-		{
-			unsigned short *pvalue = (unsigned short *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%hu", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %hu",	pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_LONG:		// N x 32-bit unsigned integer 
-		{
-			DWORD *pvalue = (DWORD *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%lu", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %lu",	pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_RATIONAL: // N x 64-bit unsigned fraction 
-		{
-			DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%ld/%ld", pvalue[0], pvalue[1]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %ld/%ld", pvalue[2*i], pvalue[2*i+1]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_SBYTE:	// N x 8-bit signed integer 
-		{
-			char *pvalue = (char*)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%ld",	(LONG) pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %ld",	(LONG) pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_SSHORT:	// N x 16-bit signed integer 
-		{
-			short *pvalue = (short *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%hd", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %hd",	pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_SLONG:	// N x 32-bit signed integer 
-		{
-			LONG *pvalue = (LONG *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%ld", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %ld",	pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_SRATIONAL:// N x 64-bit signed fraction 
-		{
-			LONG *pvalue = (LONG*)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%ld/%ld", pvalue[0], pvalue[1]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %ld/%ld", pvalue[2*i], pvalue[2*i+1]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_FLOAT:	// N x 32-bit IEEE floating point 
-		{
-			float *pvalue = (float *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%f", (double) pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, "%f", (double) pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_DOUBLE:	// N x 64-bit IEEE floating point 
-		{
-			double *pvalue = (double *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%f", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, "%f", pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_IFD:		// N x 32-bit unsigned integer (offset) 
-		{
-			DWORD *pvalue = (DWORD *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%X", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " %X",	pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-		case FIDT_PALETTE:	// N x 32-bit RGBQUAD 
-		{
-			RGBQUAD *pvalue = (RGBQUAD *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "(%d,%d,%d,%d)", pvalue[0].rgbRed, pvalue[0].rgbGreen, pvalue[0].rgbBlue, pvalue[0].rgbReserved);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, " (%d,%d,%d,%d)", pvalue[i].rgbRed, pvalue[i].rgbGreen, pvalue[i].rgbBlue, pvalue[i].rgbReserved);
-				buffer += format;
-			}
-			break;
-		}
-		
-		case FIDT_LONG8:	// N x 64-bit unsigned integer 
-		{
-			UINT64 *pvalue = (UINT64 *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%lld", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, "%lld", pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-
-		case FIDT_IFD8:		// N x 64-bit unsigned integer (offset)
-		{
-			UINT64 *pvalue = (UINT64 *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%llX", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, "%llX", pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-
-		case FIDT_SLONG8:	// N x 64-bit signed integer
-		{
-			INT64 *pvalue = (INT64 *)FreeImage_GetTagValue(tag);
-
-			sprintf(format, "%lld", pvalue[0]);
-			buffer += format;
-			for(i = 1; i < tag_count; i++) {
-				sprintf(format, "%lld", pvalue[i]);
-				buffer += format;
-			}
-			break;
-		}
-
-		case FIDT_ASCII:	// 8-bit bytes w/ last byte null 
-		case FIDT_UNDEFINED:// 8-bit untyped data 
-		default:
-		{
-			int max_size = MIN((int)FreeImage_GetTagLength(tag), (int)MAX_TEXT_EXTENT);
-			if(max_size == MAX_TEXT_EXTENT)
-				max_size--;
-			memcpy(format, (char*)FreeImage_GetTagValue(tag), max_size);
-			format[max_size] = '\0';
-			buffer += format;
-			break;
-		}
-	}
-
-	return buffer.c_str();
-}
-
-/**
-Convert a Exif tag to a C string
-*/
-static const char* 
-ConvertExifTag(FITAG *tag) {
-	char format[MAX_TEXT_EXTENT];
-	static std::string buffer;
-
-	if(!tag)
-		return NULL;
-
-	buffer.erase();
-
-	// convert the tag value to a string buffer
-
-	switch(FreeImage_GetTagID(tag)) {
-		case TAG_ORIENTATION:
-		{
-			unsigned short orientation = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch (orientation) {
-				case 1:
-					return "top, left side";
-				case 2:
-					return "top, right side";
-				case 3:
-					return "bottom, right side";
-				case 4:
-					return "bottom, left side";
-				case 5:
-					return "left side, top";
-				case 6:
-					return "right side, top";
-				case 7:
-					return "right side, bottom";
-				case 8:
-					return "left side, bottom";
-				default:
-					break;
-			}
-		}
-		break;
-
-		case TAG_REFERENCE_BLACK_WHITE:
-		{
-			DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag);
-			if(FreeImage_GetTagLength(tag) == 48) {
-				// reference black point value and reference white point value (ReferenceBlackWhite)
-				int blackR = 0, whiteR = 0, blackG = 0, whiteG = 0, blackB = 0, whiteB = 0;
-				if(pvalue[1])
-					blackR = (int)(pvalue[0] / pvalue[1]);
-				if(pvalue[3])
-					whiteR = (int)(pvalue[2] / pvalue[3]);
-				if(pvalue[5])
-					blackG = (int)(pvalue[4] / pvalue[5]);
-				if(pvalue[7])
-					whiteG = (int)(pvalue[6] / pvalue[7]);
-				if(pvalue[9])
-					blackB = (int)(pvalue[8] / pvalue[9]);
-				if(pvalue[11])
-					whiteB = (int)(pvalue[10] / pvalue[11]);
-
-				sprintf(format, "[%d,%d,%d] [%d,%d,%d]", blackR, blackG, blackB, whiteR, whiteG, whiteB);
-				buffer += format;
-				return buffer.c_str();
-			}
-
-		}
-		break;
-
-		case TAG_COLOR_SPACE:
-		{
-			unsigned short colorSpace = *((unsigned short *)FreeImage_GetTagValue(tag));
-			if (colorSpace == 1) {
-				return "sRGB";
-			} else if (colorSpace == 65535) {
-				return "Undefined";
-			} else {
-				return "Unknown";
-			}
-		}
-		break;
-
-		case TAG_COMPONENTS_CONFIGURATION:
-		{
-			const char *componentStrings[7] = {"", "Y", "Cb", "Cr", "R", "G", "B"};
-			BYTE *pvalue = (BYTE*)FreeImage_GetTagValue(tag);
-			for(DWORD i = 0; i < MIN((DWORD)4, FreeImage_GetTagCount(tag)); i++) {
-				int j = pvalue[i];
-				if(j > 0 && j < 7)
-					buffer += componentStrings[j];
-			}
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_COMPRESSED_BITS_PER_PIXEL:
-		{
-			FIRational r(tag);
-			buffer = r.toString();
-			if(buffer == "1")
-				buffer += " bit/pixel";
-			else 
-				buffer += " bits/pixel";
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_X_RESOLUTION:
-		case TAG_Y_RESOLUTION:
-		case TAG_FOCAL_PLANE_X_RES:
-		case TAG_FOCAL_PLANE_Y_RES:
-		case TAG_BRIGHTNESS_VALUE:
-		case TAG_EXPOSURE_BIAS_VALUE:
-		{
-			FIRational r(tag);
-			buffer = r.toString();
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_RESOLUTION_UNIT:
-		case TAG_FOCAL_PLANE_UNIT:
-		{
-			unsigned short resolutionUnit = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch (resolutionUnit) {
-				case 1:
-					return "(No unit)";
-				case 2:
-					return "inches";
-				case 3:
-					return "cm";
-				default:
-					break;
-			}
-		}
-		break;
-
-		case TAG_YCBCR_POSITIONING:
-		{
-			unsigned short yCbCrPosition = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch (yCbCrPosition) {
-				case 1:
-					return "Center of pixel array";
-				case 2:
-					return "Datum point";
-				default:
-					break;
-			}
-		} 
-		break;
-
-		case TAG_EXPOSURE_TIME:
-		{
-			FIRational r(tag);
-			buffer = r.toString();
-			buffer += " sec";
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_SHUTTER_SPEED_VALUE:
-		{
-			FIRational r(tag);
-			LONG apexValue = r.longValue();
-			LONG apexPower = 1 << apexValue;
-			sprintf(format, "1/%d sec", (int)apexPower);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_APERTURE_VALUE:
-		case TAG_MAX_APERTURE_VALUE:
-		{
-			FIRational r(tag);
-			double apertureApex = r.doubleValue();
-	        double rootTwo = sqrt((double)2);
-			double fStop = pow(rootTwo, apertureApex);
-			sprintf(format, "F%.1f", fStop);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_FNUMBER:
-		{
-			FIRational r(tag);
-			double fnumber = r.doubleValue();
-			sprintf(format, "F%.1f", fnumber);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_FOCAL_LENGTH:
-		{
-			FIRational r(tag);
-			double focalLength = r.doubleValue();
-			sprintf(format, "%.1f mm", focalLength);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_FOCAL_LENGTH_IN_35MM_FILM:
-		{
-			unsigned short focalLength = *((unsigned short *)FreeImage_GetTagValue(tag));
-			sprintf(format, "%hu mm", focalLength);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_FLASH:
-		{
-			unsigned short flash = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch(flash) {
-				case 0x0000:
-					return "Flash did not fire";
-				case 0x0001:
-					return "Flash fired";
-				case 0x0005:
-					return "Strobe return light not detected";
-				case 0x0007:
-					return "Strobe return light detected";
-				case 0x0009:
-					return "Flash fired, compulsory flash mode";
-				case 0x000D:
-					return "Flash fired, compulsory flash mode, return light not detected";
-				case 0x000F:
-					return "Flash fired, compulsory flash mode, return light detected";
-				case 0x0010:
-					return "Flash did not fire, compulsory flash mode";
-				case 0x0018:
-					return "Flash did not fire, auto mode";
-				case 0x0019:
-					return "Flash fired, auto mode";
-				case 0x001D:
-					return "Flash fired, auto mode, return light not detected";
-				case 0x001F:
-					return "Flash fired, auto mode, return light detected";
-				case 0x0020:
-					return "No flash function";
-				case 0x0041:
-					return "Flash fired, red-eye reduction mode";
-				case 0x0045:
-					return "Flash fired, red-eye reduction mode, return light not detected";
-				case 0x0047:
-					return "Flash fired, red-eye reduction mode, return light detected";
-				case 0x0049:
-					return "Flash fired, compulsory flash mode, red-eye reduction mode";
-				case 0x004D:
-					return "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected";
-				case 0x004F:
-					return "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected";
-				case 0x0059:
-					return "Flash fired, auto mode, red-eye reduction mode";
-				case 0x005D:
-					return "Flash fired, auto mode, return light not detected, red-eye reduction mode";
-				case 0x005F:
-					return "Flash fired, auto mode, return light detected, red-eye reduction mode";
-				default:
-					sprintf(format, "Unknown (%d)", flash);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SCENE_TYPE:
-		{
-			BYTE sceneType = *((BYTE*)FreeImage_GetTagValue(tag));
-			if (sceneType == 1) {
-				return "Directly photographed image";
-			} else {
-				sprintf(format, "Unknown (%d)", sceneType);
-				buffer += format;
-				return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SUBJECT_DISTANCE:
-		{
-			FIRational r(tag);
-			if(r.getNumerator() == 0xFFFFFFFF) {
-				return "Infinity";
-			} else if(r.getNumerator() == 0) {
-				return "Distance unknown";
-			} else {
-				double distance = r.doubleValue();
-				sprintf(format, "%.3f meters", distance);
-				buffer += format;
-				return buffer.c_str();
-			}
-		}
-		break;
-			
-		case TAG_METERING_MODE:
-		{
-			unsigned short meteringMode = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch (meteringMode) {
-				case 0:
-					return "Unknown";
-				case 1:
-					return "Average";
-				case 2:
-					return "Center weighted average";
-				case 3:
-					return "Spot";
-				case 4:
-					return "Multi-spot";
-				case 5:
-					return "Multi-segment";
-				case 6:
-					return "Partial";
-				case 255:
-					return "(Other)";
-				default:
-					return "";
-			}
-		}
-		break;
-
-		case TAG_LIGHT_SOURCE:
-		{
-			unsigned short lightSource = *((unsigned short *)FreeImage_GetTagValue(tag));
-			switch (lightSource) {
-				case 0:
-					return "Unknown";
-				case 1:
-					return "Daylight";
-				case 2:
-					return "Fluorescent";
-				case 3:
-					return "Tungsten (incandescent light)";
-				case 4:
-					return "Flash";
-				case 9:
-					return "Fine weather";
-				case 10:
-					return "Cloudy weather";
-				case 11:
-					return "Shade";
-				case 12:
-					return "Daylight fluorescent (D 5700 - 7100K)";
-				case 13:
-					return "Day white fluorescent (N 4600 - 5400K)";
-				case 14:
-					return "Cool white fluorescent (W 3900 - 4500K)";
-				case 15:
-					return "White fluorescent (WW 3200 - 3700K)";
-				case 17:
-					return "Standard light A";
-				case 18:
-					return "Standard light B";
-				case 19:
-					return "Standard light C";
-				case 20:
-					return "D55";
-				case 21:
-					return "D65";
-				case 22:
-					return "D75";
-				case 23:
-					return "D50";
-				case 24:
-					return "ISO studio tungsten";
-				case 255:
-					return "(Other)";
-				default:
-					return "";
-			}
-		}
-		break;
-
-		case TAG_SENSING_METHOD:
-		{
-			unsigned short sensingMethod = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (sensingMethod) {
-				case 1:
-					return "(Not defined)";
-				case 2:
-					return "One-chip color area sensor";
-				case 3:
-					return "Two-chip color area sensor";
-				case 4:
-					return "Three-chip color area sensor";
-				case 5:
-					return "Color sequential area sensor";
-				case 7:
-					return "Trilinear sensor";
-				case 8:
-					return "Color sequential linear sensor";
-				default:
-					return "";
-			}
-		}
-		break;
-
-		case TAG_FILE_SOURCE:
-		{
-			BYTE fileSource = *((BYTE*)FreeImage_GetTagValue(tag));
-			if (fileSource == 3) {
-				return "Digital Still Camera (DSC)";
-			} else {
-				sprintf(format, "Unknown (%d)", fileSource);
-				buffer += format;
-				return buffer.c_str();
-			}
-        }
-		break;
-
-		case TAG_EXPOSURE_PROGRAM:
-		{
-			unsigned short exposureProgram = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (exposureProgram) {
-				case 1:
-					return "Manual control";
-				case 2:
-					return "Program normal";
-				case 3:
-					return "Aperture priority";
-				case 4:
-					return "Shutter priority";
-				case 5:
-					return "Program creative (slow program)";
-				case 6:
-					return "Program action (high-speed program)";
-				case 7:
-					return "Portrait mode";
-				case 8:
-					return "Landscape mode";
-				default:
-					sprintf(format, "Unknown program (%d)", exposureProgram);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_CUSTOM_RENDERED:
-		{
-			unsigned short customRendered = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (customRendered) {
-				case 0:
-					return "Normal process";
-				case 1:
-					return "Custom process";
-				default:
-					sprintf(format, "Unknown rendering (%d)", customRendered);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_EXPOSURE_MODE:
-		{
-			unsigned short exposureMode = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (exposureMode) {
-				case 0:
-					return "Auto exposure";
-				case 1:
-					return "Manual exposure";
-				case 2:
-					return "Auto bracket";
-				default:
-					sprintf(format, "Unknown mode (%d)", exposureMode);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_WHITE_BALANCE:
-		{
-			unsigned short whiteBalance = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (whiteBalance) {
-				case 0:
-					return "Auto white balance";
-				case 1:
-					return "Manual white balance";
-				default:
-					sprintf(format, "Unknown (%d)", whiteBalance);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SCENE_CAPTURE_TYPE:
-		{
-			unsigned short sceneType = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (sceneType) {
-				case 0:
-					return "Standard";
-				case 1:
-					return "Landscape";
-				case 2:
-					return "Portrait";
-				case 3:
-					return "Night scene";
-				default:
-					sprintf(format, "Unknown (%d)", sceneType);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_GAIN_CONTROL:
-		{
-			unsigned short gainControl = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (gainControl) {
-				case 0:
-					return "None";
-				case 1:
-					return "Low gain up";
-				case 2:
-					return "High gain up";
-				case 3:
-					return "Low gain down";
-				case 4:
-					return "High gain down";
-				default:
-					sprintf(format, "Unknown (%d)", gainControl);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_CONTRAST:
-		{
-			unsigned short contrast = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (contrast) {
-				case 0:
-					return "Normal";
-				case 1:
-					return "Soft";
-				case 2:
-					return "Hard";
-				default:
-					sprintf(format, "Unknown (%d)", contrast);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SATURATION:
-		{
-			unsigned short saturation = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (saturation) {
-				case 0:
-					return "Normal";
-				case 1:
-					return "Low saturation";
-				case 2:
-					return "High saturation";
-				default:
-					sprintf(format, "Unknown (%d)", saturation);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SHARPNESS:
-		{
-			unsigned short sharpness = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (sharpness) {
-				case 0:
-					return "Normal";
-				case 1:
-					return "Soft";
-				case 2:
-					return "Hard";
-				default:
-					sprintf(format, "Unknown (%d)", sharpness);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_SUBJECT_DISTANCE_RANGE:
-		{
-			unsigned short distanceRange = *((unsigned short *)FreeImage_GetTagValue(tag));
-
-			switch (distanceRange) {
-				case 0:
-					return "unknown";
-				case 1:
-					return "Macro";
-				case 2:
-					return "Close view";
-				case 3:
-					return "Distant view";
-				default:
-					sprintf(format, "Unknown (%d)", distanceRange);
-					buffer += format;
-					return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_ISO_SPEED_RATINGS:
-		{
-			unsigned short isoEquiv = *((unsigned short *)FreeImage_GetTagValue(tag));
-			if (isoEquiv < 50) {
-				isoEquiv *= 200;
-			}
-			sprintf(format, "%d", isoEquiv);
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_USER_COMMENT:
-		{
-			// first 8 bytes are used to define an ID code
-			// we assume this is an ASCII string
-			const BYTE *userComment = (BYTE*)FreeImage_GetTagValue(tag);
-			for(DWORD i = 8; i < FreeImage_GetTagLength(tag); i++) {
-				buffer += userComment[i];
-			}
-			buffer += '\0';
-			return buffer.c_str();
-		}
-		break;
-
-		case TAG_COMPRESSION:
-		{
-			WORD compression = *((WORD*)FreeImage_GetTagValue(tag));
-			switch(compression) {
-				case TAG_COMPRESSION_NONE:
-					sprintf(format, "dump mode (%d)", compression);
-					break;
-				case TAG_COMPRESSION_CCITTRLE:
-					sprintf(format, "CCITT modified Huffman RLE (%d)", compression);
-					break;
-				case TAG_COMPRESSION_CCITTFAX3:
-					sprintf(format, "CCITT Group 3 fax encoding (%d)", compression);
-					break;
-				/*
-				case TAG_COMPRESSION_CCITT_T4:
-					sprintf(format, "CCITT T.4 (TIFF 6 name) (%d)", compression);
-					break;
-				*/
-				case TAG_COMPRESSION_CCITTFAX4:
-					sprintf(format, "CCITT Group 4 fax encoding (%d)", compression);
-					break;
-				/*
-				case TAG_COMPRESSION_CCITT_T6:
-					sprintf(format, "CCITT T.6 (TIFF 6 name) (%d)", compression);
-					break;
-				*/
-				case TAG_COMPRESSION_LZW:
-					sprintf(format, "LZW (%d)", compression);
-					break;
-				case TAG_COMPRESSION_OJPEG:
-					sprintf(format, "!6.0 JPEG (%d)", compression);
-					break;
-				case TAG_COMPRESSION_JPEG:
-					sprintf(format, "JPEG (%d)", compression);
-					break;
-				case TAG_COMPRESSION_NEXT:
-					sprintf(format, "NeXT 2-bit RLE (%d)", compression);
-					break;
-				case TAG_COMPRESSION_CCITTRLEW:
-					sprintf(format, "CCITTRLEW (%d)", compression);
-					break;
-				case TAG_COMPRESSION_PACKBITS:
-					sprintf(format, "PackBits Macintosh RLE (%d)", compression);
-					break;
-				case TAG_COMPRESSION_THUNDERSCAN:
-					sprintf(format, "ThunderScan RLE (%d)", compression);
-					break;
-				case TAG_COMPRESSION_PIXARFILM:
-					sprintf(format, "Pixar companded 10bit LZW (%d)", compression);
-					break;
-				case TAG_COMPRESSION_PIXARLOG:
-					sprintf(format, "Pixar companded 11bit ZIP (%d)", compression);
-					break;
-				case TAG_COMPRESSION_DEFLATE:
-					sprintf(format, "Deflate compression (%d)", compression);
-					break;
-				case TAG_COMPRESSION_ADOBE_DEFLATE:
-					sprintf(format, "Adobe Deflate compression (%d)", compression);
-					break;
-				case TAG_COMPRESSION_DCS:
-					sprintf(format, "Kodak DCS encoding (%d)", compression);
-					break;
-				case TAG_COMPRESSION_JBIG:
-					sprintf(format, "ISO JBIG (%d)", compression);
-					break;
-				case TAG_COMPRESSION_SGILOG:
-					sprintf(format, "SGI Log Luminance RLE (%d)", compression);
-					break;
-				case TAG_COMPRESSION_SGILOG24:
-					sprintf(format, "SGI Log 24-bit packed (%d)", compression);
-					break;
-				case TAG_COMPRESSION_JP2000:
-					sprintf(format, "Leadtools JPEG2000 (%d)", compression);
-					break;
-				case TAG_COMPRESSION_LZMA:
-					sprintf(format, "LZMA2 (%d)", compression);
-					break;
-				default:
-					sprintf(format, "Unknown type (%d)", compression);
-					break;
-			}
-
-			buffer += format;
-			return buffer.c_str();
-		}
-		break;
-	}
-
-	return ConvertAnyTag(tag);
-}
-
-/**
-Convert a Exif GPS tag to a C string
-*/
-static const char* 
-ConvertExifGPSTag(FITAG *tag) {
-	char format[MAX_TEXT_EXTENT];
-	static std::string buffer;
-
-	if(!tag)
-		return NULL;
-
-	buffer.erase();
-
-	// convert the tag value to a string buffer
-
-	switch(FreeImage_GetTagID(tag)) {
-		case TAG_GPS_LATITUDE:
-		case TAG_GPS_LONGITUDE:
-		case TAG_GPS_TIME_STAMP:
-		{
-			DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag);
-			if(FreeImage_GetTagLength(tag) == 24) {
-				// dd:mm:ss or hh:mm:ss
-				int dd = 0, mm = 0;
-				double ss = 0;
-
-				// convert to seconds
-				if(pvalue[1])
-					ss += ((double)pvalue[0] / (double)pvalue[1]) * 3600;
-				if(pvalue[3])
-					ss += ((double)pvalue[2] / (double)pvalue[3]) * 60;
-				if(pvalue[5])
-					ss += ((double)pvalue[4] / (double)pvalue[5]);
-				
-				// convert to dd:mm:ss.ss
-				dd = (int)(ss / 3600);
-				mm = (int)(ss / 60) - dd * 60;
-				ss = ss - dd * 3600 - mm * 60;
-
-				sprintf(format, "%d:%d:%.2f", dd, mm, ss);
-				buffer += format;
-				return buffer.c_str();
-			}
-		}
-		break;
-
-		case TAG_GPS_VERSION_ID:
-		case TAG_GPS_LATITUDE_REF:
-		case TAG_GPS_LONGITUDE_REF:
-		case TAG_GPS_ALTITUDE_REF:
-		case TAG_GPS_ALTITUDE:
-		case TAG_GPS_SATELLITES:
-		case TAG_GPS_STATUS:
-		case TAG_GPS_MEASURE_MODE:
-		case TAG_GPS_DOP:
-		case TAG_GPS_SPEED_REF:
-		case TAG_GPS_SPEED:
-		case TAG_GPS_TRACK_REF:
-		case TAG_GPS_TRACK:
-		case TAG_GPS_IMG_DIRECTION_REF:
-		case TAG_GPS_IMG_DIRECTION:
-		case TAG_GPS_MAP_DATUM:
-		case TAG_GPS_DEST_LATITUDE_REF:
-		case TAG_GPS_DEST_LATITUDE:
-		case TAG_GPS_DEST_LONGITUDE_REF:
-		case TAG_GPS_DEST_LONGITUDE:
-		case TAG_GPS_DEST_BEARING_REF:
-		case TAG_GPS_DEST_BEARING:
-		case TAG_GPS_DEST_DISTANCE_REF:
-		case TAG_GPS_DEST_DISTANCE:
-		case TAG_GPS_PROCESSING_METHOD:
-		case TAG_GPS_AREA_INFORMATION:
-		case TAG_GPS_DATE_STAMP:
-		case TAG_GPS_DIFFERENTIAL:
-			break;
-	}
-
-	return ConvertAnyTag(tag);
-}
-
-// ==========================================================
-// Tag to string conversion function
-//
-
-const char* DLL_CALLCONV 
-FreeImage_TagToString(FREE_IMAGE_MDMODEL model, FITAG *tag, char *Make) {
-	switch(model) {
-		case FIMD_EXIF_MAIN:
-		case FIMD_EXIF_EXIF:
-			return ConvertExifTag(tag);
-
-		case FIMD_EXIF_GPS:
-			return ConvertExifGPSTag(tag);
-
-		case FIMD_EXIF_MAKERNOTE:
-			// We should use the Make string to select an appropriate conversion function
-			// TO DO ...
-			break;
-
-		case FIMD_EXIF_INTEROP:
-		default:
-			break;
-	}
-
-	return ConvertAnyTag(tag);
-}
-
diff --git a/plugins/AdvaImg/src/Metadata/TagLib.cpp b/plugins/AdvaImg/src/Metadata/TagLib.cpp
deleted file mode 100644
index f0aba628e6..0000000000
--- a/plugins/AdvaImg/src/Metadata/TagLib.cpp
+++ /dev/null
@@ -1,1617 +0,0 @@
-// ==========================================================
-// Tag library
-//
-// Design and implementation by
-// - Hervé Drolon <drolon@infonie.fr>
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-// ==========================================================
-// Implementation notes : 
-// ----------------------
-// The tag info tables declared in this file should probably 
-// be loaded from an XML file. 
-// This would allow internationalization features and also 
-// more extensibility. 
-// Maybe in a future release ? 
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-
-/**
- HOW-TO : add a new TagInfo table
- --------------------------------------------------------------------------
- 1) add a table identifier in the TagLib class definition (see enum MDMODEL)
- 2) declare the tag table as static and use a 0/NULL value as last entry
- 3) initialize the table in TagLib::TagLib
- 4) provide a conversion in TagLib::getFreeImageModel
-*/
-
-// --------------------------------------------------------------------------
-// EXIF standard tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  exif_exif_tag_table[] =
-  {
-    {  0x0100, (char *) "ImageWidth", (char *) "Image width"},
-    {  0x0101, (char *) "ImageLength", (char *) "Image height"},
-    {  0x0102, (char *) "BitsPerSample", (char *) "Number of bits per component"},
-    {  0x0103, (char *) "Compression", (char *) "Compression scheme"},
-    {  0x0106, (char *) "PhotometricInterpretation", (char *) "Pixel composition"},
-    {  0x010A, (char *) "FillOrder", (char*) NULL},
-    {  0x010D, (char *) "DocumentName", (char *) NULL},
-    {  0x010E, (char *) "ImageDescription", (char *) "Image title"},
-    {  0x010F, (char *) "Make", (char *) "Image input equipment manufacturer"},
-    {  0x0110, (char *) "Model", (char *) "Image input equipment model"},
-    {  0x0111, (char *) "StripOffsets", (char *) "Image data location"},
-    {  0x0112, (char *) "Orientation", (char *) "Orientation of image"},
-    {  0x0115, (char *) "SamplesPerPixel", (char *) "Number of components"},
-    {  0x0116, (char *) "RowsPerStrip", (char *) "Number of rows per strip"},
-    {  0x0117, (char *) "StripByteCounts", (char *) "Bytes per compressed strip"},
-    {  0x011A, (char *) "XResolution", (char *) "Image resolution in width direction"},
-    {  0x011B, (char *) "YResolution", (char *) "Image resolution in height direction"},
-    {  0x011C, (char *) "PlanarConfiguration", (char *) "Image data arrangement"},
-	{  0x011D, (char *) "PageName", (char *) "Name of the page"},
-	{  0x011E, (char *) "XPosition", (char *) "X position of the image"},
-	{  0x011F, (char *) "YPosition", (char *) "Y position of the image"},
-    {  0x0128, (char *) "ResolutionUnit", (char *) "Unit of X and Y resolution"},
-	{  0x0129, (char *) "PageNumber", (char *) "Page number"},
-    {  0x012D, (char *) "TransferFunction", (char *) "Transfer function"},
-    {  0x0131, (char *) "Software", (char *) "Software used"},
-    {  0x0132, (char *) "DateTime", (char *) "File change date and time"},
-    {  0x013B, (char *) "Artist", (char *) "Person who created the image"},
-	{  0x013C, (char *) "HostComputer", (char *) "Host computer used to generate the image"},
-    {  0x013E, (char *) "WhitePoint", (char *) "White point chromaticity"},
-    {  0x013F, (char *) "PrimaryChromaticities", (char *) "Chromaticities of primaries"},
-    {  0x0156, (char *) "TransferRange", (char *) NULL},
-    {  0x0200, (char *) "JPEGProc", (char *) NULL},
-    {  0x0201, (char *) "JPEGInterchangeFormat", (char *) "Offset to JPEG SOI"},
-    {  0x0202, (char *) "JPEGInterchangeFormatLength", (char *) "Bytes of JPEG data"},
-    {  0x0211, (char *) "YCbCrCoefficients", (char *) "Color space transformation matrix coefficients"},
-    {  0x0212, (char *) "YCbCrSubSampling", (char *) "Subsampling ratio of Y to C"},
-    {  0x0213, (char *) "YCbCrPositioning", (char *) "Y and C positioning"},
-    {  0x0214, (char *) "ReferenceBlackWhite", (char *) "Pair of black and white reference values"},
-    {  0x828D, (char *) "CFARepeatPatternDim", (char *) NULL},
-    {  0x828E, (char *) "CFAPattern", (char *) NULL},
-    {  0x828F, (char *) "BatteryLevel", (char *) NULL},
-    {  0x8298, (char *) "Copyright", (char *) "Copyright holder"},
-    {  0x829A, (char *) "ExposureTime", (char *) "Exposure time"},
-    {  0x829D, (char *) "FNumber", (char *) "F number"},
-    {  0x83BB, (char *) "IPTC/NAA", (char *) NULL},
-    {  0x8773, (char *) "InterColorProfile", (char *) NULL},
-    {  0x8822, (char *) "ExposureProgram", (char *) "Exposure program"},
-    {  0x8824, (char *) "SpectralSensitivity", (char *) "Spectral sensitivity"},
-    {  0x8825, (char *) "GPSInfo", (char *) NULL},
-    {  0x8827, (char *) "ISOSpeedRatings", (char *) "ISO speed rating"},
-    {  0x8828, (char *) "OECF", (char *) "Optoelectric conversion factor"},
-    {  0x9000, (char *) "ExifVersion", (char *) "Exif version"},
-    {  0x9003, (char *) "DateTimeOriginal", (char *) "Date and time of original data generation"},
-    {  0x9004, (char *) "DateTimeDigitized", (char *) "Date and time of digital data generation"},
-    {  0x9101, (char *) "ComponentsConfiguration", (char *) "Meaning of each component"},
-    {  0x9102, (char *) "CompressedBitsPerPixel", (char *) "Image compression mode"},
-    {  0x9201, (char *) "ShutterSpeedValue", (char *) "Shutter speed"},
-    {  0x9202, (char *) "ApertureValue", (char *) "Aperture"},
-    {  0x9203, (char *) "BrightnessValue", (char *) "Brightness"},
-    {  0x9204, (char *) "ExposureBiasValue", (char *) "Exposure bias"},
-    {  0x9205, (char *) "MaxApertureValue", (char *) "Maximum lens aperture"},
-    {  0x9206, (char *) "SubjectDistance", (char *) "Subject distance"},
-    {  0x9207, (char *) "MeteringMode", (char *) "Metering mode"},
-    {  0x9208, (char *) "LightSource", (char *) "Light source"},
-    {  0x9209, (char *) "Flash", (char *) "Flash"},
-    {  0x920A, (char *) "FocalLength", (char *) "Lens focal length"},
-	{  0x9214, (char *) "SubjectArea", (char *) "Subject area"},
-    {  0x927C, (char *) "MakerNote", (char *) "Manufacturer notes"},
-    {  0x9286, (char *) "UserComment", (char *) "User comments"},
-    {  0x9290, (char *) "SubSecTime", (char *) "DateTime subseconds"},
-    {  0x9291, (char *) "SubSecTimeOriginal", (char *) "DateTimeOriginal subseconds"},
-    {  0x9292, (char *) "SubSecTimeDigitized", (char *) "DateTimeDigitized subseconds"},
-    {  0xA000, (char *) "FlashPixVersion", (char *) "Supported Flashpix version"},
-    {  0xA001, (char *) "ColorSpace", (char *) "Color space information"},
-    {  0xA002, (char *) "PixelXDimension", (char *) "Valid image width"},
-    {  0xA003, (char *) "PixelYDimension", (char *) "Valid image height"},
-    {  0xA004, (char *) "RelatedSoundFile", (char *) "Related audio file"},
-    {  0xA005, (char *) "InteroperabilityOffset", (char *) NULL},
-    {  0xA20B, (char *) "FlashEnergy", (char *) "Flash energy"},
-    {  0xA20C, (char *) "SpatialFrequencyResponse", (char *) "Spatial frequency response"},
-    {  0xA20E, (char *) "FocalPlaneXResolution", (char *) "Focal plane X resolution"},
-    {  0xA20F, (char *) "FocalPlaneYResolution", (char *) "Focal plane Y resolution"},
-    {  0xA210, (char *) "FocalPlaneResolutionUnit", (char *) "Focal plane resolution unit"},
-    {  0xA214, (char *) "SubjectLocation", (char *) "Subject location"},
-    {  0xA215, (char *) "ExposureIndex", (char *) "Exposure index"},
-    {  0xA217, (char *) "SensingMethod", (char *) "Sensing method"},
-    {  0xA300, (char *) "FileSrc", (char *) "File source"},
-    {  0xA301, (char *) "SceneType", (char *) "Scene type"},
-    {  0xA302, (char *) "CFAPattern", (char *) "CFA pattern"},
-    {  0xA401, (char *) "CustomRendered", (char *) "Custom image processing"},
-    {  0xA402, (char *) "ExposureMode", (char *) "Exposure mode"},
-    {  0xA403, (char *) "WhiteBalance", (char *) "White balance"},
-    {  0xA404, (char *) "DigitalZoomRatio", (char *) "Digital zoom ratio"},
-    {  0xA405, (char *) "FocalLengthIn35mmFilm", (char *) "Focal length in 35 mm film"},
-    {  0xA406, (char *) "SceneCaptureType", (char *) "Scene capture type"},
-    {  0xA407, (char *) "GainControl", (char *) "Gain control"},
-    {  0xA408, (char *) "Contrast", (char *) "Contrast"},
-    {  0xA409, (char *) "Saturation", (char *) "Saturation"},
-    {  0xA40A, (char *) "Sharpness", (char *) "Sharpness"},
-    {  0xA40B, (char *) "DeviceSettingDescription", (char *) "Device settings description"},
-    {  0xA40C, (char *) "SubjectDistanceRange", (char *) "Subject distance range"},
-    {  0xA420, (char *) "ImageUniqueID", (char *) "Unique image ID"},
-    {  0xA430, (char *) "CameraOwnerName", (char *) "Camera owner name"},
-    {  0xA431, (char *) "BodySerialNumber", (char *) "Body serial number"},
-    {  0xA432, (char *) "LensSpecification", (char *) "Lens specification"},
-    {  0xA433, (char *) "LensMake", (char *) "Lens make"},
-    {  0xA434, (char *) "LensModel", (char *) "Lens model"},
-    {  0xA435, (char *) "LensSerialNumber", (char *) "Lens serial number"},
-
-	// These tags are not part of the Exiv v2.3 specifications but are often loaded by applications as Exif data
-	{  0x4746, (char *) "Rating", (char *) "Rating tag used by Windows"},
-	{  0x4749, (char *) "RatingPercent", (char *) "Rating tag used by Windows, value in percent"},
-	{  0x9C9B, (char *) "XPTitle", (char *) "Title tag used by Windows, encoded in UCS2"},
-	{  0x9C9C, (char *) "XPComment", (char *) "Comment tag used by Windows, encoded in UCS2"},
-	{  0x9C9D, (char *) "XPAuthor", (char *) "Author tag used by Windows, encoded in UCS2"},
-	{  0x9C9E, (char *) "XPKeywords", (char *) "Keywords tag used by Windows, encoded in UCS2"},
-	{  0x9C9F, (char *) "XPSubject", (char *) "Subject tag used by Windows, encoded in UCS2"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// EXIF GPS tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  exif_gps_tag_table[] =
-  {
-    {  0x0000, (char *) "GPSVersionID", (char *) "GPS tag version"},
-	{  0x0001, (char *) "GPSLatitudeRef", (char *) "North or South Latitude"},
-    {  0x0002, (char *) "GPSLatitude", (char *) "Latitude"},
-    {  0x0003, (char *) "GPSLongitudeRef", (char *) "East or West Longitude"},
-    {  0x0004, (char *) "GPSLongitude", (char *) "Longitude"},
-    {  0x0005, (char *) "GPSAltitudeRef", (char *) "Altitude reference"},
-    {  0x0006, (char *) "GPSAltitude", (char *) "Altitude"},
-    {  0x0007, (char *) "GPSTimeStamp", (char *) "GPS time (atomic clock)"},
-    {  0x0008, (char *) "GPSSatellites", (char *) "GPS satellites used for measurement"},
-    {  0x0009, (char *) "GPSStatus", (char *) "GPS receiver status"},
-    {  0x000A, (char *) "GPSMeasureMode", (char *) "GPS measurement mode"},
-    {  0x000B, (char *) "GPSDOP", (char *) "Measurement precision"},
-    {  0x000C, (char *) "GPSSpeedRef", (char *) "Speed unit"},
-    {  0x000D, (char *) "GPSSpeed", (char *) "Speed of GPS receiver"},
-    {  0x000E, (char *) "GPSTrackRef", (char *) "Reference for direction of movement"},
-    {  0x000F, (char *) "GPSTrack", (char *) "Direction of movement"},
-    {  0x0010, (char *) "GPSImgDirectionRef", (char *) "Reference for direction of image"},
-    {  0x0011, (char *) "GPSImgDirection", (char *) "Direction of image"},
-    {  0x0012, (char *) "GPSMapDatum", (char *) "Geodetic survey data used"},
-    {  0x0013, (char *) "GPSDestLatitudeRef", (char *) "Reference for latitude of destination"},
-    {  0x0014, (char *) "GPSDestLatitude", (char *) "Latitude of destination"},
-    {  0x0015, (char *) "GPSDestLongitudeRef", (char *) "Reference for longitude of destination"},
-    {  0x0016, (char *) "GPSDestLongitude", (char *) "Longitude of destination"},
-    {  0x0017, (char *) "GPSDestBearingRef", (char *) "Reference for bearing of destination"},
-    {  0x0018, (char *) "GPSDestBearing", (char *) "Bearing of destination"},
-    {  0x0019, (char *) "GPSDestDistanceRef", (char *) "Reference for distance to destination"},
-    {  0x001A, (char *) "GPSDestDistance", (char *) "Distance to destination"},
-    {  0x001B, (char *) "GPSProcessingMethod", (char *) "Name of GPS processing method"},
-    {  0x001C, (char *) "GPSAreaInformation", (char *) "Name of GPS area"},
-    {  0x001D, (char *) "GPSDateStamp", (char *) "GPS date"},
-    {  0x001E, (char *) "GPSDifferential", (char *) "GPS differential correction"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// EXIF interoperability tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  exif_interop_tag_table[] =
-  {
-    {  0x0001, (char *) "InteroperabilityIndex", (char *) "Interoperability Identification"},
-    {  0x0002, (char *) "InteroperabilityVersion", (char *) "Interoperability version"},
-    {  0x1000, (char *) "RelatedImageFileFormat", (char *) "File format of image file"},
-    {  0x1001, (char *) "RelatedImageWidth", (char *) "Image width"},
-    {  0x1002, (char *) "RelatedImageLength", (char *) "Image height"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// EXIF maker note tags definition
-// --------------------------------------------------------------------------
-
-/**
-Canon maker note
-*/
-static TagInfo
-  exif_canon_tag_table[] =
-  {
-    {  0x0001, (char *) "CanonCameraSettings", (char *) "Canon CameraSettings Tags"},
-    {  0x0002, (char *) "CanonFocalLength", (char *) "Canon FocalLength Tags"},
-    {  0x0003, (char *) "CanonFlashInfo?", (char *) NULL},
-    {  0x0004, (char *) "CanonShotInfo", (char *) "Canon ShotInfo Tags"},
-    {  0x0005, (char *) "CanonPanorama", (char *) "Canon Panorama Tags"},
-    {  0x0006, (char *) "CanonImageType", (char *) NULL},
-    {  0x0007, (char *) "CanonFirmwareVersion", (char *) NULL},
-    {  0x0008, (char *) "FileNumber", (char *) NULL},
-    {  0x0009, (char *) "OwnerName", (char *) NULL},
-    {  0x000A, (char *) "UnknownD30", (char *) "Canon UnknownD30 Tags"},
-    {  0x000C, (char *) "SerialNumber", (char *) NULL},
-    {  0x000D, (char *) "CanonCameraInfo", (char *) "Canon CameraInfo Tags"},
-    {  0x000E, (char *) "CanonFileLength", (char *) NULL},
-    {  0x000F, (char *) "CanonCustomFunctions", (char *) "Custom Functions"},
-    {  0x0010, (char *) "CanonModelID", (char *) NULL},
-    {  0x0012, (char *) "CanonAFInfo", (char *) "Canon AFInfo Tags"},
-    {  0x0013, (char *) "ThumbnailImageValidArea", (char *) NULL},
-    {  0x0015, (char *) "SerialNumberFormat", (char *) NULL},
-    {  0x001A, (char *) "SuperMacro", (char *) NULL},
-    {  0x001C, (char *) "DateStampMode", (char *) NULL},
-    {  0x001D, (char *) "MyColors", (char *) NULL},
-    {  0x001E, (char *) "FirmwareRevision", (char *) NULL},
-    {  0x0023, (char *) "Categories", (char *) NULL},
-    {  0x0024, (char *) "FaceDetect1", (char *) NULL},
-    {  0x0025, (char *) "FaceDetect2", (char *) NULL},
-    {  0x0026, (char *) "CanonAFInfo2", (char *) "Canon AFInfo2 Tags"},
-    {  0x0028, (char *) "ImageUniqueID", (char *) NULL},
-    {  0x0081, (char *) "RawDataOffset", (char *) NULL},
-    {  0x0083, (char *) "OriginalDecisionDataOffset", (char *) NULL},
-    {  0x0090, (char *) "CustomFunctions1D", (char *) "CanonCustom Functions1D Tags"},
-    {  0x0091, (char *) "PersonalFunctions", (char *) "CanonCustom PersonalFuncs Tags"},
-    {  0x0092, (char *) "PersonalFunctionValues", (char *) "CanonCustom PersonalFuncValues Tags"},
-    {  0x0093, (char *) "CanonFileInfo", (char *) "Canon FileInfo Tags"},
-    {  0x0094, (char *) "AFPointsInFocus1D", (char *) NULL},
-    {  0x0095, (char *) "LensModel", (char *) NULL},
-    {  0x0096, (char *) "SerialInfo", (char *) NULL},
-    {  0x0097, (char *) "DustRemovalData", (char *) NULL},
-	{  0x0098, (char *) "CropInfo", (char *) NULL},
-    {  0x0099, (char *) "CustomFunctions2", (char *) NULL},
-	{  0x009A, (char *) "AspectInfo", (char *) NULL},
-    {  0x00A0, (char *) "ProcessingInfo", (char *) NULL},
-    {  0x00A1, (char *) "ToneCurveTable", (char *) NULL},
-    {  0x00A2, (char *) "SharpnessTable", (char *) NULL},
-    {  0x00A3, (char *) "SharpnessFreqTable", (char *) NULL},
-    {  0x00A4, (char *) "WhiteBalanceTable", (char *) NULL},
-    {  0x00A9, (char *) "ColorBalance", (char *) NULL},
-    {  0x00AA, (char *) "MeasuredColor", (char *) NULL},
-    {  0x00AE, (char *) "ColorTemperature", (char *) NULL},
-    {  0x00B0, (char *) "CanonFlags", (char *) NULL},
-    {  0x00B1, (char *) "ModifiedInfo", (char *) NULL},
-    {  0x00B2, (char *) "ToneCurveMatching", (char *) NULL},
-    {  0x00B3, (char *) "WhiteBalanceMatching", (char *) NULL},
-    {  0x00B4, (char *) "ColorSpace", (char *) NULL},
-    {  0x00B6, (char *) "PreviewImageInfo", (char *) NULL},
-    {  0x00D0, (char *) "VRDOffset", (char *) "Offset of VRD 'recipe data' if it exists"},
-    {  0x00E0, (char *) "SensorInfo", (char *) NULL},
-    {  0x4001, (char *) "ColorData", (char *) "Canon ColorData Tags"},
-    {  0x4002, (char *) "CRWParam?", (char *) NULL},
-    {  0x4003, (char *) "ColorInfo", (char *) NULL},
-    {  0x4005, (char *) "Flavor?", (char *) NULL},
-    {  0x4008, (char *) "BlackLevel?", (char *) NULL},
-	{  0x4010, (char *) "CustomPictureStyleFileName", (char *) NULL},
-    {  0x4013, (char *) "AFMicroAdj", (char *) NULL},
-    {  0x4015, (char *) "VignettingCorr", (char *) NULL},
-    {  0x4016, (char *) "VignettingCorr2", (char *) NULL},
-    {  0x4018, (char *) "LightingOpt", (char *) NULL},
-	{  0x4019, (char *) "LensInfo", (char *) NULL},
-	{  0x4020, (char *) "AmbienceInfo", (char *) NULL},
-	{  0x4024, (char *) "FilterInfo", (char *) NULL},
-
-	// These 'sub'-tag values have been created for consistency -- they don't exist within the exif segment
-
-	// Fields under tag 0x0001 (we add 0xC100 to make unique tag id)
-    {  0xC100 + 1, (char *) "CameraSettings:MacroMode", (char *) NULL},
-    {  0xC100 + 2, (char *) "CameraSettings:SelfTimer", (char *) NULL},
-    {  0xC100 + 3, (char *) "CameraSettings:Quality", (char *) NULL},
-    {  0xC100 + 4, (char *) "CameraSettings:CanonFlashMode", (char *) NULL},
-    {  0xC100 + 5, (char *) "CameraSettings:ContinuousDrive", (char *) NULL},
-	{  0xC100 + 6, (char *) "CameraSettings:0x0006", (char *) NULL},
-    {  0xC100 + 7, (char *) "CameraSettings:FocusMode", (char *) NULL},
-	{  0xC100 + 8, (char *) "CameraSettings:0x0008", (char *) NULL},
-    {  0xC100 + 9, (char *) "CameraSettings:RecordMode", (char *) NULL},
-    {  0xC100 + 10, (char *) "CameraSettings:CanonImageSize", (char *) NULL},
-    {  0xC100 + 11, (char *) "CameraSettings:EasyMode", (char *) NULL},
-    {  0xC100 + 12, (char *) "CameraSettings:DigitalZoom", (char *) NULL},
-    {  0xC100 + 13, (char *) "CameraSettings:Contrast", (char *) NULL},
-    {  0xC100 + 14, (char *) "CameraSettings:Saturation", (char *) NULL},
-    {  0xC100 + 15, (char *) "CameraSettings:Sharpness", (char *) NULL},
-    {  0xC100 + 16, (char *) "CameraSettings:CameraISO", (char *) NULL},
-    {  0xC100 + 17, (char *) "CameraSettings:MeteringMode", (char *) NULL},
-    {  0xC100 + 18, (char *) "CameraSettings:FocusRange", (char *) NULL},
-    {  0xC100 + 19, (char *) "CameraSettings:AFPoint", (char *) NULL},
-    {  0xC100 + 20, (char *) "CameraSettings:CanonExposureMode", (char *) NULL},
-	{  0xC100 + 21, (char *) "CameraSettings:0x0015", (char *) NULL},
-    {  0xC100 + 22, (char *) "CameraSettings:LensType", (char *) NULL},
-    {  0xC100 + 23, (char *) "CameraSettings:LongFocal", (char *) NULL},
-    {  0xC100 + 24, (char *) "CameraSettings:ShortFocal", (char *) NULL},
-    {  0xC100 + 25, (char *) "CameraSettings:FocalUnits", (char *) "Focal Units per mm"},
-    {  0xC100 + 26, (char *) "CameraSettings:MaxAperture", (char *) NULL},
-    {  0xC100 + 27, (char *) "CameraSettings:MinAperture", (char *) NULL},
-    {  0xC100 + 28, (char *) "CameraSettings:FlashActivity", (char *) NULL},
-    {  0xC100 + 29, (char *) "CameraSettings:FlashBits", (char *) NULL},
-	{  0xC100 + 30, (char *) "CameraSettings:0x001E", (char *) NULL},
-	{  0xC100 + 31, (char *) "CameraSettings:0x001F", (char *) NULL},
-    {  0xC100 + 32, (char *) "CameraSettings:FocusContinuous", (char *) NULL},
-    {  0xC100 + 33, (char *) "CameraSettings:AESetting", (char *) NULL},
-    {  0xC100 + 34, (char *) "CameraSettings:ImageStabilization", (char *) NULL},
-    {  0xC100 + 35, (char *) "CameraSettings:DisplayAperture", (char *) NULL},
-    {  0xC100 + 36, (char *) "CameraSettings:ZoomSourceWidth", (char *) NULL},
-    {  0xC100 + 37, (char *) "CameraSettings:ZoomTargetWidth", (char *) NULL},
-	{  0xC100 + 38, (char *) "CameraSettings:0x0026", (char *) NULL},
-    {  0xC100 + 39, (char *) "CameraSettings:SpotMeteringMode", (char *) NULL},
-    {  0xC100 + 40, (char *) "CameraSettings:PhotoEffect", (char *) NULL},
-    {  0xC100 + 41, (char *) "CameraSettings:ManualFlashOutput", (char *) NULL},
-    {  0xC100 + 42, (char *) "CameraSettings:ColorTone", (char *) NULL},
-	{  0xC100 + 43, (char *) "CameraSettings:0x002B", (char *) NULL},
-	{  0xC100 + 44, (char *) "CameraSettings:0x002C", (char *) NULL},
-	{  0xC100 + 45, (char *) "CameraSettings:0x002D", (char *) NULL},
-    {  0xC100 + 46, (char *) "CameraSettings:SRAWQuality", (char *) NULL},
-	{  0xC100 + 47, (char *) "CameraSettings:0x002F", (char *) NULL},
-	{  0xC100 + 48, (char *) "CameraSettings:0x0030", (char *) NULL},
-
-	// Fields under tag 0x0002 (we add 0xC200 to make unique tag id)
-    {  0xC200 + 0, (char *) "FocalLength:FocalType", (char *) NULL},
-    {  0xC200 + 1, (char *) "FocalLength:FocalLength", (char *) NULL},
-    {  0xC200 + 2, (char *) "FocalLength:FocalPlaneXSize", (char *) NULL},
-    {  0xC200 + 3, (char *) "FocalLength:FocalPlaneYSize", (char *) NULL},
-	
-	// Fields under tag 0x0004 (we add 0xC400 to make unique tag id)
-    {  0xC400 + 1, (char *) "ShotInfo:AutoISO", (char *) NULL},
-	{  0xC400 + 2, (char *) "ShotInfo:BaseISO", (char *) NULL},
-	{  0xC400 + 3, (char *) "ShotInfo:MeasuredEV", (char *) NULL},
-    {  0xC400 + 4, (char *) "ShotInfo:TargetAperture", (char *) NULL},
-    {  0xC400 + 5, (char *) "ShotInfo:TargetExposureTime", (char *) NULL},
-    {  0xC400 + 6, (char *) "ShotInfo:ExposureCompensation", (char *) NULL},
-    {  0xC400 + 7, (char *) "ShotInfo:WhiteBalance", (char *) NULL},
-    {  0xC400 + 8, (char *) "ShotInfo:SlowShutter", (char *) NULL},
-    {  0xC400 + 9, (char *) "ShotInfo:SequenceNumber", (char *) NULL},
-    {  0xC400 + 10, (char *) "ShotInfo:OpticalZoomCode", (char *) NULL},
-	{  0xC400 + 11, (char *) "ShotInfo:0x000B", (char *) NULL},
-	{  0xC400 + 12, (char *) "ShotInfo:CameraTemperature", (char *) NULL},
-    {  0xC400 + 13, (char *) "ShotInfo:FlashGuideNumber", (char *) NULL},
-    {  0xC400 + 14, (char *) "ShotInfo:AFPointsInFocus", (char *) NULL},
-    {  0xC400 + 15, (char *) "ShotInfo:FlashExposureComp", (char *) NULL},
-    {  0xC400 + 16, (char *) "ShotInfo:AutoExposureBracketing", (char *) NULL},
-    {  0xC400 + 17, (char *) "ShotInfo:AEBBracketValue", (char *) NULL},
-    {  0xC400 + 18, (char *) "ShotInfo:ControlMode", (char *) NULL},
-    {  0xC400 + 19, (char *) "ShotInfo:FocusDistanceUpper", (char *) NULL},
-    {  0xC400 + 20, (char *) "ShotInfo:FocusDistanceLower", (char *) NULL},
-    {  0xC400 + 21, (char *) "ShotInfo:FNumber", (char *) NULL},
-    {  0xC400 + 22, (char *) "ShotInfo:ExposureTime", (char *) NULL},
-    {  0xC400 + 23, (char *) "ShotInfo:MeasuredEV2", (char *) NULL},
-    {  0xC400 + 24, (char *) "ShotInfo:BulbDuration", (char *) NULL},
-	{  0xC400 + 25, (char *) "ShotInfo:0x0019", (char *) NULL},
-    {  0xC400 + 26, (char *) "ShotInfo:CameraType", (char *) NULL},
-    {  0xC400 + 27, (char *) "ShotInfo:AutoRotate", (char *) NULL},
-    {  0xC400 + 28, (char *) "ShotInfo:NDFilter", (char *) NULL},
-    {  0xC400 + 29, (char *) "ShotInfo:SelfTimer2", (char *) NULL},
-	{  0xC400 + 30, (char *) "ShotInfo:0x001E", (char *) NULL},
-	{  0xC400 + 31, (char *) "ShotInfo:0x001F", (char *) NULL},
-	{  0xC400 + 32, (char *) "ShotInfo:0x0020", (char *) NULL},
-    {  0xC400 + 33, (char *) "ShotInfo:FlashOutput", (char *) NULL},
-
-	// Fields under tag 0x0012 (we add 0x1200 to make unique tag id)
-    {  0x1200 + 0, (char *) "AFInfo:NumAFPoints", (char *) NULL},
-    {  0x1200 + 1, (char *) "AFInfo:ValidAFPoints", (char *) NULL},
-    {  0x1200 + 2, (char *) "AFInfo:CanonImageWidth", (char *) NULL},
-    {  0x1200 + 3, (char *) "AFInfo:CanonImageHeight", (char *) NULL},
-    {  0x1200 + 4, (char *) "AFInfo:AFImageWidth", (char *) NULL},
-    {  0x1200 + 5, (char *) "AFInfo:AFImageHeight", (char *) NULL},
-    {  0x1200 + 6, (char *) "AFInfo:AFAreaWidth", (char *) NULL},
-    {  0x1200 + 7, (char *) "AFInfo:AFAreaHeight", (char *) NULL},
-    {  0x1200 + 8, (char *) "AFInfo:AFAreaXPositions", (char *) NULL},
-    {  0x1200 + 9, (char *) "AFInfo:AFAreaYPositions", (char *) NULL},
-    {  0x1200 + 10, (char *) "AFInfo:AFPointsInFocus", (char *) NULL},
-    {  0x1200 + 11, (char *) "AFInfo:PrimaryAFPoint?", (char *) NULL},
-    {  0x1200 + 12, (char *) "AFInfo:PrimaryAFPoint", (char *) NULL},
-	{  0x1200 + 13, (char *) "AFInfo:0x000D", (char *) NULL},
-	{  0x1200 + 14, (char *) "AFInfo:0x000E", (char *) NULL},
-	{  0x1200 + 15, (char *) "AFInfo:0x000F", (char *) NULL},
-	{  0x1200 + 16, (char *) "AFInfo:0x0010", (char *) NULL},
-	{  0x1200 + 17, (char *) "AFInfo:0x0011", (char *) NULL},
-	{  0x1200 + 18, (char *) "AFInfo:0x0012", (char *) NULL},
-	{  0x1200 + 19, (char *) "AFInfo:0x0013", (char *) NULL},
-	{  0x1200 + 20, (char *) "AFInfo:0x0014", (char *) NULL},
-	{  0x1200 + 21, (char *) "AFInfo:0x0015", (char *) NULL},
-	{  0x1200 + 22, (char *) "AFInfo:0x0016", (char *) NULL},
-	{  0x1200 + 23, (char *) "AFInfo:0x0017", (char *) NULL},
-	{  0x1200 + 24, (char *) "AFInfo:0x0018", (char *) NULL},
-	{  0x1200 + 25, (char *) "AFInfo:0x0019", (char *) NULL},
-	{  0x1200 + 26, (char *) "AFInfo:0x001A", (char *) NULL},
-	{  0x1200 + 27, (char *) "AFInfo:0x001B", (char *) NULL},
-
-	// Fields under tag 0x00A0 (we add 0xCA00 to make unique tag id)
-    {  0xCA00 + 1, (char *) "ProcessingInfo:ToneCurve", (char *) NULL},
-    {  0xCA00 + 2, (char *) "ProcessingInfo:Sharpness", (char *) NULL},
-    {  0xCA00 + 3, (char *) "ProcessingInfo:SharpnessFrequency", (char *) NULL},
-    {  0xCA00 + 4, (char *) "ProcessingInfo:SensorRedLevel", (char *) NULL},
-    {  0xCA00 + 5, (char *) "ProcessingInfo:SensorBlueLevel", (char *) NULL},
-    {  0xCA00 + 6, (char *) "ProcessingInfo:WhiteBalanceRed", (char *) NULL},
-    {  0xCA00 + 7, (char *) "ProcessingInfo:WhiteBalanceBlue", (char *) NULL},
-    {  0xCA00 + 8, (char *) "ProcessingInfo:WhiteBalance", (char *) NULL},
-    {  0xCA00 + 9, (char *) "ProcessingInfo:ColorTemperature", (char *) NULL},
-    {  0xCA00 + 10, (char *) "ProcessingInfo:PictureStyle", (char *) NULL},
-    {  0xCA00 + 11, (char *) "ProcessingInfo:DigitalGain", (char *) NULL},
-    {  0xCA00 + 12, (char *) "ProcessingInfo:WBShiftAB", (char *) NULL},
-    {  0xCA00 + 13, (char *) "ProcessingInfo:WBShiftGM", (char *) NULL},
-
-	// Fields under tag 0x00E0 (we add 0xCE00 to make unique tag id)
-    {  0xCE00 + 1, (char *) "SensorInfo:SensorWidth", (char *) NULL},
-    {  0xCE00 + 2, (char *) "SensorInfo:SensorHeight", (char *) NULL},
-	{  0xCE00 + 3, (char *) "SensorInfo:0x0003", (char *) NULL},
-	{  0xCE00 + 4, (char *) "SensorInfo:0x0004", (char *) NULL},
-    {  0xCE00 + 5, (char *) "SensorInfo:SensorLeftBorder", (char *) NULL},
-    {  0xCE00 + 6, (char *) "SensorInfo:SensorTopBorder", (char *) NULL},
-    {  0xCE00 + 7, (char *) "SensorInfo:SensorRightBorder", (char *) NULL},
-    {  0xCE00 + 8, (char *) "SensorInfo:SensorBottomBorder", (char *) NULL},
-    {  0xCE00 + 9, (char *) "SensorInfo:BlackMaskLeftBorder", (char *) NULL},
-    {  0xCE00 + 10, (char *) "SensorInfo:BlackMaskTopBorder", (char *) NULL},
-    {  0xCE00 + 11, (char *) "SensorInfo:BlackMaskRightBorder", (char *) NULL},
-    {  0xCE00 + 12, (char *) "SensorInfo:BlackMaskBottomBorder", (char *) NULL},
-	{  0xCE00 + 13, (char *) "SensorInfo:0x000D", (char *) NULL},
-	{  0xCE00 + 14, (char *) "SensorInfo:0x000E", (char *) NULL},
-	{  0xCE00 + 15, (char *) "SensorInfo:0x000F", (char *) NULL},
-	{  0xCE00 + 16, (char *) "SensorInfo:0x0010", (char *) NULL},
-
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Casio type 1 maker note
-*/
-static TagInfo
-  exif_casio_type1_tag_table[] =
-  {
-    {  0x0001, (char *) "RecordingMode", (char *) NULL},
-    {  0x0002, (char *) "Quality", (char *) NULL},
-    {  0x0003, (char *) "FocusMode", (char *) NULL},
-    {  0x0004, (char *) "FlashMode", (char *) NULL},
-    {  0x0005, (char *) "FlashIntensity", (char *) NULL},
-    {  0x0006, (char *) "ObjectDistance", (char *) NULL},
-    {  0x0007, (char *) "WhiteBalance", (char *) NULL},
-    {  0x000A, (char *) "DigitalZoom", (char *) NULL},
-    {  0x000B, (char *) "Sharpness", (char *) NULL},
-    {  0x000C, (char *) "Contrast", (char *) NULL},
-    {  0x000D, (char *) "Saturation", (char *) NULL},
-    {  0x0014, (char *) "ISO", (char *) NULL},
-	{  0x0015, (char *) "FirmwareDate", (char *) NULL},
-    {  0x0016, (char *) "Enhancement", (char *) NULL},
-    {  0x0017, (char *) "ColorFilter", (char *) NULL},
-    {  0x0018, (char *) "AFPoint", (char *) NULL},
-    {  0x0019, (char *) "FlashIntensity", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Casio type 2 maker note
-*/
-static TagInfo
-  exif_casio_type2_tag_table[] =
-  {
-    {  0x0002, (char *) "PreviewImageSize", (char *) NULL},
-    {  0x0003, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x0004, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x0008, (char *) "QualityMode", (char *) NULL},
-    {  0x0009, (char *) "CasioImageSize", (char *) NULL},
-    {  0x000D, (char *) "FocusMode", (char *) NULL},
-    {  0x0014, (char *) "ISO", (char *) NULL},
-    {  0x0019, (char *) "WhiteBalance", (char *) NULL},
-    {  0x001D, (char *) "FocalLength", (char *) NULL},
-    {  0x001F, (char *) "Saturation", (char *) NULL},
-    {  0x0020, (char *) "Contrast", (char *) NULL},
-    {  0x0021, (char *) "Sharpness", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x2000, (char *) "PreviewImage", (char *) NULL},
-    {  0x2001, (char *) "FirmwareDate", (char *) NULL},
-    {  0x2011, (char *) "WhiteBalanceBias", (char *) NULL},
-    {  0x2012, (char *) "WhiteBalance", (char *) NULL},
-    {  0x2021, (char *) "AFPointPosition", (char *) NULL},
-    {  0x2022, (char *) "ObjectDistance", (char *) NULL},
-    {  0x2034, (char *) "FlashDistance", (char *) NULL},
-	{  0x2076, (char *) "SpecialEffectMode", (char *) NULL},
-    {  0x3000, (char *) "RecordMode", (char *) NULL},
-    {  0x3001, (char *) "ReleaseMode", (char *) NULL},
-    {  0x3002, (char *) "Quality", (char *) NULL},
-    {  0x3003, (char *) "FocusMode", (char *) NULL},
-    {  0x3006, (char *) "HometownCity", (char *) NULL},
-    {  0x3007, (char *) "BestShotMode", (char *) NULL},
-    {  0x3008, (char *) "AutoISO", (char *) NULL},
-    {  0x3009, (char *) "AFMode", (char *) NULL},
-    {  0x3011, (char *) "Sharpness", (char *) NULL},
-    {  0x3012, (char *) "Contrast", (char *) NULL},
-    {  0x3013, (char *) "Saturation", (char *) NULL},
-    {  0x3014, (char *) "ISO", (char *) NULL},
-    {  0x3015, (char *) "ColorMode", (char *) NULL},
-    {  0x3016, (char *) "Enhancement", (char *) NULL},
-    {  0x3017, (char *) "ColorFilter", (char *) NULL},
-	{  0x301B, (char *) "ArtMode", (char *) NULL},
-    {  0x301C, (char *) "SequenceNumber", (char *) NULL},
-    {  0x301D, (char *) "BracketSequence", (char *) NULL},
-    {  0x3020, (char *) "ImageStabilization", (char *) NULL},
-    {  0x302A, (char *) "LightingMode", (char *) NULL},
-    {  0x302B, (char *) "PortraitRefiner", (char *) NULL},
-    {  0x3030, (char *) "SpecialEffectLevel", (char *) NULL},
-    {  0x3031, (char *) "SpecialEffectSetting", (char *) NULL},
-	{  0x3103, (char *) "DriveMode", (char *) NULL},
-	{  0x4001, (char *) "CaptureFrameRate", (char *) NULL},
-	{  0x4003, (char *) "VideoQuality", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-FujiFilm maker note
-*/
-static TagInfo
-  exif_fujifilm_tag_table[] =
-  {
-    {  0x0000, (char *) "Version", (char *) NULL},
-    {  0x0010, (char *) "InternalSerialNumber", (char *) NULL},
-    {  0x1000, (char *) "Quality", (char *) NULL},
-    {  0x1001, (char *) "Sharpness", (char *) NULL},
-    {  0x1002, (char *) "WhiteBalance", (char *) NULL},
-    {  0x1003, (char *) "Saturation", (char *) NULL},
-    {  0x1004, (char *) "Contrast", (char *) NULL},
-	{  0x1005, (char *) "ColorTemperature", (char *) NULL},
-	{  0x100A, (char *) "WhiteBalanceFineTune", (char *) NULL},
-	{  0x100B, (char *) "NoiseReduction", (char *) NULL},
-    {  0x1010, (char *) "FujiFlashMode", (char *) NULL},
-    {  0x1011, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x1020, (char *) "Macro", (char *) NULL},
-    {  0x1021, (char *) "FocusMode", (char *) NULL},
-    {  0x1023, (char *) "FocusPixel", (char *) NULL},
-    {  0x1030, (char *) "SlowSync", (char *) NULL},
-    {  0x1031, (char *) "PictureMode", (char *) NULL},
-	{  0x1033, (char *) "EXRAuto", (char *) NULL},
-	{  0x1034, (char *) "EXRMode", (char *) NULL},
-    {  0x1100, (char *) "AutoBracketting", (char *) NULL},
-    {  0x1101, (char *) "SequenceNumber", (char *) NULL},
-    {  0x1210, (char *) "ColorMode", (char *) NULL},
-    {  0x1300, (char *) "BlurWarning", (char *) NULL},
-    {  0x1301, (char *) "FocusWarning", (char *) NULL},
-    {  0x1302, (char *) "ExposureWarning", (char *) NULL},
-    {  0x1400, (char *) "DynamicRange", (char *) NULL},
-	{  0x1401, (char *) "FilmMode", (char *) NULL},
-	{  0x1402, (char *) "DynamicRangeSetting", (char *) NULL},
-	{  0x1403, (char *) "DevelopmentDynamicRange", (char *) NULL},
-	{  0x1404, (char *) "MinFocalLength", (char *) NULL},
-	{  0x1405, (char *) "MaxFocalLength", (char *) NULL},
-	{  0x1406, (char *) "MaxApertureAtMinFocal", (char *) NULL},
-	{  0x1407, (char *) "MaxApertureAtMaxFocal", (char *) NULL},
-	{  0x4100, (char *) "FacesDetected", (char *) NULL},
-	{  0x4103, (char *) "FacePositions", (char *) NULL},
-	{  0x8000, (char *) "FileSource", (char *) NULL},
-	{  0x8002, (char *) "OrderNumber", (char *) NULL},
-	{  0x8003, (char *) "FrameNumber", (char *) NULL},
-	{  0xB211, (char *) "Parallax", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Kyocera maker note
-*/
-static TagInfo
-  exif_kyocera_tag_table[] =
-  {
-    {  0x0001, (char *) "ThumbnailImage", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) "Print Image Matching Info"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Olympus Type 1 / Epson / Agfa maker note
-*/
-static TagInfo
-  exif_olympus_type1_tag_table[] =
-  {
-    {  0x0000, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x0001, (char *) "MinoltaCameraSettingsOld", (char *) NULL},
-    {  0x0003, (char *) "MinoltaCameraSettings", (char *) NULL},
-    {  0x0040, (char *) "CompressedImageSize", (char *) NULL},
-    {  0x0081, (char *) "PreviewImageData", (char *) NULL},
-    {  0x0088, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x0089, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x0100, (char *) "ThumbnailImage", (char *) NULL},
-    {  0x0104, (char *) "BodyFirmwareVersion", (char *) NULL},
-    {  0x0200, (char *) "SpecialMode", (char *) NULL},
-    {  0x0201, (char *) "Quality", (char *) NULL},
-    {  0x0202, (char *) "Macro", (char *) NULL},
-    {  0x0203, (char *) "BWMode", (char *) NULL},
-    {  0x0204, (char *) "DigitalZoom", (char *) NULL},
-    {  0x0205, (char *) "FocalPlaneDiagonal", (char *) NULL},
-	{  0x0206, (char *) "LensDistortionParams", (char *) NULL},
-    {  0x0207, (char *) "CameraType", (char *) NULL},
-    {  0x0208, (char *) "TextInfo", (char *) "Olympus TextInfo Tags"},
-    {  0x0209, (char *) "CameraID", (char *) NULL},
-    {  0x020B, (char *) "EpsonImageWidth", (char *) NULL},
-    {  0x020C, (char *) "EpsonImageHeight", (char *) NULL},
-    {  0x020D, (char *) "EpsonSoftware", (char *) NULL},
-    {  0x0280, (char *) "PreviewImage", (char *) NULL},
-    {  0x0300, (char *) "PreCaptureFrames", (char *) NULL},
-	{  0x0301, (char *) "WhiteBoard", (char *) NULL},
-    {  0x0302, (char *) "OneTouchWB", (char *) NULL}, 
-	{  0x0303, (char *) "WhiteBalanceBracket", (char *) NULL}, 
-	{  0x0304, (char *) "WhiteBalanceBias", (char *) NULL}, 
-	{  0x0403, (char *) "SceneMode", (char *) NULL}, 
-    {  0x0404, (char *) "SerialNumber", (char *) NULL}, 
-	{  0x0405, (char *) "Firmware", (char *) NULL}, 
-    {  0x0E00, (char *) "PrintIM", (char *) "PrintIM Tags"}, 
-	{  0x0F00, (char *) "DataDump", (char *) NULL},
-	{  0x0F01, (char *) "DataDump2", (char *) NULL},
-	{  0x1000, (char *) "ShutterSpeedValue", (char *) NULL},
-	{  0x1001, (char *) "ISOValue", (char *) NULL},
-	{  0x1002, (char *) "ApertureValue", (char *) NULL},
-	{  0x1003, (char *) "BrightnessValue", (char *) NULL},
-	{  0x1004, (char *) "FlashMode", (char *) NULL},
-	{  0x1005, (char *) "FlashDevice", (char *) NULL},
-	{  0x1006, (char *) "ExposureCompensation", (char *) NULL},
-	{  0x1007, (char *) "SensorTemperature", (char *) NULL},
-	{  0x1008, (char *) "LensTemperature", (char *) NULL},
-	{  0x1009, (char *) "LightCondition", (char *) NULL},
-	{  0x100A, (char *) "FocusRange", (char *) NULL},
-	{  0x100B, (char *) "FocusMode", (char *) NULL},
-	{  0x100C, (char *) "ManualFocusDistance", (char *) NULL},
-	{  0x100D, (char *) "ZoomStepCount", (char *) NULL},
-	{  0x100E, (char *) "FocusStepCount", (char *) NULL},
-	{  0x100F, (char *) "Sharpness", (char *) NULL},
-	{  0x1010, (char *) "FlashChargeLevel", (char *) NULL},
-	{  0x1011, (char *) "ColorMatrix", (char *) NULL},
-	{  0x1012, (char *) "BlackLevel", (char *) NULL},
-	{  0x1015, (char *) "WBMode", (char *) NULL},
-	{  0x1017, (char *) "RedBalance", (char *) NULL},
-	{  0x1018, (char *) "BlueBalance", (char *) NULL},
-	{  0x1019, (char *) "ColorMatrixNumber", (char *) NULL},
-	{  0x101A, (char *) "SerialNumber", (char *) NULL},
-	{  0x1023, (char *) "FlashExposureComp", (char *) NULL},
-	{  0x1024, (char *) "InternalFlashTable", (char *) NULL},
-	{  0x1025, (char *) "ExternalFlashGValue", (char *) NULL},
-	{  0x1026, (char *) "ExternalFlashBounce", (char *) NULL},
-	{  0x1027, (char *) "ExternalFlashZoom", (char *) NULL},
-	{  0x1028, (char *) "ExternalFlashMode", (char *) NULL},
-	{  0x1029, (char *) "Contrast", (char *) NULL},
-	{  0x102A, (char *) "SharpnessFactor", (char *) NULL},
-	{  0x102B, (char *) "ColorControl", (char *) NULL},
-	{  0x102C, (char *) "ValidBits", (char *) NULL},
-	{  0x102D, (char *) "CoringFilter", (char *) NULL},
-	{  0x102E, (char *) "OlympusImageWidth", (char *) NULL},
-	{  0x102F, (char *) "OlympusImageHeight", (char *) NULL},
-	{  0x1030, (char *) "SceneDetect", (char *) NULL},
-	{  0x1031, (char *) "SceneArea?", (char *) NULL},
-	{  0x1033, (char *) "SceneDetectData?", (char *) NULL},
-	{  0x1034, (char *) "CompressionRatio", (char *) NULL},
-	{  0x1035, (char *) "PreviewImageValid", (char *) NULL},
-	{  0x1036, (char *) "PreviewImageStart", (char *) NULL},
-	{  0x1037, (char *) "PreviewImageLength", (char *) NULL},
-	{  0x1038, (char *) "AFResult", (char *) NULL},
-	{  0x1039, (char *) "CCDScanMode", (char *) NULL},
-	{  0x103A, (char *) "NoiseReduction", (char *) NULL},
-	{  0x103B, (char *) "InfinityLensStep", (char *) NULL},
-	{  0x103C, (char *) "NearLensStep", (char *) NULL},
-	{  0x103D, (char *) "LightValueCenter", (char *) NULL},
-	{  0x103E, (char *) "LightValuePeriphery", (char *) NULL},
-	{  0x2010, (char *) "Equipment", (char *) "Olympus Equipment Tags"},
-	{  0x2020, (char *) "CameraSettings", (char *) "Olympus CameraSettings Tags"},
-	{  0x2030, (char *) "RawDevelopment", (char *) "Olympus RawDevelopment Tags"},
-	{  0x2040, (char *) "ImageProcessing", (char *) "Olympus ImageProcessing Tags"},
-	{  0x2050, (char *) "FocusInfo", (char *) "Olympus FocusInfo Tags"},
-	{  0x2100, (char *) "Olympus2100", (char *) "Olympus FE Tags"},
-	{  0x2200, (char *) "Olympus2200", (char *) "Olympus FE Tags"},
-	{  0x2300, (char *) "Olympus2300", (char *) "Olympus FE Tags"},
-	{  0x2400, (char *) "Olympus2400", (char *) "Olympus FE Tags"},
-	{  0x2500, (char *) "Olympus2500", (char *) "Olympus FE Tags"},
-	{  0x2600, (char *) "Olympus2600", (char *) "Olympus FE Tags"},
-	{  0x2700, (char *) "Olympus2700", (char *) "Olympus FE Tags"},
-	{  0x2800, (char *) "Olympus2800", (char *) "Olympus FE Tags"},
-	{  0x2900, (char *) "Olympus2900", (char *) "Olympus FE Tags"},
-	{  0x3000, (char *) "RawInfo", (char *) "Olympus RawInfo Tags"},
-	{  0x4000, (char *) "MainInfo", (char *) "Olympus MainInfo Tags"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Minolta maker note
-*/
-static TagInfo
-  exif_minolta_tag_table[] =
-  {
-    {  0x0000, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x0001, (char *) "MinoltaCameraSettingsOld", (char *) NULL},
-    {  0x0003, (char *) "MinoltaCameraSettings", (char *) NULL},
-    {  0x0004, (char *) "MinoltaCameraSettings7D", (char *) NULL},
-    {  0x0018, (char *) "ImageStabilization", (char *) NULL},
-	{  0x0040, (char *) "CompressedImageSize", (char *) NULL},
-    {  0x0081, (char *) "PreviewImage", (char *) NULL},
-    {  0x0088, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x0089, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x0100, (char *) "SceneMode", (char *) NULL},
-    {  0x0101, (char *) "ColorMode", (char *) NULL},
-    {  0x0102, (char *) "MinoltaQuality", (char *) NULL},
-    {  0x0103, (char *) "MinoltaImageSize", (char *) NULL},
-    {  0x0104, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x0105, (char *) "Teleconverter", (char *) NULL},
-    {  0x0107, (char *) "ImageStabilization", (char *) NULL},
-    {  0x0109, (char *) "RawAndJpgRecording", (char *) NULL},
-    {  0x010A, (char *) "ZoneMatching", (char *) NULL},
-    {  0x010B, (char *) "ColorTemperature", (char *) NULL},
-    {  0x010C, (char *) "LensType", (char *) NULL},
-    {  0x0111, (char *) "ColorCompensationFilter", (char *) NULL},
-    {  0x0112, (char *) "WhiteBalanceFineTune", (char *) NULL},
-    {  0x0113, (char *) "ImageStabilization", (char *) NULL},
-    {  0x0114, (char *) "MinoltaCameraSettings5D", (char *) NULL},
-    {  0x0115, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x0F00, (char *) "MinoltaCameraSettings2", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-There are 3 formats of Nikon's MakerNote. MakerNote of E700/E800/E900/E900S/E910/E950
-starts from ASCII string "Nikon". Data format is the same as IFD, but it starts from
-offset 0x08. This is the same as Olympus except start string. 
-*/
-
-/**
-TYPE 1 is for E-Series cameras prior to (not including) E990
-*/
-static TagInfo
-  exif_nikon_type1_tag_table[] =
-  {
-    {  0x0002, (char *) "FamilyID", (char *) NULL},
-    {  0x0003, (char *) "Quality", (char *) NULL},
-    {  0x0004, (char *) "ColorMode", (char *) NULL},
-    {  0x0005, (char *) "ImageAdjustment", (char *) NULL},
-    {  0x0006, (char *) "CCDSensitivity", (char *) NULL},
-    {  0x0007, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0008, (char *) "Focus", (char *) NULL},
-    {  0x000A, (char *) "DigitalZoom", (char *) NULL},
-    {  0x000B, (char *) "FisheyeConverter", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Nikon type 2 maker note
-*/
-static TagInfo
-  exif_nikon_type2_tag_table[] =
-  {
-    {  0x0001, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x0002, (char *) "ISO", (char *) NULL},
-    {  0x0003, (char *) "ColorMode", (char *) NULL},
-    {  0x0004, (char *) "Quality", (char *) NULL},
-    {  0x0005, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0006, (char *) "Sharpness", (char *) NULL},
-    {  0x0007, (char *) "FocusMode", (char *) NULL},
-    {  0x0008, (char *) "FlashSetting", (char *) NULL},
-    {  0x0009, (char *) "FlashType", (char *) NULL},
-    {  0x000B, (char *) "WhiteBalanceFineTune", (char *) NULL},
-    {  0x000F, (char *) "ISOSelection", (char *) NULL},
-    {  0x0010, (char *) "DataDump", (char *) NULL},
-    {  0x0080, (char *) "ImageAdjustment", (char *) NULL},
-    {  0x0082, (char *) "AuxiliaryLens", (char *) NULL},
-    {  0x0085, (char *) "ManualFocusDistance", (char *) NULL},
-    {  0x0086, (char *) "DigitalZoom", (char *) NULL},
-    {  0x0088, (char *) "AFInfo", (char *) NULL},
-    {  0x0089, (char *) "ShootingMode", (char *) NULL},
-    {  0x008D, (char *) "ColorMode", (char *) NULL},
-    {  0x008F, (char *) "SceneMode", (char *) NULL},
-    {  0x0092, (char *) "HueAdjustment", (char *) NULL},
-    {  0x0094, (char *) "Saturation", (char *) NULL},
-    {  0x0095, (char *) "NoiseReduction", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-The type-3 directory is for D-Series cameras such as the D1 and D100.
-see http://www.timelesswanderings.net/equipment/D100/NEF.html
-*/
-static TagInfo
-  exif_nikon_type3_tag_table[] =
-  {
-    {  0x0001, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x0002, (char *) "ISO", (char *) NULL},
-    {  0x0003, (char *) "ColorMode", (char *) NULL},
-    {  0x0004, (char *) "Quality", (char *) NULL},
-    {  0x0005, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0006, (char *) "Sharpness", (char *) NULL},
-    {  0x0007, (char *) "FocusMode", (char *) NULL},
-    {  0x0008, (char *) "FlashSetting", (char *) NULL},
-    {  0x0009, (char *) "FlashType", (char *) NULL},
-    {  0x000B, (char *) "WhiteBalanceFineTune", (char *) NULL},
-    {  0x000C, (char *) "WB_RBLevels", (char *) NULL},
-    {  0x000D, (char *) "ProgramShift", (char *) NULL},
-    {  0x000E, (char *) "ExposureDifference", (char *) NULL},
-    {  0x000F, (char *) "ISOSelection", (char *) NULL},
-	{  0x0010, (char *) "DataDump", (char *) NULL},
-    {  0x0011, (char *) "PreviewIFD", (char *) NULL},
-    {  0x0012, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x0013, (char *) "ISOSetting", (char *) NULL},
-	{  0x0014, (char *) "ColorBalanceA", (char *) NULL},
-    {  0x0016, (char *) "ImageBoundary", (char *) NULL},
-	{  0x0017, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x0018, (char *) "FlashExposureBracketValue", (char *) NULL},
-    {  0x0019, (char *) "ExposureBracketValue", (char *) NULL},
-    {  0x001A, (char *) "ImageProcessing", (char *) NULL},
-    {  0x001B, (char *) "CropHiSpeed", (char *) NULL},
-	{  0x001C, (char *) "ExposureTuning", (char *) NULL},
-    {  0x001D, (char *) "SerialNumber", (char *) NULL},
-    {  0x001E, (char *) "ColorSpace", (char *) NULL},
-	{  0x001F, (char *) "VRInfo", (char *) NULL},
-	{  0x0020, (char *) "ImageAuthentication", (char *) NULL},
-	{  0x0022, (char *) "ActiveD-Lighting", (char *) NULL},
-	{  0x0023, (char *) "PictureControl", (char *) NULL},
-	{  0x0024, (char *) "WorldTime", (char *) NULL},
-	{  0x0025, (char *) "ISOInfo", (char *) NULL},
-	{  0x002A, (char *) "VignetteControl", (char *) NULL},
-	{  0x002B, (char *) "DistortInfo", (char *) NULL},
-	{  0x0080, (char *) "ImageAdjustment", (char *) NULL},
-	{  0x0081, (char *) "ToneComp", (char *) NULL},
-	{  0x0082, (char *) "AuxiliaryLens", (char *) NULL},
-	{  0x0083, (char *) "LensType", (char *) NULL},
-    {  0x0084, (char *) "Lens", (char *) NULL},
-    {  0x0085, (char *) "ManualFocusDistance", (char *) NULL},
-    {  0x0086, (char *) "DigitalZoom", (char *) NULL},
-    {  0x0087, (char *) "FlashMode", (char *) NULL},
-    {  0x0088, (char *) "AFInfo", (char *) NULL},
-    {  0x0089, (char *) "ShootingMode", (char *) NULL},
-    {  0x008B, (char *) "LensFStops", (char *) NULL},
-    {  0x008C, (char *) "ContrastCurve", (char *) NULL},
-    {  0x008D, (char *) "ColorHue", (char *) NULL},
-    {  0x008F, (char *) "SceneMode", (char *) NULL},
-    {  0x0090, (char *) "LightSource", (char *) NULL},
-	{  0x0091, (char *) "ShotInfo", (char *) NULL},
-    {  0x0092, (char *) "HueAdjustment", (char *) NULL},
-	{  0x0093, (char *) "NEFCompression", (char *) NULL},
-    {  0x0094, (char *) "Saturation", (char *) NULL},
-    {  0x0095, (char *) "NoiseReduction", (char *) NULL},
-    {  0x0096, (char *) "LinearizationTable", (char *) NULL},
-	{  0x0097, (char *) "ColorBalance", (char *) NULL},
-	{  0x0098, (char *) "LensData", (char *) NULL},
-    {  0x0099, (char *) "RawImageCenter", (char *) NULL},
-    {  0x009A, (char *) "SensorPixelSize", (char *) NULL},
-    {  0x009C, (char *) "SceneAssist", (char *) NULL},
-    {  0x009E, (char *) "RetouchHistory", (char *) NULL},
-    {  0x00A0, (char *) "SerialNumber", (char *) NULL},
-    {  0x00A2, (char *) "ImageDataSize", (char *) NULL},
-    {  0x00A5, (char *) "ImageCount", (char *) NULL},
-    {  0x00A6, (char *) "DeletedImageCount", (char *) NULL},
-    {  0x00A7, (char *) "ShutterCount", (char *) NULL},
-	{  0x00A8, (char *) "FlashInfo", (char *) NULL},
-    {  0x00A9, (char *) "ImageOptimization", (char *) NULL},
-    {  0x00AA, (char *) "Saturation", (char *) NULL},
-    {  0x00AB, (char *) "VariProgram", (char *) NULL},
-    {  0x00AC, (char *) "ImageStabilization", (char *) NULL},
-    {  0x00AD, (char *) "AFResponse", (char *) NULL},
-    {  0x00B0, (char *) "MultiExposure", (char *) NULL},
-    {  0x00B1, (char *) "HighISONoiseReduction", (char *) NULL},
-    {  0x00B3, (char *) "ToningEffect", (char *) NULL},
-    {  0x00B6, (char *) "PowerUpTime", (char *) NULL},
-    {  0x00B7, (char *) "AFInfo2", (char *) NULL},
-    {  0x00B8, (char *) "FileInfo", (char *) NULL},
-    {  0x00B9, (char *) "AFTune", (char *) NULL},
-    {  0x00BD, (char *) "PictureControl", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x0E01, (char *) "NikonCaptureData", (char *) NULL},
-    {  0x0E09, (char *) "NikonCaptureVersion", (char *) NULL},
-    {  0x0E0E, (char *) "NikonCaptureOffsets", (char *) NULL},
-    {  0x0E10, (char *) "NikonScanIFD", (char *) NULL},
-    {  0x0E1D, (char *) "NikonICCProfile", (char *) NULL},
-    {  0x0E1E, (char *) "NikonCaptureOutput", (char *) NULL},
-	{  0x0E22, (char *) "NEFBitDepth", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Panasonic / Leica maker note
-*/
-static TagInfo
-  exif_panasonic_tag_table[] =
-  {
-    {  0x0001, (char *) "ImageQuality", (char *) NULL},
-    {  0x0002, (char *) "FirmwareVersion", (char *) NULL},
-    {  0x0003, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0007, (char *) "FocusMode", (char *) NULL},
-    {  0x000F, (char *) "AFAreaMode", (char *) NULL},
-    {  0x001A, (char *) "ImageStabilization", (char *) NULL},
-    {  0x001C, (char *) "MacroMode", (char *) NULL},
-    {  0x001F, (char *) "ShootingMode", (char *) NULL},
-    {  0x0020, (char *) "Audio", (char *) NULL},
-    {  0x0021, (char *) "DataDump", (char *) NULL},
-	{  0x0022, (char *) "EasyMode", (char *) NULL},
-    {  0x0023, (char *) "WhiteBalanceBias", (char *) NULL},
-    {  0x0024, (char *) "FlashBias", (char *) NULL},
-    {  0x0025, (char *) "InternalSerialNumber", (char *) NULL},
-	{  0x0026, (char *) "PanasonicExifVersion", (char *) NULL},
-    {  0x0028, (char *) "ColorEffect", (char *) NULL},
-	{  0x0029, (char *) "TimeSincePowerOn", (char *) NULL},
-    {  0x002A, (char *) "BurstMode", (char *) NULL},
-    {  0x002B, (char *) "SequenceNumber", (char *) NULL},
-    {  0x002C, (char *) "ContrastMode", (char *) NULL},
-    {  0x002D, (char *) "NoiseReduction", (char *) NULL},
-    {  0x002E, (char *) "SelfTimer", (char *) NULL},
-    {  0x0030, (char *) "Rotation", (char *) NULL},
-	{  0x0031, (char *) "AFAssistLamp", (char *) NULL},
-    {  0x0032, (char *) "ColorMode", (char *) NULL},
-	{  0x0033, (char *) "BabyAge_0x0033", (char *) NULL},
-	{  0x0034, (char *) "OpticalZoomMode", (char *) NULL},
-	{  0x0035, (char *) "ConversionLens", (char *) NULL},
-	{  0x0036, (char *) "TravelDay", (char *) NULL},
-	{  0x0039, (char *) "Contrast", (char *) NULL},
-	{  0x003A, (char *) "WorldTimeLocation", (char *) NULL},
-	{  0x003B, (char *) "TextStamp_0x003B", (char *) NULL},
-	{  0x003C, (char *) "ProgramISO", (char *) NULL},
-	{  0x003D, (char *) "AdvancedSceneMode", (char *) NULL},
-	{  0x003E, (char *) "TextStamp_0x003E", (char *) NULL},
-	{  0x003F, (char *) "FacesDetected", (char *) NULL},
-	{  0x0040, (char *) "Saturation", (char *) NULL},
-	{  0x0041, (char *) "Sharpness", (char *) NULL},
-	{  0x0042, (char *) "FilmMode", (char *) NULL},
-	{  0x0046, (char *) "WBAdjustAB", (char *) NULL},
-	{  0x0047, (char *) "WBAdjustGM", (char *) NULL},
-	{  0x004B, (char *) "PanasonicImageWidth", (char *) NULL},
-	{  0x004C, (char *) "PanasonicImageHeight", (char *) NULL},
-	{  0x004D, (char *) "AFPointPosition", (char *) NULL},
-	{  0x004E, (char *) "FaceDetInfo", (char *) "Panasonic FaceDetInfo Tags"},
-	{  0x0051, (char *) "LensType", (char *) NULL},
-	{  0x0052, (char *) "LensSerialNumber", (char *) NULL},
-	{  0x0053, (char *) "AccessoryType", (char *) NULL},
-	{  0x0059, (char *) "Transform", (char *) NULL},
-	{  0x005D, (char *) "IntelligentExposure", (char *) NULL},
-	{  0x0061, (char *) "FaceRecInfo", (char *) "Panasonic FaceRecInfo Tags"},
-	{  0x0062, (char *) "FlashWarning", (char *) NULL},
-	{  0x0063, (char *) "RecognizedFaceFlags?", (char *) NULL},
-	{  0x0065, (char *) "Title", (char *) NULL},
-	{  0x0066, (char *) "BabyName", (char *) NULL},
-	{  0x0067, (char *) "Location", (char *) NULL},
-	{  0x0069, (char *) "Country", (char *) NULL},
-	{  0x006B, (char *) "State", (char *) NULL},
-	{  0x006D, (char *) "City", (char *) NULL},
-	{  0x006F, (char *) "Landmark", (char *) NULL},
-	{  0x0070, (char *) "IntelligentResolution", (char *) NULL},
-	{  0x0079, (char *) "IntelligentD-Range", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-	{  0x8000, (char *) "MakerNoteVersion", (char *) NULL},
-	{  0x8001, (char *) "SceneMode", (char *) NULL},
-	{  0x8004, (char *) "WBRedLevel", (char *) NULL},
-	{  0x8005, (char *) "WBGreenLevel", (char *) NULL},
-	{  0x8006, (char *) "WBBlueLevel", (char *) NULL},
-	{  0x8007, (char *) "FlashFired", (char *) NULL},
-	{  0x8008, (char *) "TextStamp_0x8008", (char *) NULL},
-	{  0x8009, (char *) "TextStamp_0x8009", (char *) NULL},
-	{  0x8010, (char *) "BabyAge_0x8010", (char *) NULL},
-	{  0x8012, (char *) "Transform", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Pentax (Asahi) maker note type 1
-*/
-static TagInfo
-  exif_asahi_tag_table[] =
-  {
-    {  0x0001, (char *) "Capture Mode", (char *) NULL},
-    {  0x0002, (char *) "Quality Level", (char *) NULL},
-    {  0x0003, (char *) "Focus Mode", (char *) NULL},
-    {  0x0004, (char *) "Flash Mode", (char *) NULL},
-    {  0x0007, (char *) "White Balance", (char *) NULL},
-    {  0x000A, (char *) "Digital Zoom", (char *) NULL},
-    {  0x000B, (char *) "Sharpness", (char *) NULL},
-    {  0x000C, (char *) "Contrast", (char *) NULL},
-    {  0x000D, (char *) "Saturation", (char *) NULL},
-    {  0x0014, (char *) "ISO Speed", (char *) NULL},
-    {  0x0017, (char *) "Color", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x1000, (char *) "Time Zone", (char *) NULL},
-    {  0x1001, (char *) "Daylight Savings", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Pentax maker note type 2
-*/
-static TagInfo
-  exif_pentax_tag_table[] =
-  {
-    {  0x0000, (char *) "PentaxVersion", (char *) NULL},
-    {  0x0001, (char *) "PentaxMode", (char *) NULL},
-    {  0x0002, (char *) "PreviewImageSize", (char *) NULL},
-    {  0x0003, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x0004, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x0005, (char *) "PentaxModelID", (char *) "Pentax PentaxModelID Values"},
-    {  0x0006, (char *) "Date", (char *) NULL},
-    {  0x0007, (char *) "Time", (char *) NULL},
-    {  0x0008, (char *) "Quality", (char *) NULL},
-    {  0x0009, (char *) "PentaxImageSize", (char *) NULL},
-    {  0x000B, (char *) "PictureMode", (char *) NULL},
-    {  0x000C, (char *) "FlashMode", (char *) NULL},
-    {  0x000D, (char *) "FocusMode", (char *) NULL},
-    {  0x000E, (char *) "AFPointSelected", (char *) NULL},
-    {  0x000F, (char *) "AFPointsInFocus", (char *) NULL},
-    {  0x0010, (char *) "FocusPosition", (char *) NULL},
-    {  0x0012, (char *) "ExposureTime", (char *) NULL},
-    {  0x0013, (char *) "FNumber", (char *) NULL},
-    {  0x0014, (char *) "ISO", (char *) NULL},
-	{  0x0015, (char *) "LightReading", (char *) NULL},
-    {  0x0016, (char *) "ExposureCompensation", (char *) NULL},
-    {  0x0017, (char *) "MeteringMode", (char *) NULL},
-    {  0x0018, (char *) "AutoBracketing", (char *) NULL},
-    {  0x0019, (char *) "WhiteBalance", (char *) NULL},
-    {  0x001A, (char *) "WhiteBalanceMode", (char *) NULL},
-    {  0x001B, (char *) "BlueBalance", (char *) NULL},
-    {  0x001C, (char *) "RedBalance", (char *) NULL},
-    {  0x001D, (char *) "FocalLength", (char *) NULL},
-    {  0x001E, (char *) "DigitalZoom", (char *) NULL},
-    {  0x001F, (char *) "Saturation", (char *) NULL},
-    {  0x0020, (char *) "Contrast", (char *) NULL},
-    {  0x0021, (char *) "Sharpness", (char *) NULL},
-    {  0x0022, (char *) "WorldTimeLocation", (char *) NULL},
-    {  0x0023, (char *) "HometownCity", (char *) "Pentax City Values"},
-    {  0x0024, (char *) "DestinationCity", (char *) "Pentax City Values"},
-    {  0x0025, (char *) "HometownDST", (char *) NULL},
-    {  0x0026, (char *) "DestinationDST", (char *) NULL},
-    {  0x0027, (char *) "DSPFirmwareVersion", (char *) NULL},
-    {  0x0028, (char *) "CPUFirmwareVersion", (char *) NULL},
-    {  0x0029, (char *) "FrameNumber", (char *) NULL},
-    {  0x002D, (char *) "EffectiveLV", (char *) NULL},
-    {  0x0032, (char *) "ImageProcessing", (char *) NULL},
-    {  0x0033, (char *) "PictureMode", (char *) NULL},
-    {  0x0034, (char *) "DriveMode", (char *) NULL},
-	{  0x0035, (char *) "SensorSize", (char *) NULL},
-    {  0x0037, (char *) "ColorSpace", (char *) NULL},
-    {  0x0039, (char *) "RawImageSize", (char *) NULL},
-	{  0x003C, (char *) "AFPointsInFocus", (char *) NULL},
-    {  0x003E, (char *) "PreviewImageBorders", (char *) NULL},
-    {  0x003F, (char *) "LensType", (char *) "Pentax LensType Values"},
-    {  0x0040, (char *) "SensitivityAdjust", (char *) NULL},
-    {  0x0041, (char *) "ImageProcessingCount", (char *) NULL},
-    {  0x0047, (char *) "CameraTemperature", (char *) NULL},
-    {  0x0048, (char *) "AELock", (char *) NULL},
-    {  0x0049, (char *) "NoiseReduction", (char *) NULL},
-    {  0x004D, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x004F, (char *) "ImageTone", (char *) NULL},
-	{  0x0050, (char *) "ColorTemperature", (char *) NULL},
-    {  0x005C, (char *) "ShakeReductionInfo", (char *) "Pentax SRInfo Tags"},
-    {  0x005D, (char *) "ShutterCount", (char *) NULL},
-	{  0x0060, (char *) "FaceInfo", (char *) "Pentax FaceInfo Tags"},
-	{  0x0067, (char *) "Hue", (char *) NULL},
-	{  0x0068, (char *) "AWBInfo", (char *) "Pentax AWBInfo Tags"},
-    {  0x0069, (char *) "DynamicRangeExpansion", (char *) NULL},
-	{  0x006B, (char *) "TimeInfo", (char *) "Pentax TimeInfo Tags"},
-	{  0x006C, (char *) "HighLowKeyAdj", (char *) NULL},
-	{  0x006D, (char *) "ContrastHighlight", (char *) NULL},
-	{  0x006E, (char *) "ContrastShadow", (char *) NULL},
-	{  0x006F, (char *) "ContrastHighlightShadowAdj", (char *) NULL},
-	{  0x0070, (char *) "FineSharpness", (char *) NULL},
-    {  0x0071, (char *) "HighISONoiseReduction", (char *) NULL},
-    {  0x0072, (char *) "AFAdjustment", (char *) NULL},
-	{  0x0073, (char *) "MonochromeFilterEffect", (char *) NULL},
-	{  0x0074, (char *) "MonochromeToning", (char *) NULL},
-	{  0x0076, (char *) "FaceDetect", (char *) NULL},
-	{  0x0077, (char *) "FaceDetectFrameSize", (char *) NULL},
-	{  0x0079, (char *) "ShadowCompensation", (char *) NULL},
-	{  0x007A, (char *) "ISOAutoParameters", (char *) NULL},
-	{  0x007B, (char *) "CrossProcess", (char *) NULL},
-	{  0x007D, (char *) "LensCorr", (char *) "Pentax LensCorr Tags"},
-	{  0x007F, (char *) "BleachBypassToning", (char *) NULL},
-    {  0x0200, (char *) "BlackPoint", (char *) NULL},
-    {  0x0201, (char *) "WhitePoint", (char *) NULL},
-    {  0x0203, (char *) "ColorMatrixA", (char *) NULL},
-    {  0x0204, (char *) "ColorMatrixB", (char *) NULL},
-    {  0x0205, (char *) "CameraSettings", (char *) "Pentax CameraSettings Tags"},
-	{  0x0206, (char *) "AEInfo", (char *) "Pentax AEInfo Tags"},
-    {  0x0207, (char *) "LensInfo", (char *) "Pentax LensInfo Tags"},
-    {  0x0208, (char *) "FlashInfo", (char *) "Pentax FlashInfo Tags"},
-    {  0x0209, (char *) "AEMeteringSegments", (char *) NULL},
-    {  0x020A, (char *) "FlashMeteringSegments", (char *) NULL},
-    {  0x020B, (char *) "SlaveFlashMeteringSegments", (char *) NULL},
-    {  0x020D, (char *) "WB_RGGBLevelsDaylight", (char *) NULL},
-    {  0x020E, (char *) "WB_RGGBLevelsShade", (char *) NULL},
-    {  0x020F, (char *) "WB_RGGBLevelsCloudy", (char *) NULL},
-    {  0x0210, (char *) "WB_RGGBLevelsTungsten", (char *) NULL},
-    {  0x0211, (char *) "WB_RGGBLevelsFluorescentD", (char *) NULL},
-    {  0x0212, (char *) "WB_RGGBLevelsFluorescentN", (char *) NULL},
-    {  0x0213, (char *) "WB_RGGBLevelsFluorescentW", (char *) NULL},
-    {  0x0214, (char *) "WB_RGGBLevelsFlash", (char *) NULL},
-    {  0x0215, (char *) "CameraInfo", (char *) "Pentax CameraInfo Tags"},
-    {  0x0216, (char *) "BatteryInfo", (char *) "Pentax BatteryInfo Tags"},
-    {  0x021B, (char *) "SaturationInfo", (char *) NULL},
-    {  0x021F, (char *) "AFInfo", (char *) "Pentax AFInfo Tags"},
-    {  0x0222, (char *) "ColorInfo", (char *) "Pentax ColorInfo Tags"},
-    {  0x0224, (char *) "EVStepInfo", (char *) "Pentax EVStepInfo Tags"},
-	{  0x0226, (char *) "ShotInfo", (char *) "Pentax ShotInfo Tags"},
-	{  0x0227, (char *) "FacePos", (char *) "Pentax FacePos Tags"},
-	{  0x0228, (char *) "FaceSize", (char *) "Pentax FaceSize Tags"},
-	{  0x0229, (char *) "SerialNumber", (char *) NULL},
-	{  0x022A, (char *) "FilterInfo", (char *) "Pentax FilterInfo Tags"},
-	{  0x022B, (char *) "LevelInfo", (char *) "Pentax LevelInfo Tags"},
-	{  0x022E, (char *) "Artist", (char *) NULL},
-	{  0x022F, (char *) "Copyright", (char *) NULL},
-	{  0x0230, (char *) "FirmwareVersion", (char *) NULL},
-	{  0x0231, (char *) "ContrastDetectAFArea", (char *) NULL},
-	{  0x0235, (char *) "CrossProcessParams", (char *) NULL},
-	{  0x03FE, (char *) "DataDump", (char *) NULL},
-    {  0x0402, (char *) "ToneCurve", (char *) NULL},
-    {  0x0403, (char *) "ToneCurves", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x1000, (char *) "HometownCityCode", (char *) NULL},
-    {  0x1001, (char *) "DestinationCityCode", (char *) NULL},
-    {  0x2000, (char *) "PreviewImageData", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Sony maker note
-*/
-static TagInfo
-  exif_sony_tag_table[] =
-  {
-    {  0x0102, (char *) "Quality", (char *) NULL},
-    {  0x0104, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x0105, (char *) "Teleconverter", (char *) NULL},
-    {  0x0112, (char *) "WhiteBalanceFineTune", (char *) NULL},
-    {  0x0114, (char *) "CameraSettings", (char *) NULL},
-    {  0x0115, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0E00, (char *) "PrintIM", (char *) NULL},
-    {  0x1000, (char *) "MultiBurstMode", (char *) NULL},
-    {  0x1001, (char *) "MultiBurstImageWidth", (char *) NULL},
-    {  0x1002, (char *) "MultiBurstImageHeight", (char *) NULL},
-    {  0x1003, (char *) "Panorama", (char *) NULL},
-    {  0x2001, (char *) "PreviewImage", (char *) NULL},
-    {  0x2004, (char *) "Contrast", (char *) NULL},
-    {  0x2005, (char *) "Saturation", (char *) NULL},
-    {  0x2006, (char *) "Sharpness", (char *) NULL},
-    {  0x2007, (char *) "Brightness", (char *) NULL},
-    {  0x2008, (char *) "LongExposureNoiseReduction", (char *) NULL},
-    {  0x2009, (char *) "HighISONoiseReduction", (char *) NULL},
-    {  0x200A, (char *) "HDR", (char *) NULL},
-    {  0x200B, (char *) "MultiFrameNoiseReduction", (char *) NULL},
-    {  0x3000, (char *) "ShotInfo", (char *) NULL},
-    {  0xB000, (char *) "FileFormat", (char *) NULL},
-    {  0xB001, (char *) "SonyModelID", (char *) NULL},
-    {  0xB020, (char *) "ColorReproduction", (char *) NULL},
-    {  0xB021, (char *) "ColorTemperature", (char *) NULL},
-    {  0xB022, (char *) "ColorCompensationFilter", (char *) NULL},
-    {  0xB023, (char *) "SceneMode", (char *) NULL},
-    {  0xB024, (char *) "ZoneMatching", (char *) NULL},
-    {  0xB025, (char *) "DynamicRangeOptimizer", (char *) NULL},
-    {  0xB026, (char *) "ImageStabilization", (char *) NULL},
-    {  0xB027, (char *) "LensType", (char *) NULL},
-    {  0xB028, (char *) "MinoltaMakerNote", (char *) NULL},
-    {  0xB029, (char *) "ColorMode", (char *) NULL},
-    {  0xB02B, (char *) "FullImageSize", (char *) NULL},
-    {  0xB02C, (char *) "PreviewImageSize", (char *) NULL},
-    {  0xB040, (char *) "Macro", (char *) NULL},
-    {  0xB041, (char *) "ExposureMode", (char *) NULL},
-    {  0xB042, (char *) "FocusMode", (char *) NULL},
-    {  0xB043, (char *) "AFMode", (char *) NULL},
-    {  0xB044, (char *) "AFIlluminator", (char *) NULL},
-    {  0xB047, (char *) "Quality2", (char *) NULL},
-    {  0xB048, (char *) "FlashLevel", (char *) NULL},
-    {  0xB049, (char *) "ReleaseMode", (char *) NULL},
-    {  0xB04A, (char *) "SequenceNumber", (char *) NULL},
-    {  0xB04B, (char *) "Anti-Blur", (char *) NULL},
-    {  0xB04E, (char *) "LongExposureNoiseReduction", (char *) NULL},
-    {  0xB04F, (char *) "DynamicRangeOptimizer", (char *) NULL},
-    {  0xB052, (char *) "IntelligentAuto", (char *) NULL},
-    {  0xB054, (char *) "WhiteBalance2", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Sigma SD1 maker note
-*/
-static TagInfo
-  exif_sigma_sd1_tag_table[] =
-  {
-    {  0x0002, (char *) "SerialNumber", (char *) NULL},
-    {  0x0003, (char *) "DriveMode", (char *) NULL},
-    {  0x0004, (char *) "ResolutionMode", (char *) NULL},
-    {  0x0005, (char *) "AFMode", (char *) NULL},
-    {  0x0006, (char *) "FocusSetting", (char *) NULL},
-    {  0x0007, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0008, (char *) "ExposureMode", (char *) NULL},
-    {  0x0009, (char *) "MeteringMode", (char *) NULL},
-    {  0x000A, (char *) "LensFocalRange", (char *) NULL},
-    {  0x000B, (char *) "ColorSpace", (char *) NULL},
-    {  0x000C, (char *) "ExposureCompensation", (char *) NULL},
-    {  0x000D, (char *) "Contrast", (char *) NULL},
-    {  0x000E, (char *) "Shadow", (char *) NULL},
-    {  0x000F, (char *) "Highlight", (char *) NULL},
-    {  0x0010, (char *) "Saturation", (char *) NULL},
-    {  0x0011, (char *) "Sharpness", (char *) NULL},
-    {  0x0012, (char *) "X3FillLight", (char *) NULL},
-    {  0x0014, (char *) "ColorAdjustment", (char *) NULL},
-    {  0x0015, (char *) "AdjustmentMode", (char *) NULL},
-    {  0x0016, (char *) "Quality", (char *) NULL},
-    {  0x0017, (char *) "Firmware", (char *) NULL},
-    {  0x0018, (char *) "Software", (char *) NULL},
-    {  0x0019, (char *) "AutoBracket", (char *) NULL},
-    {  0x001A, (char *) "ChrominanceNoiseReduction", (char *) NULL},
-    {  0x001B, (char *) "LuminanceNoiseReduction", (char *) NULL},
-    {  0x001C, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x001D, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x001F, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x0026, (char *) "FileFormat", (char *) NULL},
-    {  0x002C, (char *) "ColorMode", (char *) NULL},
-    {  0x0030, (char *) "Calibration", (char *) NULL},
-    {  0x0048, (char *) "LensApertureRange", (char *) NULL},
-    {  0x0049, (char *) "FNumber", (char *) NULL},
-    {  0x004A, (char *) "ExposureTime", (char *) NULL},
-    {  0x004B, (char *) "ExposureTime2", (char *) NULL},
-    {  0x004D, (char *) "ExposureCompensation_SD1", (char *) NULL},
-    {  0x0055, (char *) "SensorTemperature", (char *) NULL},
-    {  0x0056, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x0057, (char *) "Firmware_SD1", (char *) NULL},
-    {  0x0058, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-/**
-Sigma / Foveon maker note (others than SD1 models)
-NB: many tags are not consistent between different models
-*/
-static TagInfo
-  exif_sigma_foveon_tag_table[] =
-  {
-    {  0x0002, (char *) "SerialNumber", (char *) NULL},
-    {  0x0003, (char *) "DriveMode", (char *) NULL},
-    {  0x0004, (char *) "ResolutionMode", (char *) NULL},
-    {  0x0005, (char *) "AFMode", (char *) NULL},
-    {  0x0006, (char *) "FocusSetting", (char *) NULL},
-    {  0x0007, (char *) "WhiteBalance", (char *) NULL},
-    {  0x0008, (char *) "ExposureMode", (char *) NULL},
-    {  0x0009, (char *) "MeteringMode", (char *) NULL},
-    {  0x000A, (char *) "LensFocalRange", (char *) NULL},
-    {  0x000B, (char *) "ColorSpace", (char *) NULL},
-    {  0x000C, (char *) "ExposureCompensation", (char *) NULL},
-    {  0x000D, (char *) "Contrast", (char *) NULL},
-    {  0x000E, (char *) "Shadow", (char *) NULL},
-    {  0x000F, (char *) "Highlight", (char *) NULL},
-    {  0x0010, (char *) "Saturation", (char *) NULL},
-    {  0x0011, (char *) "Sharpness", (char *) NULL},
-    {  0x0012, (char *) "X3FillLight", (char *) NULL},
-    {  0x0014, (char *) "ColorAdjustment", (char *) NULL},
-    {  0x0015, (char *) "AdjustmentMode", (char *) NULL},
-    {  0x0016, (char *) "Quality", (char *) NULL},
-    {  0x0017, (char *) "Firmware", (char *) NULL},
-    {  0x0018, (char *) "Software", (char *) NULL},
-    {  0x0019, (char *) "AutoBracket", (char *) NULL},
-    {  0x001A, (char *) "PreviewImageStart", (char *) NULL},
-    {  0x001B, (char *) "PreviewImageLength", (char *) NULL},
-    {  0x001C, (char *) "PreviewImageSize", (char *) NULL},
-    {  0x001D, (char *) "MakerNoteVersion", (char *) NULL},
-    {  0x001F, (char *) "AFPoint", (char *) NULL},
-    {  0x0022, (char *) "FileFormat", (char *) NULL},
-    {  0x0024, (char *) "Calibration", (char *) NULL},
-    {  0x002C, (char *) "ColorMode", (char *) NULL},
-    {  0x0030, (char *) "LensApertureRange", (char *) NULL},
-    {  0x0031, (char *) "FNumber", (char *) NULL},
-    {  0x0032, (char *) "ExposureTime", (char *) NULL},
-    {  0x0033, (char *) "ExposureTime2", (char *) NULL},
-    {  0x0034, (char *) "BurstShot", (char *) NULL},
-    {  0x0035, (char *) "ExposureCompensation", (char *) NULL},
-    {  0x0039, (char *) "SensorTemperature", (char *) NULL},
-    {  0x003A, (char *) "FlashExposureComp", (char *) NULL},
-    {  0x003B, (char *) "Firmware", (char *) NULL},
-    {  0x003C, (char *) "WhiteBalance", (char *) NULL},
-    {  0x003D, (char *) "PictureMode", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// IPTC tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  iptc_tag_table[] =
-  {
-	  // IPTC-NAA IIM version 4
-    {  0x0200 +   0, (char *) "ApplicationRecordVersion", (char *) "Application Record Version"},
-    {  0x0200 +   3, (char *) "ObjectTypeReference", (char *) "Object Type Reference"},
-    {  0x0200 +   4, (char *) "ObjectAttributeReference", (char *) "Object Attribute Reference"},
-    {  0x0200 +   5, (char *) "ObjectName", (char *) "Title"},
-    {  0x0200 +   7, (char *) "EditStatus", (char *) "Edit Status"},
-    {  0x0200 +   8, (char *) "EditorialUpdate", (char *) "Editorial Update"},
-    {  0x0200 +  10, (char *) "Urgency", (char *) "Urgency"},
-    {  0x0200 +  12, (char *) "SubjectReference", (char *) "Subject Reference"},
-    {  0x0200 +  15, (char *) "Category", (char *) "Category"},
-    {  0x0200 +  20, (char *) "SupplementalCategories", (char *) "Supplemental Categories"},
-    {  0x0200 +  22, (char *) "FixtureIdentifier", (char *) "Fixture Identifier"},
-    {  0x0200 +  25, (char *) "Keywords", (char *) "Keywords"},
-    {  0x0200 +  26, (char *) "ContentLocationCode", (char *) "Content Location Code"},
-    {  0x0200 +  27, (char *) "ContentLocationName", (char *) "Content Location Name"},
-    {  0x0200 +  30, (char *) "ReleaseDate", (char *) "Release Date"},
-    {  0x0200 +  35, (char *) "ReleaseTime", (char *) "Release Time"},
-    {  0x0200 +  37, (char *) "ExpirationDate", (char *) "Expiration Date"},
-    {  0x0200 +  38, (char *) "ExpirationTime", (char *) "Expiration Time"},
-    {  0x0200 +  40, (char *) "SpecialInstructions", (char *) "Instructions"},
-    {  0x0200 +  42, (char *) "ActionAdvised", (char *) "Action Advised"},
-    {  0x0200 +  45, (char *) "ReferenceService", (char *) "Reference Service"},
-    {  0x0200 +  47, (char *) "ReferenceDate", (char *) "Reference Date"},
-    {  0x0200 +  50, (char *) "ReferenceNumber", (char *) "Reference Number"},
-    {  0x0200 +  55, (char *) "DateCreated", (char *) "Date Created"},
-    {  0x0200 +  60, (char *) "TimeCreated", (char *) "Time Created"},
-    {  0x0200 +  62, (char *) "DigitalCreationDate", (char *) "Digital Creation Date"},
-    {  0x0200 +  63, (char *) "DigitalCreationTime", (char *) "Digital Creation Time"},
-    {  0x0200 +  65, (char *) "OriginatingProgram", (char *) "Originating Program"},
-    {  0x0200 +  70, (char *) "ProgramVersion", (char *) "Program Version"},
-    {  0x0200 +  75, (char *) "ObjectCycle", (char *) "Object Cycle"},
-    {  0x0200 +  80, (char *) "By-line", (char *) "Author"},
-    {  0x0200 +  85, (char *) "By-lineTitle", (char *) "Author's Position"},
-    {  0x0200 +  90, (char *) "City", (char *) "City"},
-    {  0x0200 +  92, (char *) "SubLocation", (char *) "Sub-Location"},
-    {  0x0200 +  95, (char *) "Province-State", (char *) "State/Province"},
-    {  0x0200 + 100, (char *) "Country-PrimaryLocationCode", (char *) "Country Code"},
-    {  0x0200 + 101, (char *) "Country-PrimaryLocationName", (char *) "Country Name"},
-    {  0x0200 + 103, (char *) "OriginalTransmissionReference", (char *) "Transmission Reference"},
-    {  0x0200 + 105, (char *) "Headline", (char *) "Headline"},
-    {  0x0200 + 110, (char *) "Credit", (char *) "Credit"},
-    {  0x0200 + 115, (char *) "Source", (char *) "Source"},
-    {  0x0200 + 116, (char *) "CopyrightNotice", (char *) "Copyright Notice"},
-    {  0x0200 + 118, (char *) "Contact", (char *) "Contact"},
-    {  0x0200 + 120, (char *) "Caption-Abstract", (char *) "Caption"},
-    {  0x0200 + 122, (char *) "Writer-Editor", (char *) "Caption Writer"},
-    {  0x0200 + 125, (char *) "RasterizedCaption", (char *) "Rasterized Caption"},
-    {  0x0200 + 130, (char *) "ImageType", (char *) "Image Type"},
-    {  0x0200 + 131, (char *) "ImageOrientation", (char *) "Image Orientation"},
-    {  0x0200 + 135, (char *) "LanguageIdentifier", (char *) "Language Identifier"},
-    {  0x0200 + 150, (char *) "AudioType", (char *) "Audio Type"},
-    {  0x0200 + 151, (char *) "AudioSamplingRate", (char *) "Audio Sampling Rate"},
-    {  0x0200 + 152, (char *) "AudioSamplingResolution", (char *) "Audio Sampling Resolution"},
-    {  0x0200 + 153, (char *) "AudioDuration", (char *) "Audio Duration"},
-    {  0x0200 + 154, (char *) "AudioOutcue", (char *) "Audio Outcue"},
-		// Metadata seen in other softwares (see also http://owl.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html#ApplicationRecord)
-    {  0x0200 + 184, (char *) "JobID", (char *) "Job ID"},
-    {  0x0200 + 185, (char *) "MasterDocumentID", (char *) "Master Document ID"},
-    {  0x0200 + 186, (char *) "ShortDocumentID", (char *) "Short Document ID"},
-    {  0x0200 + 187, (char *) "UniqueDocumentID", (char *) "Unique Document ID"},
-    {  0x0200 + 188, (char *) "OwnerID", (char *) "Owner ID"},
-		// IPTC-NAA IIM version 4
-    {  0x0200 + 200, (char *) "ObjectPreviewFileFormat", (char *) "Object Preview File Format"},
-    {  0x0200 + 201, (char *) "ObjectPreviewFileVersion", (char *) "Object Preview File Version"},
-    {  0x0200 + 202, (char *) "ObjectPreviewData", (char *) "Audio Outcue"},
-		// Metadata seen in other softwares (see also http://owl.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html#ApplicationRecord)
-    {  0x0200 + 221, (char *) "Prefs", (char *) "PhotoMechanic preferences"},
-    {  0x0200 + 225, (char *) "ClassifyState", (char *) "Classify State"},
-    {  0x0200 + 228, (char *) "SimilarityIndex", (char *) "Similarity Index"},
-    {  0x0200 + 230, (char *) "DocumentNotes", (char *) "Document Notes"},
-    {  0x0200 + 231, (char *) "DocumentHistory", (char *) "Document History"},
-    {  0x0200 + 232, (char *) "ExifCameraInfo", (char *) "Exif Camera Info"},
-
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// GeoTIFF tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  geotiff_tag_table[] =
-  {
-    {  0x830E, (char *) "GeoPixelScale", (char *) NULL},
-    {  0x8480, (char *) "Intergraph TransformationMatrix", (char *) NULL},
-    {  0x8482, (char *) "GeoTiePoints", (char *) NULL},
-    {  0x85D7, (char *) "JPL Carto IFD offset", (char *) NULL},
-    {  0x85D8, (char *) "GeoTransformationMatrix", (char *) NULL},
-    {  0x87AF, (char *) "GeoKeyDirectory", (char *) NULL},
-    {  0x87B0, (char *) "GeoDoubleParams", (char *) NULL},
-    {  0x87B1, (char *) "GeoASCIIParams", (char *) NULL},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// Animation tags definition
-// --------------------------------------------------------------------------
-
-static TagInfo
-  animation_tag_table[] =
-  {
-    {  0x0001, (char *) "LogicalWidth", (char *) "Logical width"},
-    {  0x0002, (char *) "LogicalHeight", (char *) "Logical height"},
-    {  0x0003, (char *) "GlobalPalette", (char *) "Global Palette"},
-    {  0x0004, (char *) "Loop", (char *) "loop"},
-    {  0x1001, (char *) "FrameLeft", (char *) "Frame left"},
-    {  0x1002, (char *) "FrameTop", (char *) "Frame top"},
-    {  0x1003, (char *) "NoLocalPalette", (char *) "No Local Palette"},
-    {  0x1004, (char *) "Interlaced", (char *) "Interlaced"},
-    {  0x1005, (char *) "FrameTime", (char *) "Frame display time"},
-    {  0x1006, (char *) "DisposalMethod", (char *) "Frame disposal method"},
-    {  0x0000, (char *) NULL, (char *) NULL}
-  };
-
-// --------------------------------------------------------------------------
-// TagLib class definition
-// --------------------------------------------------------------------------
-
-
-/**
-This is where the tag info tables are initialized
-*/
-TagLib::TagLib() {
-	// initialize all known metadata models
-	// ====================================
-
-	// Exif
-	addMetadataModel(TagLib::EXIF_MAIN, exif_exif_tag_table);
-	addMetadataModel(TagLib::EXIF_EXIF, exif_exif_tag_table);
-	addMetadataModel(TagLib::EXIF_GPS, exif_gps_tag_table);
-	addMetadataModel(TagLib::EXIF_INTEROP, exif_interop_tag_table);
-
-	// Exif maker note
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_CANON, exif_canon_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_CASIOTYPE1, exif_casio_type1_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_CASIOTYPE2, exif_casio_type2_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_FUJIFILM, exif_fujifilm_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_KYOCERA, exif_kyocera_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_MINOLTA, exif_minolta_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_NIKONTYPE1, exif_nikon_type1_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_NIKONTYPE2, exif_nikon_type2_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_NIKONTYPE3, exif_nikon_type3_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_OLYMPUSTYPE1, exif_olympus_type1_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_PANASONIC, exif_panasonic_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_ASAHI, exif_asahi_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_PENTAX, exif_pentax_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_SONY, exif_sony_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_SIGMA_SD1, exif_sigma_sd1_tag_table);
-	addMetadataModel(TagLib::EXIF_MAKERNOTE_SIGMA_FOVEON, exif_sigma_foveon_tag_table);
-
-	// IPTC/NAA
-	addMetadataModel(TagLib::IPTC, iptc_tag_table);
-
-	// GeoTIFF
-	addMetadataModel(TagLib::GEOTIFF, geotiff_tag_table);
-
-	// Animation
-	addMetadataModel(TagLib::ANIMATION, animation_tag_table);
-}
-
-BOOL TagLib::addMetadataModel(MDMODEL md_model, TagInfo *tag_table) {
-	// check that the model doesn't already exist
-	if((_table_map.find(md_model) == _table_map.end()) && (tag_table != NULL)) {
-
-		// add the tag description table
-		TAGINFO *info_map = new(std::nothrow) TAGINFO();
-		if(!info_map) return FALSE;
-
-		for(int i = 0; ; i++) {
-			if((tag_table[i].tag == 0) && (tag_table[i].fieldname == NULL))
-				break;
-			(*info_map)[tag_table[i].tag] = &tag_table[i];
-		}
-
-		// add the metadata model
-		_table_map[md_model] = info_map;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-TagLib::~TagLib() {
-	// delete metadata models
-	for(TABLEMAP::iterator i = _table_map.begin(); i != _table_map.end(); i++) {
-		TAGINFO *info_map = (*i).second;
-		delete info_map;
-	}
-}
-
-
-static TagLib g_hInstance;
-
-TagLib& TagLib::instance() {
-	return g_hInstance;
-}
-
-const TagInfo* 
-TagLib::getTagInfo(MDMODEL md_model, WORD tagID) {
-
-	if(_table_map.find(md_model) != _table_map.end()) {
-
-		TAGINFO *info_map = (TAGINFO*)_table_map[md_model];
-		if(info_map->find(tagID) != info_map->end()) {
-			return (*info_map)[tagID];
-		}
-	}
-	return NULL;
-}
-
-const char* 
-TagLib::getTagFieldName(MDMODEL md_model, WORD tagID, char *defaultKey) {
-
-	const TagInfo *info = getTagInfo(md_model, tagID);
-	if(NULL == info) {
-		if(defaultKey != NULL) {
-			sprintf(defaultKey, "Tag 0x%04X", tagID);
-			return &defaultKey[0];
-		} else {
-			return NULL;
-		}
-	}
-
-	return info->fieldname;
-}
-
-const char* 
-TagLib::getTagDescription(MDMODEL md_model, WORD tagID) {
-
-	const TagInfo *info = getTagInfo(md_model, tagID);
-	if(info) {
-		return info->description;
-	}
-
-	return NULL;
-}
-
-int TagLib::getTagID(MDMODEL md_model, const char *key) {
-
-	if(_table_map.find(md_model) != _table_map.end()) {
-
-		TAGINFO *info_map = (TAGINFO*)_table_map[md_model];
-		for(TAGINFO::iterator i = info_map->begin(); i != info_map->end(); i++) {
-			const TagInfo *info = (*i).second;
-			if(info && (strcmp(info->fieldname, key) == 0)) {
-				return (int)info->tag;
-			}
-		}
-	}
-	return -1;
-}
-
-FREE_IMAGE_MDMODEL 
-TagLib::getFreeImageModel(MDMODEL model) {
-	switch(model) {
-		case EXIF_MAIN:
-			return FIMD_EXIF_MAIN;
-
-		case EXIF_EXIF:
-			return FIMD_EXIF_EXIF;
-
-		case EXIF_GPS: 
-			return FIMD_EXIF_GPS;
-
-		case EXIF_INTEROP:
-			return FIMD_EXIF_INTEROP;
-
-		case EXIF_MAKERNOTE_CANON:
-		case EXIF_MAKERNOTE_CASIOTYPE1:
-		case EXIF_MAKERNOTE_CASIOTYPE2:
-		case EXIF_MAKERNOTE_FUJIFILM:
-		case EXIF_MAKERNOTE_KYOCERA:
-		case EXIF_MAKERNOTE_MINOLTA:
-		case EXIF_MAKERNOTE_NIKONTYPE1:
-		case EXIF_MAKERNOTE_NIKONTYPE2:
-		case EXIF_MAKERNOTE_NIKONTYPE3:
-		case EXIF_MAKERNOTE_OLYMPUSTYPE1:
-		case EXIF_MAKERNOTE_PANASONIC:
-		case EXIF_MAKERNOTE_ASAHI:
-		case EXIF_MAKERNOTE_PENTAX:
-		case EXIF_MAKERNOTE_SONY:
-		case EXIF_MAKERNOTE_SIGMA_SD1:
-		case EXIF_MAKERNOTE_SIGMA_FOVEON:
-			return FIMD_EXIF_MAKERNOTE;
-
-		case IPTC:
-			return FIMD_IPTC;
-
-		case GEOTIFF:
-			return FIMD_GEOTIFF;
-
-		case ANIMATION:
-			return FIMD_ANIMATION;
-	}
-
-	return FIMD_NODATA;
-}
diff --git a/plugins/AdvaImg/src/Metadata/XTIFF.cpp b/plugins/AdvaImg/src/Metadata/XTIFF.cpp
deleted file mode 100644
index d5be902ad4..0000000000
--- a/plugins/AdvaImg/src/Metadata/XTIFF.cpp
+++ /dev/null
@@ -1,766 +0,0 @@
-// ==========================================================
-// Metadata functions implementation
-// Extended TIFF Directory GEO Tag Support
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-// - Thorsten Radde (support@IdealSoftware.com)
-// - Berend Engelbrecht (softwarecave@users.sourceforge.net)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// Based on the LibTIFF xtiffio sample and on LibGeoTIFF
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ========================================================== 
-
-#ifdef _MSC_VER
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif
-
-#include "../LibTIFF4/tiffiop.h"
-
-#include "FreeImage.h"
-#include "Utilities.h"
-#include "FreeImageTag.h"
-#include "FIRational.h"
-
-// ----------------------------------------------------------
-//   Extended TIFF Directory GEO Tag Support
-// ----------------------------------------------------------
-
-/**
-  Tiff info structure.
-  Entry format:
-  { TAGNUMBER, ReadCount, WriteCount, DataType, FIELDNUM, OkToChange, PassDirCountOnSet, AsciiName }
-
-  For ReadCount, WriteCount, -1 = unknown.
-*/
-static const TIFFFieldInfo xtiffFieldInfo[] = {
-  { TIFFTAG_GEOPIXELSCALE, -1, -1, TIFF_DOUBLE, FIELD_CUSTOM, TRUE, TRUE, (char*)"GeoPixelScale" },
-  { TIFFTAG_INTERGRAPH_MATRIX, -1, -1, TIFF_DOUBLE, FIELD_CUSTOM, TRUE, TRUE, (char*)"Intergraph TransformationMatrix" },
-  { TIFFTAG_GEOTRANSMATRIX, -1, -1, TIFF_DOUBLE, FIELD_CUSTOM, TRUE, TRUE, (char*)"GeoTransformationMatrix" },
-  { TIFFTAG_GEOTIEPOINTS,	-1, -1, TIFF_DOUBLE, FIELD_CUSTOM, TRUE, TRUE, (char*)"GeoTiePoints" },
-  { TIFFTAG_GEOKEYDIRECTORY,-1,-1, TIFF_SHORT, FIELD_CUSTOM, TRUE, TRUE, (char*)"GeoKeyDirectory" },
-  { TIFFTAG_GEODOUBLEPARAMS, -1, -1, TIFF_DOUBLE,	FIELD_CUSTOM, TRUE, TRUE, (char*)"GeoDoubleParams" },
-  { TIFFTAG_GEOASCIIPARAMS, -1, -1, TIFF_ASCII, FIELD_CUSTOM, TRUE, FALSE, (char*) "GeoASCIIParams" },
-  { TIFFTAG_JPL_CARTO_IFD, 1, 1, TIFF_LONG, FIELD_CUSTOM, TRUE, TRUE, (char*)"JPL Carto IFD offset" }  /** Don't use this! **/
-};
-
-static void
-_XTIFFLocalDefaultDirectory(TIFF *tif) {
-	int tag_size = sizeof(xtiffFieldInfo) / sizeof(xtiffFieldInfo[0]);
-	// Install the extended Tag field info
-	TIFFMergeFieldInfo(tif, xtiffFieldInfo, tag_size);
-}
-
-static TIFFExtendProc _ParentExtender;
-
-/**
-This is the callback procedure, and is
-called by the DefaultDirectory method
-every time a new TIFF directory is opened.
-*/
-static void
-_XTIFFDefaultDirectory(TIFF *tif) {
-	// set up our own defaults
-	_XTIFFLocalDefaultDirectory(tif);
-
-	/*
-	Since an XTIFF client module may have overridden
-	the default directory method, we call it now to
-	allow it to set up the rest of its own methods.
-	*/
-	if (_ParentExtender) {
-		(*_ParentExtender)(tif);
-	}
-}
-
-/**
-XTIFF Initializer -- sets up the callback procedure for the TIFF module.
-@see PluginTIFF::InitTIFF
-*/
-void
-XTIFFInitialize(void) {
-	static int first_time = 1;
-
-	if (! first_time) {
-		return; /* Been there. Done that. */
-	}
-	first_time = 0;
-
-	// Grab the inherited method and install
-	_ParentExtender = TIFFSetTagExtender(_XTIFFDefaultDirectory);
-}
-
-// ----------------------------------------------------------
-//   GeoTIFF tag reading / writing
-// ----------------------------------------------------------
-
-BOOL
-tiff_read_geotiff_profile(TIFF *tif, FIBITMAP *dib) {
-	char defaultKey[16];
-
-	// first check for a mandatory tag
-	{
-		short tag_count = 0;
-		void* data = NULL;
-		
-		if(!TIFFGetField(tif, TIFFTAG_GEOKEYDIRECTORY, &tag_count, &data)) {
-			// no GeoTIFF tag here
-			return TRUE;
-		}
-	}
-
-	// next, read GeoTIFF tags
-
-	const size_t tag_size = sizeof(xtiffFieldInfo) / sizeof(xtiffFieldInfo[0]);
-
-	TagLib& tag_lib = TagLib::instance();
-
-	for(size_t i = 0; i < tag_size; i++) {
-
-		const TIFFFieldInfo *fieldInfo = &xtiffFieldInfo[i];
-
-		if(fieldInfo->field_type == TIFF_ASCII) {
-			char *params = NULL;
-
-			if(TIFFGetField(tif, fieldInfo->field_tag, &params)) {
-				// create a tag
-				FITAG *tag = FreeImage_CreateTag();
-				if(!tag) {
-					return FALSE;
-				}
-
-				WORD tag_id = (WORD)fieldInfo->field_tag;
-
-				FreeImage_SetTagType(tag, (FREE_IMAGE_MDTYPE)fieldInfo->field_type);
-				FreeImage_SetTagID(tag, tag_id);
-				FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::GEOTIFF, tag_id, defaultKey));
-				FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::GEOTIFF, tag_id));
-				FreeImage_SetTagLength(tag, (DWORD)strlen(params) + 1);
-				FreeImage_SetTagCount(tag, FreeImage_GetTagLength(tag));
-				FreeImage_SetTagValue(tag, params);
-				FreeImage_SetMetadata(FIMD_GEOTIFF, dib, FreeImage_GetTagKey(tag), tag);
-
-				// delete the tag
-				FreeImage_DeleteTag(tag);
-			}
-		} else {
-			short tag_count = 0;
-			void* data = NULL;
-
-			if(TIFFGetField(tif, fieldInfo->field_tag, &tag_count, &data)) {
-				// create a tag
-				FITAG *tag = FreeImage_CreateTag();
-				if(!tag) {
-					return FALSE;
-				}
-
-				WORD tag_id = (WORD)fieldInfo->field_tag;
-				FREE_IMAGE_MDTYPE tag_type = (FREE_IMAGE_MDTYPE)fieldInfo->field_type;
-
-				FreeImage_SetTagType(tag, tag_type);
-				FreeImage_SetTagID(tag, tag_id);
-				FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::GEOTIFF, tag_id, defaultKey));
-				FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::GEOTIFF, tag_id));
-				FreeImage_SetTagLength(tag, FreeImage_TagDataWidth(tag_type) * tag_count);
-				FreeImage_SetTagCount(tag, tag_count);
-				FreeImage_SetTagValue(tag, data);
-				FreeImage_SetMetadata(FIMD_GEOTIFF, dib, FreeImage_GetTagKey(tag), tag);
-
-				// delete the tag
-				FreeImage_DeleteTag(tag);
-			}
-		}
-	} // for(tag_size)
-
-	return TRUE;
-}
-
-BOOL
-tiff_write_geotiff_profile(TIFF *tif, FIBITMAP *dib) {
-	char defaultKey[16];
-
-	if(FreeImage_GetMetadataCount(FIMD_GEOTIFF, dib) == 0) {
-		// no GeoTIFF tag here
-		return TRUE;
-	}
-
-	const size_t tag_size = sizeof(xtiffFieldInfo) / sizeof(xtiffFieldInfo[0]);
-
-	TagLib& tag_lib = TagLib::instance();
-
-	for(size_t i = 0; i < tag_size; i++) {
-		const TIFFFieldInfo *fieldInfo = &xtiffFieldInfo[i];
-
-		FITAG *tag = NULL;
-		const char *key = tag_lib.getTagFieldName(TagLib::GEOTIFF, (WORD)fieldInfo->field_tag, defaultKey);
-
-		if(FreeImage_GetMetadata(FIMD_GEOTIFF, dib, key, &tag)) {
-			if(FreeImage_GetTagType(tag) == FIDT_ASCII) {
-				TIFFSetField(tif, fieldInfo->field_tag, FreeImage_GetTagValue(tag));
-			} else {
-				TIFFSetField(tif, fieldInfo->field_tag, FreeImage_GetTagCount(tag), FreeImage_GetTagValue(tag));
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-// ----------------------------------------------------------
-//   TIFF EXIF tag reading & writing
-// ----------------------------------------------------------
-
-/**
-Read a single Exif tag
-
-@param tif TIFF handle
-@param tag_id TIFF Tag ID
-@param dib Image being read
-@param md_model Metadata model where to store the tag
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-static BOOL 
-tiff_read_exif_tag(TIFF *tif, uint32 tag_id, FIBITMAP *dib, TagLib::MDMODEL md_model) {
-	uint32 value_count = 0;
-	int mem_alloc = 0;
-	void *raw_data = NULL;
-
-	if(tag_id == TIFFTAG_EXIFIFD) {
-		// Exif IFD offset - skip this tag
-		// md_model should be EXIF_MAIN, the Exif IFD is processed later using the EXIF_EXIF metadata model
-		return TRUE;
-	}
-	if((tag_id == TIFFTAG_GPSIFD) && (md_model == TagLib::EXIF_MAIN)) {
-		// Exif GPS IFD offset - skip this tag
-		// should be processed in another way ...
-		return TRUE;
-	}
-	
-	TagLib& tagLib = TagLib::instance();
-
-	// get the tag key - use NULL to avoid reading GeoTIFF tags
-	const char *key = tagLib.getTagFieldName(md_model, (WORD)tag_id, NULL);
-	if(key == NULL) {
-		return TRUE;
-	}
-
-	const TIFFField *fip = TIFFFieldWithTag(tif, tag_id);
-	if(fip == NULL) {
-		return TRUE;
-	}
-
-	if(TIFFFieldPassCount(fip)) { 
-		// a count value is required for 'TIFFGetField'
-
-		if (TIFFFieldReadCount(fip) != TIFF_VARIABLE2) {
-			// a count is required, it will be of type uint16
-			uint16 value_count16 = 0;
-			if(TIFFGetField(tif, tag_id, &value_count16, &raw_data) != 1) {
-				// stop, ignore error
-				return TRUE;
-			}
-			value_count = value_count16;
-		} else {
-			// a count is required, it will be of type uint32
-			uint32 value_count32 = 0;
-			if(TIFFGetField(tif, tag_id, &value_count32, &raw_data) != 1) {
-				// stop, ignore error
-				return TRUE;
-			}
-			value_count = value_count32;
-		}
-
-	} else {
-		// determine count
-
-		if (TIFFFieldReadCount(fip) == TIFF_VARIABLE || TIFFFieldReadCount(fip) == TIFF_VARIABLE2) {
-			value_count = 1;
-		} else if (TIFFFieldReadCount(fip) == TIFF_SPP) {
-			uint16 spp;
-			TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp);
-			value_count = spp;
-		} else {
-			value_count = TIFFFieldReadCount(fip);
-		}
-
-		// access fields as pointers to data
-		// (### determining this is NOT robust... and hardly can be. It is implemented looking the _TIFFVGetField code)
-
-		if(TIFFFieldTag(fip) == TIFFTAG_TRANSFERFUNCTION) {
-			// reading this tag cause a bug probably located somewhere inside libtiff
-			return TRUE;
-		}
-
-		if ((TIFFFieldDataType(fip) == TIFF_ASCII
-		     || TIFFFieldReadCount(fip) == TIFF_VARIABLE
-		     || TIFFFieldReadCount(fip) == TIFF_VARIABLE2
-		     || TIFFFieldReadCount(fip) == TIFF_SPP
-			 || value_count > 1)
-			 
-			 && TIFFFieldTag(fip) != TIFFTAG_PAGENUMBER
-			 && TIFFFieldTag(fip) != TIFFTAG_HALFTONEHINTS
-			 && TIFFFieldTag(fip) != TIFFTAG_YCBCRSUBSAMPLING
-			 && TIFFFieldTag(fip) != TIFFTAG_DOTRANGE
-
-			 && TIFFFieldTag(fip) != TIFFTAG_BITSPERSAMPLE	//<- these two are tricky - 
-			 && TIFFFieldTag(fip) != TIFFTAG_COMPRESSION	//<- they are defined as TIFF_VARIABLE but in reality return a single value
-			 ) {
-				 if(TIFFGetField(tif, tag_id, &raw_data) != 1) {
-					 // stop, ignore error
-					 return TRUE;
-				 }
-		} else {
-			int value_size = 0;
-
-			// access fields as values
-
-			// Note: 
-			// For TIFF_RATIONAL values, TIFFDataWidth() returns 8, but LibTIFF use internaly 4-byte float to represent rationals.
-			{
-				TIFFDataType tag_type = TIFFFieldDataType(fip);
-				switch(tag_type) {
-					case TIFF_RATIONAL:
-					case TIFF_SRATIONAL:
-						value_size = 4;
-						break;
-					default:
-						value_size = TIFFDataWidth(tag_type);
-						break;
-				}
-			}
-
-			raw_data = _TIFFmalloc(value_size * value_count);
-			mem_alloc = 1;
-			int ok = FALSE;
-			
-			// ### if value_count > 1, tag is PAGENUMBER or HALFTONEHINTS or YCBCRSUBSAMPLING or DOTRANGE, 
-			// all off which are value_count == 2 (see tif_dirinfo.c)
-			switch(value_count)
-			{
-				case 1:
-					ok = TIFFGetField(tif, tag_id, raw_data);
-					break;
-				case 2:
-					ok = TIFFGetField(tif, tag_id, raw_data, (BYTE*)(raw_data) + value_size*1);
-					break;
-/* # we might need more in the future:
-				case 3:
-					ok = TIFFGetField(tif, tag_id, raw_data, (BYTE*)(raw_data) + value_size*1, (BYTE*)(raw_data) + value_size*2);
-					break;
-*/
-				default:
-					FreeImage_OutputMessageProc(FIF_TIFF, "Unimplemented variable number of parameters for Tiff Tag %s", TIFFFieldName(fip));
-					break;
-			}
-			if(ok != 1) {
-				_TIFFfree(raw_data);
-				return TRUE;
-			}
-		}
-	}
-
-	// build FreeImage tag from Tiff Tag data we collected
-
-	FITAG *fitag = FreeImage_CreateTag();
-	if(!fitag) {
-		if(mem_alloc) {
-			_TIFFfree(raw_data);
-		}
-		return FALSE;
-	}
-
-	FreeImage_SetTagID(fitag, (WORD)tag_id);
-	FreeImage_SetTagKey(fitag, key);
-
-	switch(TIFFFieldDataType(fip)) {
-		case TIFF_BYTE:
-			FreeImage_SetTagType(fitag, FIDT_BYTE);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_UNDEFINED:
-			FreeImage_SetTagType(fitag, FIDT_UNDEFINED);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_SBYTE:
-			FreeImage_SetTagType(fitag, FIDT_SBYTE);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_SHORT:
-			FreeImage_SetTagType(fitag, FIDT_SHORT);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_SSHORT:
-			FreeImage_SetTagType(fitag, FIDT_SSHORT);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_LONG:
-			FreeImage_SetTagType(fitag, FIDT_LONG);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_IFD:
-			FreeImage_SetTagType(fitag, FIDT_IFD);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_SLONG:
-			FreeImage_SetTagType(fitag, FIDT_SLONG);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_RATIONAL: {
-			// LibTIFF converts rational to floats : reconvert floats to rationals
-			DWORD *rvalue = (DWORD*)malloc(2 * value_count * sizeof(DWORD));
-			for(uint32 i = 0; i < value_count; i++) {
-				float *fv = (float*)raw_data;
-				FIRational rational(fv[i]);
-				rvalue[2*i] = rational.getNumerator();
-				rvalue[2*i+1] = rational.getDenominator();
-			}
-			FreeImage_SetTagType(fitag, FIDT_RATIONAL);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, rvalue);
-			free(rvalue);
-		}
-		break;
-
-		case TIFF_SRATIONAL: {
-			// LibTIFF converts rational to floats : reconvert floats to rationals
-			LONG *rvalue = (LONG*)malloc(2 * value_count * sizeof(LONG));
-			for(uint32 i = 0; i < value_count; i++) {
-				float *fv = (float*)raw_data;
-				FIRational rational(fv[i]);
-				rvalue[2*i] = rational.getNumerator();
-				rvalue[2*i+1] = rational.getDenominator();
-			}
-			FreeImage_SetTagType(fitag, FIDT_RATIONAL);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, rvalue);
-			free(rvalue);
-		}
-		break;
-
-		case TIFF_FLOAT:
-			FreeImage_SetTagType(fitag, FIDT_FLOAT);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_DOUBLE:
-			FreeImage_SetTagType(fitag, FIDT_DOUBLE);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_LONG8:	// BigTIFF 64-bit unsigned integer 
-			FreeImage_SetTagType(fitag, FIDT_LONG8);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_IFD8:		// BigTIFF 64-bit unsigned integer (offset) 
-			FreeImage_SetTagType(fitag, FIDT_IFD8);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_SLONG8:		// BigTIFF 64-bit signed integer 
-			FreeImage_SetTagType(fitag, FIDT_SLONG8);
-			FreeImage_SetTagLength(fitag, TIFFDataWidth( TIFFFieldDataType(fip) ) * value_count);
-			FreeImage_SetTagCount(fitag, value_count);
-			FreeImage_SetTagValue(fitag, raw_data);
-			break;
-
-		case TIFF_ASCII:
-		default: {
-			size_t length = 0;
-			if(!mem_alloc && (TIFFFieldDataType(fip) == TIFF_ASCII) && (TIFFFieldReadCount(fip) == TIFF_VARIABLE)) {
-				// when metadata tag is of type ASCII and it's value is of variable size (TIFF_VARIABLE),
-				// tiff_read_exif_tag function gives length of 1 so all strings are truncated ...
-				// ... try to avoid this by using an explicit calculation for 'length'
-				length = strlen((char*)raw_data) + 1;
-			}
-			else {
-				// remember that raw_data = _TIFFmalloc(value_size * value_count);
-				const int value_size = TIFFDataWidth( TIFFFieldDataType(fip) );
-				length = value_size * value_count;
-			}
-			FreeImage_SetTagType(fitag, FIDT_ASCII);
-			FreeImage_SetTagLength(fitag, (DWORD)length);
-			FreeImage_SetTagCount(fitag, (DWORD)length);
-			FreeImage_SetTagValue(fitag, raw_data);
-		}
-		break;
-	}
-
-	const char *description = tagLib.getTagDescription(md_model, (WORD)tag_id);
-	if(description) {
-		FreeImage_SetTagDescription(fitag, description);
-	}
-	// store the tag
-	FreeImage_SetMetadata(tagLib.getFreeImageModel(md_model), dib, FreeImage_GetTagKey(fitag), fitag);
-
-	// destroy the tag
-	FreeImage_DeleteTag(fitag);
-
-	if(mem_alloc) {
-		_TIFFfree(raw_data);
-	}
-	return TRUE;
-}
-
-/**
-Read all known exif tags
-
-@param tif TIFF handle
-@param md_model Metadata model where to store the tags
-@param dib Image being read
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-tiff_read_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) {
-
-	TagLib& tagLib = TagLib::instance();
-
-	const int count = TIFFGetTagListCount(tif);
-	for(int i = 0; i < count; i++) {
-		uint32 tag_id = TIFFGetTagListEntry(tif, i);
-		// read the tag
-		if (!tiff_read_exif_tag(tif, tag_id, dib, md_model))
-			return FALSE;
-	}
-
-	// we want to know values of standard tags too!!
-
-	// loop over all Core Directory Tags
-	// ### uses private data, but there is no other way
-	if(md_model == TagLib::EXIF_MAIN) {
-		const TIFFDirectory *td = &tif->tif_dir;
-
-		uint32 lastTag = 0;	//<- used to prevent reading some tags twice (as stored in tif_fieldinfo)
-
-		for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) {
-			const TIFFField *fld = tif->tif_fields[fi];
-
-			const uint32 tag_id = TIFFFieldTag(fld);
-
-			if(tag_id == lastTag) {
-				continue;
-			}
-
-			// test if tag value is set
-			// (lifted directly from LibTiff _TIFFWriteDirectory)
-
-			if( fld->field_bit == FIELD_CUSTOM ) {
-				int is_set = FALSE;
-
-				for(int ci = 0; ci < td->td_customValueCount; ci++ ) {
-					is_set |= (td->td_customValues[ci].info == fld);
-				}
-
-				if( !is_set ) {
-					continue;
-				}
-
-			} else if(!TIFFFieldSet(tif, fld->field_bit)) {
-				continue;
-			}
-
-			// process *all* other tags (some will be ignored)
-
-			tiff_read_exif_tag(tif, tag_id, dib, md_model);
-
-			lastTag = tag_id;
-		}
-
-	}
-
-	return TRUE;
-}
-
-
-/**
-Skip tags that are already handled by the LibTIFF writing process
-*/
-static BOOL 
-skip_write_field(TIFF* tif, uint32 tag) {
-	switch (tag) {
-		case TIFFTAG_SUBFILETYPE:
-		case TIFFTAG_OSUBFILETYPE:
-		case TIFFTAG_IMAGEWIDTH:
-		case TIFFTAG_IMAGELENGTH:
-		case TIFFTAG_BITSPERSAMPLE:
-		case TIFFTAG_COMPRESSION:
-		case TIFFTAG_PHOTOMETRIC:
-		case TIFFTAG_THRESHHOLDING:
-		case TIFFTAG_CELLWIDTH:
-		case TIFFTAG_CELLLENGTH:
-		case TIFFTAG_FILLORDER:
-		case TIFFTAG_STRIPOFFSETS:
-		case TIFFTAG_ORIENTATION:
-		case TIFFTAG_SAMPLESPERPIXEL:
-		case TIFFTAG_ROWSPERSTRIP:
-		case TIFFTAG_STRIPBYTECOUNTS:
-		case TIFFTAG_MINSAMPLEVALUE:
-		case TIFFTAG_MAXSAMPLEVALUE:
-		case TIFFTAG_XRESOLUTION:
-		case TIFFTAG_YRESOLUTION:
-		case TIFFTAG_PLANARCONFIG:
-		case TIFFTAG_FREEOFFSETS:
-		case TIFFTAG_FREEBYTECOUNTS:
-		case TIFFTAG_GRAYRESPONSEUNIT:
-		case TIFFTAG_GRAYRESPONSECURVE:
-		case TIFFTAG_GROUP3OPTIONS:
-		case TIFFTAG_GROUP4OPTIONS:
-		case TIFFTAG_RESOLUTIONUNIT:
-		case TIFFTAG_PAGENUMBER:
-		case TIFFTAG_COLORRESPONSEUNIT:
-		case TIFFTAG_PREDICTOR:
-		case TIFFTAG_COLORMAP:
-		case TIFFTAG_HALFTONEHINTS:
-		case TIFFTAG_TILEWIDTH:
-		case TIFFTAG_TILELENGTH:
-		case TIFFTAG_TILEOFFSETS:
-		case TIFFTAG_TILEBYTECOUNTS:
-		case TIFFTAG_EXTRASAMPLES:
-		case TIFFTAG_SAMPLEFORMAT:
-		case TIFFTAG_SMINSAMPLEVALUE:
-		case TIFFTAG_SMAXSAMPLEVALUE:
-			// skip always, values have been set in SaveOneTIFF()
-			return TRUE;
-			break;
-		
-		case TIFFTAG_RICHTIFFIPTC:
-			// skip always, IPTC metadata model is set in tiff_write_iptc_profile()
-			return TRUE;
-			break;
-
-		case TIFFTAG_YCBCRCOEFFICIENTS:
-		case TIFFTAG_REFERENCEBLACKWHITE:
-		case TIFFTAG_YCBCRSUBSAMPLING:
-			// skip as they cannot be filled yet
-			return TRUE;
-			break;
-			
-		case TIFFTAG_PAGENAME:
-		{
-			char *value = NULL;
-			TIFFGetField(tif, TIFFTAG_PAGENAME, &value);
-			// only skip if no value has been set
-			if(value == NULL) {
-				return FALSE;
-			} else {
-				return TRUE;
-			}
-		}
-		default:
-			return FALSE;
-			break;
-	}
-}
-
-/**
-Write all known exif tags
-
-@param tif TIFF handle
-@param md_model Metadata model from where to load the tags
-@param dib Image being written
-@return Returns TRUE if successful, returns FALSE otherwise
-*/
-BOOL 
-tiff_write_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) {
-	char defaultKey[16];
-	
-	// only EXIF_MAIN so far
-	if(md_model != TagLib::EXIF_MAIN) {
-		return FALSE;
-	}
-	
-	if(FreeImage_GetMetadataCount(FIMD_EXIF_MAIN, dib) == 0) {
-		return FALSE;
-	}
-	
-	TagLib& tag_lib = TagLib::instance();
-	
-	for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) {
-		const TIFFField *fld = tif->tif_fields[fi];
-		
-		const uint32 tag_id = TIFFFieldTag(fld);
-
-		if(skip_write_field(tif, tag_id)) {
-			// skip tags that are already handled by the LibTIFF writing process
-			continue;
-		}
-
-		FITAG *tag = NULL;
-		// get the tag key
-		const char *key = tag_lib.getTagFieldName(TagLib::EXIF_MAIN, (WORD)tag_id, defaultKey);
-
-		if(FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, key, &tag)) {
-			FREE_IMAGE_MDTYPE tag_type = FreeImage_GetTagType(tag);
-			TIFFDataType tif_tag_type = TIFFFieldDataType(fld);
-			
-			// check for identical formats
-
-			// (enum value are the sames between FREE_IMAGE_MDTYPE and TIFFDataType types)
-			if((int)tif_tag_type != (int)tag_type) {
-				// skip tag or _TIFFmemcpy will fail
-				continue;
-			}
-			// type of storage may differ (e.g. rationnal array vs float array type)
-			if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
-				// skip tag or _TIFFmemcpy will fail
-				continue;
-			}
-
-			if(tag_type == FIDT_ASCII) {
-				TIFFSetField(tif, tag_id, FreeImage_GetTagValue(tag));
-			} else {
-				TIFFSetField(tif, tag_id, FreeImage_GetTagCount(tag), FreeImage_GetTagValue(tag));
-			}
-		}
-	}
-
-	return TRUE;
-}
diff --git a/plugins/AdvaImg/src/Plugin.h b/plugins/AdvaImg/src/Plugin.h
deleted file mode 100644
index 76ffc90522..0000000000
--- a/plugins/AdvaImg/src/Plugin.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// ==========================================================
-// FreeImage Plugin Interface
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Rui Lopes (ruiglopes@yahoo.com)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifdef _MSC_VER 
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
-#endif 
-
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include "FreeImage.h"
-#include "Utilities.h"
-
-// ==========================================================
-
-struct Plugin;
-
-// =====================================================================
-//  Plugin Node
-// =====================================================================
-
-FI_STRUCT (PluginNode) {
-	/** FREE_IMAGE_FORMAT attached to this plugin */
-	int m_id;
-	/** Handle to a user plugin DLL (NULL for standard plugins) */
-	void *m_instance;
-	/** The actual plugin, holding the function pointers */
-	Plugin *m_plugin;
-	/** Enable/Disable switch */
-	BOOL m_enabled;
-
-	/** Unique format string for the plugin */
-	const char *m_format;
-	/** Description string for the plugin */
-	const char *m_description;
-	/** Comma separated list of file extensions indicating what files this plugin can open */
-	const char *m_extension;
-	/** optional regular expression to help	software identifying a bitmap type */
-	const char *m_regexpr;
-};
-
-// =====================================================================
-//  Internal Plugin List
-// =====================================================================
-
-class PluginList {
-public :
-	PluginList();
-	~PluginList();
-
-	FREE_IMAGE_FORMAT AddNode(FI_InitProc proc, void *instance = NULL, const char *format = 0, const char *description = 0, const char *extension = 0, const char *regexpr = 0);
-	PluginNode *FindNodeFromFormat(const char *format);
-	PluginNode *FindNodeFromMime(const char *mime);
-	PluginNode *FindNodeFromFIF(int node_id);
-
-	int Size() const;
-	BOOL IsEmpty() const;
-
-private :
-	std::map<int, PluginNode *> m_plugin_map;
-	int m_node_count;
-};
-
-// ==========================================================
-//   Plugin Initialisation Callback
-// ==========================================================
-
-void DLL_CALLCONV FreeImage_OutputMessage(int fif, const char *message, ...);
-
-// =====================================================================
-// Reimplementation of stricmp (it is not supported on some systems)
-// =====================================================================
-
-int FreeImage_stricmp(const char *s1, const char *s2);
-
-// ==========================================================
-//   Internal functions
-// ==========================================================
-
-extern "C" {
-	BOOL DLL_CALLCONV FreeImage_Validate(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle);
-    void * DLL_CALLCONV FreeImage_Open(PluginNode *node, FreeImageIO *io, fi_handle handle, BOOL open_for_reading);
-    void DLL_CALLCONV FreeImage_Close(PluginNode *node, FreeImageIO *io, fi_handle handle, void *data); // plugin.cpp
-    PluginList * DLL_CALLCONV FreeImage_GetPluginList(); // plugin.cpp
-}
-
-// ==========================================================
-//   Internal plugins
-// ==========================================================
-
-void DLL_CALLCONV InitBMP(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitCUT(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitICO(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitIFF(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitJPEG(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitKOALA(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitLBM(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitMNG(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPCD(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPCX(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPNG(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPNM(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPSD(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitRAS(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitTARGA(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitTIFF(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitWBMP(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitXBM(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitXPM(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitDDS(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitGIF(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitHDR(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitG3(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitSGI(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitEXR(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitJ2K(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitJP2(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPFM(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitPICT(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitRAW(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitJNG(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitWEBP(Plugin *plugin, int format_id);
-void DLL_CALLCONV InitJXR(Plugin *plugin, int format_id);
-
-#endif //!PLUGIN_H
diff --git a/plugins/AdvaImg/src/Quantizers.h b/plugins/AdvaImg/src/Quantizers.h
deleted file mode 100644
index ad7ee57b9b..0000000000
--- a/plugins/AdvaImg/src/Quantizers.h
+++ /dev/null
@@ -1,354 +0,0 @@
-// =============================================================
-// Quantizer objects and functions
-//
-// Design and implementation by:
-// - Hervé Drolon <drolon@infonie.fr>
-// - Carsten Klein (cklein05@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// =============================================================
-
-// 
-////////////////////////////////////////////////////////////////
-
-#include "FreeImage.h"
-
-////////////////////////////////////////////////////////////////
-
-/**
-  Xiaolin Wu color quantization algorithm
-*/
-class WuQuantizer
-{
-public:
-
-typedef struct tagBox {
-    int r0;			 // min value, exclusive
-    int r1;			 // max value, inclusive
-    int g0;  
-    int g1;  
-    int b0;  
-    int b1;
-    int vol;
-} Box;
-
-protected:
-    float *gm2;
-	LONG *wt, *mr, *mg, *mb;
-	WORD *Qadd;
-
-	// DIB data
-	unsigned width, height;
-	unsigned pitch;
-	FIBITMAP *m_dib;
-
-protected:
-    void Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int ReserveSize, RGBQUAD *ReservePalette);
-	void M3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2);
-	LONG Vol(Box *cube, LONG *mmt);
-	LONG Bottom(Box *cube, BYTE dir, LONG *mmt);
-	LONG Top(Box *cube, BYTE dir, int pos, LONG *mmt);
-	float Var(Box *cube);
-	float Maximize(Box *cube, BYTE dir, int first, int last , int *cut,
-				   LONG whole_r, LONG whole_g, LONG whole_b, LONG whole_w);
-	bool Cut(Box *set1, Box *set2);
-	void Mark(Box *cube, int label, BYTE *tag);
-
-public:
-	// Constructor - Input parameter: DIB 24-bit to be quantized
-    WuQuantizer(FIBITMAP *dib);
-	// Destructor
-	~WuQuantizer();
-	// Quantizer - Return value: quantized 8-bit (color palette) DIB
-	FIBITMAP* Quantize(int PaletteSize, int ReserveSize, RGBQUAD *ReservePalette);
-};
-
-
-/**
-  NEUQUANT Neural-Net quantization algorithm by Anthony Dekker
-*/
-
-// ----------------------------------------------------------------
-// Constant definitions
-// ----------------------------------------------------------------
-
-/** number of colours used: 
-	for 256 colours, fixed arrays need 8kb, plus space for the image
-*/
-//static const int netsize = 256;
-
-/**@name network definitions */
-//@{
-//static const int maxnetpos = (netsize - 1);
-/// bias for colour values
-static const int netbiasshift = 4;
-/// no. of learning cycles
-static const int ncycles = 100;
-//@}
-
-/**@name defs for freq and bias */
-//@{
-/// bias for fractions
-static const int intbiasshift = 16;
-static const int intbias = (((int)1) << intbiasshift);
-/// gamma = 1024
-static const int gammashift = 10;
-// static const int gamma = (((int)1) << gammashift);
-/// beta = 1 / 1024
-static const int betashift = 10;
-static const int beta = (intbias >> betashift);
-static const int betagamma = (intbias << (gammashift-betashift));
-//@}
-
-/**@name defs for decreasing radius factor */
-//@{
-/// for 256 cols, radius starts
-//static const int initrad = (netsize >> 3);
-/// at 32.0 biased by 6 bits
-static const int radiusbiasshift = 6;
-static const int radiusbias = (((int)1) << radiusbiasshift);
-/// and decreases by a 
-//static const int initradius	= (initrad * radiusbias);
-// factor of 1/30 each cycle
-static const int radiusdec = 30;
-//@}
-
-/**@name defs for decreasing alpha factor */
-//@{
-/// alpha starts at 1.0
-static const int alphabiasshift = 10;
-static const int initalpha = (((int)1) << alphabiasshift);
-//@}
-
-/**@name radbias and alpharadbias used for radpower calculation */
-//@{
-static const int radbiasshift = 8;
-static const int radbias = (((int)1) << radbiasshift);
-static const int alpharadbshift = (alphabiasshift+radbiasshift);
-static const int alpharadbias = (((int)1) << alpharadbshift);	
-//@}
-
-class NNQuantizer
-{
-protected:
-	/**@name image parameters */
-	//@{
-	/// pointer to input dib
-	FIBITMAP *dib_ptr;
-	/// image width
-	int img_width;
-	/// image height
-	int img_height;
-	/// image line length
-	int img_line;
-	//@}
-
-	/**@name network parameters */
-	//@{
-
-	int netsize, maxnetpos, initrad, initradius;
-
-	/// BGRc
-	typedef int pixel[4];
-	/// the network itself
-	pixel *network;
-
-	/// for network lookup - really 256
-	int netindex[256];
-
-	/// bias array for learning
-	int *bias;
-	/// freq array for learning
-	int *freq;
-	/// radpower for precomputation
-	int *radpower;
-	//@}
-
-protected:
-	/// Initialise network in range (0,0,0) to (255,255,255) and set parameters
-	void initnet();	
-
-	/// Unbias network to give byte values 0..255 and record position i to prepare for sort
-	void unbiasnet();
-
-	/// Insertion sort of network and building of netindex[0..255] (to do after unbias)
-	void inxbuild();
-
-	/// Search for BGR values 0..255 (after net is unbiased) and return colour index
-	int inxsearch(int b, int g, int r);
-
-	/// Search for biased BGR values
-	int contest(int b, int g, int r);
-	
-	/// Move neuron i towards biased (b,g,r) by factor alpha
-	void altersingle(int alpha, int i, int b, int g, int r);
-
-	/// Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|]
-	void alterneigh(int rad, int i, int b, int g, int r);
-
-	/** Main Learning Loop
-	@param sampling_factor sampling factor in [1..30]
-	*/
-	void learn(int sampling_factor);
-
-	/// Get a pixel sample at position pos. Handle 4-byte boundary alignment.
-	void getSample(long pos, int *b, int *g, int *r);
-
-
-public:
-	/// Constructor
-	NNQuantizer(int PaletteSize);
-
-	/// Destructor
-	~NNQuantizer();
-
-	/** Quantizer
-	@param dib input 24-bit dib to be quantized
-	@param sampling a sampling factor in range 1..30. 
-	1 => slower (but better), 30 => faster. Default value is 1
-	@return returns the quantized 8-bit (color palette) DIB
-	*/
-	FIBITMAP* Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *ReservePalette, int sampling = 1);
-
-};
-
-/**
- * LFPQUANT - Lossless Fast Pseudo-Quantization Algorithm
- *
- * The Lossless Fast Pseudo-Quantization algorithm is no real quantization
- * algorithm, since it makes no attempt to create a palette, that is suitable
- * for all colors of the 24-bit source image. However, it provides very fast
- * conversions from 24-bit to 8-bit images, if the number of distinct colors
- * in the source image is not greater than the desired palette size. If the
- * number of colors in the source image is exceeded, the Quantize method of
- * this implementation stops the process and returns NULL.
- *
- * This implementation uses a very fast hash map implementation to collect
- * the source image's colors. It turned out that a customized implementation
- * of a hash table with open addressing (using linear probing) provides the
- * best performance. The hash table has 512 entries, which prevents the load
- * factor to exceed 0.5 as we have 256 entries at most. Each entry consumes
- * 64 bits, so the whole hash table takes 4KB of memory.
- *
- * For large images, the LFPQuantizer is typically up to three times faster
- * than the WuQuantizer.
- */
-class LFPQuantizer {
-public:
-	/** Constructor */
-	LFPQuantizer(unsigned PaletteSize);
-
-	/** Destructor */
-	~LFPQuantizer();
-
-	/**
-	 * Quantizer
-	 * @param dib input 24-bit or 32-bit bitmap to be quantized
-	 * @return returns the pseudo-quantized 8-bit bitmap
-	 */
-	FIBITMAP* Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *ReservePalette);
-
-protected:
-	/** The maximum size of a palette. */
-	static const unsigned MAX_SIZE = 256;
-
-	/**
-	 * The size of the hash table. Must be a power of 2. By sizing it
-	 * MAX_SIZE * 2, we ensure the load factor not to exceed 0.5 at any
-	 * time, since we will have MAX_SIZE entries at most.
-	 */
-	static const unsigned MAP_SIZE = MAX_SIZE * 2;
-
-	/**
-	 * With open addressing we need a special value for empty buckets.
-	 * Both entry.color and entry.index are 0xFFFFFFFF for an empty
-	 * entry.
-	 */
-	static const unsigned EMPTY_BUCKET = 0xFFFFFFFF;
-
-	/**
-	 * This structure defines a single entry in the hash table. We use
-	 * color as the entry's key.
-	 */
-	typedef struct MapEntry {
-		unsigned color;
-		unsigned index;
-	} MapEntry;
-
-	/** The hash table. */
-	MapEntry *m_map;
-
-	/**
-	 * The current size of the newly created palette. Since the provided
-	 * reserve palette could contain duplicates, this is not necessarily
-	 * the number of entries in the hash table. Initialized to zero.
-	 */
-	unsigned m_size;
-
-	/**
-	 * The desired maximum number of entries in the newly created palette.
-	 * If m_size exceeds this value, the palette is full and the
-	 * quantization process is stopped. Initialized to the desired
-	 * palette size.
-	 */
-	unsigned m_limit;
-
-	/**
-	 *  The palette index used for the next color added. Initialized to
-	 *  zero (the reserve palette is put to the end of the palette).
-	 */
-	unsigned m_index;
-
-	/**
-	 * Ensures that hash codes that differ only by constant multiples
-	 * at each bit position have a bounded number of collisions.
-	 * @param h the initial (aka raw) hash code
-	 * @return the modified hash code
-	 */
-	static inline unsigned hash(unsigned h) {
-		h ^= (h >> 20) ^ (h >> 12);
-		return h ^ (h >> 7) ^ (h >> 4);
-	}
-
-	/**
-	 * Returns the palette index of the specified color. Tries to put the
-	 * color into the map, if it's not already present in the map. In that
-	 * case, a new index is used for the color. Returns -1, if adding the
-	 * color would exceed the desired maximum number of colors in the
-	 * palette.
-	 * @param color the color to get the index from
-	 * @return the palette index of the specified color or -1, if there
-	 * is no space left in the palette
-	 */
-	int GetIndexForColor(unsigned color);
-
-	/**
-	 * Adds the specified number of entries of the specified reserve
-	 * palette to the newly created palette.
-	 * @param *palette a pointer to the reserve palette to copy from
-	 * @param size the number of entries to copy
-	 */
-	void AddReservePalette(const void *palette, unsigned size);
-
-	/**
-	 * Copies the newly created palette into the specified destination
-	 * palettte. Although unused palette entries are not overwritten in
-	 * the destination palette, it is assumed to have space for at
-	 * least 256 entries.
-	 * @param palette a pointer to the destination palette
-	 */
-	void WritePalette(void *palette);
-
-};
diff --git a/plugins/AdvaImg/src/ToneMapping.h b/plugins/AdvaImg/src/ToneMapping.h
deleted file mode 100644
index 20f283fee9..0000000000
--- a/plugins/AdvaImg/src/ToneMapping.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// ==========================================================
-// High Dynamic Range bitmap conversion routines
-//
-// Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef TONE_MAPPING_H
-#define TONE_MAPPING_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-BOOL ConvertInPlaceRGBFToYxy(FIBITMAP *dib);
-BOOL ConvertInPlaceYxyToRGBF(FIBITMAP *dib);
-FIBITMAP* ConvertRGBFToY(FIBITMAP *src);
-
-BOOL LuminanceFromYxy(FIBITMAP *dib, float *maxLum, float *minLum, float *worldLum);
-BOOL LuminanceFromY(FIBITMAP *dib, float *maxLum, float *minLum, float *Lav, float *Llav);
-
-void NormalizeY(FIBITMAP *Y, float minPrct, float maxPrct);
-
-FIBITMAP* ClampConvertRGBFTo24(FIBITMAP *src);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // TONE_MAPPING_H
diff --git a/plugins/AdvaImg/src/Utilities.h b/plugins/AdvaImg/src/Utilities.h
deleted file mode 100644
index 79b0c1d59d..0000000000
--- a/plugins/AdvaImg/src/Utilities.h
+++ /dev/null
@@ -1,516 +0,0 @@
-// ==========================================================
-// Utility functions
-//
-// Design and implementation by
-// - Floris van den Berg (flvdberg@wxs.nl)
-// - Hervé Drolon <drolon@infonie.fr>
-// - Ryan Rubley (ryan@lostreality.org)
-// - Mihail Naydenov (mnaydenov@users.sourceforge.net)
-//
-// This file is part of FreeImage 3
-//
-// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
-// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT
-// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
-// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-// THIS DISCLAIMER.
-//
-// Use at your own risk!
-// ==========================================================
-
-#ifndef UTILITIES_H
-#define UTILITIES_H
-
-// ==========================================================
-//   Standard includes used by the library
-// ==========================================================
-
-#include <math.h>
-#include <stdlib.h> 
-#include <memory.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <assert.h>
-#include <errno.h>
-#include <float.h>
-#include <limits.h>
-
-#include <string>
-#include <list>
-#include <map>
-#include <set>
-#include <vector>
-#include <stack>
-#include <sstream>
-#include <algorithm>
-#include <limits>
-#include <memory>
-
-// ==========================================================
-//   Bitmap palette and pixels alignment
-// ==========================================================
-
-#define FIBITMAP_ALIGNMENT	16	// We will use a 16 bytes alignment boundary
-
-// Memory allocation on a specified alignment boundary
-// defined in BitmapAccess.cpp
-
-void* FreeImage_Aligned_Malloc(size_t amount, size_t alignment);
-void FreeImage_Aligned_Free(void* mem);
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/**
-Allocate a FIBITMAP with possibly no pixel data 
-(i.e. only header data and some or all metadata)
-@param header_only If TRUE, allocate a 'header only' FIBITMAP, otherwise allocate a full FIBITMAP
-@param type Image type
-@param width Image width
-@param height Image height
-@param bpp Number of bits per pixel
-@param red_mask Image red mask 
-@param green_mask Image green mask
-@param blue_mask Image blue mask
-@return Returns the allocated FIBITMAP
-@see FreeImage_AllocateT
-*/
-DLL_API FIBITMAP * DLL_CALLCONV FreeImage_AllocateHeaderT(BOOL header_only, FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-
-/**
-Allocate a FIBITMAP of type FIT_BITMAP, with possibly no pixel data 
-(i.e. only header data and some or all metadata)
-@param header_only If TRUE, allocate a 'header only' FIBITMAP, otherwise allocate a full FIBITMAP
-@param width Image width
-@param height Image height
-@param bpp Number of bits per pixel
-@param red_mask Image red mask 
-@param green_mask Image green mask
-@param blue_mask Image blue mask
-@return Returns the allocated FIBITMAP
-@see FreeImage_Allocate
-*/
-DLL_API FIBITMAP * DLL_CALLCONV FreeImage_AllocateHeader(BOOL header_only, int width, int height, int bpp, unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
-
-/**
-Allocate a FIBITMAP with no pixel data and wrap a user provided pixel buffer
-@param ext_bits Pointer to external user's pixel buffer
-@param ext_pitch Pointer to external user's pixel buffer pitch
-@param type Image type
-@param width Image width
-@param height Image height
-@param bpp Number of bits per pixel
-@param red_mask Image red mask 
-@param green_mask Image green mask
-@param blue_mask Image blue mask
-@return Returns the allocated FIBITMAP
-@see FreeImage_ConvertFromRawBitsEx
-*/
-DLL_API FIBITMAP * DLL_CALLCONV FreeImage_AllocateHeaderForBits(BYTE *ext_bits, unsigned ext_pitch, FREE_IMAGE_TYPE type, int width, int height, int bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask);
-
-/**
-Helper for 16-bit FIT_BITMAP
-@see FreeImage_GetRGBMasks
-*/
-DLL_API BOOL DLL_CALLCONV FreeImage_HasRGBMasks(FIBITMAP *dib);
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-// ==========================================================
-//   File I/O structs
-// ==========================================================
-
-// these structs are for file I/O and should not be confused with similar
-// structs in FreeImage.h which are for in-memory bitmap handling
-
-#ifdef _WIN32
-#pragma pack(push, 1)
-#else
-#pragma pack(1)
-#endif // _WIN32
-
-typedef struct tagFILE_RGBA {
-  unsigned char r,g,b,a;
-} FILE_RGBA;
-
-typedef struct tagFILE_BGRA {
-  unsigned char b,g,r,a;
-} FILE_BGRA;
-
-typedef struct tagFILE_RGB {
-  unsigned char r,g,b;
-} FILE_RGB;
-
-typedef struct tagFILE_BGR {
-  unsigned char b,g,r;
-} FILE_BGR;
-
-#ifdef _WIN32
-#pragma pack(pop)
-#else
-#pragma pack()
-#endif // _WIN32
-
-// ==========================================================
-//   Template utility functions
-// ==========================================================
-
-/// Max function
-template <class T> T MAX(const T &a, const T &b) {
-	return (a > b) ? a: b;
-}
-
-/// Min function
-template <class T> T MIN(const T &a, const T &b) {
-	return (a < b) ? a: b;
-}
-
-/// INPLACESWAP adopted from codeguru.com 
-template <class T> void INPLACESWAP(T& a, T& b) {
-	a ^= b; b ^= a; a ^= b;
-}
-
-/// Clamp function
-template <class T> T CLAMP(const T &value, const T &min_value, const T &max_value) {
-	return ((value < min_value) ? min_value : (value > max_value) ? max_value : value);
-}
-
-/** This procedure computes minimum min and maximum max
- of n numbers using only (3n/2) - 2 comparisons.
- min = L[i1] and max = L[i2].
- ref: Aho A.V., Hopcroft J.E., Ullman J.D., 
- The design and analysis of computer algorithms, 
- Addison-Wesley, Reading, 1974.
-*/
-template <class T> void 
-MAXMIN(const T* L, long n, T& max, T& min) {
-	long i1, i2, i, j;
-	T x1, x2;
-	long k1, k2;
-
-	i1 = 0; i2 = 0; min = L[0]; max = L[0]; j = 0;
-	if((n % 2) != 0)  j = 1;
-	for(i = j; i < n; i+= 2) {
-		k1 = i; k2 = i+1;
-		x1 = L[k1]; x2 = L[k2];
-		if(x1 > x2)	{
-			k1 = k2;  k2 = i;
-			x1 = x2;  x2 = L[k2];
-		}
-		if(x1 < min) {
-			min = x1;  i1 = k1;
-		}
-		if(x2 > max) {
-			max = x2;  i2 = k2;
-		}
-	}
-}
-
-// ==========================================================
-//   Utility functions
-// ==========================================================
-
-#ifndef _WIN32
-inline char*
-i2a(unsigned i, char *a, unsigned r) {
-	if (i/r > 0) a = i2a(i/r,a,r);
-	*a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
-	return a+1;
-}
-
-/** 
- Transforms integer i into an ascii string and stores the result in a; 
- string is encoded in the base indicated by r.
- @param i Number to be converted
- @param a String result
- @param r Base of value; must be in the range 2 - 36
- @return Returns a
-*/
-inline char *
-_itoa(int i, char *a, int r) {
-	r = ((r < 2) || (r > 36)) ? 10 : r;
-	if(i < 0) {
-		*a = '-';
-		*i2a(-i, a+1, r) = 0;
-	}
-	else *i2a(i, a, r) = 0;
-	return a;
-}
-
-#endif // !_WIN32
-
-inline unsigned char
-HINIBBLE (unsigned char byte) {
-	return byte & 0xF0;
-}
-
-inline unsigned char
-LOWNIBBLE (unsigned char byte) {
-	return byte & 0x0F;
-}
-
-inline int
-CalculateUsedBits(int bits) {
-	int bit_count = 0;
-	unsigned bit = 1;
-
-	for (unsigned i = 0; i < 32; i++) {
-		if ((bits & bit) == bit) {
-			bit_count++;
-		}
-
-		bit <<= 1;
-	}
-
-	return bit_count;
-}
-
-inline unsigned
-CalculateLine(unsigned width, unsigned bitdepth) {
-	return (unsigned)( ((unsigned long long)width * bitdepth + 7) / 8 );
-}
-
-inline unsigned
-CalculatePitch(unsigned line) {
-	return line + 3 & ~3;
-}
-
-inline unsigned
-CalculateUsedPaletteEntries(unsigned bit_count) {
-	if ((bit_count >= 1) && (bit_count <= 8))
-		return 1 << bit_count;
-
-	return 0;
-}
-
-inline unsigned char *
-CalculateScanLine(unsigned char *bits, unsigned pitch, int scanline) {
-	return bits ? (bits + ((size_t)pitch * scanline)) : NULL;
-}
-
-// ----------------------------------------------------------
-
-/**
-Fast generic assign (faster than for loop)
-@param dst Destination pixel
-@param src Source pixel
-@param bytesperpixel # of bytes per pixel
-*/
-inline void 
-AssignPixel(BYTE* dst, const BYTE* src, unsigned bytesperpixel) {
-	switch (bytesperpixel) {
-		case 1:	// FIT_BITMAP (8-bit)
-			*dst = *src;
-			break;
-
-		case 2: // FIT_UINT16 / FIT_INT16 / 16-bit
-			*(reinterpret_cast<WORD*>(dst)) = *(reinterpret_cast<const WORD*> (src));
-			break;
-
-		case 3: // FIT_BITMAP (24-bit)
-			*(reinterpret_cast<WORD*>(dst)) = *(reinterpret_cast<const WORD*> (src));
-			dst[2] = src[2];
-			break;
-
-		case 4: // FIT_BITMAP (32-bit) / FIT_UINT32 / FIT_INT32 / FIT_FLOAT
-			*(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src));
-			break;
-
-		case 6: // FIT_RGB16 (3 x 16-bit)
-			*(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src));
-			*(reinterpret_cast<WORD*>(dst + 4)) = *(reinterpret_cast<const WORD*> (src + 4));	
-			break;
-
-		// the rest can be speeded up with int64
-			
-		case 8: // FIT_RGBA16 (4 x 16-bit)
-			*(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src));
-			*(reinterpret_cast<DWORD*>(dst + 4)) = *(reinterpret_cast<const DWORD*> (src + 4));	
-			break;
-		
-		case 12: // FIT_RGBF (3 x 32-bit IEEE floating point)
-			*(reinterpret_cast<float*>(dst)) = *(reinterpret_cast<const float*> (src));
-			*(reinterpret_cast<float*>(dst + 4)) = *(reinterpret_cast<const float*> (src + 4));
-			*(reinterpret_cast<float*>(dst + 8)) = *(reinterpret_cast<const float*> (src + 8));
-			break;
-		
-		case 16: // FIT_RGBAF (4 x 32-bit IEEE floating point)
-			*(reinterpret_cast<float*>(dst)) = *(reinterpret_cast<const float*> (src));
-			*(reinterpret_cast<float*>(dst + 4)) = *(reinterpret_cast<const float*> (src + 4));
-			*(reinterpret_cast<float*>(dst + 8)) = *(reinterpret_cast<const float*> (src + 8));
-			*(reinterpret_cast<float*>(dst + 12)) = *(reinterpret_cast<const float*> (src + 12));
-			break;
-			
-		default:
-			assert(FALSE);
-	}
-}
-
-/**
-Swap red and blue channels in a 24- or 32-bit dib. 
-@return Returns TRUE if successful, returns FALSE otherwise
-@see See definition in Conversion.cpp
-*/
-BOOL SwapRedBlue32(FIBITMAP* dib);
-
-/**
-Inplace convert CMYK to RGBA.(8- and 16-bit). 
-Alpha is filled with the first extra channel if any or white otherwise.
-@return Returns TRUE if successful, returns FALSE otherwise
-@see See definition in Conversion.cpp
-*/
-BOOL ConvertCMYKtoRGBA(FIBITMAP* dib);
-
-/**
-Inplace convert CIELab to RGBA (8- and 16-bit).
-@return Returns TRUE if successful, returns FALSE otherwise
-@see See definition in Conversion.cpp
-*/
-BOOL ConvertLABtoRGB(FIBITMAP* dib);
-
-/**
-RGBA to RGB conversion
-@see See definition in Conversion.cpp
-*/
-FIBITMAP* RemoveAlphaChannel(FIBITMAP* dib);
-
-/**
-Rotate a dib according to Exif info
-@param dib Input / Output dib to rotate
-@see Exif.cpp, PluginJPEG.cpp
-*/
-void RotateExif(FIBITMAP **dib);
-
-
-// ==========================================================
-//   Big Endian / Little Endian utility functions
-// ==========================================================
-
-inline WORD 
-__SwapUInt16(WORD arg) { 
-#if defined(_MSC_VER) && _MSC_VER >= 1310 
-	return _byteswap_ushort(arg); 
-#elif defined(__i386__) && defined(__GNUC__) 
-	__asm__("xchgb %b0, %h0" : "+q" (arg)); 
-	return arg; 
-#elif defined(__ppc__) && defined(__GNUC__) 
-	WORD result; 
-	__asm__("lhbrx %0,0,%1" : "=r" (result) : "r" (&arg), "m" (arg)); 
-	return result; 
-#else 
-	// swap bytes 
-	WORD result;
-	result = ((arg << 8) & 0xFF00) | ((arg >> 8) & 0x00FF); 
-	return result; 
-#endif 
-} 
- 
-inline DWORD 
-__SwapUInt32(DWORD arg) { 
-#if defined(_MSC_VER) && _MSC_VER >= 1310 
-	return _byteswap_ulong(arg); 
-#elif defined(__i386__) && defined(__GNUC__) 
-	__asm__("bswap %0" : "+r" (arg)); 
-	return arg; 
-#elif defined(__ppc__) && defined(__GNUC__) 
-	DWORD result; 
-	__asm__("lwbrx %0,0,%1" : "=r" (result) : "r" (&arg), "m" (arg)); 
-	return result; 
-#else 
-	// swap words then bytes
-	DWORD result; 
-	result = ((arg & 0x000000FF) << 24) | ((arg & 0x0000FF00) << 8) | ((arg >> 8) & 0x0000FF00) | ((arg >> 24) & 0x000000FF); 
-	return result; 
-#endif 
-} 
- 
-/**
-for later use ...
-inline uint64_t 
-SwapInt64(uint64_t arg) { 
-#if defined(_MSC_VER) && _MSC_VER >= 1310 
-	return _byteswap_uint64(arg); 
-#else 
-	union Swap { 
-		uint64_t sv; 
-		uint32_t ul[2]; 
-	} tmp, result; 
-	tmp.sv = arg; 
-	result.ul[0] = SwapInt32(tmp.ul[1]);  
-	result.ul[1] = SwapInt32(tmp.ul[0]); 
-	return result.sv; 
-#endif 
-} 
-*/
-
-inline void
-SwapShort(WORD *sp) {
-	*sp = __SwapUInt16(*sp);
-}
-
-inline void
-SwapLong(DWORD *lp) {
-	*lp = __SwapUInt32(*lp);
-}
-
-// ==========================================================
-//   Greyscale and color conversion
-// ==========================================================
-
-/**
-Extract the luminance channel L from a RGBF image. 
-Luminance is calculated from the sRGB model using a D65 white point, using the Rec.709 formula : 
-L = ( 0.2126 * r ) + ( 0.7152 * g ) + ( 0.0722 * b )
-Reference : 
-A Standard Default Color Space for the Internet - sRGB. 
-[online] http://www.w3.org/Graphics/Color/sRGB
-*/
-#define LUMA_REC709(r, g, b)	(0.2126F * r + 0.7152F * g + 0.0722F * b)
-
-#define GREY(r, g, b) (BYTE)(LUMA_REC709(r, g, b) + 0.5F)
-/*
-#define GREY(r, g, b) (BYTE)(((WORD)r * 77 + (WORD)g * 150 + (WORD)b * 29) >> 8)	// .299R + .587G + .114B
-*/
-/*
-#define GREY(r, g, b) (BYTE)(((WORD)r * 169 + (WORD)g * 256 + (WORD)b * 87) >> 9)	// .33R + 0.5G + .17B
-*/
-
-#define RGB565(b, g, r) ((((b) >> 3) << FI16_565_BLUE_SHIFT) | (((g) >> 2) << FI16_565_GREEN_SHIFT) | (((r) >> 3) << FI16_565_RED_SHIFT))
-#define RGB555(b, g, r) ((((b) >> 3) << FI16_555_BLUE_SHIFT) | (((g) >> 3) << FI16_555_GREEN_SHIFT) | (((r) >> 3) << FI16_555_RED_SHIFT))
-
-#define IS_FORMAT_RGB565(dib) ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK))
-#define RGBQUAD_TO_WORD(dib, color) (IS_FORMAT_RGB565(dib) ? RGB565((color)->rgbBlue, (color)->rgbGreen, (color)->rgbRed) : RGB555((color)->rgbBlue, (color)->rgbGreen, (color)->rgbRed))
-
-#define CREATE_GREYSCALE_PALETTE(palette, entries) \
-	for (unsigned i = 0, v = 0; i < entries; i++, v += 0x00FFFFFF / (entries - 1)) { \
-		((unsigned *)palette)[i] = v; \
-	}
-
-#define CREATE_GREYSCALE_PALETTE_REVERSE(palette, entries) \
-	for (unsigned i = 0, v = 0x00FFFFFF; i < entries; i++, v -= (0x00FFFFFF / (entries - 1))) { \
-		((unsigned *)palette)[i] = v; \
-	}
-
-// ==========================================================
-//   Generic error messages
-// ==========================================================
-
-static const char *FI_MSG_ERROR_MEMORY = "Memory allocation failed";
-static const char *FI_MSG_ERROR_DIB_MEMORY = "DIB allocation failed, maybe caused by an invalid image size or by a lack of memory";
-static const char *FI_MSG_ERROR_PARSING = "Parsing error";
-static const char *FI_MSG_ERROR_MAGIC_NUMBER = "Invalid magic number";
-static const char *FI_MSG_ERROR_UNSUPPORTED_FORMAT = "Unsupported format";
-static const char *FI_MSG_ERROR_UNSUPPORTED_COMPRESSION = "Unsupported compression type";
-static const char *FI_MSG_WARNING_INVALID_THUMBNAIL = "Warning: attached thumbnail cannot be written to output file (invalid format) - Thumbnail saving aborted";
-
-#endif // UTILITIES_H
diff --git a/plugins/AdvaImg/src/main.cpp b/plugins/AdvaImg/src/main.cpp
index 799f8bc102..a3b74d15a5 100644
--- a/plugins/AdvaImg/src/main.cpp
+++ b/plugins/AdvaImg/src/main.cpp
@@ -24,16 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <windows.h>

-#include <commdlg.h>

-#include <malloc.h>

-

-#include <m_imgsrvc.h>

-

-#include "newpluginapi.h"

-#include "version.h"

-

-#include "libpng/png.h"

+#include "stdafx.h"

 

 static const PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

@@ -48,151 +39,6 @@ static const PLUGININFOEX pluginInfoEx = {
 	{0x7c070f7c, 0x459e, 0x46b7, {0x8e, 0x6d, 0xbc, 0x6e, 0xfa, 0xa2, 0x2f, 0x78}}

 };

 

-/*

-* freeimage helper functions

-*/

-

-// Correct alpha from bitmaps loaded without it (it cames with 0 and should be 255)

-// originally in loadavatars...

-

-static void FI_CorrectBitmap32Alpha(HBITMAP hBitmap, BOOL force)

-{

-	BITMAP bmp;

-	DWORD dwLen;

-	BYTE *p;

-	int x, y;

-	BOOL fixIt;

-

-	GetObject(hBitmap, sizeof(bmp), &bmp);

-

-	if (bmp.bmBitsPixel != 32)

-		return;

-

-	dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);

-	p = (BYTE *)malloc(dwLen);

-	if (p == nullptr)

-		return;

-	memset(p, 0, dwLen);

-

-	GetBitmapBits(hBitmap, dwLen, p);

-

-	fixIt = TRUE;

-	for (y = 0; fixIt && y < bmp.bmHeight; ++y) {

-		BYTE *px = p + bmp.bmWidth * 4 * y;

-

-		for (x = 0; fixIt && x < bmp.bmWidth; ++x)

-		{

-			if (px[3] != 0 && !force)

-			{

-				fixIt = FALSE;

-			}

-			else

-			{

-				px[3] = 255;

-			}

-

-			px += 4;

-		}

-	}

-

-	if (fixIt)

-		SetBitmapBits(hBitmap, dwLen, p);

-

-	free(p);

-}

-

-/*

-* needed for per pixel transparent images. Such images should then be rendered by

-* using AlphaBlend() with AC_SRC_ALPHA

-* dwFlags will be set to AVS_PREMULTIPLIED

-* return TRUE if the image has at least one pixel with transparency

-*/

-static BOOL FreeImage_PreMultiply(HBITMAP hBitmap)

-{

-	BOOL transp = FALSE;

-

-	BITMAP bmp;

-	GetObject(hBitmap, sizeof(bmp), &bmp);

-	if (bmp.bmBitsPixel == 32) {

-		int width = bmp.bmWidth;

-		int height = bmp.bmHeight;

-		int dwLen = width * height * 4;

-		BYTE *p = (BYTE *)malloc(dwLen);

-		if (p != nullptr) {

-			GetBitmapBits(hBitmap, dwLen, p);

-

-			for (int y = 0; y < height; ++y) {

-				BYTE *px = p + width * 4 * y;

-				for (int x = 0; x < width; ++x) {

-					BYTE alpha = px[3];

-					if (alpha < 255) {

-						transp = TRUE;

-

-						px[0] = px[0] * alpha/255;

-						px[1] = px[1] * alpha/255;

-						px[2] = px[2] * alpha/255;

-					}

-

-					px += 4;

-				}

-			}

-

-			if (transp)

-				dwLen = SetBitmapBits(hBitmap, dwLen, p);

-			free(p);

-		}

-	}

-

-	return transp;

-}

-

-static HBITMAP FreeImage_CreateHBITMAPFromDIB(FIBITMAP *in)

-{

-    FIBITMAP *dib = nullptr;

-	int bpp = FreeImage_GetBPP(in);

-

-	if (bpp == 48)

-		dib = FreeImage_ConvertTo24Bits(in);

-	else if (FreeImage_GetBPP(in) > 32)

-		dib = FreeImage_ConvertTo32Bits(in);

-    else

-        dib = in;

-

-	BYTE *ptPixels;

-	BITMAPINFO *info = FreeImage_GetInfo(dib);

-	HBITMAP hBmp = CreateDIBSection(nullptr, info, DIB_RGB_COLORS, (void **)&ptPixels, nullptr, 0);

-	if (ptPixels != nullptr)

-		memmove(ptPixels, FreeImage_GetBits(dib), FreeImage_GetPitch(dib) * FreeImage_GetHeight(dib));

-

-	if (dib != in)

-		FreeImage_Unload(dib);

-

-	return hBmp;

-}

-

-static FIBITMAP *FreeImage_CreateDIBFromHBITMAP(HBITMAP hBmp)

-{

-	BITMAP bm;

-

-	if(hBmp) {

-		GetObject(hBmp, sizeof(BITMAP), (LPSTR) &bm);

-		FIBITMAP *dib = FreeImage_Allocate(bm.bmWidth, bm.bmHeight, bm.bmBitsPixel,0,0,0);

-		// The GetDIBits function clears the biClrUsed and biClrImportant BITMAPINFO members (dont't know why)

-		// So we save these infos below. This is needed for palettized images only.

-		int nColors = FreeImage_GetColorsUsed(dib);

-		HDC dc = GetDC(nullptr);

-		int Success = GetDIBits(dc, hBmp, 0, FreeImage_GetHeight(dib),

-			FreeImage_GetBits(dib), FreeImage_GetInfo(dib), DIB_RGB_COLORS);

-		ReleaseDC(nullptr, dc);

-		// restore BITMAPINFO members

-		FreeImage_GetInfoHeader(dib)->biClrUsed = nColors;

-		FreeImage_GetInfoHeader(dib)->biClrImportant = nColors;

-		return dib;

-	}

-	return nullptr;

-}

-

-

 // Resize /////////////////////////////////////////////////////////////////////////////////////////

 

 

@@ -202,7 +48,7 @@ static FIBITMAP *FreeImage_CreateDIBFromHBITMAP(HBITMAP hBmp)
 // lParam = NULL

 // return NULL on error, ResizeBitmap->hBmp if don't need to resize or a new HBITMAP if resized

 

-static INT_PTR serviceBmpFilterResizeBitmap(WPARAM wParam,LPARAM lParam)

+static INT_PTR serviceBmpFilterResizeBitmap(WPARAM wParam,LPARAM)

 {

 	BITMAP bminfo;

 	int width, height;

@@ -324,57 +170,9 @@ static INT_PTR serviceBmpFilterResizeBitmap(WPARAM wParam,LPARAM lParam)
 	}

 }

 

-FIBITMAP* FreeImage_LoadFromMem(FREE_IMAGE_FORMAT fif, fiio_mem_handle *handle, int flags)

-{

-	if (handle && handle->data) {

-		FIMEMORY *hmem = FreeImage_OpenMemory((BYTE *)handle->data, handle->datalen);

-		FREE_IMAGE_FORMAT _fif = (fif != FIF_UNKNOWN) ? fif : FreeImage_GetFileTypeFromMemory(hmem, 0);

-		FIBITMAP *dib = FreeImage_LoadFromMemory(_fif, hmem, flags);

-		FreeImage_CloseMemory(hmem);

-	}

-

-	return nullptr;

-}

-

-FIMEMORY* FreeImage_SaveToMem(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, fiio_mem_handle *handle, int flags)

-{

-	if (handle) {

-		FIMEMORY *hmem = FreeImage_OpenMemory(nullptr, 0);

-		if(fif == FIF_UNKNOWN)

-			fif = FIF_BMP;

-		handle->curpos = 0;

-		FreeImage_SaveToMemory(fif, dib, hmem, flags);

-		FreeImage_AcquireMemory(hmem, (BYTE **)&handle->data, (DWORD *)&handle->datalen);

-		return hmem;

-	}

-	return nullptr;

-}

-

 ///////////////////////////////////////////////////////////////////////////////

 // Load - initializes the plugin instance

 

-FI_INTERFACE feif = {0};

-

-/*

-* caller MUST supply the desired version in wParam

-* if it doesn't match, error will be returned

-*/

-

-static INT_PTR serviceGetInterface(WPARAM wParam, LPARAM lParam)

-{

-	FI_INTERFACE **ppfe = (FI_INTERFACE **)lParam;

-

-	if ((DWORD)wParam != FI_IF_VERSION)

-		return CALLSERVICE_NOTFOUND;

-

-	if(ppfe) {

-		*ppfe = &feif;

-		return S_OK;

-	}

-	else

-		return CALLSERVICE_NOTFOUND;

-}

-

 static INT_PTR serviceLoad(WPARAM wParam, LPARAM lParam)

 {

 	char *lpszFilename = (char *)wParam;

@@ -408,7 +206,7 @@ static INT_PTR serviceLoad(WPARAM wParam, LPARAM lParam)
 

 		HBITMAP hbm = FreeImage_CreateHBITMAPFromDIB(dib);

 		FreeImage_Unload(dib);

-		FI_CorrectBitmap32Alpha(hbm, FALSE);

+		FreeImage_CorrectBitmap32Alpha(hbm, FALSE);

 		return ((INT_PTR)hbm);

 	}

 	return NULL;

@@ -434,7 +232,7 @@ static INT_PTR serviceLoadFromMem(WPARAM wParam, LPARAM lParam)
 	return (INT_PTR)hbm;

 }

 

-static INT_PTR serviceUnload(WPARAM wParam, LPARAM lParam)

+static INT_PTR serviceUnload(WPARAM wParam, LPARAM)

 {

 	FIBITMAP *dib = (FIBITMAP *)wParam;

 

@@ -471,7 +269,7 @@ static INT_PTR serviceSave(WPARAM wParam, LPARAM lParam)
 			if(isi->hbm != nullptr && (isi->dwMask & IMGI_HBITMAP) && !(isi->dwMask & IMGI_FBITMAP)) {

 				// create temporary dib, because we got a HBTIMAP passed

 				fUnload = TRUE;

-				FI_CorrectBitmap32Alpha(isi->hbm, FALSE);

+				FreeImage_CorrectBitmap32Alpha(isi->hbm, FALSE);

 				dib = FreeImage_CreateDIBFromHBITMAP(isi->hbm);

 			}

 			else if(isi->dib != nullptr && (isi->dwMask & IMGI_FBITMAP) && !(isi->dwMask & IMGI_HBITMAP))

@@ -509,232 +307,13 @@ static INT_PTR serviceSave(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR serviceGetVersion(WPARAM wParam, LPARAM lParam)

-{

-	return FI_IF_VERSION;

-}

-

-DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle)

-{

-	return FreeImage_Rotate(dib, angle, nullptr);

-}

-

-void FI_Populate(void)

-{

-	/*

-	* populate the interface

-	*/

-

-	feif.version = FI_IF_VERSION;

-

-	feif.FI__AllocateT = FreeImage_AllocateT;

-	feif.FI_Allocate = FreeImage_Allocate;

-	feif.FI_Clone = FreeImage_Clone;

-	feif.FI_Unload = FreeImage_Unload;

-

-	feif.FI_Load = FreeImage_Load;

-	feif.FI_LoadFromHandle = FreeImage_LoadFromHandle;

-	feif.FI_LoadU = FreeImage_LoadU;

-	feif.FI_Save = FreeImage_Save;

-	feif.FI_SaveToHandle = FreeImage_SaveToHandle;

-	feif.FI_SaveU = FreeImage_SaveU;

-

-	feif.FI_OpenMemory = FreeImage_OpenMemory;

-	feif.FI_CloseMemory = FreeImage_CloseMemory;

-	feif.FI_LoadFromMemory = FreeImage_LoadFromMemory;

-	feif.FI_SaveToMemory = FreeImage_SaveToMemory;

-	feif.FI_TellMemory = FreeImage_TellMemory;

-	feif.FI_SeekMemory = FreeImage_SeekMemory;

-	feif.FI_AcquireMemory = FreeImage_AcquireMemory;

-	feif.FI_ReadMemory = FreeImage_ReadMemory;

-	feif.FI_WriteMemory = FreeImage_WriteMemory;

-	feif.FI_LoadMultiBitmapFromMemory = FreeImage_LoadMultiBitmapFromMemory;

-

-	feif.FI_OpenMultiBitmap = FreeImage_OpenMultiBitmap;

-	feif.FI_OpenMultiBitmapU = FreeImage_OpenMultiBitmapU;

-	feif.FI_CloseMultiBitmap = FreeImage_CloseMultiBitmap;

-	feif.FI_GetPageCount = FreeImage_GetPageCount;

-	feif.FI_AppendPage = FreeImage_AppendPage;

-	feif.FI_InsertPage = FreeImage_InsertPage;

-	feif.FI_DeletePage = FreeImage_DeletePage;

-	feif.FI_LockPage = FreeImage_LockPage;

-	feif.FI_UnlockPage = FreeImage_UnlockPage;

-	feif.FI_MovePage = FreeImage_MovePage;

-	feif.FI_GetLockedPageNumbers = FreeImage_GetLockedPageNumbers;

-

-	feif.FI_GetFileType = FreeImage_GetFileType;

-	feif.FI_GetFileTypeU = FreeImage_GetFileTypeU;

-	feif.FI_GetFileTypeFromHandle = FreeImage_GetFileTypeFromHandle;

-	feif.FI_GetFileTypeFromMemory = FreeImage_GetFileTypeFromMemory;

-	feif.FI_GetImageType = FreeImage_GetImageType;

-

-	feif.FI_GetBits = FreeImage_GetBits;

-	feif.FI_GetScanLine = FreeImage_GetScanLine;

-	feif.FI_GetPixelIndex = FreeImage_GetPixelIndex;

-	feif.FI_GetPixelColor = FreeImage_GetPixelColor;

-	feif.FI_SetPixelColor = FreeImage_SetPixelColor;

-	feif.FI_SetPixelIndex = FreeImage_SetPixelIndex;

-

-	feif.FI_GetColorsUsed = FreeImage_GetColorsUsed;

-	feif.FI_GetBPP = FreeImage_GetBPP;

-	feif.FI_GetWidth = FreeImage_GetWidth;

-	feif.FI_GetHeight = FreeImage_GetHeight;

-	feif.FI_GetLine = FreeImage_GetLine;

-	feif.FI_GetPitch = FreeImage_GetPitch;

-	feif.FI_GetDIBSize = FreeImage_GetDIBSize;

-	feif.FI_GetPalette = FreeImage_GetPalette;

-	feif.FI_GetDotsPerMeterX = FreeImage_GetDotsPerMeterX;

-	feif.FI_GetDotsPerMeterY = FreeImage_GetDotsPerMeterY;

-	feif.FI_SetDotsPerMeterX = FreeImage_SetDotsPerMeterX;

-	feif.FI_SetDotsPerMeterY = FreeImage_SetDotsPerMeterY;

-	feif.FI_GetInfoHeader = FreeImage_GetInfoHeader;

-	feif.FI_GetInfo = FreeImage_GetInfo;

-	feif.FI_GetColorType = FreeImage_GetColorType;

-	feif.FI_GetRedMask = FreeImage_GetRedMask;

-	feif.FI_GetGreenMask = FreeImage_GetGreenMask;

-	feif.FI_GetBlueMask = FreeImage_GetBlueMask;

-	feif.FI_GetTransparencyCount = FreeImage_GetTransparencyCount;

-	feif.FI_GetTransparencyTable = FreeImage_GetTransparencyTable;

-	feif.FI_SetTransparent = FreeImage_SetTransparent;

-	feif.FI_SetTransparencyTable = FreeImage_SetTransparencyTable;

-	feif.FI_IsTransparent = FreeImage_IsTransparent;

-	feif.FI_HasBackgroundColor = FreeImage_HasBackgroundColor;

-	feif.FI_GetBackgroundColor = FreeImage_GetBackgroundColor;

-	feif.FI_SetBackgroundColor = FreeImage_SetBackgroundColor;

-

-	feif.FI_ConvertTo4Bits = FreeImage_ConvertTo4Bits;

-	feif.FI_ConvertTo8Bits = FreeImage_ConvertTo8Bits;

-	feif.FI_ConvertToGreyscale = FreeImage_ConvertToGreyscale;

-	feif.FI_ConvertTo16Bits555 = FreeImage_ConvertTo16Bits555;

-	feif.FI_ConvertTo16Bits565 = FreeImage_ConvertTo16Bits565;

-	feif.FI_ConvertTo24Bits = FreeImage_ConvertTo24Bits;

-	feif.FI_ConvertTo32Bits = FreeImage_ConvertTo32Bits;

-	feif.FI_ColorQuantize = FreeImage_ColorQuantize;

-	feif.FI_ColorQuantizeEx = FreeImage_ColorQuantizeEx;

-	feif.FI_Threshold = FreeImage_Threshold;

-	feif.FI_Dither = FreeImage_Dither;

-	feif.FI_ConvertFromRawBits = FreeImage_ConvertFromRawBits;

-	feif.FI_ConvertToRawBits = FreeImage_ConvertToRawBits;

-	feif.FI_ConvertToRGBF = FreeImage_ConvertToRGBF;

-	feif.FI_ConvertToStandardType = FreeImage_ConvertToStandardType;

-	feif.FI_ConvertToType = FreeImage_ConvertToType;

-

-	feif.FI_RegisterLocalPlugin = FreeImage_RegisterLocalPlugin;

-	feif.FI_RegisterExternalPlugin = FreeImage_RegisterExternalPlugin;

-	feif.FI_GetFIFCount = FreeImage_GetFIFCount;

-	feif.FI_SetPluginEnabled = FreeImage_SetPluginEnabled;

-	feif.FI_IsPluginEnabled = FreeImage_IsPluginEnabled;

-	feif.FI_GetFIFFromFormat = FreeImage_GetFIFFromFormat;

-	feif.FI_GetFIFFromMime = FreeImage_GetFIFFromMime;

-	feif.FI_GetFormatFromFIF = FreeImage_GetFormatFromFIF;

-	feif.FI_GetFIFExtensionList = FreeImage_GetFIFExtensionList;

-	feif.FI_GetFIFDescription = FreeImage_GetFIFDescription;

-	feif.FI_GetFIFRegExpr = FreeImage_GetFIFRegExpr;

-	feif.FI_GetFIFMimeType = FreeImage_GetFIFMimeType;

-	feif.FI_GetFIFFromFilename = FreeImage_GetFIFFromFilename;

-	feif.FI_GetFIFFromFilenameU = FreeImage_GetFIFFromFilenameU;

-	feif.FI_FIFSupportsReading = FreeImage_FIFSupportsReading;

-	feif.FI_FIFSupportsWriting = FreeImage_FIFSupportsWriting;

-	feif.FI_FIFSupportsExportBPP = FreeImage_FIFSupportsExportBPP;

-	feif.FI_FIFSupportsExportType = FreeImage_FIFSupportsExportType;

-	feif.FI_FIFSupportsICCProfiles = FreeImage_FIFSupportsICCProfiles;

-

-	feif.FI_RotateClassic = FreeImage_RotateClassic;

-	feif.FI_RotateEx = FreeImage_RotateEx;

-	feif.FI_FlipHorizontal = FreeImage_FlipHorizontal;

-	feif.FI_FlipVertical = FreeImage_FlipVertical;

-	feif.FI_JPEGTransform = FreeImage_JPEGTransform;

-

-	feif.FI_Rescale = FreeImage_Rescale;

-	feif.FI_MakeThumbnail = FreeImage_MakeThumbnail;

-

-	feif.FI_AdjustCurve = FreeImage_AdjustCurve;

-	feif.FI_AdjustGamma = FreeImage_AdjustGamma;

-	feif.FI_AdjustBrightness = FreeImage_AdjustBrightness;

-	feif.FI_AdjustContrast = FreeImage_AdjustContrast;

-	feif.FI_Invert = FreeImage_Invert;

-	feif.FI_GetHistogram = FreeImage_GetHistogram;

-

-	feif.FI_GetChannel = FreeImage_GetChannel;

-	feif.FI_SetChannel = FreeImage_SetChannel;

-	feif.FI_GetComplexChannel = FreeImage_GetComplexChannel;

-	feif.FI_SetComplexChannel = FreeImage_SetComplexChannel;

-

-	feif.FI_Copy = FreeImage_Copy;

-	feif.FI_Paste = FreeImage_Paste;

-	feif.FI_Composite = FreeImage_Composite;

-	feif.FI_JPEGCrop = FreeImage_JPEGCrop;

-

-	feif.FI_LoadFromMem = FreeImage_LoadFromMem;

-	feif.FI_SaveToMem = FreeImage_SaveToMem;

-

-	feif.FI_CreateDIBFromHBITMAP = FreeImage_CreateDIBFromHBITMAP;

-	feif.FI_CreateHBITMAPFromDIB = FreeImage_CreateHBITMAPFromDIB;

-

-	feif.FI_Premultiply = FreeImage_PreMultiply;

-	feif.FI_BmpFilterResizeBitmap = serviceBmpFilterResizeBitmap;

-

-	feif.FI_IsLittleEndian = FreeImage_IsLittleEndian;

-	feif.FI_LookupX11Color = FreeImage_LookupX11Color;

-	feif.FI_LookupSVGColor = FreeImage_LookupSVGColor;

-

-	feif.FI_GetICCProfile = FreeImage_GetICCProfile;

-	feif.FI_CreateICCProfile = FreeImage_CreateICCProfile;

-	feif.FI_DestroyICCProfile = FreeImage_DestroyICCProfile;

-

-	feif.FI_ToneMapping = FreeImage_ToneMapping;

-	feif.FI_TmoDrago03 = FreeImage_TmoDrago03;

-	feif.FI_TmoReinhard05 = FreeImage_TmoReinhard05;

-

-	feif.FI_ZLibCompress = FreeImage_ZLibCompress;

-	feif.FI_ZLibUncompress = FreeImage_ZLibUncompress;

-	feif.FI_ZLibGZip = FreeImage_ZLibGZip;

-	feif.FI_ZLibGUnzip = FreeImage_ZLibGUnzip;

-	feif.FI_ZLibCRC32 = FreeImage_ZLibCRC32;

-

-	feif.FI_CreateTag = FreeImage_CreateTag;

-	feif.FI_DeleteTag = FreeImage_DeleteTag;

-	feif.FI_CloneTag = FreeImage_CloneTag;

-

-	feif.FI_GetTagKey = FreeImage_GetTagKey;

-	feif.FI_GetTagDescription = FreeImage_GetTagDescription;

-	feif.FI_GetTagID = FreeImage_GetTagID;

-	feif.FI_GetTagType = FreeImage_GetTagType;

-	feif.FI_GetTagCount = FreeImage_GetTagCount;

-	feif.FI_GetTagLength = FreeImage_GetTagLength;

-	feif.FI_GetTagValue = FreeImage_GetTagValue;

-

-	feif.FI_SetTagKey = FreeImage_SetTagKey;

-	feif.FI_SetTagDescription = FreeImage_SetTagDescription;

-	feif.FI_SetTagID = FreeImage_SetTagID;

-	feif.FI_SetTagType = FreeImage_SetTagType;

-	feif.FI_SetTagCount = FreeImage_SetTagCount;

-	feif.FI_SetTagLength = FreeImage_SetTagLength;

-	feif.FI_SetTagValue = FreeImage_SetTagValue;

-

-	feif.FI_FindFirstMetadata = FreeImage_FindFirstMetadata;

-	feif.FI_FindNextMetadata = FreeImage_FindNextMetadata;

-	feif.FI_FindCloseMetadata = FreeImage_FindCloseMetadata;

-	feif.FI_SetMetadata = FreeImage_SetMetadata;

-	feif.FI_GetMetadata = FreeImage_GetMetadata;

-

-	feif.FI_GetMetadataCount = FreeImage_GetMetadataCount;

-	feif.FI_TagToString = FreeImage_TagToString;

-

-	feif.FI_CorrectBitmap32Alpha = FI_CorrectBitmap32Alpha;

-}

-

 static int IMGSERVICE_Load()

 {

-	FI_Populate();

-

-	CreateServiceFunction(MS_IMG_GETINTERFACE, serviceGetInterface);

 	CreateServiceFunction(MS_IMG_LOAD, serviceLoad);

 	CreateServiceFunction(MS_IMG_LOADFROMMEM, serviceLoadFromMem);

 	CreateServiceFunction(MS_IMG_SAVE, serviceSave);

 	CreateServiceFunction(MS_IMG_UNLOAD, serviceUnload);

 	CreateServiceFunction(MS_IMG_RESIZE, serviceBmpFilterResizeBitmap);

-	CreateServiceFunction(MS_IMG_GETIFVERSION, serviceGetVersion);

 	return 0;

 }

 

@@ -756,7 +335,7 @@ extern "C" int __declspec(dllexport) Unload(void)
 	return IMGSERVICE_Unload();

 }

 

-extern "C" __declspec(dllexport) const PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) const PLUGININFOEX * MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfoEx;

 }

diff --git a/plugins/AdvaImg/src/stdafx.cxx b/plugins/AdvaImg/src/stdafx.cxx
new file mode 100644
index 0000000000..fd4f341c7b
--- /dev/null
+++ b/plugins/AdvaImg/src/stdafx.cxx
@@ -0,0 +1 @@
+#include "stdafx.h"
diff --git a/plugins/AdvaImg/src/stdafx.h b/plugins/AdvaImg/src/stdafx.h
new file mode 100644
index 0000000000..76a1b7b842
--- /dev/null
+++ b/plugins/AdvaImg/src/stdafx.h
@@ -0,0 +1,8 @@
+#include <windows.h>
+#include <commdlg.h>
+#include <malloc.h>
+
+#include <m_imgsrvc.h>
+#include <newpluginapi.h>
+
+#include "version.h"