summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2010-10-31 12:40:49 +0000
committerMarcin Bukat <marcin.bukat@gmail.com>2010-10-31 12:40:49 +0000
commite26d0c62e07d1b1c1087a065242ed7ab1a2c522f (patch)
treeb1e27ee113a94784233ca7aaf5b9d670f303b332
parentc8901b3506ffb2f18798b005552c61b92b9d6a6c (diff)
downloadrockbox-e26d0c62e07d1b1c1087a065242ed7ab1a2c522f.tar.gz
rockbox-e26d0c62e07d1b1c1087a065242ed7ab1a2c522f.tar.bz2
rockbox-e26d0c62e07d1b1c1087a065242ed7ab1a2c522f.zip
Fix and extend imageviewer png support. FS#11641 by me
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28413 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/imageviewer/SUBDIRS2
-rw-r--r--apps/plugins/imageviewer/png/SOURCES9
-rw-r--r--apps/plugins/imageviewer/png/adler32.c149
-rw-r--r--apps/plugins/imageviewer/png/crc32.c89
-rw-r--r--apps/plugins/imageviewer/png/crc32_png.c423
-rw-r--r--apps/plugins/imageviewer/png/crc32_png.h441
-rw-r--r--apps/plugins/imageviewer/png/inffast.c379
-rw-r--r--apps/plugins/imageviewer/png/inffast.h11
-rw-r--r--apps/plugins/imageviewer/png/inffixed.h94
-rw-r--r--apps/plugins/imageviewer/png/inflate.c1332
-rw-r--r--apps/plugins/imageviewer/png/inflate.h116
-rw-r--r--apps/plugins/imageviewer/png/inftrees.c329
-rw-r--r--apps/plugins/imageviewer/png/inftrees.h55
-rw-r--r--apps/plugins/imageviewer/png/png.c1413
-rw-r--r--apps/plugins/imageviewer/png/png.h4
-rw-r--r--apps/plugins/imageviewer/png/png.make2
-rw-r--r--apps/plugins/imageviewer/png/png_decoder.c2195
-rw-r--r--apps/plugins/imageviewer/png/png_decoder.h141
-rw-r--r--apps/plugins/imageviewer/png/tinf.h77
-rw-r--r--apps/plugins/imageviewer/png/tinflate.c503
-rw-r--r--apps/plugins/imageviewer/png/tinfzlib.c100
-rw-r--r--apps/plugins/imageviewer/png/zconf.h332
-rw-r--r--apps/plugins/imageviewer/png/zlib.h1357
-rw-r--r--apps/plugins/imageviewer/png/zutil.h269
24 files changed, 3214 insertions, 6608 deletions
diff --git a/apps/plugins/imageviewer/SUBDIRS b/apps/plugins/imageviewer/SUBDIRS
index ca9665a022..9d8da7d53b 100644
--- a/apps/plugins/imageviewer/SUBDIRS
+++ b/apps/plugins/imageviewer/SUBDIRS
@@ -1,5 +1,3 @@
bmp
jpeg
-#ifdef HAVE_LCD_COLOR
png
-#endif
diff --git a/apps/plugins/imageviewer/png/SOURCES b/apps/plugins/imageviewer/png/SOURCES
index 19ca69d927..8c278b02b9 100644
--- a/apps/plugins/imageviewer/png/SOURCES
+++ b/apps/plugins/imageviewer/png/SOURCES
@@ -1,7 +1,6 @@
-adler32.c
-crc32_png.c
-inffast.c
-inflate.c
-inftrees.c
+crc32.c
+tinflate.c
+tinfzlib.c
+png_decoder.c
png.c
png_ui.c
diff --git a/apps/plugins/imageviewer/png/adler32.c b/apps/plugins/imageviewer/png/adler32.c
deleted file mode 100644
index 007ba26277..0000000000
--- a/apps/plugins/imageviewer/png/adler32.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#define BASE 65521UL /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf) DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware */
-#ifdef NO_DIVIDE
-# define MOD(a) \
- do { \
- if (a >= (BASE << 16)) a -= (BASE << 16); \
- if (a >= (BASE << 15)) a -= (BASE << 15); \
- if (a >= (BASE << 14)) a -= (BASE << 14); \
- if (a >= (BASE << 13)) a -= (BASE << 13); \
- if (a >= (BASE << 12)) a -= (BASE << 12); \
- if (a >= (BASE << 11)) a -= (BASE << 11); \
- if (a >= (BASE << 10)) a -= (BASE << 10); \
- if (a >= (BASE << 9)) a -= (BASE << 9); \
- if (a >= (BASE << 8)) a -= (BASE << 8); \
- if (a >= (BASE << 7)) a -= (BASE << 7); \
- if (a >= (BASE << 6)) a -= (BASE << 6); \
- if (a >= (BASE << 5)) a -= (BASE << 5); \
- if (a >= (BASE << 4)) a -= (BASE << 4); \
- if (a >= (BASE << 3)) a -= (BASE << 3); \
- if (a >= (BASE << 2)) a -= (BASE << 2); \
- if (a >= (BASE << 1)) a -= (BASE << 1); \
- if (a >= BASE) a -= BASE; \
- } while (0)
-# define MOD4(a) \
- do { \
- if (a >= (BASE << 4)) a -= (BASE << 4); \
- if (a >= (BASE << 3)) a -= (BASE << 3); \
- if (a >= (BASE << 2)) a -= (BASE << 2); \
- if (a >= (BASE << 1)) a -= (BASE << 1); \
- if (a >= BASE) a -= BASE; \
- } while (0)
-#else
-# define MOD(a) a %= BASE
-# define MOD4(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
- uLong adler;
- const Bytef *buf;
- uInt len;
-{
- unsigned long sum2;
- unsigned n;
-
- /* split Adler-32 into component sums */
- sum2 = (adler >> 16) & 0xffff;
- adler &= 0xffff;
-
- /* in case user likes doing a byte at a time, keep it fast */
- if (len == 1) {
- adler += buf[0];
- if (adler >= BASE)
- adler -= BASE;
- sum2 += adler;
- if (sum2 >= BASE)
- sum2 -= BASE;
- return adler | (sum2 << 16);
- }
-
- /* initial Adler-32 value (deferred check for len == 1 speed) */
- if (buf == Z_NULL)
- return 1L;
-
- /* in case short lengths are provided, keep it somewhat fast */
- if (len < 16) {
- while (len--) {
- adler += *buf++;
- sum2 += adler;
- }
- if (adler >= BASE)
- adler -= BASE;
- MOD4(sum2); /* only added so many BASE's */
- return adler | (sum2 << 16);
- }
-
- /* do length NMAX blocks -- requires just one modulo operation */
- while (len >= NMAX) {
- len -= NMAX;
- n = NMAX / 16; /* NMAX is divisible by 16 */
- do {
- DO16(buf); /* 16 sums unrolled */
- buf += 16;
- } while (--n);
- MOD(adler);
- MOD(sum2);
- }
-
- /* do remaining bytes (less than NMAX, still just one modulo) */
- if (len) { /* avoid modulos if none remaining */
- while (len >= 16) {
- len -= 16;
- DO16(buf);
- buf += 16;
- }
- while (len--) {
- adler += *buf++;
- sum2 += adler;
- }
- MOD(adler);
- MOD(sum2);
- }
-
- /* return recombined sums */
- return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
- uLong adler1;
- uLong adler2;
- z_off_t len2;
-{
- unsigned long sum1;
- unsigned long sum2;
- unsigned rem;
-
- /* the derivation of this formula is left as an exercise for the reader */
- rem = (unsigned)(len2 % BASE);
- sum1 = adler1 & 0xffff;
- sum2 = rem * sum1;
- MOD(sum2);
- sum1 += (adler2 & 0xffff) + BASE - 1;
- sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
- if (sum1 > BASE) sum1 -= BASE;
- if (sum1 > BASE) sum1 -= BASE;
- if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
- if (sum2 > BASE) sum2 -= BASE;
- return sum1 | (sum2 << 16);
-}
diff --git a/apps/plugins/imageviewer/png/crc32.c b/apps/plugins/imageviewer/png/crc32.c
new file mode 100644
index 0000000000..c7921a028b
--- /dev/null
+++ b/apps/plugins/imageviewer/png/crc32.c
@@ -0,0 +1,89 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Original source:
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ *
+ * Rockbox adaptation:
+ * Copyright (c) 2010 by Marcin Bukat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ * CRC32 checksum
+ *
+ * Copyright (c) 1998-2003 by Joergen Ibsen / Jibz
+ * All Rights Reserved
+ *
+ * http://www.ibsensoftware.com/
+ *
+ * This software is provided 'as-is', without any express
+ * or implied warranty. In no event will the authors be
+ * held liable for any damages arising from the use of
+ * this software.
+ *
+ * Permission is granted to anyone to use this software
+ * for any purpose, including commercial applications,
+ * and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The origin of this software must not be
+ * misrepresented; you must not claim that you
+ * wrote the original software. If you use this
+ * software in a product, an acknowledgment in
+ * the product documentation would be appreciated
+ * but is not required.
+ *
+ * 2. Altered source versions must be plainly marked
+ * as such, and must not be misrepresented as
+ * being the original software.
+ *
+ * 3. This notice may not be removed or altered from
+ * any source distribution.
+ */
+
+/*
+ * CRC32 algorithm taken from the zlib source, which is
+ * Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+ */
+
+#include "tinf.h"
+
+static const unsigned int tinf_crc32tab[16] = {
+ 0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190,
+ 0x6b6b51f4, 0x4db26158, 0x5005713c, 0xedb88320, 0xf00f9344,
+ 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278,
+ 0xbdbdf21c
+};
+
+unsigned int tinf_crc32(const void *data, unsigned int length)
+{
+ const unsigned char *buf = (const unsigned char *)data;
+ unsigned int crc = 0xffffffff;
+ unsigned int i;
+
+ if (length == 0) return 0;
+
+ for (i = 0; i < length; ++i)
+ {
+ crc ^= buf[i];
+ crc = tinf_crc32tab[crc & 0x0f] ^ (crc >> 4);
+ crc = tinf_crc32tab[crc & 0x0f] ^ (crc >> 4);
+ }
+
+ return crc ^ 0xffffffff;
+}
diff --git a/apps/plugins/imageviewer/png/crc32_png.c b/apps/plugins/imageviewer/png/crc32_png.c
deleted file mode 100644
index a76f49d35c..0000000000
--- a/apps/plugins/imageviewer/png/crc32_png.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors. This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
- Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
- protection on the static variables used to control the first-use generation
- of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
- first call get_crc_table() to initialize the tables before allowing more than
- one thread to use crc32().
- */
-
-#ifdef MAKECRCH
-# include <stdio.h>
-# ifndef DYNAMIC_CRC_TABLE
-# define DYNAMIC_CRC_TABLE
-# endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h" /* for STDC and FAR definitions */
-
-#define local static
-
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-# ifdef STDC /* need ANSI C limits.h to determine sizes */
-# include <limits.h>
-# define BYFOUR
-# if (UINT_MAX == 0xffffffffUL)
- typedef unsigned int u4;
-# else
-# if (ULONG_MAX == 0xffffffffUL)
- typedef unsigned long u4;
-# else
-# if (USHRT_MAX == 0xffffffffUL)
- typedef unsigned short u4;
-# else
-# undef BYFOUR /* can't find a four-byte integer type! */
-# endif
-# endif
-# endif
-# endif /* STDC */
-#endif /* !NOBYFOUR */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#ifdef BYFOUR
-# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
- (((w)&0xff00)<<8)+(((w)&0xff)<<24))
- local unsigned long crc32_little OF((unsigned long,
- const unsigned char FAR *, unsigned));
- local unsigned long crc32_big OF((unsigned long,
- const unsigned char FAR *, unsigned));
-# define TBLS 8
-#else
-# define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
- unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
- local void write_table OF((FILE *, const unsigned long FAR *));
-#endif /* MAKECRCH */
-/*
- Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
- x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
- Polynomials over GF(2) are represented in binary, one bit per coefficient,
- with the lowest powers in the most significant bit. Then adding polynomials
- is just exclusive-or, and multiplying a polynomial by x is a right shift by
- one. If we call the above polynomial p, and represent a byte as the
- polynomial q, also with the lowest power in the most significant bit (so the
- byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
- where a mod b means the remainder after dividing a by b.
-
- This calculation is done using the shift-register method of multiplying and
- taking the remainder. The register is initialized to zero, and for each
- incoming bit, x^32 is added mod p to the register if the bit is a one (where
- x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
- x (which is shifting right by one and adding x^32 mod p if the bit shifted
- out is a one). We start with the highest power (least significant bit) of
- q and repeat for all eight bits of q.
-
- The first table is simply the CRC of all possible eight bit values. This is
- all the information needed to generate CRCs on data a byte at a time for all
- combinations of CRC register values and incoming bytes. The remaining tables
- allow for word-at-a-time CRC calculation for both big-endian and little-
- endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
- unsigned long c;
- int n, k;
- unsigned long poly; /* polynomial exclusive-or pattern */
- /* terms of polynomial defining this crc (except x^32): */
- static volatile int first = 1; /* flag to limit concurrent making */
- static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
- /* See if another task is already doing this (not thread-safe, but better
- than nothing -- significantly reduces duration of vulnerability in
- case the advice about DYNAMIC_CRC_TABLE is ignored) */
- if (first) {
- first = 0;
-
- /* make exclusive-or pattern from polynomial (0xedb88320UL) */
- poly = 0UL;
- for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
- poly |= 1UL << (31 - p[n]);
-
- /* generate a crc for every 8-bit value */
- for (n = 0; n < 256; n++) {
- c = (unsigned long)n;
- for (k = 0; k < 8; k++)
- c = c & 1 ? poly ^ (c >> 1) : c >> 1;
- crc_table[0][n] = c;
- }
-
-#ifdef BYFOUR
- /* generate crc for each value followed by one, two, and three zeros,
- and then the byte reversal of those as well as the first table */
- for (n = 0; n < 256; n++) {
- c = crc_table[0][n];
- crc_table[4][n] = REV(c);
- for (k = 1; k < 4; k++) {
- c = crc_table[0][c & 0xff] ^ (c >> 8);
- crc_table[k][n] = c;
- crc_table[k + 4][n] = REV(c);
- }
- }
-#endif /* BYFOUR */
-
- crc_table_empty = 0;
- }
- else { /* not first */
- /* wait for the other guy to finish (not efficient, but rare) */
- while (crc_table_empty)
- ;
- }
-
-#ifdef MAKECRCH
- /* write out CRC tables to crc32.h */
- {
- FILE *out;
-
- out = fopen("crc32_png.h", "w");
- if (out == NULL) return;
- fprintf(out, "/* crc32_png.h -- tables for rapid CRC calculation\n");
- fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
- fprintf(out, "local const unsigned long FAR ");
- fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
- write_table(out, crc_table[0]);
-# ifdef BYFOUR
- fprintf(out, "#ifdef BYFOUR\n");
- for (k = 1; k < 8; k++) {
- fprintf(out, " },\n {\n");
- write_table(out, crc_table[k]);
- }
- fprintf(out, "#endif\n");
-# endif /* BYFOUR */
- fprintf(out, " }\n};\n");
- fclose(out);
- }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
- FILE *out;
- const unsigned long FAR *table;
-{
- int n;
-
- for (n = 0; n < 256; n++)
- fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n],
- n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32_png.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const unsigned long FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
- if (crc_table_empty)
- make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
- return (const unsigned long FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- unsigned len;
-{
- if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
- if (crc_table_empty)
- make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
- if (sizeof(void *) == sizeof(ptrdiff_t)) {
- u4 endian;
-
- endian = 1;
- if (*((unsigned char *)(&endian)))
- return crc32_little(crc, buf, len);
- else
- return crc32_big(crc, buf, len);
- }
-#endif /* BYFOUR */
- crc = crc ^ 0xffffffffUL;
- while (len >= 8) {
- DO8;
- len -= 8;
- }
- if (len) do {
- DO1;
- } while (--len);
- return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
- c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
- crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- unsigned len;
-{
- register u4 c;
- register const u4 FAR *buf4;
-
- c = (u4)crc;
- c = ~c;
- while (len && ((ptrdiff_t)buf & 3)) {
- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
- len--;
- }
-
- buf4 = (const u4 FAR *)(const void FAR *)buf;
- while (len >= 32) {
- DOLIT32;
- len -= 32;
- }
- while (len >= 4) {
- DOLIT4;
- len -= 4;
- }
- buf = (const unsigned char FAR *)buf4;
-
- if (len) do {
- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
- } while (--len);
- c = ~c;
- return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
- c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
- crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- unsigned len;
-{
- register u4 c;
- register const u4 FAR *buf4;
-
- c = REV((u4)crc);
- c = ~c;
- while (len && ((ptrdiff_t)buf & 3)) {
- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
- len--;
- }
-
- buf4 = (const u4 FAR *)(const void FAR *)buf;
- buf4--;
- while (len >= 32) {
- DOBIG32;
- len -= 32;
- }
- while (len >= 4) {
- DOBIG4;
- len -= 4;
- }
- buf4++;
- buf = (const unsigned char FAR *)buf4;
-
- if (len) do {
- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
- } while (--len);
- c = ~c;
- return (unsigned long)(REV(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
- unsigned long *mat;
- unsigned long vec;
-{
- unsigned long sum;
-
- sum = 0;
- while (vec) {
- if (vec & 1)
- sum ^= *mat;
- vec >>= 1;
- mat++;
- }
- return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
- unsigned long *square;
- unsigned long *mat;
-{
- int n;
-
- for (n = 0; n < GF2_DIM; n++)
- square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
- uLong crc1;
- uLong crc2;
- z_off_t len2;
-{
- int n;
- unsigned long row;
- unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */
- unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */
-
- /* degenerate case */
- if (len2 == 0)
- return crc1;
-
- /* put operator for one zero bit in odd */
- odd[0] = 0xedb88320L; /* CRC-32 polynomial */
- row = 1;
- for (n = 1; n < GF2_DIM; n++) {
- odd[n] = row;
- row <<= 1;
- }
-
- /* put operator for two zero bits in even */
- gf2_matrix_square(even, odd);
-
- /* put operator for four zero bits in odd */
- gf2_matrix_square(odd, even);
-
- /* apply len2 zeros to crc1 (first square will put the operator for one
- zero byte, eight zero bits, in even) */
- do {
- /* apply zeros operator for this bit of len2 */
- gf2_matrix_square(even, odd);
- if (len2 & 1)
- crc1 = gf2_matrix_times(even, crc1);
- len2 >>= 1;
-
- /* if no more bits set, then done */
- if (len2 == 0)
- break;
-
- /* another iteration of the loop with odd and even swapped */
- gf2_matrix_square(odd, even);
- if (len2 & 1)
- crc1 = gf2_matrix_times(odd, crc1);
- len2 >>= 1;
-
- /* if no more bits set, then done */
- } while (len2 != 0);
-
- /* return combined crc */
- crc1 ^= crc2;
- return crc1;
-}
diff --git a/apps/plugins/imageviewer/png/crc32_png.h b/apps/plugins/imageviewer/png/crc32_png.h
deleted file mode 100644
index 8053b6117c..0000000000
--- a/apps/plugins/imageviewer/png/crc32_png.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const unsigned long FAR crc_table[TBLS][256] =
-{
- {
- 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
- 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
- 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
- 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
- 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
- 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
- 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
- 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
- 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
- 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
- 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
- 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
- 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
- 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
- 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
- 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
- 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
- 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
- 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
- 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
- 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
- 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
- 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
- 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
- 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
- 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
- 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
- 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
- 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
- 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
- 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
- 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
- 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
- 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
- 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
- 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
- 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
- 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
- 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
- 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
- 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
- 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
- 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
- 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
- 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
- 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
- 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
- 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
- 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
- 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
- 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
- 0x2d02ef8dUL
-#ifdef BYFOUR
- },
- {
- 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
- 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
- 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
- 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
- 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
- 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
- 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
- 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
- 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
- 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
- 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
- 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
- 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
- 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
- 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
- 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
- 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
- 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
- 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
- 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
- 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
- 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
- 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
- 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
- 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
- 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
- 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
- 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
- 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
- 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
- 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
- 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
- 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
- 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
- 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
- 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
- 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
- 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
- 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
- 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
- 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
- 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
- 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
- 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
- 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
- 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
- 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
- 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
- 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
- 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
- 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
- 0x9324fd72UL
- },
- {
- 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
- 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
- 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
- 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
- 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
- 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
- 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
- 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
- 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
- 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
- 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
- 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
- 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
- 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
- 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
- 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
- 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
- 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
- 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
- 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
- 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
- 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
- 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
- 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
- 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
- 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
- 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
- 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
- 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
- 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
- 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
- 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
- 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
- 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
- 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
- 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
- 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
- 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
- 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
- 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
- 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
- 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
- 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
- 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
- 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
- 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
- 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
- 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
- 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
- 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
- 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
- 0xbe9834edUL
- },
- {
- 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
- 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
- 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
- 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
- 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
- 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
- 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
- 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
- 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
- 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
- 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
- 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
- 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
- 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
- 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
- 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
- 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
- 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
- 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
- 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
- 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
- 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
- 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
- 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
- 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
- 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
- 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
- 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
- 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
- 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
- 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
- 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
- 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
- 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
- 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
- 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
- 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
- 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
- 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
- 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
- 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
- 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
- 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
- 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
- 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
- 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
- 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
- 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
- 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
- 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
- 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
- 0xde0506f1UL
- },
- {
- 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
- 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
- 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
- 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
- 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
- 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
- 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
- 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
- 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
- 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
- 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
- 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
- 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
- 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
- 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
- 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
- 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
- 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
- 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
- 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
- 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
- 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
- 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
- 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
- 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
- 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
- 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
- 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
- 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
- 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
- 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
- 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
- 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
- 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
- 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
- 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
- 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
- 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
- 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
- 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
- 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
- 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
- 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
- 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
- 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
- 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
- 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
- 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
- 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
- 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
- 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
- 0x8def022dUL
- },
- {
- 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
- 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
- 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
- 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
- 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
- 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
- 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
- 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
- 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
- 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
- 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
- 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
- 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
- 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
- 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
- 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
- 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
- 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
- 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
- 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
- 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
- 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
- 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
- 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
- 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
- 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
- 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
- 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
- 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
- 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
- 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
- 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
- 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
- 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
- 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
- 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
- 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
- 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
- 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
- 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
- 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
- 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
- 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
- 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
- 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
- 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
- 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
- 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
- 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
- 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
- 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
- 0x72fd2493UL
- },
- {
- 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
- 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
- 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
- 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
- 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
- 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
- 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
- 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
- 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
- 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
- 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
- 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
- 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
- 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
- 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
- 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
- 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
- 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
- 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
- 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
- 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
- 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
- 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
- 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
- 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
- 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
- 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
- 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
- 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
- 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
- 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
- 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
- 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
- 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
- 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
- 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
- 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
- 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
- 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
- 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
- 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
- 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
- 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
- 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
- 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
- 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
- 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
- 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
- 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
- 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
- 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
- 0xed3498beUL
- },
- {
- 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
- 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
- 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
- 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
- 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
- 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
- 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
- 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
- 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
- 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
- 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
- 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
- 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
- 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
- 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
- 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
- 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
- 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
- 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
- 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
- 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
- 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
- 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
- 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
- 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
- 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
- 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
- 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
- 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
- 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
- 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
- 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
- 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
- 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
- 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
- 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
- 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
- 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
- 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
- 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
- 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
- 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
- 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
- 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
- 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
- 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
- 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
- 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
- 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
- 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
- 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
- 0xf10605deUL
-#endif
- }
-};
diff --git a/apps/plugins/imageviewer/png/inffast.c b/apps/plugins/imageviewer/png/inffast.c
deleted file mode 100644
index bf96323ab2..0000000000
--- a/apps/plugins/imageviewer/png/inffast.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-#include "plugin.h"
-
-#ifndef ASMINF
-
-extern struct inflate_state state;
-extern unsigned char *memory_max;
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
- Based on testing to date,
- Pre-increment preferred for:
- - PowerPC G3 (Adler)
- - MIPS R5000 (Randers-Pehrson)
- Post-increment preferred for:
- - none
- No measurable difference:
- - Pentium III (Anderson)
- - M68060 (Nikl)
- */
-#ifdef POSTINC
-# define OFF 0
-# define PUP(a) *(a)++
-#else
-# define OFF 1
-# define PUP(a) *++(a)
-#endif
-
-/*
- Decode literal, length, and distance codes and write out the resulting
- literal and match bytes until either not enough input or output is
- available, an end-of-block is encountered, or a data error is encountered.
- When large enough input and output buffers are supplied to inflate(), for
- example, a 16K input buffer and a 64K output buffer, more than 95% of the
- inflate execution time is spent in this routine.
-
- Entry assumptions:
-
- state->mode == LEN
- strm->avail_in >= 6
- strm->avail_out >= 258
- start >= strm->avail_out
- state->bits < 8
-
- On return, state->mode is one of:
-
- LEN -- ran out of enough output space or enough available input
- TYPE -- reached end of block code, inflate() to interpret next block
- BAD -- error in block data
-
- Notes:
-
- - The maximum input bits used by a length/distance pair is 15 bits for the
- length code, 5 bits for the length extra, 15 bits for the distance code,
- and 13 bits for the distance extra. This totals 48 bits, or six bytes.
- Therefore if strm->avail_in >= 6, then there is enough input to avoid
- checking for available input while decoding.
-
- - The maximum bytes that a single length/distance pair can output is 258
- bytes, which is the maximum length that can be coded. inflate_fast()
- requires strm->avail_out >= 258 for each loop to avoid checking for
- output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start; /* inflate()'s starting value for strm->avail_out */
-{
- //struct inflate_state FAR *state;
- unsigned char FAR *in; /* local strm->next_in */
- unsigned char FAR *last; /* while in < last, enough input available */
- unsigned char FAR *out; /* local strm->next_out */
- unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
- unsigned char FAR *end; /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
- unsigned dmax; /* maximum distance from zlib header */
-#endif
- unsigned wsize; /* window size or zero if not using window */
- unsigned whave; /* valid bytes in the window */
- unsigned write; /* window write index */
- unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */
- unsigned long hold; /* local strm->hold */
- unsigned bits; /* local strm->bits */
- code const FAR *lcode; /* local strm->lencode */
- code const FAR *dcode; /* local strm->distcode */
- unsigned lmask; /* mask for first level of length codes */
- unsigned dmask; /* mask for first level of distance codes */
- code this; /* retrieved table entry */
- unsigned op; /* code bits, operation, extra bits, or */
- /* window position, window bytes to copy */
- unsigned len; /* match length, unused bytes */
- unsigned dist; /* match distance */
- unsigned char FAR *from; /* where to copy match from */
-
- /* copy state to local variables */
- //state = (struct inflate_state FAR *)strm->state;
- in = strm->next_in - OFF;
- last = in + (strm->avail_in - 5);
- out = strm->next_out - OFF;
- beg = out - (start - strm->avail_out);
- end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
- dmax = state->dmax;
-#endif
- wsize = state.wsize;
- whave = state.whave;
- write = state.write;
- window = state.window;
- hold = state.hold;
- bits = state.bits;
- lcode = state.lencode;
- dcode = state.distcode;
- lmask = (1U << state.lenbits) - 1;
- dmask = (1U << state.distbits) - 1;
-
- /* decode literals and length/distances until end-of-block or not enough
- input data or output space */
- do {
- if (bits < 15) {
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- }
- this = lcode[hold & lmask];
- dolen:
- op = (unsigned)(this.bits);
- hold >>= op;
- bits -= op;
- op = (unsigned)(this.op);
- if (op == 0) { /* literal */
- //DEBUGF(this.val >= 0x20 && this.val < 0x7f ?
- // "inflate: literal '%c'\n" :
- // "inflate: literal 0x%02x\n", this.val);
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = (unsigned char)(this.val);
- }
- else if (op & 16) { /* length base */
- len = (unsigned)(this.val);
- op &= 15; /* number of extra bits */
- if (op) {
- if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- }
- len += (unsigned)hold & ((1U << op) - 1);
- hold >>= op;
- bits -= op;
- }
- //DEBUGF("inflate: length %u\n", len);
- if (bits < 15) {
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- }
- this = dcode[hold & dmask];
- dodist:
- op = (unsigned)(this.bits);
- hold >>= op;
- bits -= op;
- op = (unsigned)(this.op);
- if (op & 16) { /* distance base */
- dist = (unsigned)(this.val);
- op &= 15; /* number of extra bits */
- if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
- bits += 8;
- }
- }
- dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
- if (dist > dmax) {
- strm->msg = (char *)"invalid distance too far back";
- state->mode = BAD;
- break;
- }
-#endif
- hold >>= op;
- bits -= op;
- //DEBUGF("inflate: distance %u\n", dist);
- op = (unsigned)(out - beg); /* max distance in output */
- if (dist > op) { /* see if copy from window */
- op = dist - op; /* distance back in window */
- if (op > whave) {
- strm->msg = (char *)"invalid distance too far back";
- state.mode = BAD;
- break;
- }
- from = window - OFF;
- if (write == 0) { /* very common case */
- from += wsize - op;
- if (op < len) { /* some from window */
- len -= op;
- do {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- } while (--op);
- from = out - dist; /* rest from output */
- }
- }
- else if (write < op) { /* wrap around window */
- from += wsize + write - op;
- op -= write;
- if (op < len) { /* some from end of window */
- len -= op;
- do {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- } while (--op);
- from = window - OFF;
- if (write < len) { /* some from start of window */
- op = write;
- len -= op;
- do {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- } while (--op);
- from = out - dist; /* rest from output */
- }
- }
- }
- else { /* contiguous in window */
- from += write - op;
- if (op < len) { /* some from window */
- len -= op;
- do {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- } while (--op);
- from = out - dist; /* rest from output */
- }
- }
- while (len > 2) {
- if (out >= memory_max-2) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- len -= 3;
- }
- if (len) {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- if (len > 1) {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- }
- }
- }
- else {
- from = out - dist; /* copy direct from output */
- do { /* minimum length is three */
- if (out >= memory_max-2) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- len -= 3;
- } while (len > 2);
- if (len) {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- if (len > 1) {
- if (out >= memory_max) {
- strm->msg = (char *)"Out of memory";
- state.mode = ZMEM;
- break;
- }
- PUP(out) = PUP(from);
- }
- }
- }
- }
- else if ((op & 64) == 0) { /* 2nd level distance code */
- this = dcode[this.val + (hold & ((1U << op) - 1))];
- goto dodist;
- }
- else {
- strm->msg = (char *)"invalid distance code";
- state.mode = BAD;
- break;
- }
- }
- else if ((op & 64) == 0) { /* 2nd level length code */
- this = lcode[this.val + (hold & ((1U << op) - 1))];
- goto dolen;
- }
- else if (op & 32) { /* end-of-block */
- //DEBUGF("inflate: end of block\n");
- state.mode = TYPE;
- break;
- }
- else {
- strm->msg = (char *)"invalid literal/length code";
- state.mode = BAD;
- break;
- }
- } while (in < last && out < end);
-
- /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
- len = bits >> 3;
- in -= len;
- bits -= len << 3;
- hold &= (1U << bits) - 1;
-
- /* update state and return */
- strm->next_in = in + OFF;
- strm->next_out = out + OFF;
- strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
- strm->avail_out = (unsigned)(out < end ?
- 257 + (end - out) : 257 - (out - end));
- state.hold = hold;
- state.bits = bits;
- return;
-}
-
-/*
- inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
- - Using bit fields for code structure
- - Different op definition to avoid & for extra bits (do & for table bits)
- - Three separate decoding do-loops for direct, window, and write == 0
- - Special case for distance > 1 copies to do overlapped load and store copy
- - Explicit branch predictions (based on measured branch probabilities)
- - Deferring match copy and interspersed it with decoding subsequent codes
- - Swapping literal/length else
- - Swapping window/direct else
- - Larger unrolled copy loops (three is about right)
- - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff --git a/apps/plugins/imageviewer/png/inffast.h b/apps/plugins/imageviewer/png/inffast.h
deleted file mode 100644
index 1e88d2d97b..0000000000
--- a/apps/plugins/imageviewer/png/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/apps/plugins/imageviewer/png/inffixed.h b/apps/plugins/imageviewer/png/inffixed.h
deleted file mode 100644
index 75ed4b5978..0000000000
--- a/apps/plugins/imageviewer/png/inffixed.h
+++ /dev/null
@@ -1,94 +0,0 @@
- /* inffixed.h -- table for decoding fixed codes
- * Generated automatically by makefixed().
- */
-
- /* WARNING: this file should *not* be used by applications. It
- is part of the implementation of the compression library and
- is subject to change. Applications should only use zlib.h.
- */
-
- static const code lenfix[512] = {
- {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
- {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
- {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
- {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
- {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
- {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
- {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
- {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
- {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
- {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
- {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
- {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
- {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
- {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
- {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
- {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
- {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
- {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
- {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
- {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
- {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
- {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
- {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
- {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
- {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
- {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
- {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
- {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
- {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
- {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
- {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
- {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
- {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
- {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
- {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
- {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
- {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
- {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
- {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
- {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
- {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
- {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
- {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
- {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
- {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
- {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
- {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
- {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
- {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
- {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
- {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
- {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
- {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
- {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
- {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
- {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
- {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
- {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
- {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
- {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
- {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
- {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
- {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
- {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
- {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
- {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
- {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
- {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
- {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
- {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
- {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
- {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
- {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
- {0,9,255}
- };
-
- static const code distfix[32] = {
- {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
- {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
- {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
- {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
- {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
- {22,5,193},{64,5,0}
- };
diff --git a/apps/plugins/imageviewer/png/inflate.c b/apps/plugins/imageviewer/png/inflate.c
deleted file mode 100644
index beec74044b..0000000000
--- a/apps/plugins/imageviewer/png/inflate.c
+++ /dev/null
@@ -1,1332 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0 24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- * creation of window when not needed, minimize use of window when it is
- * needed, make inffast.c even faster, implement gzip decoding, and to
- * improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1 25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2 4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state.offset] to *(strm->next_out - state.offset)
- * to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3 22 Dec 2002
- * - Add comments on state.bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- * buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4 1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common write == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- * source file infback.c to provide a call-back interface to inflate for
- * programs like gzip and unzip -- uses window as output buffer to avoid
- * window copying
- *
- * 1.2.beta5 1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- * input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6 4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- * make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7 27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0 9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- * for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- * and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-#include "plugin.h"
-#include "png.h"
-
-#ifdef MAKEFIXED
-# ifndef BUILDFIXED
-# define BUILDFIXED
-# endif
-#endif
-
-struct inflate_state state;
-
-/* function prototypes */
-local void fixedtables OF((void));
-local int updatewindow OF((z_streamp strm, unsigned out));
-#ifdef BUILDFIXED
- void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
- unsigned len));
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
- //struct inflate_state FAR *state;
-
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = strm->state;
- strm->total_in = strm->total_out = state.total = 0;
- strm->msg = Z_NULL;
- strm->adler = 1; /* to support ill-conceived Java test suite */
- state.mode = HEAD;
- state.last = 0;
- state.havedict = 0;
- state.dmax = 32768U;
- state.head = Z_NULL;
- state.wsize = 0;
- state.whave = 0;
- state.write = 0;
- state.hold = 0;
- state.bits = 0;
- state.lencode = state.distcode = state.next = state.codes;
- //DEBUGF("inflate: reset\n");
- return Z_OK;
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
- //struct inflate_state FAR *state;
-
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- if (bits > 16 || state.bits + bits > 32) return Z_STREAM_ERROR;
- value &= (1L << bits) - 1;
- state.hold += value << state.bits;
- state.bits += bits;
- return Z_OK;
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
- //struct inflate_state FAR *state;
-
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
- stream_size != (int)(sizeof(z_stream)))
- return Z_VERSION_ERROR;
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- strm->msg = Z_NULL; /* in case we return an error */
- //if (strm->zalloc == (alloc_func)0) {
- // strm->zalloc = zcalloc;
- // strm->opaque = (voidpf)0;
- //}
- //if (strm->zfree == (free_func)0) strm->zfree = zcfree;
- //state = (struct inflate_state FAR *)
- // ZALLOC(strm, 1, sizeof(struct inflate_state));
- //if (state == Z_NULL) return Z_MEM_ERROR;
- //DEBUGF("inflate: allocated\n");
- //strm->state = (struct internal_state FAR *)state;
- if (windowBits < 0) {
- state.wrap = 0;
- windowBits = -windowBits;
- }
- else {
- state.wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
- if (windowBits < 48) windowBits &= 15;
-#endif
- }
- if (windowBits < 8 || windowBits > 15) {
- //ZFREE(strm, state);
- //strm->state = Z_NULL;
- return Z_STREAM_ERROR;
- }
- state.wbits = (unsigned)windowBits;
- state.window = Z_NULL;
- return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
- return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-/*
- Return state with length and distance decoding tables and index sizes set to
- fixed code decoding. Normally this returns fixed tables from inffixed.h.
- If BUILDFIXED is defined, then instead this routine builds the tables the
- first time it's called, and returns those tables the first time and
- thereafter. This reduces the size of the code by about 2K bytes, in
- exchange for a little execution time. However, BUILDFIXED should not be
- used for threaded applications, since the rewriting of the tables and virgin
- may not be thread-safe.
- */
-local void fixedtables(void)
-//struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
- static int virgin = 1;
- static code *lenfix, *distfix;
- static code fixed[544];
-
- /* build fixed huffman tables if first call (may not be thread safe) */
- if (virgin) {
- unsigned sym, bits;
- static code *next;
-
- /* literal/length table */
- sym = 0;
- while (sym < 144) state.lens[sym++] = 8;
- while (sym < 256) state.lens[sym++] = 9;
- while (sym < 280) state.lens[sym++] = 7;
- while (sym < 288) state.lens[sym++] = 8;
- next = fixed;
- lenfix = next;
- bits = 9;
- inflate_table(LENS, state.lens, 288, &(next), &(bits), state.work);
-
- /* distance table */
- sym = 0;
- while (sym < 32) state.lens[sym++] = 5;
- distfix = next;
- bits = 5;
- inflate_table(DISTS, state.lens, 32, &(next), &(bits), state.work);
-
- /* do this just once */
- virgin = 0;
- }
-#else /* !BUILDFIXED */
-# include "inffixed.h"
-#endif /* BUILDFIXED */
- state.lencode = lenfix;
- state.lenbits = 9;
- state.distcode = distfix;
- state.distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
- Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
- defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
- those tables to stdout, which would be piped to inffixed.h. A small program
- can simply call makefixed to do this:
-
- void makefixed(void);
-
- int main(void)
- {
- makefixed();
- return 0;
- }
-
- Then that can be linked with zlib built with MAKEFIXED defined and run:
-
- a.out > inffixed.h
- */
-void makefixed()
-{
- unsigned low, size;
- struct inflate_state state;
-
- fixedtables(&state);
- puts(" /* inffixed.h -- table for decoding fixed codes");
- puts(" * Generated automatically by makefixed().");
- puts(" */");
- puts("");
- puts(" /* WARNING: this file should *not* be used by applications.");
- puts(" It is part of the implementation of this library and is");
- puts(" subject to change. Applications should only use zlib.h.");
- puts(" */");
- puts("");
- size = 1U << 9;
- printf(" static const code lenfix[%u] = {", size);
- low = 0;
- for (;;) {
- if ((low % 7) == 0) printf("\n ");
- printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
- state.lencode[low].val);
- if (++low == size) break;
- putchar(',');
- }
- puts("\n };");
- size = 1U << 5;
- printf("\n static const code distfix[%u] = {", size);
- low = 0;
- for (;;) {
- if ((low % 6) == 0) printf("\n ");
- printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
- state.distcode[low].val);
- if (++low == size) break;
- putchar(',');
- }
- puts("\n };");
-}
-#endif /* MAKEFIXED */
-
-/*
- Update the window with the last wsize (normally 32K) bytes written before
- returning. If window does not exist yet, create it. This is only called
- when a window is already in use, or when output has been written during this
- inflate call, but the end of the deflate stream has not been reached yet.
- It is also called to create a window for dictionary data when a dictionary
- is loaded.
-
- Providing output buffers larger than 32K to inflate() should provide a speed
- advantage, since only the last 32K of output is copied to the sliding window
- upon return from inflate(), and since all distances after the first 32K of
- output will fall in the output data, making match copies simpler and faster.
- The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, out)
-z_streamp strm;
-unsigned out;
-{
- //struct inflate_state FAR *state;
- unsigned copy, dist;
-
- //state = (struct inflate_state FAR *)strm->state;
-
- /* if it hasn't been done already, allocate space for the window */
- if (state.window == Z_NULL) {
- state.window = (unsigned char FAR *)
- ZALLOC(strm, 1U << state.wbits,
- sizeof(unsigned char));
- if (state.window == Z_NULL) return 1;
- }
-
- /* if window not in use yet, initialize */
- if (state.wsize == 0) {
- state.wsize = 1U << state.wbits;
- state.write = 0;
- state.whave = 0;
- }
-
- /* copy state.wsize or less output bytes into the circular window */
- copy = out - strm->avail_out;
- if (copy >= state.wsize) {
- zmemcpy(state.window, strm->next_out - state.wsize, state.wsize);
- state.write = 0;
- state.whave = state.wsize;
- }
- else {
- dist = state.wsize - state.write;
- if (dist > copy) dist = copy;
- zmemcpy(state.window + state.write, strm->next_out - copy, dist);
- copy -= dist;
- if (copy) {
- zmemcpy(state.window, strm->next_out - copy, copy);
- state.write = copy;
- state.whave = state.wsize;
- }
- else {
- state.write += dist;
- if (state.write == state.wsize) state.write = 0;
- if (state.whave < state.wsize) state.whave += dist;
- }
- }
- return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-# define UPDATE(check, buf, len) \
- (state.flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-# define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-# define CRC2(check, word) \
- do { \
- hbuf[0] = (unsigned char)(word); \
- hbuf[1] = (unsigned char)((word) >> 8); \
- check = crc32(check, hbuf, 2); \
- } while (0)
-
-# define CRC4(check, word) \
- do { \
- hbuf[0] = (unsigned char)(word); \
- hbuf[1] = (unsigned char)((word) >> 8); \
- hbuf[2] = (unsigned char)((word) >> 16); \
- hbuf[3] = (unsigned char)((word) >> 24); \
- check = crc32(check, hbuf, 4); \
- } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
- do { \
- put = strm->next_out; \
- left = strm->avail_out; \
- next = strm->next_in; \
- have = strm->avail_in; \
- hold = state.hold; \
- bits = state.bits; \
- } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
- do { \
- strm->next_out = put; \
- strm->avail_out = left; \
- strm->next_in = next; \
- strm->avail_in = have; \
- state.hold = hold; \
- state.bits = bits; \
- } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
- do { \
- hold = 0; \
- bits = 0; \
- } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
- if there is no input available. */
-#define PULLBYTE() \
- do { \
- if (have == 0) goto inf_leave; \
- have--; \
- hold += (unsigned long)(*next++) << bits; \
- bits += 8; \
- } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator. If there is
- not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
- do { \
- while (bits < (unsigned)(n)) \
- PULLBYTE(); \
- } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
- ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
- do { \
- hold >>= (n); \
- bits -= (unsigned)(n); \
- } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
- do { \
- hold >>= bits & 7; \
- bits -= bits & 7; \
- } while (0)
-
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
- ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
- (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-/*
- inflate() uses a state machine to process as much input data and generate as
- much output data as possible before returning. The state machine is
- structured roughly as follows:
-
- for (;;) switch (state) {
- ...
- case STATEn:
- if (not enough input data or output space to make progress)
- return;
- ... make progress ...
- state = STATEm;
- break;
- ...
- }
-
- so when inflate() is called again, the same case is attempted again, and
- if the appropriate resources are provided, the machine proceeds to the
- next state. The NEEDBITS() macro is usually the way the state evaluates
- whether it can proceed or should return. NEEDBITS() does the return if
- the requested bits are not available. The typical use of the BITS macros
- is:
-
- NEEDBITS(n);
- ... do something with BITS(n) ...
- DROPBITS(n);
-
- where NEEDBITS(n) either returns from inflate() if there isn't enough
- input left to load n bits into the accumulator, or it continues. BITS(n)
- gives the low n bits in the accumulator. When done, DROPBITS(n) drops
- the low n bits off the accumulator. INITBITS() clears the accumulator
- and sets the number of available bits to zero. BYTEBITS() discards just
- enough bits to put the accumulator on a byte boundary. After BYTEBITS()
- and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
- NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
- if there is no input available. The decoding of variable length codes uses
- PULLBYTE() directly in order to pull just enough bytes to decode the next
- code, and no more.
-
- Some states loop until they get enough input, making sure that enough
- state information is maintained to continue the loop where it left off
- if NEEDBITS() returns in the loop. For example, want, need, and keep
- would all have to actually be part of the saved state in case NEEDBITS()
- returns:
-
- case STATEw:
- while (want < need) {
- NEEDBITS(n);
- keep[want++] = BITS(n);
- DROPBITS(n);
- }
- state = STATEx;
- case STATEx:
-
- As shown above, if the next state is also the next case, then the break
- is omitted.
-
- A state may also return if there is not enough output space available to
- complete that state. Those states are copying stored data, writing a
- literal byte, and copying a matching string.
-
- When returning, a "goto inf_leave" is used to update the total counters,
- update the check value, and determine whether any progress has been made
- during that inflate() call in order to return the proper return code.
- Progress is defined as a change in either strm->avail_in or strm->avail_out.
- When there is a window, goto inf_leave will update the window with the last
- output written. If a goto inf_leave occurs in the middle of decompression
- and there is no window currently, goto inf_leave will create one and copy
- output to the window for the next call of inflate().
-
- In this implementation, the flush parameter of inflate() only affects the
- return code (per zlib.h). inflate() always writes as much as possible to
- strm->next_out, given the space available and the provided input--the effect
- documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
- the allocation of and copying into a sliding window until necessary, which
- provides the effect documented in zlib.h for Z_FINISH when the entire input
- stream available. So the only thing the flush parameter actually does is:
- when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
- will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
- //struct inflate_state FAR *state;
- unsigned char FAR *next; /* next input */
- unsigned char FAR *put; /* next output */
- unsigned have, left; /* available input and output */
- unsigned long hold; /* bit buffer */
- unsigned bits; /* bits in bit buffer */
- unsigned in, out; /* save starting available input and output */
- unsigned copy; /* number of stored or match bytes to copy */
- unsigned char FAR *from; /* where to copy match bytes from */
- code this; /* current decoding table entry */
- code last; /* parent table entry */
- unsigned len; /* length to copy for repeats, bits to drop */
- int ret; /* return code */
-#ifdef GUNZIP
- unsigned char hbuf[4]; /* buffer for gzip header crc calculation */
-#endif
- static const unsigned short order[19] = /* permutation of code lengths */
- {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
- if (strm == Z_NULL || strm->next_out == Z_NULL ||
- (strm->next_in == Z_NULL && strm->avail_in != 0))
- return Z_STREAM_ERROR;
-
- uInt insize = strm->avail_in;
-
- //state = (struct inflate_state FAR *)strm->state;
- if (state.mode == TYPE) state.mode = TYPEDO; /* skip check */
- LOAD();
- in = have;
- out = left;
- ret = Z_OK;
- for (;;) {
- switch (state.mode) {
- case HEAD:
- if (state.wrap == 0) {
- state.mode = TYPEDO;
- break;
- }
- NEEDBITS(16);
-#ifdef GUNZIP
- if ((state.wrap & 2) && hold == 0x8b1f) { /* gzip header */
- state.check = crc32(0L, Z_NULL, 0);
- CRC2(state.check, hold);
- INITBITS();
- state.mode = FLAGS;
- break;
- }
- state.flags = 0; /* expect zlib header */
- if (state.head != Z_NULL)
- state.head->done = -1;
- if (!(state.wrap & 1) || /* check if zlib header allowed */
-#else
- if (
-#endif
- ((BITS(8) << 8) + (hold >> 8)) % 31) {
- strm->msg = (char *)"incorrect header check";
- state.mode = BAD;
- break;
- }
- if (BITS(4) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
- state.mode = BAD;
- break;
- }
- DROPBITS(4);
- len = BITS(4) + 8;
- if (len > state.wbits) {
- strm->msg = (char *)"invalid window size";
- state.mode = BAD;
- break;
- }
- state.dmax = 1U << len;
- //DEBUGF("inflate: zlib header ok\n");
- strm->adler = state.check = adler32(0L, Z_NULL, 0);
- state.mode = hold & 0x200 ? DICTID : TYPE;
- INITBITS();
- break;
-#ifdef GUNZIP
- case FLAGS:
- NEEDBITS(16);
- state.flags = (int)(hold);
- if ((state.flags & 0xff) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
- state.mode = BAD;
- break;
- }
- if (state.flags & 0xe000) {
- strm->msg = (char *)"unknown header flags set";
- state.mode = BAD;
- break;
- }
- if (state.head != Z_NULL)
- state.head->text = (int)((hold >> 8) & 1);
- if (state.flags & 0x0200) CRC2(state.check, hold);
- INITBITS();
- state.mode = TIME;
- case TIME:
- NEEDBITS(32);
- if (state.head != Z_NULL)
- state.head->time = hold;
- if (state.flags & 0x0200) CRC4(state.check, hold);
- INITBITS();
- state.mode = OS;
- case OS:
- NEEDBITS(16);
- if (state.head != Z_NULL) {
- state.head->xflags = (int)(hold & 0xff);
- state.head->os = (int)(hold >> 8);
- }
- if (state.flags & 0x0200) CRC2(state.check, hold);
- INITBITS();
- state.mode = EXLEN;
- case EXLEN:
- if (state.flags & 0x0400) {
- NEEDBITS(16);
- state.length = (unsigned)(hold);
- if (state.head != Z_NULL)
- state.head->extra_len = (unsigned)hold;
- if (state.flags & 0x0200) CRC2(state.check, hold);
- INITBITS();
- }
- else if (state.head != Z_NULL)
- state.head->extra = Z_NULL;
- state.mode = EXTRA;
- case EXTRA:
- if (state.flags & 0x0400) {
- copy = state.length;
- if (copy > have) copy = have;
- if (copy) {
- if (state.head != Z_NULL &&
- state.head->extra != Z_NULL) {
- len = state.head->extra_len - state.length;
- zmemcpy(state.head->extra + len, next,
- len + copy > state.head->extra_max ?
- state.head->extra_max - len : copy);
- }
- if (state.flags & 0x0200)
- state.check = crc32(state.check, next, copy);
- have -= copy;
- next += copy;
- state.length -= copy;
- }
- if (state.length) goto inf_leave;
- }
- state.length = 0;
- state.mode = NAME;
- case NAME:
- if (state.flags & 0x0800) {
- if (have == 0) goto inf_leave;
- copy = 0;
- do {
- len = (unsigned)(next[copy++]);
- if (state.head != Z_NULL &&
- state.head->name != Z_NULL &&
- state.length < state.head->name_max)
- state.head->name[state.length++] = len;
- } while (len && copy < have);
- if (state.flags & 0x0200)
- state.check = crc32(state.check, next, copy);
- have -= copy;
- next += copy;
- if (len) goto inf_leave;
- }
- else if (state.head != Z_NULL)
- state.head->name = Z_NULL;
- state.length = 0;
- state.mode = COMMENT;
- case COMMENT:
- if (state.flags & 0x1000) {
- if (have == 0) goto inf_leave;
- copy = 0;
- do {
- len = (unsigned)(next[copy++]);
- if (state.head != Z_NULL &&
- state.head->comment != Z_NULL &&
- state.length < state.head->comm_max)
- state.head->comment[state.length++] = len;
- } while (len && copy < have);
- if (state.flags & 0x0200)
- state.check = crc32(state.check, next, copy);
- have -= copy;
- next += copy;
- if (len) goto inf_leave;
- }
- else if (state.head != Z_NULL)
- state.head->comment = Z_NULL;
- state.mode = HCRC;
- case HCRC:
- if (state.flags & 0x0200) {
- NEEDBITS(16);
- if (hold != (state.check & 0xffff)) {
- strm->msg = (char *)"header crc mismatch";
- state.mode = BAD;
- break;
- }
- INITBITS();
- }
- if (state.head != Z_NULL) {
- state.head->hcrc = (int)((state.flags >> 9) & 1);
- state.head->done = 1;
- }
- strm->adler = state.check = crc32(0L, Z_NULL, 0);
- state.mode = TYPE;
- break;
-#endif
- case DICTID:
- NEEDBITS(32);
- strm->adler = state.check = REVERSE(hold);
- INITBITS();
- state.mode = DICT;
- case DICT:
- if (state.havedict == 0) {
- RESTORE();
- return Z_NEED_DICT;
- }
- strm->adler = state.check = adler32(0L, Z_NULL, 0);
- state.mode = TYPE;
- case TYPE:
- if (flush == Z_BLOCK) goto inf_leave;
- case TYPEDO:
- if (state.last) {
- BYTEBITS();
- state.mode = CHECK;
- break;
- }
- NEEDBITS(3);
- state.last = BITS(1);
- DROPBITS(1);
- switch (BITS(2)) {
- case 0: /* stored block */
- //DEBUGF("inflate: stored block%s\n",
- //state.last ? " (last)" : "");
- state.mode = STORED;
- break;
- case 1: /* fixed block */
- fixedtables();
- //DEBUGF("inflate: fixed codes block%s\n",
- //state.last ? " (last)" : "");
- state.mode = LEN; /* decode codes */
- break;
- case 2: /* dynamic block */
- //DEBUGF("inflate: dynamic codes block%s\n",
- //state.last ? " (last)" : "");
- state.mode = TABLE;
- break;
- case 3:
- strm->msg = (char *)"invalid block type";
- state.mode = BAD;
- }
- DROPBITS(2);
- break;
- case STORED:
- BYTEBITS(); /* go to byte boundary */
- NEEDBITS(32);
- if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
- strm->msg = (char *)"invalid stored block lengths";
- state.mode = BAD;
- break;
- }
- state.length = (unsigned)hold & 0xffff;
- //DEBUGF("inflate: stored length %u\n",
- //state.length);
- INITBITS();
- state.mode = COPY;
- case COPY:
- copy = state.length;
- if (copy) {
- if (copy > have) copy = have;
- if (copy > left) copy = left;
- if (copy == 0) goto inf_leave;
- zmemcpy(put, next, copy);
- have -= copy;
- next += copy;
- left -= copy;
- put += copy;
- state.length -= copy;
- break;
- }
- //DEBUGF("inflate: stored end\n");
- state.mode = TYPE;
- break;
- case TABLE:
- NEEDBITS(14);
- state.nlen = BITS(5) + 257;
- DROPBITS(5);
- state.ndist = BITS(5) + 1;
- DROPBITS(5);
- state.ncode = BITS(4) + 4;
- DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
- if (state.nlen > 286 || state.ndist > 30) {
- strm->msg = (char *)"too many length or distance symbols";
- state.mode = BAD;
- break;
- }
-#endif
- //DEBUGF("inflate: table sizes ok\n");
- state.have = 0;
- state.mode = LENLENS;
- case LENLENS:
- while (state.have < state.ncode) {
- NEEDBITS(3);
- state.lens[order[state.have++]] = (unsigned short)BITS(3);
- DROPBITS(3);
- }
- while (state.have < 19)
- state.lens[order[state.have++]] = 0;
- state.next = state.codes;
- state.lencode = (code const FAR *)(state.next);
- state.lenbits = 7;
- ret = inflate_table(CODES, state.lens, 19, &(state.next),
- &(state.lenbits), state.work);
- if (ret) {
- strm->msg = (char *)"invalid code lengths set";
- state.mode = BAD;
- break;
- }
- //DEBUGF("inflate: code lengths ok\n");
- state.have = 0;
- state.mode = CODELENS;
- case CODELENS:
- while (state.have < state.nlen + state.ndist) {
- for (;;) {
- this = state.lencode[BITS(state.lenbits)];
- if ((unsigned)(this.bits) <= bits) break;
- PULLBYTE();
- }
- if (this.val < 16) {
- NEEDBITS(this.bits);
- DROPBITS(this.bits);
- state.lens[state.have++] = this.val;
- }
- else {
- if (this.val == 16) {
- NEEDBITS(this.bits + 2);
- DROPBITS(this.bits);
- if (state.have == 0) {
- strm->msg = (char *)"invalid bit length repeat";
- state.mode = BAD;
- break;
- }
- len = state.lens[state.have - 1];
- copy = 3 + BITS(2);
- DROPBITS(2);
- }
- else if (this.val == 17) {
- NEEDBITS(this.bits + 3);
- DROPBITS(this.bits);
- len = 0;
- copy = 3 + BITS(3);
- DROPBITS(3);
- }
- else {
- NEEDBITS(this.bits + 7);
- DROPBITS(this.bits);
- len = 0;
- copy = 11 + BITS(7);
- DROPBITS(7);
- }
- if (state.have + copy > state.nlen + state.ndist) {
- strm->msg = (char *)"invalid bit length repeat";
- state.mode = BAD;
- break;
- }
- while (copy--)
- state.lens[state.have++] = (unsigned short)len;
- }
- }
-
- /* handle error breaks in while */
- if (state.mode == BAD) break;
-
- /* build code tables */
- state.next = state.codes;
- state.lencode = (code const FAR *)(state.next);
- state.lenbits = 9;
- ret = inflate_table(LENS, state.lens, state.nlen, &(state.next),
- &(state.lenbits), state.work);
- if (ret) {
- strm->msg = (char *)"invalid literal/lengths set";
- state.mode = BAD;
- break;
- }
- state.distcode = (code const FAR *)(state.next);
- state.distbits = 6;
- ret = inflate_table(DISTS, state.lens + state.nlen, state.ndist,
- &(state.next), &(state.distbits), state.work);
- if (ret) {
- strm->msg = (char *)"invalid distances set";
- state.mode = BAD;
- break;
- }
- //DEBUGF("inflate: codes ok\n");
- state.mode = LEN;
- case LEN:
- if (have >= 6 && left >= 258) {
- RESTORE();
- inflate_fast(strm, out);
- LOAD();
- break;
- }
- for (;;) {
- this = state.lencode[BITS(state.lenbits)];
- if ((unsigned)(this.bits) <= bits) break;
- PULLBYTE();
- }
- if (this.op && (this.op & 0xf0) == 0) {
- last = this;
- for (;;) {
- this = state.lencode[last.val +
- (BITS(last.bits + last.op) >> last.bits)];
- if ((unsigned)(last.bits + this.bits) <= bits) break;
- PULLBYTE();
- }
- DROPBITS(last.bits);
- }
- DROPBITS(this.bits);
- state.length = (unsigned)this.val;
- if ((int)(this.op) == 0) {
- //DEBUGF(this.val >= 0x20 && this.val < 0x7f ?
- //"inflate: literal '%c'\n" :
- //"inflate: literal 0x%02x\n", this.val);
- state.mode = LIT;
- break;
- }
- if (this.op & 32) {
- //DEBUGF("inflate: end of block\n");
- state.mode = TYPE;
- break;
- }
- if (this.op & 64) {
- strm->msg = (char *)"invalid literal/length code";
- state.mode = BAD;
- break;
- }
- state.extra = (unsigned)(this.op) & 15;
- state.mode = LENEXT;
- case LENEXT:
- if (state.extra) {
- NEEDBITS(state.extra);
- state.length += BITS(state.extra);
- DROPBITS(state.extra);
- }
- //DEBUGF("inflate: length %u\n", state.length);
- state.mode = DIST;
- case DIST:
- for (;;) {
- this = state.distcode[BITS(state.distbits)];
- if ((unsigned)(this.bits) <= bits) break;
- PULLBYTE();
- }
- if ((this.op & 0xf0) == 0) {
- last = this;
- for (;;) {
- this = state.distcode[last.val +
- (BITS(last.bits + last.op) >> last.bits)];
- if ((unsigned)(last.bits + this.bits) <= bits) break;
- PULLBYTE();
- }
- DROPBITS(last.bits);
- }
- DROPBITS(this.bits);
- if (this.op & 64) {
- strm->msg = (char *)"invalid distance code";
- state.mode = BAD;
- break;
- }
- state.offset = (unsigned)this.val;
- state.extra = (unsigned)(this.op) & 15;
- state.mode = DISTEXT;
- case DISTEXT:
- if (state.extra) {
- NEEDBITS(state.extra);
- state.offset += BITS(state.extra);
- DROPBITS(state.extra);
- }
-#ifdef INFLATE_STRICT
- if (state.offset > state.dmax) {
- strm->msg = (char *)"invalid distance too far back";
- state.mode = BAD;
- break;
- }
-#endif
- if (state.offset > state.whave + out - left) {
- strm->msg = (char *)"invalid distance too far back";
- state.mode = BAD;
- break;
- }
- //DEBUGF("inflate: distance %u\n", state.offset);
- state.mode = MATCH;
- case MATCH:
- if (left == 0) goto inf_leave;
- copy = out - left;
- if (state.offset > copy) { /* copy from window */
- copy = state.offset - copy;
- if (copy > state.write) {
- copy -= state.write;
- from = state.window + (state.wsize - copy);
- }
- else
- from = state.window + (state.write - copy);
- if (copy > state.length) copy = state.length;
- }
- else { /* copy from output */
- from = put - state.offset;
- copy = state.length;
- }
- if (copy > left) copy = left;
- left -= copy;
- state.length -= copy;
- do {
- *put++ = *from++;
- } while (--copy);
- if (state.length == 0) state.mode = LEN;
- break;
- case LIT:
- if (left == 0) goto inf_leave;
- *put++ = (unsigned char)(state.length);
- left--;
- state.mode = LEN;
- break;
- case CHECK:
- if (state.wrap) {
- NEEDBITS(32);
- out -= left;
- strm->total_out += out;
- state.total += out;
- if (out)
- strm->adler = state.check =
- UPDATE(state.check, put - out, out);
- out = left;
- if ((
-#ifdef GUNZIP
- state.flags ? hold :
-#endif
- REVERSE(hold)) != state.check) {
- strm->msg = (char *)"incorrect data check";
- state.mode = BAD;
- break;
- }
- INITBITS();
- //DEBUGF("inflate: check matches trailer\n");
- }
-#ifdef GUNZIP
- state.mode = LENGTH;
- case LENGTH:
- if (state.wrap && state.flags) {
- NEEDBITS(32);
- if (hold != (state.total & 0xffffffffUL)) {
- strm->msg = (char *)"incorrect length check";
- state.mode = BAD;
- break;
- }
- INITBITS();
- Tracev((stderr, "inflate: length matches trailer\n"));
- }
-#endif
- state.mode = DONE;
- case DONE:
- ret = Z_STREAM_END;
- goto inf_leave;
- case BAD:
- ret = Z_DATA_ERROR;
- goto inf_leave;
- case ZMEM:
- return Z_MEM_ERROR;
- case SYNC:
- default:
- return Z_STREAM_ERROR;
- }
- //DEBUGF("%d / %d\n", strm->total_in, strm->avail_in);
- if (rb->button_get(false) == IMGVIEW_MENU)
- return PLUGIN_ABORT;
- else cb_progress(insize - strm->avail_in, insize);
- }
-
- /*
- Return from inflate(), updating the total counts and the check value.
- If there was no progress during the inflate() call, return a buffer
- error. Call updatewindow() to create and/or update the window state.
- Note: a memory error from inflate() is non-recoverable.
- */
- inf_leave:
- RESTORE();
- if (state.wsize || (state.mode < CHECK && out != strm->avail_out))
- if (updatewindow(strm, out)) {
- state.mode = ZMEM;
- return Z_MEM_ERROR;
- }
- in -= strm->avail_in;
- out -= strm->avail_out;
- strm->total_in += in;
- strm->total_out += out;
- state.total += out;
- if (state.wrap && out)
- strm->adler = state.check =
- UPDATE(state.check, strm->next_out - out, out);
- strm->data_type = state.bits + (state.last ? 64 : 0) +
- (state.mode == TYPE ? 128 : 0);
- if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
- ret = Z_BUF_ERROR;
- return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
- //struct inflate_state FAR *state;
- if (strm == Z_NULL /*|| strm->zfree == (free_func)0*/)
- return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- //if (state.window != Z_NULL) ZFREE(strm, state.window);
- //ZFREE(strm, strm->state);
- //strm->state = Z_NULL;
- //DEBUGF("inflate: end\n");
- return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
- //struct inflate_state FAR *state;
- unsigned long id;
-
- /* check state */
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- if (state.wrap != 0 && state.mode != DICT)
- return Z_STREAM_ERROR;
-
- /* check for correct dictionary id */
- if (state.mode == DICT) {
- id = adler32(0L, Z_NULL, 0);
- id = adler32(id, dictionary, dictLength);
- if (id != state.check)
- return Z_DATA_ERROR;
- }
-
- /* copy dictionary to window */
- if (updatewindow(strm, strm->avail_out)) {
- state.mode = ZMEM;
- return Z_MEM_ERROR;
- }
- if (dictLength > state.wsize) {
- zmemcpy(state.window, dictionary + dictLength - state.wsize,
- state.wsize);
- state.whave = state.wsize;
- }
- else {
- zmemcpy(state.window + state.wsize - dictLength, dictionary,
- dictLength);
- state.whave = dictLength;
- }
- state.havedict = 1;
- //DEBUGF("inflate: dictionary set\n");
- return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
- //struct inflate_state FAR *state;
-
- /* check state */
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- if ((state.wrap & 2) == 0) return Z_STREAM_ERROR;
-
- /* save header structure */
- state.head = head;
- head->done = 0;
- return Z_OK;
-}
-
-/*
- Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found
- or when out of input. When called, *have is the number of pattern bytes
- found in order so far, in 0..3. On return *have is updated to the new
- state. If on return *have equals four, then the pattern was found and the
- return value is how many bytes were read including the last byte of the
- pattern. If *have is less than four, then the pattern has not been found
- yet and the return value is len. In the latter case, syncsearch() can be
- called again with more data and the *have state. *have is initialized to
- zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-unsigned char FAR *buf;
-unsigned len;
-{
- unsigned got;
- unsigned next;
-
- got = *have;
- next = 0;
- while (next < len && got < 4) {
- if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
- got++;
- else if (buf[next])
- got = 0;
- else
- got = 4 - got;
- next++;
- }
- *have = got;
- return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
- unsigned len; /* number of bytes to look at or looked at */
- unsigned long in, out; /* temporary to save total_in and total_out */
- unsigned char buf[4]; /* to restore bit buffer to byte string */
- //struct inflate_state FAR *state;
-
- /* check parameters */
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- if (strm->avail_in == 0 && state.bits < 8) return Z_BUF_ERROR;
-
- /* if first time, start search in bit buffer */
- if (state.mode != SYNC) {
- state.mode = SYNC;
- state.hold <<= state.bits & 7;
- state.bits -= state.bits & 7;
- len = 0;
- while (state.bits >= 8) {
- buf[len++] = (unsigned char)(state.hold);
- state.hold >>= 8;
- state.bits -= 8;
- }
- state.have = 0;
- syncsearch(&(state.have), buf, len);
- }
-
- /* search available input */
- len = syncsearch(&(state.have), strm->next_in, strm->avail_in);
- strm->avail_in -= len;
- strm->next_in += len;
- strm->total_in += len;
-
- /* return no joy or set up to restart inflate() on a new block */
- if (state.have != 4) return Z_DATA_ERROR;
- in = strm->total_in; out = strm->total_out;
- inflateReset(strm);
- strm->total_in = in; strm->total_out = out;
- state.mode = TYPE;
- return Z_OK;
-}
-
-/*
- Returns true if inflate is currently at the end of a block generated by
- Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- implementation to provide an additional safety check. PPP uses
- Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
- block. When decompressing, PPP checks that at the end of input packet,
- inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
- //struct inflate_state FAR *state;
-
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- //state = (struct inflate_state FAR *)strm->state;
- return state.mode == STORED && state.bits == 0;
-}
diff --git a/apps/plugins/imageviewer/png/inflate.h b/apps/plugins/imageviewer/png/inflate.h
deleted file mode 100644
index d35c1bc041..0000000000
--- a/apps/plugins/imageviewer/png/inflate.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
- trailer decoding by inflate(). NO_GZIP would be used to avoid linking in
- the crc code when it is not needed. For shared libraries, gzip decoding
- should be left enabled. */
-
-#ifndef NO_GZIP
-# define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
- HEAD, /* i: waiting for magic header */
- FLAGS, /* i: waiting for method and flags (gzip) */
- TIME, /* i: waiting for modification time (gzip) */
- OS, /* i: waiting for extra flags and operating system (gzip) */
- EXLEN, /* i: waiting for extra length (gzip) */
- EXTRA, /* i: waiting for extra bytes (gzip) */
- NAME, /* i: waiting for end of file name (gzip) */
- COMMENT, /* i: waiting for end of comment (gzip) */
- HCRC, /* i: waiting for header crc (gzip) */
- DICTID, /* i: waiting for dictionary check value */
- DICT, /* waiting for inflateSetDictionary() call */
- TYPE, /* i: waiting for type bits, including last-flag bit */
- TYPEDO, /* i: same, but skip check to exit inflate on new block */
- STORED, /* i: waiting for stored size (length and complement) */
- COPY, /* i/o: waiting for input or output to copy stored block */
- TABLE, /* i: waiting for dynamic block table lengths */
- LENLENS, /* i: waiting for code length code lengths */
- CODELENS, /* i: waiting for length/lit and distance code lengths */
- LEN, /* i: waiting for length/lit code */
- LENEXT, /* i: waiting for length extra bits */
- DIST, /* i: waiting for distance code */
- DISTEXT, /* i: waiting for distance extra bits */
- MATCH, /* o: waiting for output space to copy string */
- LIT, /* o: waiting for output space to write literal */
- CHECK, /* i: waiting for 32-bit check value */
- LENGTH, /* i: waiting for 32-bit length (gzip) */
- DONE, /* finished check, done -- remain here until reset */
- BAD, /* got a data error -- remain here until reset */
- ZMEM, /* got an inflate() memory error -- remain here until reset */
- SYNC /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
- State transitions between above modes -
-
- (most modes can go to the BAD or MEM mode -- not shown for clarity)
-
- Process header:
- HEAD -> (gzip) or (zlib)
- (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
- NAME -> COMMENT -> HCRC -> TYPE
- (zlib) -> DICTID or TYPE
- DICTID -> DICT -> TYPE
- Read deflate blocks:
- TYPE -> STORED or TABLE or LEN or CHECK
- STORED -> COPY -> TYPE
- TABLE -> LENLENS -> CODELENS -> LEN
- Read deflate codes:
- LEN -> LENEXT or LIT or TYPE
- LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
- LIT -> LEN
- Process trailer:
- CHECK -> LENGTH -> DONE
- */
-
-/* state maintained between inflate() calls. Approximately 7K bytes. */
-struct inflate_state {
- inflate_mode mode; /* current inflate mode */
- int last; /* true if processing last block */
- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
- int havedict; /* true if dictionary provided */
- int flags; /* gzip header method and flags (0 if zlib) */
- unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
- unsigned long check; /* protected copy of check value */
- unsigned long total; /* protected copy of output count */
- gz_headerp head; /* where to save gzip header information */
- /* sliding window */
- unsigned wbits; /* log base 2 of requested window size */
- unsigned wsize; /* window size or zero if not using window */
- unsigned whave; /* valid bytes in the window */
- unsigned write; /* window write index */
- unsigned char FAR *window; /* allocated sliding window, if needed */
- /* bit accumulator */
- unsigned long hold; /* input bit accumulator */
- unsigned bits; /* number of bits in "in" */
- /* for string and stored block copying */
- unsigned length; /* literal or length of data to copy */
- unsigned offset; /* distance back to copy string from */
- /* for table and code decoding */
- unsigned extra; /* extra bits needed */
- /* fixed and dynamic code tables */
- code const FAR *lencode; /* starting table for length/literal codes */
- code const FAR *distcode; /* starting table for distance codes */
- unsigned lenbits; /* index bits for lencode */
- unsigned distbits; /* index bits for distcode */
- /* dynamic table building */
- unsigned ncode; /* number of code length code lengths */
- unsigned nlen; /* number of length code lengths */
- unsigned ndist; /* number of distance code lengths */
- unsigned have; /* number of code lengths in lens[] */
- code FAR *next; /* next available space in codes[] */
- unsigned short lens[320]; /* temporary storage for code lengths */
- unsigned short work[288]; /* work area for code table building */
- code codes[ENOUGH]; /* space for code tables */
-};
diff --git a/apps/plugins/imageviewer/png/inftrees.c b/apps/plugins/imageviewer/png/inftrees.c
deleted file mode 100644
index 8a9c13ff03..0000000000
--- a/apps/plugins/imageviewer/png/inftrees.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
- " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
-/*
- If you use the zlib library in a product, an acknowledgment is welcome
- in the documentation of your product. If for some reason you cannot
- include such an acknowledgment, I would appreciate that you keep this
- copyright string in the executable of your product.
- */
-
-/*
- Build a set of tables to decode the provided canonical Huffman code.
- The code lengths are lens[0..codes-1]. The result starts at *table,
- whose indices are 0..2^bits-1. work is a writable array of at least
- lens shorts, which is used as a work area. type is the type of code
- to be generated, CODES, LENS, or DISTS. On return, zero is success,
- -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
- on return points to the next available entry's address. bits is the
- requested root table index bits, and on return it is the actual root
- table index bits. It will differ if the request is greater than the
- longest code or if it is less than the shortest code.
- */
-int inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
- unsigned len; /* a code's length in bits */
- unsigned sym; /* index of code symbols */
- unsigned min, max; /* minimum and maximum code lengths */
- unsigned root; /* number of index bits for root table */
- unsigned curr; /* number of index bits for current table */
- unsigned drop; /* code bits to drop for sub-table */
- int left; /* number of prefix codes available */
- unsigned used; /* code entries in table used */
- unsigned huff; /* Huffman code */
- unsigned incr; /* for incrementing code, index */
- unsigned fill; /* index for replicating entries */
- unsigned low; /* low bits for current root entry */
- unsigned mask; /* mask for low root bits */
- code this; /* table entry for duplication */
- code FAR *next; /* next available space in table */
- const unsigned short FAR *base; /* base value table to use */
- const unsigned short FAR *extra; /* extra bits table to use */
- int end; /* use base and extra for symbol > end */
- unsigned short count[MAXBITS+1]; /* number of codes of each length */
- unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
- static const unsigned short lbase[31] = { /* Length codes 257..285 base */
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
- 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
- static const unsigned short lext[31] = { /* Length codes 257..285 extra */
- 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
- static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
- 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
- 8193, 12289, 16385, 24577, 0, 0};
- static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
- 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
- 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
- 28, 28, 29, 29, 64, 64};
-
- /*
- Process a set of code lengths to create a canonical Huffman code. The
- code lengths are lens[0..codes-1]. Each length corresponds to the
- symbols 0..codes-1. The Huffman code is generated by first sorting the
- symbols by length from short to long, and retaining the symbol order
- for codes with equal lengths. Then the code starts with all zero bits
- for the first code of the shortest length, and the codes are integer
- increments for the same length, and zeros are appended as the length
- increases. For the deflate format, these bits are stored backwards
- from their more natural integer increment ordering, and so when the
- decoding tables are built in the large loop below, the integer codes
- are incremented backwards.
-
- This routine assumes, but does not check, that all of the entries in
- lens[] are in the range 0..MAXBITS. The caller must assure this.
- 1..MAXBITS is interpreted as that code length. zero means that that
- symbol does not occur in this code.
-
- The codes are sorted by computing a count of codes for each length,
- creating from that a table of starting indices for each length in the
- sorted table, and then entering the symbols in order in the sorted
- table. The sorted table is work[], with that space being provided by
- the caller.
-
- The length counts are used for other purposes as well, i.e. finding
- the minimum and maximum length codes, determining if there are any
- codes at all, checking for a valid set of lengths, and looking ahead
- at length counts to determine sub-table sizes when building the
- decoding tables.
- */
-
- /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
- for (len = 0; len <= MAXBITS; len++)
- count[len] = 0;
- for (sym = 0; sym < codes; sym++)
- count[lens[sym]]++;
-
- /* bound code lengths, force root to be within code lengths */
- root = *bits;
- for (max = MAXBITS; max >= 1; max--)
- if (count[max] != 0) break;
- if (root > max) root = max;
- if (max == 0) { /* no symbols to code at all */
- this.op = (unsigned char)64; /* invalid code marker */
- this.bits = (unsigned char)1;
- this.val = (unsigned short)0;
- *(*table)++ = this; /* make a table to force an error */
- *(*table)++ = this;
- *bits = 1;
- return 0; /* no symbols, but wait for decoding to report error */
- }
- for (min = 1; min <= MAXBITS; min++)
- if (count[min] != 0) break;
- if (root < min) root = min;
-
- /* check for an over-subscribed or incomplete set of lengths */
- left = 1;
- for (len = 1; len <= MAXBITS; len++) {
- left <<= 1;
- left -= count[len];
- if (left < 0) return -1; /* over-subscribed */
- }
- if (left > 0 && (type == CODES || max != 1))
- return -1; /* incomplete set */
-
- /* generate offsets into symbol table for each length for sorting */
- offs[1] = 0;
- for (len = 1; len < MAXBITS; len++)
- offs[len + 1] = offs[len] + count[len];
-
- /* sort symbols by length, by symbol order within each length */
- for (sym = 0; sym < codes; sym++)
- if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
- /*
- Create and fill in decoding tables. In this loop, the table being
- filled is at next and has curr index bits. The code being used is huff
- with length len. That code is converted to an index by dropping drop
- bits off of the bottom. For codes where len is less than drop + curr,
- those top drop + curr - len bits are incremented through all values to
- fill the table with replicated entries.
-
- root is the number of index bits for the root table. When len exceeds
- root, sub-tables are created pointed to by the root entry with an index
- of the low root bits of huff. This is saved in low to check for when a
- new sub-table should be started. drop is zero when the root table is
- being filled, and drop is root when sub-tables are being filled.
-
- When a new sub-table is needed, it is necessary to look ahead in the
- code lengths to determine what size sub-table is needed. The length
- counts are used for this, and so count[] is decremented as codes are
- entered in the tables.
-
- used keeps track of how many table entries have been allocated from the
- provided *table space. It is checked when a LENS table is being made
- against the space in *table, ENOUGH, minus the maximum space needed by
- the worst case distance code, MAXD. This should never happen, but the
- sufficiency of ENOUGH has not been proven exhaustively, hence the check.
- This assumes that when type == LENS, bits == 9.
-
- sym increments through all symbols, and the loop terminates when
- all codes of length max, i.e. all codes, have been processed. This
- routine permits incomplete codes, so another loop after this one fills
- in the rest of the decoding tables with invalid code markers.
- */
-
- /* set up for code type */
- switch (type) {
- case CODES:
- base = extra = work; /* dummy value--not used */
- end = 19;
- break;
- case LENS:
- base = lbase;
- base -= 257;
- extra = lext;
- extra -= 257;
- end = 256;
- break;
- default: /* DISTS */
- base = dbase;
- extra = dext;
- end = -1;
- }
-
- /* initialize state for loop */
- huff = 0; /* starting code */
- sym = 0; /* starting code symbol */
- len = min; /* starting code length */
- next = *table; /* current table to fill in */
- curr = root; /* current table index bits */
- drop = 0; /* current bits to drop from code for index */
- low = (unsigned)(-1); /* trigger new sub-table when len > root */
- used = 1U << root; /* use root table entries */
- mask = used - 1; /* mask for comparing low */
-
- /* check available table space */
- if (type == LENS && used >= ENOUGH - MAXD)
- return 1;
-
- /* process all codes and make table entries */
- for (;;) {
- /* create table entry */
- this.bits = (unsigned char)(len - drop);
- if ((int)(work[sym]) < end) {
- this.op = (unsigned char)0;
- this.val = work[sym];
- }
- else if ((int)(work[sym]) > end) {
- this.op = (unsigned char)(extra[work[sym]]);
- this.val = base[work[sym]];
- }
- else {
- this.op = (unsigned char)(32 + 64); /* end of block */
- this.val = 0;
- }
-
- /* replicate for those indices with low len bits equal to huff */
- incr = 1U << (len - drop);
- fill = 1U << curr;
- min = fill; /* save offset to next table */
- do {
- fill -= incr;
- next[(huff >> drop) + fill] = this;
- } while (fill != 0);
-
- /* backwards increment the len-bit code huff */
- incr = 1U << (len - 1);
- while (huff & incr)
- incr >>= 1;
- if (incr != 0) {
- huff &= incr - 1;
- huff += incr;
- }
- else
- huff = 0;
-
- /* go to next symbol, update count, len */
- sym++;
- if (--(count[len]) == 0) {
- if (len == max) break;
- len = lens[work[sym]];
- }
-
- /* create new sub-table if needed */
- if (len > root && (huff & mask) != low) {
- /* if first time, transition to sub-tables */
- if (drop == 0)
- drop = root;
-
- /* increment past last table */
- next += min; /* here min is 1 << curr */
-
- /* determine length of next table */
- curr = len - drop;
- left = (int)(1 << curr);
- while (curr + drop < max) {
- left -= count[curr + drop];
- if (left <= 0) break;
- curr++;
- left <<= 1;
- }
-
- /* check for enough space */
- used += 1U << curr;
- if (type == LENS && used >= ENOUGH - MAXD)
- return 1;
-
- /* point entry in root table to sub-table */
- low = huff & mask;
- (*table)[low].op = (unsigned char)curr;
- (*table)[low].bits = (unsigned char)root;
- (*table)[low].val = (unsigned short)(next - *table);
- }
- }
-
- /*
- Fill in rest of table for incomplete codes. This loop is similar to the
- loop above in incrementing huff for table indices. It is assumed that
- len is equal to curr + drop, so there is no loop needed to increment
- through high index bits. When the current sub-table is filled, the loop
- drops back to the root table to fill in any remaining entries there.
- */
- this.op = (unsigned char)64; /* invalid code marker */
- this.bits = (unsigned char)(len - drop);
- this.val = (unsigned short)0;
- while (huff != 0) {
- /* when done with sub-table, drop back to root table */
- if (drop != 0 && (huff & mask) != low) {
- drop = 0;
- len = root;
- next = *table;
- this.bits = (unsigned char)len;
- }
-
- /* put invalid code marker in table */
- next[huff >> drop] = this;
-
- /* backwards increment the len-bit code huff */
- incr = 1U << (len - 1);
- while (huff & incr)
- incr >>= 1;
- if (incr != 0) {
- huff &= incr - 1;
- huff += incr;
- }
- else
- huff = 0;
- }
-
- /* set return parameters */
- *table += used;
- *bits = root;
- return 0;
-}
diff --git a/apps/plugins/imageviewer/png/inftrees.h b/apps/plugins/imageviewer/png/inftrees.h
deleted file mode 100644
index b1104c87e7..0000000000
--- a/apps/plugins/imageviewer/png/inftrees.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables. Each entry provides either the
- information needed to do the operation requested by the code that
- indexed that table entry, or it provides a pointer to another
- table that indexes more bits of the code. op indicates whether
- the entry is a pointer to another table, a literal, a length or
- distance, an end-of-block, or an invalid code. For a table
- pointer, the low four bits of op is the number of index bits of
- that table. For a length or distance, the low four bits of op
- is the number of extra bits to get after the code. bits is
- the number of bits in this code or part of the code to drop off
- of the bit buffer. val is the actual byte to output in the case
- of a literal, the base length or distance, or the offset from
- the current table to the next table. Each entry is four bytes. */
-typedef struct {
- unsigned char op; /* operation, extra bits, table bits */
- unsigned char bits; /* bits in this part of the code */
- unsigned short val; /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
- 00000000 - literal
- 0000tttt - table link, tttt != 0 is the number of table index bits
- 0001eeee - length or distance, eeee is the number of extra bits
- 01100000 - end of block
- 01000000 - invalid code
- */
-
-/* Maximum size of dynamic tree. The maximum found in a long but non-
- exhaustive search was 1444 code structures (852 for length/literals
- and 592 for distances, the latter actually the result of an
- exhaustive search). The true maximum is not known, but the value
- below is more than safe. */
-#define ENOUGH 2048
-#define MAXD 592
-
-/* Type of code to build for inftable() */
-typedef enum {
- CODES,
- LENS,
- DISTS
-} codetype;
-
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
- unsigned codes, code FAR * FAR *table,
- unsigned FAR *bits, unsigned short FAR *work));
diff --git a/apps/plugins/imageviewer/png/png.c b/apps/plugins/imageviewer/png/png.c
index 46430607ea..4bd988d939 100644
--- a/apps/plugins/imageviewer/png/png.c
+++ b/apps/plugins/imageviewer/png/png.c
@@ -12,6 +12,11 @@
* Based on lodepng, a lightweight png decoder/encoder
* (c) 2005-2008 Lode Vandevenne
*
+ * Copyright (c) 2010 Marcin Bukat
+ * - pixel format conversion & transparency handling
+ * - adaptation of tinf (tiny inflate library)
+ * - code refactoring & cleanups
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
@@ -22,1279 +27,29 @@
*
****************************************************************************/
-/*
-LodePNG version 20080927
-
-Copyright (c) 2005-2008 Lode Vandevenne
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source
- distribution.
-*/
-
-/*
-The manual and changelog can be found in the header file "lodepng.h"
-You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
-*/
-
#include "plugin.h"
#include "lcd.h"
#include <lib/pluginlib_bmp.h>
-#include "zlib.h"
+#include "tinf.h"
#include "png.h"
+#include "png_decoder.h"
+#include "bmp.h"
-/* ////////////////////////////////////////////////////////////////////////// */
-/* LodeFlate & LodeZlib Setting structs */
-/* ////////////////////////////////////////////////////////////////////////// */
-
-typedef struct LodePNG_InfoColor /*info about the color type of an image*/
-{
- /*header (IHDR)*/
- unsigned colorType; /*color type*/
- unsigned bitDepth; /*bits per sample*/
-
- /*palette (PLTE)*/
- unsigned char palette[256 * 4]; /*palette in RGBARGBA... order*/
- size_t palettesize; /*palette size in number of colors (amount of bytes is 4 * palettesize)*/
+/* decoder context struct */
+static LodePNG_Decoder decoder;
- /*transparent color key (tRNS)*/
- unsigned key_defined; /*is a transparent color key given?*/
- unsigned key_r; /*red component of color key*/
- unsigned key_g; /*green component of color key*/
- unsigned key_b; /*blue component of color key*/
-} LodePNG_InfoColor;
-
-typedef struct LodePNG_Time /*LodePNG's encoder does not generate the current time. To make it add a time chunk the correct time has to be provided*/
-{
- unsigned year; /*2 bytes*/
- unsigned char month; /*1-12*/
- unsigned char day; /*1-31*/
- unsigned char hour; /*0-23*/
- unsigned char minute; /*0-59*/
- unsigned char second; /*0-60 (to allow for leap seconds)*/
-} LodePNG_Time;
-
-typedef struct LodePNG_InfoPng /*information about the PNG image, except pixels and sometimes except width and height*/
-{
- /*header (IHDR), palette (PLTE) and transparency (tRNS)*/
- unsigned width; /*width of the image in pixels (ignored by encoder, but filled in by decoder)*/
- unsigned height; /*height of the image in pixels (ignored by encoder, but filled in by decoder)*/
- unsigned compressionMethod; /*compression method of the original file*/
- unsigned filterMethod; /*filter method of the original file*/
- unsigned interlaceMethod; /*interlace method of the original file*/
- LodePNG_InfoColor color; /*color type and bits, palette, transparency*/
-
- /*suggested background color (bKGD)*/
- unsigned background_defined; /*is a suggested background color given?*/
- unsigned background_r; /*red component of suggested background color*/
- unsigned background_g; /*green component of suggested background color*/
- unsigned background_b; /*blue component of suggested background color*/
-
- /*time chunk (tIME)*/
- unsigned char time_defined; /*if 0, no tIME chunk was or will be generated in the PNG image*/
- LodePNG_Time time;
-
- /*phys chunk (pHYs)*/
- unsigned phys_defined; /*is pHYs chunk defined?*/
- unsigned phys_x;
- unsigned phys_y;
- unsigned char phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/
-
-} LodePNG_InfoPng;
-
-typedef struct LodePNG_InfoRaw /*contains user-chosen information about the raw image data, which is independent of the PNG image*/
-{
- LodePNG_InfoColor color;
-} LodePNG_InfoRaw;
-
-typedef struct LodePNG_DecodeSettings
-{
- unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/
-} LodePNG_DecodeSettings;
-
-typedef struct LodePNG_Decoder
-{
- LodePNG_DecodeSettings settings;
- LodePNG_InfoRaw infoRaw;
- LodePNG_InfoPng infoPng; /*info of the PNG image obtained after decoding*/
- long error;
- char error_msg[128];
-} LodePNG_Decoder;
-
-#define VERSION_STRING "20080927"
+/* my memory pool (from the mp3 buffer) */
+static char print[128]; /* use a common snprintf() buffer */
/* decompressed image in the possible sizes (1,2,4,8), wasting the other */
static fb_data *disp[9];
-/* up to here currently used by image(s) */
static fb_data *disp_buf;
-/* my memory pool (from the mp3 buffer) */
-static char print[32]; /* use a common snprintf() buffer */
-
-unsigned char *memory, *memory_max; /* inffast.c needs memory_max */
-static size_t memory_size;
-
-static unsigned char *image; /* where we put the content of the file */
-static size_t image_size;
-
-static fb_data *converted_image; /* the (color) converted image */
-static size_t converted_image_size;
-
-static unsigned char *decoded_image; /* the decoded image */
-static size_t decoded_image_size;
-
-static LodePNG_Decoder _decoder;
-
-/*
-The two functions below (LodePNG_decompress and LodePNG_compress) directly call the
-LodeZlib_decompress and LodeZlib_compress functions. The only purpose of the functions
-below, is to provide the ability to let LodePNG use a different Zlib encoder by only
-changing the two functions below, instead of changing it inside the vareous places
-in the other LodePNG functions.
-
-*out must be NULL and *outsize must be 0 initially, and after the function is done,
-*out must point to the decompressed data, *outsize must be the size of it, and must
-be the size of the useful data in bytes, not the alloc size.
-*/
-
-static unsigned LodePNG_decompress(unsigned char* out, size_t* outsize, const unsigned char* in, size_t insize, char *error_msg)
-{
- z_stream stream;
- int err;
-
- rb->strcpy(error_msg, "");
-
- stream.next_in = (Bytef*)in;
- stream.avail_in = (uInt)insize;
-
- stream.next_out = out;
- stream.avail_out = (uInt)*outsize;
-
- stream.zalloc = (alloc_func)0;
- stream.zfree = (free_func)0;
-
- err = inflateInit(&stream);
- if (err != Z_OK) return err;
-
- err = inflate(&stream, Z_FINISH);
- if (err != Z_STREAM_END) {
- inflateEnd(&stream);
- if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
- return Z_DATA_ERROR;
- return err;
- }
- *outsize = stream.total_out;
-
- err = inflateEnd(&stream);
- if (stream.msg != Z_NULL)
- rb->strcpy(error_msg, stream.msg);
- return err;
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-/* / Reading and writing single bits and bytes from/to stream for LodePNG / */
-/* ////////////////////////////////////////////////////////////////////////// */
-
-static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream)
-{
- unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1);
- (*bitpointer)++;
- return result;
-}
-
-static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits)
-{
- unsigned result = 0;
- size_t i;
- for (i = nbits - 1; i < nbits; i--) result += (unsigned)readBitFromReversedStream(bitpointer, bitstream) << i;
- return result;
-}
-
-static void setBitOfReversedStream0(size_t* bitpointer, unsigned char* bitstream, unsigned char bit)
-{
- /*the current bit in bitstream must be 0 for this to work*/
- if (bit) bitstream[(*bitpointer) >> 3] |= (bit << (7 - ((*bitpointer) & 0x7))); /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/
- (*bitpointer)++;
-}
-
-static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit)
-{
- /*the current bit in bitstream may be 0 or 1 for this to work*/
- if (bit == 0) bitstream[(*bitpointer) >> 3] &= (unsigned char)(~(1 << (7 - ((*bitpointer) & 0x7))));
- else bitstream[(*bitpointer) >> 3] |= (1 << (7 - ((*bitpointer) & 0x7)));
- (*bitpointer)++;
-}
-
-static unsigned LodePNG_read32bitInt(const unsigned char* buffer)
-{
- return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-/* / PNG chunks / */
-/* ////////////////////////////////////////////////////////////////////////// */
-
-unsigned LodePNG_chunk_length(const unsigned char* chunk) /*get the length of the data of the chunk. Total chunk length has 12 bytes more.*/
-{
- return LodePNG_read32bitInt(&chunk[0]);
-}
-
-void LodePNG_chunk_type(char type[5], const unsigned char* chunk) /*puts the 4-byte type in null terminated string*/
-{
- unsigned i;
- for (i = 0; i < 4; i++) type[i] = chunk[4 + i];
- type[4] = 0; /*null termination char*/
-}
-
-unsigned char LodePNG_chunk_type_equals(const unsigned char* chunk, const char* type) /*check if the type is the given type*/
-{
- if (type[4] != 0) return 0;
- return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]);
-}
-
-/*properties of PNG chunks gotten from capitalization of chunk type name, as defined by the standard*/
-unsigned char LodePNG_chunk_critical(const unsigned char* chunk) /*0: ancillary chunk, 1: it's one of the critical chunk types*/
-{
- return((chunk[4] & 32) == 0);
-}
-
-unsigned char LodePNG_chunk_private(const unsigned char* chunk) /*0: public, 1: private*/
-{
- return((chunk[6] & 32) != 0);
-}
-
-unsigned char LodePNG_chunk_safetocopy(const unsigned char* chunk) /*0: the chunk is unsafe to copy, 1: the chunk is safe to copy*/
-{
- return((chunk[7] & 32) != 0);
-}
-
-unsigned char* LodePNG_chunk_data(unsigned char* chunk) /*get pointer to the data of the chunk*/
-{
- return &chunk[8];
-}
-
-const unsigned char* LodePNG_chunk_data_const(const unsigned char* chunk) /*get pointer to the data of the chunk*/
-{
- return &chunk[8];
-}
-
-unsigned LodePNG_chunk_check_crc(const unsigned char* chunk) /*returns 0 if the crc is correct, error code if it's incorrect*/
-{
- unsigned length = LodePNG_chunk_length(chunk);
- unsigned CRC = LodePNG_read32bitInt(&chunk[length + 8]);
- unsigned checksum = crc32(0L, &chunk[4], length + 4); /*the CRC is taken of the data and the 4 chunk type letters, not the length*/
- if (CRC != checksum) return 1;
- else return 0;
-}
-
-unsigned char* LodePNG_chunk_next(unsigned char* chunk) /*don't use on IEND chunk, as there is no next chunk then*/
-{
- unsigned total_chunk_length = LodePNG_chunk_length(chunk) + 12;
- return &chunk[total_chunk_length];
-}
-
-const unsigned char* LodePNG_chunk_next_const(const unsigned char* chunk) /*don't use on IEND chunk, as there is no next chunk then*/
-{
- unsigned total_chunk_length = LodePNG_chunk_length(chunk) + 12;
- return &chunk[total_chunk_length];
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-/* / Color types and such / */
-/* ////////////////////////////////////////////////////////////////////////// */
-
-/*return type is a LodePNG error code*/
-static unsigned checkColorValidity(unsigned colorType, unsigned bd) /*bd = bitDepth*/
-{
- switch (colorType)
- {
- case 0:
- if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; /*grey*/
- case 2:
- if (!( bd == 8 || bd == 16)) return 37; break; /*RGB*/
- case 3:
- if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; /*palette*/
- case 4:
- if (!( bd == 8 || bd == 16)) return 37; break; /*grey + alpha*/
- case 6:
- if (!( bd == 8 || bd == 16)) return 37; break; /*RGBA*/
- default:
- return 31;
- }
- return 0; /*allowed color type / bits combination*/
-}
-
-static unsigned getNumColorChannels(unsigned colorType)
-{
- switch (colorType)
- {
- case 0:
- return 1; /*grey*/
- case 2:
- return 3; /*RGB*/
- case 3:
- return 1; /*palette*/
- case 4:
- return 2; /*grey + alpha*/
- case 6:
- return 4; /*RGBA*/
- }
- return 0; /*unexisting color type*/
-}
-
-static unsigned getBpp(unsigned colorType, unsigned bitDepth)
-{
- return getNumColorChannels(colorType) * bitDepth; /*bits per pixel is amount of channels * bits per channel*/
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-
-void LodePNG_InfoColor_init(LodePNG_InfoColor* info)
-{
- info->key_defined = 0;
- info->key_r = info->key_g = info->key_b = 0;
- info->colorType = 6;
- info->bitDepth = 8;
- memset(info->palette, 0, 256 * 4 * sizeof(unsigned char));
- info->palettesize = 0;
-}
-
-void LodePNG_InfoColor_cleanup(LodePNG_InfoColor* info)
-{
- info->palettesize = 0;
-}
-
-unsigned LodePNG_InfoColor_getBpp(const LodePNG_InfoColor* info) { return getBpp(info->colorType, info->bitDepth); } /*calculate bits per pixel out of colorType and bitDepth*/
-unsigned LodePNG_InfoColor_isGreyscaleType(const LodePNG_InfoColor* info) { return info->colorType == 0 || info->colorType == 4; }
-
-unsigned LodePNG_InfoColor_equal(const LodePNG_InfoColor* info1, const LodePNG_InfoColor* info2)
-{
- return info1->colorType == info2->colorType
- && info1->bitDepth == info2->bitDepth; /*palette and color key not compared*/
-}
-
-void LodePNG_InfoPng_init(LodePNG_InfoPng* info)
-{
- info->width = info->height = 0;
- LodePNG_InfoColor_init(&info->color);
- info->interlaceMethod = 0;
- info->compressionMethod = 0;
- info->filterMethod = 0;
- info->background_defined = 0;
- info->background_r = info->background_g = info->background_b = 0;
-
- info->time_defined = 0;
- info->phys_defined = 0;
-}
-
-void LodePNG_InfoPng_cleanup(LodePNG_InfoPng* info)
-{
- LodePNG_InfoColor_cleanup(&info->color);
-}
-
-unsigned LodePNG_InfoColor_copy(LodePNG_InfoColor* dest, const LodePNG_InfoColor* source)
-{
- size_t i;
- LodePNG_InfoColor_cleanup(dest);
- *dest = *source;
- for (i = 0; i < source->palettesize * 4; i++) dest->palette[i] = source->palette[i];
- return 0;
-}
-
-unsigned LodePNG_InfoPng_copy(LodePNG_InfoPng* dest, const LodePNG_InfoPng* source)
-{
- unsigned error = 0;
- LodePNG_InfoPng_cleanup(dest);
- *dest = *source;
- LodePNG_InfoColor_init(&dest->color);
- error = LodePNG_InfoColor_copy(&dest->color, &source->color); if (error) return error;
- return error;
-}
-
-void LodePNG_InfoPng_swap(LodePNG_InfoPng* a, LodePNG_InfoPng* b)
-{
- LodePNG_InfoPng temp = *a;
- *a = *b;
- *b = temp;
-}
-
-void LodePNG_InfoRaw_init(LodePNG_InfoRaw* info)
-{
- LodePNG_InfoColor_init(&info->color);
-}
-
-void LodePNG_InfoRaw_cleanup(LodePNG_InfoRaw* info)
-{
- LodePNG_InfoColor_cleanup(&info->color);
-}
-
-unsigned LodePNG_InfoRaw_copy(LodePNG_InfoRaw* dest, const LodePNG_InfoRaw* source)
-{
- unsigned error = 0;
- LodePNG_InfoRaw_cleanup(dest);
- *dest = *source;
- LodePNG_InfoColor_init(&dest->color);
- error = LodePNG_InfoColor_copy(&dest->color, &source->color); if (error) return error;
- return error;
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-
-/*
-converts from any color type to 24-bit or 32-bit (later maybe more supported). return value = LodePNG error code
-the out buffer must have (w * h * bpp + 7) / 8 bytes, where bpp is the bits per pixel of the output color type (LodePNG_InfoColor_getBpp)
-for < 8 bpp images, there may _not_ be padding bits at the end of scanlines.
-*/
-unsigned LodePNG_convert(fb_data* out, const unsigned char* in, LodePNG_InfoColor* infoOut, LodePNG_InfoColor* infoIn, unsigned w, unsigned h)
-{
- size_t i, j, bp = 0; /*bitpointer, used by less-than-8-bit color types*/
- size_t x, y;
- unsigned char c;
-
- if (!running_slideshow)
- {
- rb->lcd_puts(0, 3, "color conversion in progress");
- rb->lcd_update();
- }
-
- /*cases where in and out already have the same format*/
- if (LodePNG_InfoColor_equal(infoIn, infoOut))
- {
-
- i = 0;
- j = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- unsigned char r = in[i++];
- unsigned char g = in[i++];
- unsigned char b = in[i++];
- out[j++] = LCD_RGBPACK(r,g,b);
- }
- }
- return 0;
- }
-
- if ((infoOut->colorType == 2 || infoOut->colorType == 6) && infoOut->bitDepth == 8)
- {
- if (infoIn->bitDepth == 8)
- {
- switch (infoIn->colorType)
- {
- case 0: /*greyscale color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c=in[i];
- //unsigned char r = in[i];
- //unsigned char g = in[i];
- //unsigned char b = in[i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 2: /*RGB color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- j = 3 * i;
- unsigned char r = in[j];
- unsigned char g = in[j + 1];
- unsigned char b = in[j + 2];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- case 3: /*indexed color (palette)*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- if (in[i] >= infoIn->palettesize) return 46;
- j = in[i] << 2;
- unsigned char r = infoIn->palette[j];
- unsigned char g = infoIn->palette[j + 1];
- unsigned char b = infoIn->palette[j + 2];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- case 4: /*greyscale with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i << 1];
- //unsigned char r = in[i<<1];
- //unsigned char g = in[i<<1];
- //unsigned char b = in[i<<1];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 6: /*RGB with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- j = i << 2;
- unsigned char r = in[j];
- unsigned char g = in[j + 1];
- unsigned char b = in[j + 2];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- default:
- break;
- }
- }
- else if (infoIn->bitDepth == 16)
- {
- switch (infoIn->colorType)
- {
- case 0: /*greyscale color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i << 1];
- //unsigned char r = in[2 * i];
- //unsigned char g = in[2 * i];
- //unsigned char b = in[2 * i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 2: /*RGB color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- j = 6 * i;
- unsigned char r = in[j];
- unsigned char g = in[j + 2];
- unsigned char b = in[j + 4];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- case 4: /*greyscale with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i << 2];
- //unsigned char r = in[4 * i];
- //unsigned char g = in[4 * i];
- //unsigned char b = in[4 * i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 6: /*RGB with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- j = i << 3;
- unsigned char r = in[j];
- unsigned char g = in[j + 2];
- unsigned char b = in[j + 4];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- default:
- break;
- }
- }
- else /*infoIn->bitDepth is less than 8 bit per channel*/
- {
- switch (infoIn->colorType)
- {
- case 0: /*greyscale color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- unsigned value = readBitsFromReversedStream(&bp, in, infoIn->bitDepth);
- value = (value * 255) / ((1 << infoIn->bitDepth) - 1); /*scale value from 0 to 255*/
- unsigned char r = (unsigned char)value;
- unsigned char g = (unsigned char)value;
- unsigned char b = (unsigned char)value;
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- case 3: /*indexed color (palette)*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- unsigned value = readBitsFromReversedStream(&bp, in, infoIn->bitDepth);
- if (value >= infoIn->palettesize) return 47;
- j = value << 2;
- unsigned char r = infoIn->palette[j];
- unsigned char g = infoIn->palette[j + 1];
- unsigned char b = infoIn->palette[j + 2];
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- break;
- default:
- break;
- }
- }
- }
- else if (LodePNG_InfoColor_isGreyscaleType(infoOut) && infoOut->bitDepth == 8) /*conversion from greyscale to greyscale*/
- {
- if (!LodePNG_InfoColor_isGreyscaleType(infoIn)) return 62;
- if (infoIn->bitDepth == 8)
- {
- switch (infoIn->colorType)
- {
- case 0: /*greyscale color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i];
- //unsigned char r = in[i];
- //unsigned char g = in[i];
- //unsigned char b = in[i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 4: /*greyscale with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[(i << 1) + 1];
- //unsigned char r = in[2 * i + 1];
- //unsigned char g = in[2 * i + 1];
- //unsigned char b = in[2 * i + 1];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- default:
- return 31;
- }
- }
- else if (infoIn->bitDepth == 16)
- {
- switch (infoIn->colorType)
- {
- case 0: /*greyscale color*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i << 1];
- //unsigned char r = in[2 * i];
- //unsigned char g = in[2 * i];
- //unsigned char b = in[2 * i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- case 4: /*greyscale with alpha*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- c = in[i << 2];
- //unsigned char r = in[4 * i];
- //unsigned char g = in[4 * i];
- //unsigned char b = in[4 * i];
- out[i++] = LCD_RGBPACK(c,c,c);
- }
- }
- break;
- default:
- return 31;
- }
- }
- else /*infoIn->bitDepth is less than 8 bit per channel*/
- {
- if (infoIn->colorType != 0) return 31; /*colorType 0 is the only greyscale type with < 8 bits per channel*/
- i = 0;
- for (y = 0 ; y < h ; y++) {
- for (x = 0 ; x < w ; x++) {
- unsigned value = readBitsFromReversedStream(&bp, in, infoIn->bitDepth);
- value = (value * 255) / ((1 << infoIn->bitDepth) - 1); /*scale value from 0 to 255*/
- unsigned char r = (unsigned char)value;
- unsigned char g = (unsigned char)value;
- unsigned char b = (unsigned char)value;
- out[i++] = LCD_RGBPACK(r,g,b);
- }
- }
- }
- }
- else return 59;
-
- return 0;
-}
-
-/*Paeth predicter, used by PNG filter type 4*/
-static int paethPredictor(int a, int b, int c)
-{
- int p = a + b - c;
- int pa = p > a ? p - a : a - p;
- int pb = p > b ? p - b : b - p;
- int pc = p > c ? p - c : c - p;
-
- if (pa <= pb && pa <= pc) return a;
- else if (pb <= pc) return b;
- else return c;
-}
-
-/*shared values used by multiple Adam7 related functions*/
-
-static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/
-static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/
-static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/
-static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/
-
-static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp)
-{
- /*the passstart values have 8 values: the 8th one actually indicates the byte after the end of the 7th (= last) pass*/
- unsigned i;
-
- /*calculate width and height in pixels of each pass*/
- for (i = 0; i < 7; i++)
- {
- passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i];
- passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i];
- if (passw[i] == 0) passh[i] = 0;
- if (passh[i] == 0) passw[i] = 0;
- }
-
- filter_passstart[0] = padded_passstart[0] = passstart[0] = 0;
- for (i = 0; i < 7; i++)
- {
- filter_passstart[i + 1] = filter_passstart[i] + ((passw[i] && passh[i]) ? passh[i] * (1 + (passw[i] * bpp + 7) / 8) : 0); /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/
- padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7) / 8); /*bits padded if needed to fill full byte at end of each scanline*/
- passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7) / 8; /*only padded at end of reduced image*/
- }
-}
-
-/* ////////////////////////////////////////////////////////////////////////// */
-/* / PNG Decoder / */
-/* ////////////////////////////////////////////////////////////////////////// */
-
-/*read the information from the header and store it in the LodePNG_Info. return value is error*/
-void LodePNG_inspect(LodePNG_Decoder* decoder, const unsigned char* in, size_t inlength)
-{
- if (inlength == 0 || in == 0) { decoder->error = 48; return; } /*the given data is empty*/
- if (inlength < 29) { decoder->error = 27; return; } /*error: the data length is smaller than the length of the header*/
-
- /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/
- LodePNG_InfoPng_cleanup(&decoder->infoPng);
- LodePNG_InfoPng_init(&decoder->infoPng);
- decoder->error = 0;
-
- if (in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) { decoder->error = 28; return; } /*error: the first 8 bytes are not the correct PNG signature*/
- if (in[12] != 'I' || in[13] != 'H' || in[14] != 'D' || in[15] != 'R') { decoder->error = 29; return; } /*error: it doesn't start with a IHDR chunk!*/
-
- /*read the values given in the header*/
- decoder->infoPng.width = LodePNG_read32bitInt(&in[16]);
- decoder->infoPng.height = LodePNG_read32bitInt(&in[20]);
- decoder->infoPng.color.bitDepth = in[24];
- decoder->infoPng.color.colorType = in[25];
- decoder->infoPng.compressionMethod = in[26];
- decoder->infoPng.filterMethod = in[27];
- decoder->infoPng.interlaceMethod = in[28];
-
- unsigned CRC = LodePNG_read32bitInt(&in[29]);
- unsigned checksum = crc32(0L, &in[12], 17);
- if (CRC != checksum) { decoder->error = 57; return; }
-
- if (decoder->infoPng.compressionMethod != 0) { decoder->error = 32; return; } /*error: only compression method 0 is allowed in the specification*/
- if (decoder->infoPng.filterMethod != 0) { decoder->error = 33; return; } /*error: only filter method 0 is allowed in the specification*/
- if (decoder->infoPng.interlaceMethod > 1) { decoder->error = 34; return; } /*error: only interlace methods 0 and 1 exist in the specification*/
-
- decoder->error = checkColorValidity(decoder->infoPng.color.colorType, decoder->infoPng.color.bitDepth);
-}
-
-static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, size_t bytewidth, unsigned char filterType, size_t length)
-{
- /*
- For PNG filter method 0
- unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, the filter works byte per byte (bytewidth = 1)
- precon is the previous unfiltered scanline, recon the result, scanline the current one
- the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead
- recon and scanline MAY be the same memory address! precon must be disjoint.
- */
-
- size_t i;
- switch (filterType)
- {
- case 0:
- //for(i = 0; i < length; i++) recon[i] = scanline[i];
- memcpy(recon, scanline, length * sizeof(unsigned char));
- break;
- case 1:
- //for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
- memcpy(recon, scanline, bytewidth * sizeof(unsigned char));
- for (i = bytewidth; i < length; i++) recon[i] = scanline[i] + recon[i - bytewidth];
- break;
- case 2:
- if (precon) for (i = 0; i < length; i++) recon[i] = scanline[i] + precon[i];
- else //for(i = 0; i < length; i++) recon[i] = scanline[i];
- memcpy(recon, scanline, length * sizeof(unsigned char));
- break;
- case 3:
- if (precon)
- {
- for (i = 0; i < bytewidth; i++) recon[i] = scanline[i] + precon[i] / 2;
- for (i = bytewidth; i < length; i++) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) / 2);
- }
- else
- {
- //for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
- memcpy(recon, scanline, bytewidth * sizeof(unsigned char));
- for (i = bytewidth; i < length; i++) recon[i] = scanline[i] + recon[i - bytewidth] / 2;
- }
- break;
- case 4:
- if (precon)
- {
- for (i = 0; i < bytewidth; i++) recon[i] = (unsigned char)(scanline[i] + paethPredictor(0, precon[i], 0));
- for (i = bytewidth; i < length; i++) recon[i] = (unsigned char)(scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth]));
- }
- else
- {
- //for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
- memcpy(recon, scanline, bytewidth * sizeof(unsigned char));
- for (i = bytewidth; i < length; i++) recon[i] = (unsigned char)(scanline[i] + paethPredictor(recon[i - bytewidth], 0, 0));
- }
- break;
- default:
- return 36; /*error: unexisting filter type given*/
- }
- return 0;
-}
-
-static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp)
-{
- /*
- For PNG filter method 0
- this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 it's called 7 times)
- out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline
- w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel
- in and out are allowed to be the same memory address!
- */
-
- unsigned y;
- unsigned char* prevline = 0;
-
- size_t bytewidth = (bpp + 7) / 8; /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/
- size_t linebytes = (w * bpp + 7) / 8;
-
- for (y = 0; y < h; y++)
- {
- size_t outindex = linebytes * y;
- size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/
- unsigned char filterType = in[inindex];
-
- unsigned error = unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes);
- if (error) return error;
-
- prevline = &out[outindex];
- }
-
- return 0;
-}
-
-static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp)
-{
- /*Note: this function works on image buffers WITHOUT padding bits at end of scanlines with non-multiple-of-8 bit amounts, only between reduced images is padding
- out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation (because that's likely a little bit faster)*/
- unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8];
- unsigned i;
-
- Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
-
- if (bpp >= 8)
- {
- for (i = 0; i < 7; i++)
- {
- unsigned x, y, b;
- size_t bytewidth = bpp / 8;
- for (y = 0; y < passh[i]; y++)
- for (x = 0; x < passw[i]; x++)
- {
- size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth;
- size_t pixeloutstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth;
- for (b = 0; b < bytewidth; b++)
- {
- out[pixeloutstart + b] = in[pixelinstart + b];
- }
- }
- }
- }
- else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/
- {
- for (i = 0; i < 7; i++)
- {
- unsigned x, y, b;
- unsigned ilinebits = bpp * passw[i];
- unsigned olinebits = bpp * w;
- size_t obp, ibp; /*bit pointers (for out and in buffer)*/
- for (y = 0; y < passh[i]; y++)
- for (x = 0; x < passw[i]; x++)
- {
- ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp);
- obp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp;
- for (b = 0; b < bpp; b++)
- {
- unsigned char bit = readBitFromReversedStream(&ibp, in);
- setBitOfReversedStream0(&obp, out, bit); /*note that this function assumes the out buffer is completely 0, use setBitOfReversedStream otherwise*/
- }
- }
- }
- }
-}
-
-static void removePaddingBits(unsigned char* out, const unsigned char* in, size_t olinebits, size_t ilinebits, unsigned h)
-{
- /*
- After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers for the Adam7 code, the color convert code and the output to the user.
- in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits
- also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7
- only useful if (ilinebits - olinebits) is a value in the range 1..7
- */
- unsigned y;
- size_t diff = ilinebits - olinebits;
- size_t obp = 0, ibp = 0; /*bit pointers*/
- for (y = 0; y < h; y++)
- {
- size_t x;
- for (x = 0; x < olinebits; x++)
- {
- unsigned char bit = readBitFromReversedStream(&ibp, in);
- setBitOfReversedStream(&obp, out, bit);
- }
- ibp += diff;
- }
-}
-
-/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from the IDAT chunks*/
-static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, const LodePNG_Decoder* decoder) /*return value is error*/
-{
- /*
- This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. Steps:
- *) if no Adam7: 1) unfilter 2) remove padding bits (= posible extra bits per scanline if bpp < 8)
- *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace
- NOTE: the in buffer will be overwritten with intermediate data!
- */
- unsigned bpp = LodePNG_InfoColor_getBpp(&decoder->infoPng.color);
- unsigned w = decoder->infoPng.width;
- unsigned h = decoder->infoPng.height;
- unsigned error = 0;
- if (bpp == 0) return 31; /*error: invalid colortype*/
-
- if (decoder->infoPng.interlaceMethod == 0)
- {
- if (bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8)
- {
- error = unfilter(in, in, w, h, bpp);
- if (error) return error;
- removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h);
- }
- else error = unfilter(out, in, w, h, bpp); /*we can immediatly filter into the out buffer, no other steps needed*/
- }
- else /*interlaceMethod is 1 (Adam7)*/
- {
- unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8];
- unsigned i;
-
- Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
-
- for (i = 0; i < 7; i++)
- {
- error = unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp);
- if (error) return error;
- if (bpp < 8) /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, move bytes instead of bits or move not at all*/
- {
- /*remove padding bits in scanlines; after this there still may be padding bits between the different reduced images: each reduced image still starts nicely at a byte*/
- removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, ((passw[i] * bpp + 7) / 8) * 8, passh[i]);
- }
- }
-
- Adam7_deinterlace(out, in, w, h, bpp);
- }
-
- return error;
-}
-
-/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/
-static void decodeGeneric(LodePNG_Decoder* decoder, unsigned char* in, size_t size, void (*pf_progress)(int current, int total))
-{
- if (pf_progress != NULL)
- pf_progress(0, 100);
- unsigned char IEND = 0;
- const unsigned char* chunk;
- size_t i;
- unsigned char *idat = memory;
- size_t idat_size = 0;
-
- /*for unknown chunk order*/
- unsigned unknown = 0;
- unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/
-
- /*provide some proper output values if error will happen*/
- decoded_image_size = 0;
-
- if (size == 0 || in == 0) { decoder->error = 48; return; } /*the given data is empty*/
-
- LodePNG_inspect(decoder, in, size); /*reads header and resets other parameters in decoder->infoPng*/
- if (decoder->error) return;
-
- chunk = &in[33]; /*first byte of the first chunk after the header*/
-
- while (!IEND) /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. IDAT data is put at the start of the in buffer*/
- {
- unsigned chunkLength;
- const unsigned char* data; /*the data in the chunk*/
-
- if ((size_t)((chunk - in) + 12) > size || chunk < in) { decoder->error = 30; break; } /*error: size of the in buffer too small to contain next chunk*/
- chunkLength = LodePNG_chunk_length(chunk); /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/
- if (chunkLength > 2147483647) { decoder->error = 63; break; }
- if ((size_t)((chunk - in) + chunkLength + 12) > size || (chunk + chunkLength + 12) < in) { decoder->error = 35; break; } /*error: size of the in buffer too small to contain next chunk*/
- data = LodePNG_chunk_data_const(chunk);
-
- /*IDAT chunk, containing compressed image data*/
- if (LodePNG_chunk_type_equals(chunk, "IDAT"))
- {
- size_t oldsize = idat_size;
- idat_size += chunkLength;
- if (idat + idat_size >= image) { decoder->error = OUT_OF_MEMORY; break; }
- memcpy(idat+oldsize, data, chunkLength * sizeof(unsigned char));
- critical_pos = 3;
- }
- /*IEND chunk*/
- else if (LodePNG_chunk_type_equals(chunk, "IEND"))
- {
- IEND = 1;
- }
- /*palette chunk (PLTE)*/
- else if (LodePNG_chunk_type_equals(chunk, "PLTE"))
- {
- unsigned pos = 0;
- decoder->infoPng.color.palettesize = chunkLength / 3;
- if (decoder->infoPng.color.palettesize > 256) { decoder->error = 38; break; } /*error: palette too big*/
- for (i = 0; i < decoder->infoPng.color.palettesize; i++)
- {
- decoder->infoPng.color.palette[4 * i + 0] = data[pos++]; /*R*/
- decoder->infoPng.color.palette[4 * i + 1] = data[pos++]; /*G*/
- decoder->infoPng.color.palette[4 * i + 2] = data[pos++]; /*B*/
- decoder->infoPng.color.palette[4 * i + 3] = 255; /*alpha*/
- }
- critical_pos = 2;
- }
- /*palette transparency chunk (tRNS)*/
- else if (LodePNG_chunk_type_equals(chunk, "tRNS"))
- {
- if (decoder->infoPng.color.colorType == 3)
- {
- if (chunkLength > decoder->infoPng.color.palettesize) { decoder->error = 39; break; } /*error: more alpha values given than there are palette entries*/
- for (i = 0; i < chunkLength; i++) decoder->infoPng.color.palette[4 * i + 3] = data[i];
- }
- else if (decoder->infoPng.color.colorType == 0)
- {
- if (chunkLength != 2) { decoder->error = 40; break; } /*error: this chunk must be 2 bytes for greyscale image*/
- decoder->infoPng.color.key_defined = 1;
- decoder->infoPng.color.key_r = decoder->infoPng.color.key_g = decoder->infoPng.color.key_b = 256 * data[0] + data[1];
- }
- else if (decoder->infoPng.color.colorType == 2)
- {
- if (chunkLength != 6) { decoder->error = 41; break; } /*error: this chunk must be 6 bytes for RGB image*/
- decoder->infoPng.color.key_defined = 1;
- decoder->infoPng.color.key_r = 256 * data[0] + data[1];
- decoder->infoPng.color.key_g = 256 * data[2] + data[3];
- decoder->infoPng.color.key_b = 256 * data[4] + data[5];
- }
- else { decoder->error = 42; break; } /*error: tRNS chunk not allowed for other color models*/
- }
- /*background color chunk (bKGD)*/
- else if (LodePNG_chunk_type_equals(chunk, "bKGD"))
- {
- if (decoder->infoPng.color.colorType == 3)
- {
- if (chunkLength != 1) { decoder->error = 43; break; } /*error: this chunk must be 1 byte for indexed color image*/
- decoder->infoPng.background_defined = 1;
- decoder->infoPng.background_r = decoder->infoPng.color.palette[4 * data[0] + 0];
- decoder->infoPng.background_g = decoder->infoPng.color.palette[4 * data[0] + 1];
- decoder->infoPng.background_b = decoder->infoPng.color.palette[4 * data[0] + 2];
-
- }
- else if (decoder->infoPng.color.colorType == 0 || decoder->infoPng.color.colorType == 4)
- {
- if (chunkLength != 2) { decoder->error = 44; break; } /*error: this chunk must be 2 bytes for greyscale image*/
- decoder->infoPng.background_defined = 1;
- decoder->infoPng.background_r = decoder->infoPng.background_g = decoder->infoPng.background_b = 256 * data[0] + data[1];
- }
- else if (decoder->infoPng.color.colorType == 2 || decoder->infoPng.color.colorType == 6)
- {
- if (chunkLength != 6) { decoder->error = 45; break; } /*error: this chunk must be 6 bytes for greyscale image*/
- decoder->infoPng.background_defined = 1;
- decoder->infoPng.background_r = 256 * data[0] + data[1];
- decoder->infoPng.background_g = 256 * data[2] + data[3];
- decoder->infoPng.background_b = 256 * data[4] + data[5];
- }
- }
- else if (LodePNG_chunk_type_equals(chunk, "tIME"))
- {
- if (chunkLength != 7) { decoder->error = 73; break; }
- decoder->infoPng.time_defined = 1;
- decoder->infoPng.time.year = 256 * data[0] + data[+ 1];
- decoder->infoPng.time.month = data[2];
- decoder->infoPng.time.day = data[3];
- decoder->infoPng.time.hour = data[4];
- decoder->infoPng.time.minute = data[5];
- decoder->infoPng.time.second = data[6];
- }
- else if (LodePNG_chunk_type_equals(chunk, "pHYs"))
- {
- if (chunkLength != 9) { decoder->error = 74; break; }
- decoder->infoPng.phys_defined = 1;
- decoder->infoPng.phys_x = 16777216 * data[0] + 65536 * data[1] + 256 * data[2] + data[3];
- decoder->infoPng.phys_y = 16777216 * data[4] + 65536 * data[5] + 256 * data[6] + data[7];
- decoder->infoPng.phys_unit = data[8];
- }
- else /*it's not an implemented chunk type, so ignore it: skip over the data*/
- {
- if (LodePNG_chunk_critical(chunk)) { decoder->error = 69; break; } /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/
- unknown = 1;
- }
-
- if (!unknown) /*check CRC if wanted, only on known chunk types*/
- {
- long time = *rb->current_tick;
- if (LodePNG_chunk_check_crc(chunk)) { decoder->error = 57; break; }
- time = *rb->current_tick-time;
- }
-
- if (!IEND) chunk = LodePNG_chunk_next_const(chunk);
- }
-
- if (!decoder->error)
- {
- unsigned char *scanlines = idat + idat_size;
- size_t scanlines_size = (size_t)memory_max - idat_size;
- long time = *rb->current_tick;
- decoder->error = LodePNG_decompress(scanlines, &scanlines_size, idat, idat_size, decoder->error_msg); /*decompress with the Zlib decompressor*/
- if (pf_progress) pf_progress(100, 100);
- time = *rb->current_tick-time;
-
- if (!decoder->error)
- {
- decoded_image_size = (decoder->infoPng.height * decoder->infoPng.width * LodePNG_InfoColor_getBpp(&decoder->infoPng.color) + 7) / 8;
- if (decoded_image_size > memory_size) { decoder->error = OUT_OF_MEMORY; return; }
- decoded_image = memory_max - decoded_image_size;
- if (scanlines + scanlines_size >= decoded_image) { decoder->error = OUT_OF_MEMORY; return; }
- memset(decoded_image, 0, decoded_image_size * sizeof(unsigned char));
- if (!running_slideshow)
- {
- rb->lcd_puts(0, 3, "unfiltering scanlines");
- rb->lcd_update();
- }
- decoder->error = postProcessScanlines(decoded_image, scanlines, decoder);
- }
- }
-}
-
-void LodePNG_decode(LodePNG_Decoder* decoder, unsigned char* in, size_t insize, void (*pf_progress)(int current, int total))
-{
- decodeGeneric(decoder, in, insize, pf_progress);
- if (decoder->error) return;
-
- /*TODO: check if this works according to the statement in the documentation: "The converter can convert from greyscale input color type, to 8-bit greyscale or greyscale with alpha"*/
- if (!(decoder->infoRaw.color.colorType == 2 || decoder->infoRaw.color.colorType == 6) && !(decoder->infoRaw.color.bitDepth == 8)) { decoder->error = 56; return; }
- converted_image = (fb_data *)memory;
- converted_image_size = decoder->infoPng.width*decoder->infoPng.height;
- if ((unsigned char *)(converted_image + converted_image_size) >= decoded_image) { decoder->error = OUT_OF_MEMORY; }
- if (!decoder->error) decoder->error = LodePNG_convert(converted_image, decoded_image, &decoder->infoRaw.color, &decoder->infoPng.color, decoder->infoPng.width, decoder->infoPng.height);
-}
-
-void LodePNG_DecodeSettings_init(LodePNG_DecodeSettings* settings)
-{
- settings->color_convert = 1;
-}
-
-void LodePNG_Decoder_init(LodePNG_Decoder* decoder)
-{
- LodePNG_DecodeSettings_init(&decoder->settings);
- LodePNG_InfoRaw_init(&decoder->infoRaw);
- LodePNG_InfoPng_init(&decoder->infoPng);
- decoder->error = 1;
-}
-
-void LodePNG_Decoder_cleanup(LodePNG_Decoder* decoder)
-{
- LodePNG_InfoRaw_cleanup(&decoder->infoRaw);
- LodePNG_InfoPng_cleanup(&decoder->infoPng);
-}
-
-#define PNG_ERROR_MIN 27
-#define PNG_ERROR_MAX 74
-static const unsigned char *png_error_messages[PNG_ERROR_MAX-PNG_ERROR_MIN+1] =
-{
- "png file smaller than a png header", /*27*/
- "incorrect png signature", /*28*/
- "first chunk is not IHDR", /*29*/
- "chunk length too large", /*30*/
- "illegal PNG color type or bpp", /*31*/
- "illegal PNG compression method", /*32*/
- "illegal PNG filter method", /*33*/
- "illegal PNG interlace method", /*34*/
- "chunk length of a chunk is too large or the chunk too small", /*35*/
- "illegal PNG filter type encountered", /*36*/
- "illegal bit depth for this color type given", /*37*/
- "the palette is too big (more than 256 colors)", /*38*/
- "more palette alpha values given in tRNS, than there are colors in the palette", /*39*/
- "tRNS chunk has wrong size for greyscale image", /*40*/
- "tRNS chunk has wrong size for RGB image", /*41*/
- "tRNS chunk appeared while it was not allowed for this color type", /*42*/
- "bKGD chunk has wrong size for palette image", /*43*/
- "bKGD chunk has wrong size for greyscale image", /*44*/
- "bKGD chunk has wrong size for RGB image", /*45*/
- "value encountered in indexed image is larger than the palette size", /*46*/
- "value encountered in indexed image is larger than the palette size", /*47*/
- "input file is empty", /*48*/
- NULL, /*49*/
- NULL, /*50*/
- NULL, /*51*/
- NULL, /*52*/
- NULL, /*53*/
- NULL, /*54*/
- NULL, /*55*/
- NULL, /*56*/
- "invalid CRC", /*57*/
- NULL, /*58*/
- "conversion to unexisting or unsupported color type or bit depth", /*59*/
- NULL, /*60*/
- NULL, /*61*/
- NULL, /*62*/
- "png chunk too long", /*63*/
- NULL, /*64*/
- NULL, /*65*/
- NULL, /*66*/
- NULL, /*67*/
- NULL, /*68*/
- "unknown critical chunk", /*69*/
- NULL, /*70*/
- NULL, /*71*/
- NULL, /*72*/
- "invalid tIME chunk size", /*73*/
- "invalid pHYs chunk size", /*74*/
-};
+#if defined(HAVE_LCD_COLOR)
+#define resize_bitmap smooth_resize_bitmap
+#else
+#define resize_bitmap grey_resize_bitmap
+#endif
bool img_ext(const char *ext)
{
@@ -1310,16 +65,33 @@ void draw_image_rect(struct image_info *info,
int x, int y, int width, int height)
{
fb_data **pdisp = (fb_data**)info->data;
- rb->lcd_bitmap_part(*pdisp, info->x + x, info->y + y, info->width,
+
+#ifdef HAVE_LCD_COLOR
+ rb->lcd_bitmap_part(*pdisp, info->x + x, info->y + y,
+ STRIDE(SCREEN_MAIN, info->width, info->height),
x + MAX(0, (LCD_WIDTH-info->width)/2),
y + MAX(0, (LCD_HEIGHT-info->height)/2),
width, height);
+#else
+ mylcd_ub_gray_bitmap_part((const unsigned char*)*pdisp,
+ info->x + x, info->y + y, info->width,
+ x + MAX(0, (LCD_WIDTH-info->width)/2),
+ y + MAX(0, (LCD_HEIGHT-info->height)/2),
+ width, height);
+#endif
}
int img_mem(int ds)
{
- LodePNG_Decoder *decoder = &_decoder;
- return (decoder->infoPng.width/ds) * (decoder->infoPng.height/ds) * FB_DATA_SZ;
+ LodePNG_Decoder *p_decoder = &decoder;
+
+#ifdef USEGSLIB
+ return (p_decoder->infoPng.width/ds) * (p_decoder->infoPng.height/ds);
+#else
+ return (p_decoder->infoPng.width/ds) *
+ (p_decoder->infoPng.height/ds) *
+ FB_DATA_SZ;
+#endif
}
int load_image(char *filename, struct image_info *info,
@@ -1328,10 +100,14 @@ int load_image(char *filename, struct image_info *info,
int fd;
long time = 0; /* measured ticks */
int w, h; /* used to center output */
- LodePNG_Decoder *decoder = &_decoder;
+ LodePNG_Decoder *p_decoder = &decoder;
+
+ unsigned char *memory, *memory_max;
+ static size_t memory_size, file_size;
+ static unsigned char *image;
+ /* cleanup */
memset(&disp, 0, sizeof(disp));
- LodePNG_Decoder_init(decoder);
/* align buffer */
memory = (unsigned char *)((intptr_t)(buf + 3) & ~3);
@@ -1344,7 +120,7 @@ int load_image(char *filename, struct image_info *info,
rb->splashf(HZ, "err opening %s: %d", filename, fd);
return PLUGIN_ERROR;
}
- image_size = rb->filesize(fd);
+ file_size = rb->filesize(fd);
DEBUGF("reading file '%s'\n", filename);
@@ -1353,18 +129,19 @@ int load_image(char *filename, struct image_info *info,
rb->lcd_update();
}
- if (image_size > memory_size) {
- decoder->error = FILE_TOO_LARGE;
+ if (file_size > memory_size) {
+ p_decoder->error = FILE_TOO_LARGE;
rb->close(fd);
} else {
if (!running_slideshow) {
- rb->lcd_putsf(0, 1, "loading %zu bytes", image_size);
+ rb->lcd_putsf(0, 1, "loading %zu bytes", file_size);
rb->lcd_update();
}
- image = memory_max - image_size;
- rb->read(fd, image, image_size);
+ /* load file to the end of the buffer */
+ image = memory_max - file_size;
+ rb->read(fd, image, file_size);
rb->close(fd);
if (!running_slideshow) {
@@ -1378,19 +155,27 @@ int load_image(char *filename, struct image_info *info,
}
#endif
- decoder->settings.color_convert = 1;
- decoder->infoRaw.color.colorType = 2;
- decoder->infoRaw.color.bitDepth = 8;
+ /* Initialize decoder context struct, set buffer decoder is free
+ * to use.
+ * Decoder assumes that raw image file is loaded at the very
+ * end of the allocated buffer
+ */
+ LodePNG_Decoder_init(p_decoder, memory, memory_size);
- LodePNG_inspect(decoder, image, image_size);
+ /* read file header; file is loaded at the end
+ * of the allocated buffer
+ */
+ LodePNG_inspect(p_decoder, image, file_size);
- if (!decoder->error) {
+ if (!p_decoder->error) {
if (!running_slideshow) {
rb->lcd_putsf(0, 2, "image %dx%d",
- decoder->infoPng.width, decoder->infoPng.height);
+ p_decoder->infoPng.width,
+ p_decoder->infoPng.height);
rb->lcd_putsf(0, 3, "decoding %d*%d",
- decoder->infoPng.width, decoder->infoPng.height);
+ p_decoder->infoPng.width,
+ p_decoder->infoPng.height);
rb->lcd_update();
}
@@ -1398,16 +183,16 @@ int load_image(char *filename, struct image_info *info,
time = *rb->current_tick;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true);
- LodePNG_decode(decoder, image, image_size, cb_progress);
+ LodePNG_decode(p_decoder, image, file_size, cb_progress);
rb->cpu_boost(false);
#else
- LodePNG_decode(decoder, image, image_size, cb_progress);
+ LodePNG_decode(p_decoder, image, file_size, cb_progress);
#endif /*HAVE_ADJUSTABLE_CPU_FREQ*/
time = *rb->current_tick - time;
}
}
- if (!running_slideshow && !decoder->error)
+ if (!running_slideshow && !p_decoder->error)
{
rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ);
rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */
@@ -1415,55 +200,59 @@ int load_image(char *filename, struct image_info *info,
rb->lcd_update();
}
- if (decoder->error) {
+ if (p_decoder->error) {
#ifdef USE_PLUG_BUF
- if (plug_buf && (decoder->error == FILE_TOO_LARGE
- || decoder->error == OUT_OF_MEMORY || decoder->error == Z_MEM_ERROR))
+ if (plug_buf && (p_decoder->error == FILE_TOO_LARGE ||
+ p_decoder->error == OUT_OF_MEMORY ||
+ p_decoder->error == TINF_DATA_ERROR))
return PLUGIN_OUTOFMEM;
#endif
- if (decoder->error >= PNG_ERROR_MIN && decoder->error <= PNG_ERROR_MAX
- && png_error_messages[decoder->error-PNG_ERROR_MIN] != NULL)
+ if (p_decoder->error >= PNG_ERROR_MIN &&
+ p_decoder->error <= PNG_ERROR_MAX &&
+ LodePNG_perror(p_decoder) != NULL)
{
- rb->splash(HZ, png_error_messages[decoder->error-PNG_ERROR_MIN]);
+ rb->splash(HZ, LodePNG_perror(p_decoder));
}
else
{
- switch (decoder->error) {
+ switch (p_decoder->error) {
case PLUGIN_ABORT:
break;
case OUT_OF_MEMORY:
- case Z_MEM_ERROR:
rb->splash(HZ, "Out of Memory");break;
case FILE_TOO_LARGE:
rb->splash(HZ, "File too large");break;
- case Z_DATA_ERROR:
- rb->splash(HZ, decoder->error_msg);break;
+ case TINF_DATA_ERROR:
+ rb->splash(HZ, "Zlib decompressor error");break;
default:
- rb->splashf(HZ, "other error : %ld", decoder->error);break;
+ rb->splashf(HZ, "other error : %ld", p_decoder->error);break;
}
}
- if (decoder->error == PLUGIN_ABORT)
+ if (p_decoder->error == PLUGIN_ABORT)
return PLUGIN_ABORT;
else
return PLUGIN_ERROR;
}
- disp_buf = converted_image + converted_image_size;
- info->x_size = decoder->infoPng.width;
- info->y_size = decoder->infoPng.height;
+ info->x_size = p_decoder->infoPng.width;
+ info->y_size = p_decoder->infoPng.height;
+
+ disp_buf = (fb_data *)(p_decoder->buf + p_decoder->native_img_size);
+ disp_buf = (fb_data *)ALIGN_UP((uintptr_t)disp_buf,4);
*buf_size = memory_max - (unsigned char*)disp_buf;
+
return PLUGIN_OK;
}
int get_image(struct image_info *info, int ds)
{
fb_data **p_disp = &disp[ds]; /* short cut */
- LodePNG_Decoder *decoder = &_decoder;
+ LodePNG_Decoder *p_decoder = &decoder;
- info->width = decoder->infoPng.width / ds;
- info->height = decoder->infoPng.height / ds;
+ info->width = p_decoder->infoPng.width / ds;
+ info->height = p_decoder->infoPng.height / ds;
info->data = p_disp;
if (*p_disp != NULL)
@@ -1483,34 +272,40 @@ int get_image(struct image_info *info, int ds)
int size = info->width * info->height;
- if ((unsigned char *)(disp_buf + size) >= memory_max) {
+ if ((unsigned char *)(disp_buf + size) >= p_decoder->buf + p_decoder->buf_size) {
/* have to discard the current */
int i;
for (i=1; i<=8; i++)
disp[i] = NULL; /* invalidate all bitmaps */
+
/* start again from the beginning of the buffer */
- disp_buf = converted_image + converted_image_size;
+ disp_buf = (fb_data *)(p_decoder->buf + p_decoder->native_img_size);
+ disp_buf = (fb_data *)ALIGN_UP((uintptr_t)disp_buf,4);
}
*p_disp = disp_buf;
+#ifdef USEGSLIB
+ disp_buf = (fb_data *)((unsigned char *)disp_buf + size);
+#else
disp_buf += size;
+#endif
- bmp_src.width = decoder->infoPng.width;
- bmp_src.height = decoder->infoPng.height;
- bmp_src.data = (unsigned char *)converted_image;
+ bmp_src.width = p_decoder->infoPng.width;
+ bmp_src.height = p_decoder->infoPng.height;
+ bmp_src.data = (unsigned char *)p_decoder->buf;
bmp_dst.width = info->width;
bmp_dst.height = info->height;
bmp_dst.data = (unsigned char *)*p_disp;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true);
- smooth_resize_bitmap(&bmp_src, &bmp_dst);
+ resize_bitmap(&bmp_src, &bmp_dst);
rb->cpu_boost(false);
#else
- smooth_resize_bitmap(&bmp_src, &bmp_dst);
+ resize_bitmap(&bmp_src, &bmp_dst);
#endif /*HAVE_ADJUSTABLE_CPU_FREQ*/
} else {
- *p_disp = converted_image;
+ *p_disp = (fb_data *)p_decoder->buf;
}
return PLUGIN_OK;
diff --git a/apps/plugins/imageviewer/png/png.h b/apps/plugins/imageviewer/png/png.h
index e351d9a8aa..f5c76f1f44 100644
--- a/apps/plugins/imageviewer/png/png.h
+++ b/apps/plugins/imageviewer/png/png.h
@@ -23,7 +23,3 @@
****************************************************************************/
#include "../imageviewer.h"
-
-#define OUT_OF_MEMORY 9900
-#define FILE_TOO_LARGE 9910
-
diff --git a/apps/plugins/imageviewer/png/png.make b/apps/plugins/imageviewer/png/png.make
index b2000faecf..0a7106d2a9 100644
--- a/apps/plugins/imageviewer/png/png.make
+++ b/apps/plugins/imageviewer/png/png.make
@@ -19,7 +19,7 @@ PNG_OBJ := $(call c2obj, $(PNG_SRC))
OTHER_SRC += $(PNG_SRC)
# Use -O3 for png plugin : it gives a bigger file but very good performances
-PNGFLAGS = $(PLUGINFLAGS) -O3 -DNO_GZCOMPRESS -DNO_GZIP
+PNGFLAGS = $(PLUGINFLAGS) -Os
$(PNGBUILDDIR)/png.rock: $(PNG_OBJ)
diff --git a/apps/plugins/imageviewer/png/png_decoder.c b/apps/plugins/imageviewer/png/png_decoder.c
new file mode 100644
index 0000000000..b09d2e2ece
--- /dev/null
+++ b/apps/plugins/imageviewer/png/png_decoder.c
@@ -0,0 +1,2195 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$id $
+ *
+ * Copyright (C) 2009 by Christophe Gouiran <bechris13250 -at- gmail -dot- com>
+ *
+ * Based on lodepng, a lightweight png decoder/encoder
+ * (c) 2005-2008 Lode Vandevenne
+ *
+ * Copyright (c) 2010 Marcin Bukat
+ * - pixel format conversion & transparency handling
+ * - adaptation of tinf (tiny inflate library)
+ * - code refactoring & cleanups
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+LodePNG version 20080927
+
+Copyright (c) 2005-2008 Lode Vandevenne
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+*/
+
+/*
+The manual and changelog can be found in the header file "lodepng.h"
+You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
+*/
+
+/* supported chunk types:
+ * critical:
+ * IHDR
+ * PLTE
+ * IDAT
+ * IEND
+ *
+ * ancillary:
+ * tRNS
+ * bKGD
+ */
+
+#include "plugin.h"
+#include "lcd.h"
+#include <lib/pluginlib_bmp.h>
+#include "tinf.h"
+#include "bmp.h"
+#include "png_decoder.h"
+#if LCD_DEPTH < 8
+#include <lib/grey.h>
+#endif
+
+#ifndef resize_bitmap
+#if defined(HAVE_LCD_COLOR)
+#define resize_bitmap smooth_resize_bitmap
+#else
+#define resize_bitmap grey_resize_bitmap
+#endif
+#endif
+
+static const char *png_error_messages[PNG_ERROR_MAX-PNG_ERROR_MIN+1] =
+{
+ "png file smaller than a png header", /*27*/
+ "incorrect png signature", /*28*/
+ "first chunk is not IHDR", /*29*/
+ "chunk length too large", /*30*/
+ "illegal PNG color type or bpp", /*31*/
+ "illegal PNG compression method", /*32*/
+ "illegal PNG filter method", /*33*/
+ "illegal PNG interlace method", /*34*/
+ "chunk length of a chunk is too large or the chunk too small", /*35*/
+ "illegal PNG filter type encountered", /*36*/
+ "illegal bit depth for this color type given", /*37*/
+ "the palette is too big (more than 256 colors)", /*38*/
+ "more palette alpha values given in tRNS, than there are colors in the palette", /*39*/
+ "tRNS chunk has wrong size for greyscale image", /*40*/
+ "tRNS chunk has wrong size for RGB image", /*41*/
+ "tRNS chunk appeared while it was not allowed for this color type", /*42*/
+ "bKGD chunk has wrong size for palette image", /*43*/
+ "bKGD chunk has wrong size for greyscale image", /*44*/
+ "bKGD chunk has wrong size for RGB image", /*45*/
+ "value encountered in indexed image is larger than the palette size", /*46*/
+ "value encountered in indexed image is larger than the palette size", /*47*/
+ "input file is empty", /*48*/
+ NULL, /*49*/
+ NULL, /*50*/
+ NULL, /*51*/
+ NULL, /*52*/
+ NULL, /*53*/
+ NULL, /*54*/
+ NULL, /*55*/
+ NULL, /*56*/
+ "invalid CRC", /*57*/
+ NULL, /*58*/
+ "conversion to unexisting or unsupported color type or bit depth", /*59*/
+ NULL, /*60*/
+ NULL, /*61*/
+ NULL, /*62*/
+ "png chunk too long", /*63*/
+ NULL, /*64*/
+ NULL, /*65*/
+ NULL, /*66*/
+ NULL, /*67*/
+ NULL, /*68*/
+ "unknown critical chunk", /*69*/
+ NULL, /*70*/
+ NULL, /*71*/
+ NULL, /*72*/
+ "invalid tIME chunk size", /*73*/
+ "invalid pHYs chunk size", /*74*/
+};
+
+/*
+The two functions below (LodePNG_decompress and LodePNG_compress) directly call the
+LodeZlib_decompress and LodeZlib_compress functions. The only purpose of the functions
+below, is to provide the ability to let LodePNG use a different Zlib encoder by only
+changing the two functions below, instead of changing it inside the vareous places
+in the other LodePNG functions.
+
+*out must be NULL and *outsize must be 0 initially, and after the function is done,
+*out must point to the decompressed data, *outsize must be the size of it, and must
+be the size of the useful data in bytes, not the alloc size.
+*/
+
+static unsigned LodePNG_decompress(unsigned char* out,
+ size_t* outsize,
+ const unsigned char* in,
+ size_t insize)
+{
+ int err;
+ err = tinf_zlib_uncompress((void *)out,
+ (unsigned int*)outsize,
+ (const void*)in,
+ (unsigned int)insize);
+ return err;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Reading and writing single bits and bytes from/to stream for LodePNG / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+static unsigned char readBitFromReversedStream(size_t* bitpointer,
+ const unsigned char* bitstream)
+{
+ unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >>
+ (7 - ((*bitpointer) & 0x7))) & 1);
+ (*bitpointer)++;
+ return result;
+}
+
+static unsigned readBitsFromReversedStream(size_t* bitpointer,
+ const unsigned char* bitstream,
+ size_t nbits)
+{
+ unsigned result = 0;
+ size_t i;
+ for (i = nbits - 1; i < nbits; i--)
+ result += (unsigned)readBitFromReversedStream(bitpointer, bitstream)<<i;
+
+ return result;
+}
+
+static void setBitOfReversedStream0(size_t* bitpointer,
+ unsigned char* bitstream,
+ unsigned char bit)
+{
+ /* the current bit in bitstream must be 0 for this to work
+ * earlier bit of huffman code is in a lesser significant bit
+ * of an earlier byte
+ */
+ if (bit)
+ bitstream[(*bitpointer) >> 3] |= (bit << (7 - ((*bitpointer) & 0x7)));
+
+ (*bitpointer)++;
+}
+
+static void setBitOfReversedStream(size_t* bitpointer,
+ unsigned char* bitstream,
+ unsigned char bit)
+{
+ /* the current bit in bitstream may be 0 or 1 for this to work */
+ if (bit == 0)
+ bitstream[(*bitpointer) >> 3] &=
+ (unsigned char)(~(1 << (7 - ((*bitpointer) & 0x7))));
+ else
+ bitstream[(*bitpointer) >> 3] |= (1 << (7 - ((*bitpointer) & 0x7)));
+
+ (*bitpointer)++;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / PNG chunks / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/* get the length of the data of the chunk.
+ * Total chunk length has 12 bytes more.
+ */
+static unsigned LodePNG_chunk_length(const uint8_t* chunk)
+{
+ return chunk[0]<<24|chunk[1]<<16|chunk[2]<<8|chunk[3];
+}
+
+/* check if the type is the given type */
+static bool LodePNG_chunk_type_equals(const uint8_t* chunk, uint32_t type)
+{
+ /* chunk type field: A 4-byte chunk type code. For convenience in
+ * description and in examining PNG files, type codes are restricted
+ * to consist of uppercase and lowercase ASCII letters
+ * (A-Z and a-z, or 65-90 and 97-122 decimal). However, encoders and
+ * decoders must treat the codes as fixed binary values, not character
+ * strings."
+ */
+ return ((uint32_t)(chunk[4]<<24|chunk[5]<<16|chunk[6]<<8|chunk[7]) == (uint32_t)type);
+}
+
+/* properties of PNG chunks gotten from capitalization of chunk type name,
+ * as defined by the standard
+ * 0: ancillary chunk
+ * 1: critical chunk type
+ */
+static inline bool LodePNG_chunk_critical(const uint8_t* chunk)
+{
+ return((chunk[4] & 32) == 0);
+}
+
+/* 0: public, 1: private */
+static inline bool LodePNG_chunk_private(const uint8_t* chunk)
+{
+ return((chunk[6] & 32) != 0);
+}
+
+/* get pointer to the data of the chunk */
+static inline const uint8_t* LodePNG_chunk_data(const uint8_t* chunk)
+{
+ return &chunk[8];
+}
+
+/* returns 0 if the crc is correct, error code if it's incorrect */
+static bool LodePNG_chunk_check_crc(const uint8_t* chunk)
+{
+ uint32_t length = LodePNG_chunk_length(chunk);
+ uint32_t crc = chunk[length + 8]<<24|chunk[length + 8 + 1]<<16|
+ chunk[length + 8 + 2]<<8|chunk[length + 8 + 3];
+
+ /* the CRC is taken of the data and the 4 chunk type letters,
+ * not the length
+ */
+ uint32_t checksum = tinf_crc32(chunk + 4, length + 4);
+ return (crc == checksum);
+}
+
+/* don't use on IEND chunk, as there is no next chunk then */
+static const uint8_t* LodePNG_chunk_next(const uint8_t* chunk)
+{
+ uint32_t total_chunk_length = LodePNG_chunk_length(chunk) + 12;
+ return &chunk[total_chunk_length];
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Color types and such / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/* return type is a LodePNG error code
+ * bd - bit depth
+ */
+static uint8_t checkColorValidity(uint8_t colorType, uint8_t bd)
+{
+ switch (colorType)
+ {
+ case PNG_COLORTYPE_GREY:
+ if (!(bd == 1 || bd == 2 ||
+ bd == 4 || bd == 8 ||
+ bd == 16))
+ return 37;
+ break; /*grey*/
+
+ case PNG_COLORTYPE_RGB:
+ if (!(bd == 8 || bd == 16))
+ return 37;
+ break; /*RGB*/
+
+ case PNG_COLORTYPE_PALETTE:
+ if (!(bd == 1 || bd == 2 ||
+ bd == 4 || bd == 8 ))
+ return 37;
+ break; /*palette*/
+
+ case PNG_COLORTYPE_GREYA:
+ if (!( bd == 8 || bd == 16 ))
+ return 37;
+ break; /*grey + alpha*/
+
+ case PNG_COLORTYPE_RGBA:
+ if (!( bd == 8 || bd == 16 ))
+ return 37;
+ break; /*RGBA*/
+
+ default:
+ return 31;
+ }
+ return 0; /*allowed color type / bits combination*/
+}
+
+static uint8_t getNumColorChannels(uint8_t colorType)
+{
+ switch (colorType)
+ {
+ case PNG_COLORTYPE_GREY:
+ return 1; /*grey*/
+ case PNG_COLORTYPE_RGB:
+ return 3; /*RGB*/
+ case PNG_COLORTYPE_PALETTE:
+ return 1; /*palette*/
+ case PNG_COLORTYPE_GREYA:
+ return 2; /*grey + alpha*/
+ case PNG_COLORTYPE_RGBA:
+ return 4; /*RGBA*/
+ }
+ return 0; /*unexisting color type*/
+}
+
+static uint8_t getBpp(uint8_t colorType, uint8_t bitDepth)
+{
+ /* bits per pixel is amount of channels * bits per channel */
+ return getNumColorChannels(colorType) * bitDepth;
+}
+
+static void LodePNG_InfoColor_init(LodePNG_InfoColor* info)
+{
+ info->key_defined = 0;
+ info->key_r = info->key_g = info->key_b = 0;
+ info->colorType = PNG_COLORTYPE_RGBA;
+ info->bitDepth = 8;
+ memset(info->palette, 0, 256 * 4 * sizeof(unsigned char));
+ info->palettesize = 0;
+}
+
+static void LodePNG_InfoColor_cleanup(LodePNG_InfoColor* info)
+{
+ info->palettesize = 0;
+}
+
+static void LodePNG_InfoPng_init(LodePNG_InfoPng* info)
+{
+ info->width = info->height = 0;
+ LodePNG_InfoColor_init(&info->color);
+ info->interlaceMethod = 0;
+ info->compressionMethod = 0;
+ info->filterMethod = 0;
+#ifdef HAVE_LCD_COLOR
+ info->background_r = info->background_g = info->background_b = 0;
+#else
+ info->background_r = info->background_g = info->background_b = 255;
+#endif
+}
+
+void LodePNG_InfoPng_cleanup(LodePNG_InfoPng* info)
+{
+ LodePNG_InfoColor_cleanup(&info->color);
+}
+
+/*
+ * Convert from every colortype to rockbox native pixel format (color targets) or
+ * greylib pixel format (grey targets)
+ */
+static void LodePNG_convert(LodePNG_Decoder *decoder)
+{
+
+ LodePNG_InfoPng *infoIn = &decoder->infoPng;
+ const uint8_t *in = decoder->decoded_img;
+ uint8_t *out = decoder->buf;
+ uint16_t w = infoIn->width;
+ uint16_t h = infoIn->height;
+ size_t i, j, bp = 0; /*bitpointer, used by less-than-8-bit color types*/
+ size_t x, y;
+ uint16_t value, alpha, alpha_complement;
+
+ /* line buffer for pixel format transformation */
+#ifdef HAVE_LCD_COLOR
+ struct uint8_rgb *line_buf = (struct uint8_rgb *)(out + w * h * FB_DATA_SZ);
+#else
+ uint8_t *line_buf = (unsigned char *)(out + w * h * FB_DATA_SZ);
+#endif
+
+ struct bitmap bm = {
+ .width = w,
+ .height = h,
+ .data = (unsigned char*)out,
+ };
+
+ struct scaler_context ctx = {
+ .bm = &bm,
+ .dither = 0,
+ };
+
+#if LCD_DEPTH < 8
+ const struct custom_format *cformat = &format_grey;
+#else
+ const struct custom_format *cformat = &format_native;
+#endif
+
+void (*output_row_8)(uint32_t, void*, struct scaler_context*) = cformat->output_row_8;
+
+#ifdef HAVE_LCD_COLOR
+struct uint8_rgb *pixel;
+#else
+unsigned char *pixel;
+#endif
+
+#ifdef HAVE_LCD_COLOR
+ if (infoIn->color.bitDepth == 8)
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ /* reset line buf */
+ pixel = line_buf;
+
+ for (x = 0; x < w ; x++) {
+ value = in[i++];
+ if (infoIn->color.key_defined)
+ if ( (uint8_t)value == (uint8_t)infoIn->color.key_r )
+ value = infoIn->background_r; /* full transparent */
+
+ pixel->red = (uint8_t)value;
+ pixel->green = (uint8_t)value;
+ pixel->blue = (uint8_t)value;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGB: /*RGB color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = 3*i++;
+
+ /* tRNs & bKGD */
+ if (infoIn->color.key_defined &&
+ in[j] == (uint8_t)infoIn->color.key_r &&
+ in[j + 1] == (uint8_t)infoIn->color.key_g &&
+ in[j + 2] == (uint8_t)infoIn->color.key_b)
+ {
+ pixel->red = (uint8_t)infoIn->background_r;
+ pixel->green = (uint8_t)infoIn->background_g;
+ pixel->blue = (uint8_t)infoIn->background_b;
+ }
+ else
+ {
+ pixel->red = in[j];
+ pixel->green = in[j + 1];
+ pixel->blue = in[j + 2];
+ }
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_PALETTE: /*indexed color (palette)*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ /* reset line buf */
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ if (in[i] >= infoIn->color.palettesize)
+ {
+ decoder->error = 46;
+ return;
+ }
+
+ j = in[i++]<<2;
+ alpha = infoIn->color.palette[j + 3];
+ alpha_complement = (256 - alpha);
+
+ /* tRNS and bKGD */
+ pixel->red = (infoIn->color.palette[j] * alpha +
+ alpha_complement*infoIn->background_r)>>8;
+ pixel->green = (infoIn->color.palette[j + 1] * alpha +
+ alpha_complement*infoIn->background_g)>>8;
+ pixel->blue = (infoIn->color.palette[j + 2] * alpha +
+ alpha_complement*infoIn->background_b)>>8;
+ pixel++;
+ }
+ output_row_8(y,(void *)(line_buf),&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_GREYA: /*greyscale with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ alpha = in[(i << 1) + 1];
+ alpha_complement = (256 - alpha)*infoIn->background_r;
+ value = (alpha * in[i++ << 1] + alpha_complement)>>8;
+ pixel->red = (uint8_t)(value);
+ pixel->green = (uint8_t)value;
+ pixel->blue = (uint8_t)value;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGBA: /*RGB with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = i++ << 2;
+ alpha = in[j + 3];
+ alpha_complement = (256 - alpha);
+ pixel->red = (in[j] * alpha +
+ alpha_complement*infoIn->background_r)>>8;
+ pixel->green = (in[j + 1] * alpha +
+ alpha_complement*infoIn->background_g)>>8;
+ pixel->blue = (in[j + 2] * alpha +
+ alpha_complement*infoIn->background_b)>>8;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (infoIn->color.bitDepth == 16)
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ value = (in[i<<1]<<8)|in[(i << 1) + 1];
+ i++;
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined &&
+ value == infoIn->color.key_r)
+ value = infoIn->background_r<<8;
+
+ pixel->red =
+ pixel->green =
+ pixel->blue = (uint8_t)(value>>8);
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGB: /*RGB color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = 6 * i++;
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined &&
+ ((uint16_t)(in[j]<<8|in[j + 1]) ==
+ infoIn->color.key_r) &&
+ ((uint16_t)(in[j + 2]<<8|in[j + 3]) ==
+ infoIn->color.key_g) &&
+ ((uint16_t)(in[j + 4]<<8|in[j + 5]) ==
+ infoIn->color.key_b))
+ {
+ pixel->red = (uint8_t)infoIn->background_r;
+ pixel->green = (uint8_t)infoIn->background_g;
+ pixel->blue = (uint8_t)infoIn->background_b;
+ }
+ else
+ {
+ pixel->red = in[j];
+ pixel->green = in[j + 2];
+ pixel->blue = in[j + 4];
+ }
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_GREYA: /*greyscale with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ alpha = in[(i << 2) + 2];
+ alpha_complement = (256-alpha)*infoIn->background_r;
+ value = (in[i++ << 2] * alpha + alpha_complement)>>8;
+ pixel->red = (uint8_t)value;
+ pixel->green = (uint8_t)value;
+ pixel->blue = (uint8_t)value;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGBA: /*RGB with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = i++ << 3;
+ alpha = in[j + 6];
+ alpha_complement = (256-alpha);
+ pixel->red = (in[j] * alpha +
+ alpha_complement*infoIn->background_r)>>8;
+ pixel->green = (in[j + 2] * alpha +
+ alpha_complement*infoIn->background_g)>>8;
+ pixel->blue = (in[j + 4] * alpha +
+ alpha_complement*infoIn->background_b)>>8;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else /*infoIn->bitDepth is less than 8 bit per channel*/
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ value = readBitsFromReversedStream(&bp, in, infoIn->color.bitDepth);
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined)
+ if ( value == infoIn->color.key_r )
+ value = infoIn->background_r; /* full transparent */
+
+ /* scale value from 0 to 255 */
+ value = (value * 255) / ((1 << infoIn->color.bitDepth) - 1);
+
+ pixel->red = (uint8_t)value;
+ pixel->green = (uint8_t)value;
+ pixel->blue = (uint8_t)value;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_PALETTE: /*indexed color (palette)*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ value = readBitsFromReversedStream(&bp, in, infoIn->color.bitDepth);
+ if (value >= infoIn->color.palettesize)
+ {
+ decoder->error = 47;
+ return;
+ }
+
+ j = value << 2;
+
+ /* tRNS and bKGD */
+ alpha = infoIn->color.palette[j + 3];
+ alpha_complement = (256 - alpha);
+ pixel->red = (alpha * infoIn->color.palette[j] +
+ alpha_complement*infoIn->background_r)>>8;
+ pixel->green = (alpha * infoIn->color.palette[j + 1] +
+ alpha_complement*infoIn->background_g)>>8;
+ pixel->blue = (alpha * infoIn->color.palette[j + 2] +
+ alpha_complement*infoIn->background_b)>>8;
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+#else /* greyscale targets */
+struct uint8_rgb px_rgb; /* for rgb(a) -> greyscale conversion */
+uint8_t background_grey; /* for rgb background -> greyscale background */
+
+ if (infoIn->color.bitDepth == 8)
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++ ) {
+ value = in[i++];
+
+ /* transparent color defined in tRNS chunk */
+ if (infoIn->color.key_defined)
+ if ( (uint8_t)value == (uint8_t)infoIn->color.key_r )
+ value = infoIn->background_r;
+
+ *pixel++ = (uint8_t)value;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGB: /*RGB color*/
+ /* convert background rgb color to greyscale */
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ background_grey = brightness(px_rgb);
+
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = 3*i++;
+
+ /* tRNs & bKGD */
+ if (infoIn->color.key_defined &&
+ in[j] == (uint8_t)infoIn->color.key_r &&
+ in[j + 1] == (uint8_t)infoIn->color.key_g &&
+ in[j + 2] == (uint8_t)infoIn->color.key_b)
+ {
+ *pixel = background_grey;
+ }
+ else
+ {
+ /* rgb -> greyscale */
+ px_rgb.red = in[j];
+ px_rgb.green = in[j + 1];
+ px_rgb.blue = in[j + 2];
+ *pixel = brightness(px_rgb);
+ }
+ pixel++;
+
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_PALETTE: /*indexed color (palette)*/
+ i = 0;
+ /* calculate grey value of rgb background */
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ background_grey = brightness(px_rgb);
+
+ for (y = 0 ; y < h ; y++) {
+ /* reset line buf */
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ if (in[i] >= infoIn->color.palettesize)
+ {
+ decoder->error = 46;
+ return;
+ }
+
+ j = in[i++] << 2;
+ alpha = infoIn->color.palette[j + 3];
+ alpha_complement = (256 - alpha);
+
+ /* tRNS and bKGD */
+ px_rgb.red = (alpha * infoIn->color.palette[j] +
+ alpha_complement*background_grey)>>8;
+ px_rgb.green = (alpha * infoIn->color.palette[j + 1] +
+ alpha_complement*background_grey)>>8;
+ px_rgb.blue = (alpha * infoIn->color.palette[j + 2] +
+ alpha_complement*background_grey)>>8;
+
+ *pixel++ = brightness(px_rgb);
+ }
+ output_row_8(y,(void *)(line_buf),&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_GREYA: /*greyscale with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ alpha = in[(i << 1) + 1];
+ alpha_complement = ((256 - alpha)*infoIn->background_r);
+ *pixel++ = (alpha * in[i++ << 1] + alpha_complement)>>8;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGBA: /*RGB with alpha*/
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ background_grey = brightness(px_rgb);
+
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = i++ << 2;
+ alpha = in[j + 3];
+ alpha_complement = ((256 - alpha)*background_grey);
+
+ px_rgb.red = in[j];
+ px_rgb.green = in[j + 1];
+ px_rgb.blue = in[j + 2];
+ *pixel++ = (alpha * brightness(px_rgb) +
+ alpha_complement)>>8;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (infoIn->color.bitDepth == 16)
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ /* specification states that we have to compare
+ * colors for simple transparency in 16bits
+ * even if we scale down to 8bits later
+ */
+ value = in[i<<1]<<8|in[(i << 1) + 1];
+ i++;
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined &&
+ value == infoIn->color.key_r)
+ value = infoIn->background_r<<8;
+
+ /* we take upper 8bits */
+ *pixel++ = (uint8_t)(value>>8);
+ }
+
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGB: /*RGB color*/
+ i = 0;
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ background_grey = brightness(px_rgb);
+
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = 6 * i++;
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined &&
+ (uint16_t)(in[j]<<8|in[j + 1]) ==
+ infoIn->color.key_r &&
+ (uint16_t)(in[j + 2]<<8|in[j + 3]) ==
+ infoIn->color.key_g &&
+ (uint16_t)(in[j + 4]<<8|in[j + 5]) ==
+ infoIn->color.key_b)
+ {
+ *pixel = background_grey;
+ }
+ else
+ {
+ /* we take only upper byte of 16bit value */
+ px_rgb.red = in[j];
+ px_rgb.green = in[j + 2];
+ px_rgb.blue = in[j + 4];
+ *pixel = brightness(px_rgb);
+ }
+ pixel++;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_GREYA: /*greyscale with alpha*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ alpha = in[(i << 2) + 2];
+ alpha_complement = (256 - alpha)*infoIn->background_r;
+ *pixel++ = (alpha * in[i++ << 2] + alpha_complement)>>8;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_RGBA: /*RGB with alpha*/
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ background_grey = brightness(px_rgb);
+
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ j = i++ << 3;
+ alpha = in[j + 6];
+ alpha_complement = (256 - alpha)*background_grey;
+ px_rgb.red = in[j];
+ px_rgb.green = in[j + 2];
+ px_rgb.blue = in[j + 4];
+ *pixel++ = (alpha * brightness(px_rgb) + alpha_complement)>>8;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else /*infoIn->bitDepth is less than 8 bit per channel*/
+ {
+ switch (infoIn->color.colorType)
+ {
+ case PNG_COLORTYPE_GREY: /*greyscale color*/
+ i = 0;
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ value = readBitsFromReversedStream(&bp, in, infoIn->color.bitDepth);
+
+ /* tRNS and bKGD */
+ if (infoIn->color.key_defined)
+ if ( value == infoIn->color.key_r )
+ value = infoIn->background_r; /* full transparent */
+
+ /*scale value from 0 to 255*/
+ value = (value * 255) / ((1 << infoIn->color.bitDepth) - 1);
+
+ *pixel++ = (unsigned char)value;
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ case PNG_COLORTYPE_PALETTE: /*indexed color (palette)*/
+ i = 0;
+ px_rgb.red = infoIn->background_r;
+ px_rgb.green = infoIn->background_g;
+ px_rgb.blue = infoIn->background_b;
+ uint8_t background_grey = brightness(px_rgb);
+
+ for (y = 0 ; y < h ; y++) {
+ pixel = line_buf;
+ for (x = 0 ; x < w ; x++) {
+ value = readBitsFromReversedStream(&bp, in, infoIn->color.bitDepth);
+ if (value >= infoIn->color.palettesize)
+ {
+ decoder->error = 47;
+ return;
+ }
+
+ j = value << 2;
+
+ /* tRNS and bKGD */
+ alpha = infoIn->color.palette[j + 3];
+ alpha_complement = (256 - alpha) * background_grey;
+
+ px_rgb.red = (alpha * infoIn->color.palette[j] +
+ alpha_complement)>>8;
+ px_rgb.green = (alpha * infoIn->color.palette[j + 1] +
+ alpha_complement)>>8;
+ px_rgb.blue = (alpha * infoIn->color.palette[j + 2] +
+ alpha_complement)>>8;
+ *pixel++ = brightness(px_rgb);
+ }
+ output_row_8(y,(void *)line_buf,&ctx);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+#endif
+}
+
+/*Paeth predicter, used by PNG filter type 4*/
+static int paethPredictor(int a, int b, int c)
+{
+ int p = a + b - c;
+ int pa = p > a ? p - a : a - p;
+ int pb = p > b ? p - b : b - p;
+ int pc = p > c ? p - c : c - p;
+
+ if (pa <= pb && pa <= pc) return a;
+ else if (pb <= pc) return b;
+ else return c;
+}
+
+/*shared values used by multiple Adam7 related functions*/
+
+static const uint8_t ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/
+static const uint8_t ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/
+static const uint8_t ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/
+static const uint8_t ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/
+
+static void Adam7_getpassvalues(uint16_t passw[7],
+ uint16_t passh[7],
+ size_t filter_passstart[8],
+ size_t padded_passstart[8],
+ size_t passstart[8],
+ uint16_t w,
+ uint16_t h,
+ uint8_t bpp)
+{
+ /* the passstart values have 8 values:
+ * the 8th one actually indicates the byte after the end
+ * of the 7th (= last) pass
+ */
+ uint8_t i;
+
+ /*calculate width and height in pixels of each pass*/
+ for (i = 0; i < 7; i++)
+ {
+ passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i];
+ passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i];
+ if (passw[i] == 0) passh[i] = 0;
+ if (passh[i] == 0) passw[i] = 0;
+ }
+
+ filter_passstart[0] = padded_passstart[0] = passstart[0] = 0;
+ for (i = 0; i < 7; i++)
+ {
+ /* if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte) */
+ filter_passstart[i + 1] = filter_passstart[i] + ((passw[i] && passh[i])?
+ passh[i] * (1 + (passw[i] * bpp + 7) / 8):0);
+
+ /* bits padded if needed to fill full byte at end of each scanline */
+ padded_passstart[i + 1] = padded_passstart[i] +
+ passh[i] * ((passw[i] * bpp + 7) / 8);
+
+ /* only padded at end of reduced image */
+ passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7) / 8;
+ }
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / PNG Decoder / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+
+
+static uint8_t unfilterScanline(uint8_t* recon,
+ const uint8_t* scanline,
+ const uint8_t* precon,
+ size_t bytewidth,
+ uint8_t filterType,
+ size_t length)
+{
+ /* For PNG filter method 0
+ * unfilter a PNG image scanline by scanline. when the pixels are smaller
+ * than 1 byte, the filter works byte per byte (bytewidth = 1)
+ *
+ * precon is the previous unfiltered scanline, recon the result,
+ * scanline the current one
+ *
+ * the incoming scanlines do NOT include the filtertype byte, that one is
+ * given in the parameter filterType instead
+ *
+ * recon and scanline MAY be the same memory address! precon must be
+ * disjoint.
+ */
+
+/* storage space for cached portion of scanline */
+unsigned char cache[512+16];
+
+/* ptr to second element of the cache */
+unsigned char *cache_1 = cache + bytewidth;
+unsigned char *p_cache = cache + 256 + 8; /* half way */
+unsigned char *p_cache_1 = p_cache + bytewidth;
+
+ size_t i;
+ switch (filterType)
+ {
+ case PNG_FILTERTYPE_NONE:
+ /* for(i = 0; i < length; i++) recon[i] = scanline[i]; */
+ memcpy(recon, scanline, length * sizeof(uint8_t));
+ break;
+ case PNG_FILTERTYPE_SUB:
+ /*
+ for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
+ for (i = bytewidth; i < length; i++)
+ recon[i] = scanline[i] + recon[i - bytewidth];
+ */
+
+ /* first pixel */
+ memcpy(cache, scanline, bytewidth * sizeof(unsigned char));
+ scanline += bytewidth;
+
+ while ((length - bytewidth) >> 9) /* length >> 9 */
+ {
+ /* cache part of scanline */
+ memcpy(cache_1, scanline, 512);
+
+ /* filtering */
+ for (i=bytewidth; i < 512 + bytewidth; i++)
+ cache[i] += cache[i - bytewidth];
+
+ /* copy part of filtered scanline */
+ memcpy(recon, cache, 512);
+
+ /* adjust pointers */
+ recon += 512;
+ scanline += 512;
+ length -= 512;
+
+ /* copy last pixel back to the begining of the cache */
+ memcpy(cache, cache + 512, bytewidth * sizeof(unsigned char));
+ }
+
+ /* less than our cache size */
+ if (length)
+ {
+ /* cache last part of the scanline */
+ memcpy(cache_1, scanline, length - bytewidth);
+
+ /* filtering */
+ for (i=bytewidth; i < length; i++)
+ cache[i] += cache[i - bytewidth];
+
+ /* copy remaining part of the filtered scanline */
+ memcpy(recon, cache, length * sizeof(unsigned char));
+ }
+ break;
+ case PNG_FILTERTYPE_UP:
+ /*
+ if (precon) for (i = 0; i < length; i++)
+ recon[i] = scanline[i] + precon[i];
+ */
+ if (precon)
+ {
+ while (length >> 8)
+ {
+ memcpy(cache, scanline, 256);
+ memcpy(p_cache, precon, 256);
+
+ for (i=0; i < 256; i++)
+ cache[i] += p_cache[i];
+
+ memcpy(recon, cache, 256);
+
+ scanline += 256;
+ recon += 256;
+ precon += 256;
+ length -= 256;
+ }
+
+ if (length)
+ {
+ memcpy(cache, scanline, length);
+ memcpy(p_cache, precon, length);
+
+ for (i=0; i < length; i++)
+ cache[i] += p_cache[i];
+
+ memcpy(recon, cache, length);
+ }
+ }
+ else
+ /* for(i = 0; i < length; i++) recon[i] = scanline[i]; */
+ memcpy(recon, scanline, length * sizeof(uint8_t));
+ break;
+ case PNG_FILTERTYPE_AVERAGE:
+ if (precon)
+ {
+ /*
+ for (i = 0; i < bytewidth; i++)
+ recon[i] = scanline[i] + precon[i] / 2;
+ for (i = bytewidth; i < length; i++)
+ recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) / 2);
+ */
+ memcpy(cache, scanline, bytewidth * sizeof(unsigned char));
+ memcpy(p_cache, precon, bytewidth * sizeof(unsigned char));
+
+ for (i = 0; i < bytewidth; i++)
+ cache[i] += p_cache[i]>>1;
+
+ scanline += bytewidth;
+ precon += bytewidth;
+
+ while ((length - bytewidth)>> 8) /* length/256 */
+ {
+ memcpy(cache_1, scanline, 256);
+ memcpy(p_cache_1, precon, 256);
+
+ for (i=bytewidth; i < 256 + bytewidth; i++)
+ cache[i] += (cache[i - bytewidth] + p_cache[i])>>1;
+
+ memcpy(recon, cache, 256);
+
+ recon += 256;
+ scanline += 256;
+ precon += 256;
+ length -= 256;
+
+ memcpy(cache, cache + 256, bytewidth * sizeof(unsigned char));
+ memcpy(p_cache, p_cache + 256, bytewidth * sizeof(unsigned char));
+ }
+
+ /* less than our cache size */
+ if (length)
+ {
+ /* cache last part of the scanline */
+ memcpy(cache_1, scanline, length - bytewidth);
+ memcpy(p_cache_1, precon, length - bytewidth);
+
+ /* filtering */
+ for (i=bytewidth; i < length; i++)
+ cache[i] += (cache[i - bytewidth] + p_cache[i])>>1;
+
+ /* copy remaining part of the filtered scanline */
+ memcpy(recon, cache, length * sizeof(unsigned char));
+ }
+ }
+ else
+ {
+ /*
+ for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
+ for (i = bytewidth; i < length; i++)
+ recon[i] = scanline[i] + recon[i - bytewidth] / 2;
+ */
+
+ /* first pixel */
+ memcpy(cache, scanline, bytewidth * sizeof(unsigned char));
+ scanline += bytewidth;
+
+ while ((length - bytewidth) >> 9) /* length/512 */
+ {
+ /* cache part of scanline */
+ memcpy(cache_1, scanline, 512);
+
+ /* filtering */
+ for (i=bytewidth; i < 512 + bytewidth; i++)
+ cache[i] += (cache[i - bytewidth])>>1;
+
+ /* copy part of filtered scanline */
+ memcpy(recon, cache, 512);
+
+ /* adjust pointers */
+ recon += 512;
+ scanline += 512;
+ length -= 512;
+
+ /* copy last pixel back to the begining of the cache */
+ memcpy(cache, cache + 512, bytewidth * sizeof(unsigned char));
+ }
+
+ /* less than our cache size */
+ if (length)
+ {
+ /* cache last part of the scanline */
+ memcpy(cache_1, scanline, length - bytewidth);
+
+ /* filtering */
+ for (i=bytewidth; i < length; i++)
+ cache[i] += (cache[i - bytewidth])>>1;
+
+ /* copy remaining part of the filtered scanline */
+ memcpy(recon, cache, length * sizeof(unsigned char));
+ }
+ }
+ break;
+ case PNG_FILTERTYPE_PAETH:
+ if (precon)
+ {
+ /*
+ for (i = 0; i < bytewidth; i++)
+ recon[i] = (uint8_t)(scanline[i] +
+ paethPredictor(0, precon[i], 0));
+ for (i = bytewidth; i < length; i++)
+ recon[i] = (uint8_t)(scanline[i] +
+ paethPredictor(recon[i - bytewidth],
+ precon[i],
+ precon[i - bytewidth]));
+ */
+
+ memcpy(cache, scanline, bytewidth * sizeof(unsigned char));
+ memcpy(p_cache, precon, bytewidth * sizeof(unsigned char));
+
+ for (i = 0; i < bytewidth; i++)
+ cache[i] += paethPredictor(0, p_cache[i], 0);
+
+ scanline += bytewidth;
+ precon += bytewidth;
+
+ while ((length - bytewidth)>> 8) /* length/256 */
+ {
+ memcpy(cache_1, scanline, 256);
+ memcpy(p_cache_1, precon, 256);
+
+ for (i=bytewidth; i < 256 + bytewidth; i++)
+ cache[i] += paethPredictor(cache[i - bytewidth],
+ p_cache[i],
+ p_cache[i - bytewidth]);
+
+ memcpy(recon, cache, 256);
+
+ recon += 256;
+ scanline += 256;
+ precon += 256;
+ length -= 256;
+
+ memcpy(cache, cache + 256, bytewidth * sizeof(unsigned char));
+ memcpy(p_cache, p_cache + 256, bytewidth * sizeof(unsigned char));
+ }
+
+ /* less than our cache size */
+ if (length)
+ {
+ /* cache last part of the scanline */
+ memcpy(cache_1, scanline, length - bytewidth);
+ memcpy(p_cache_1, precon, length - bytewidth);
+
+ /* filtering */
+ for (i=bytewidth; i < length; i++)
+ cache[i] += paethPredictor(cache[i - bytewidth],
+ p_cache[i],
+ p_cache[i - bytewidth]);
+
+ /* copy remaining part of the filtered scanline */
+ memcpy(recon, cache, length * sizeof(unsigned char));
+ }
+ }
+ else
+ {
+ /*
+ for(i = 0; i < bytewidth; i++) recon[i] = scanline[i];
+ for (i = bytewidth; i < length; i++)
+ recon[i] = (uint8_t)(scanline[i] +
+ paethPredictor(recon[i - bytewidth],
+ 0, 0));
+ */
+
+ memcpy(cache, scanline, bytewidth * sizeof(unsigned char));
+ scanline += bytewidth;
+
+ while ((length - bytewidth) >> 9) /* length/512 */
+ {
+ /* cache part of scanline */
+ memcpy(cache_1, scanline, 512);
+
+ /* filtering */
+ for (i=bytewidth; i < 512 + bytewidth; i++)
+ cache[i] += paethPredictor(cache[i - bytewidth], 0, 0);
+
+ /* copy part of filtered scanline */
+ memcpy(recon, cache, 512);
+
+ /* adjust pointers */
+ recon += 512;
+ scanline += 512;
+ length -= 512;
+
+ /* copy last pixel back to the begining of the cache */
+ memcpy(cache, cache + 512, bytewidth * sizeof(unsigned char));
+ }
+
+ /* less than our cache size */
+ if (length)
+ {
+ /* cache last part of the scanline */
+ memcpy(cache_1, scanline, length - bytewidth);
+
+ /* filtering */
+ for (i=bytewidth; i < length; i++)
+ cache[i] += paethPredictor(cache[i - bytewidth], 0, 0);
+
+ /* copy remaining part of the filtered scanline */
+ memcpy(recon, cache, length * sizeof(unsigned char));
+ }
+ }
+ break;
+ default:
+ return 36; /*error: unexisting filter type given*/
+ }
+ return 0;
+}
+
+static uint8_t unfilter(uint8_t* out,
+ const uint8_t* in,
+ uint16_t w,
+ uint16_t h,
+ uint8_t bpp)
+{
+ /* For PNG filter method 0
+ * this function unfilters a single image (e.g. without interlacing this is
+ * called once, with Adam7 it's called 7 times)
+ *
+ * out must have enough bytes allocated already, in must have the
+ * scanlines + 1 filtertype byte per scanline
+ *
+ * w and h are image dimensions or dimensions of reduced image,
+ * bpp is bits per pixel
+ *
+ * in and out are allowed to be the same memory address!
+ */
+
+ uint16_t y;
+ uint8_t* prevline = 0;
+
+ /* bytewidth is used for filtering, is 1 when bpp < 8,
+ * number of bytes per pixel otherwise
+ */
+ size_t bytewidth = (bpp + 7) / 8;
+ size_t linebytes = (w * bpp + 7) / 8;
+
+ for (y = 0; y < h; y++)
+ {
+ size_t outindex = linebytes * y;
+
+ /* the extra filterbyte added to each row */
+ size_t inindex = (1 + linebytes) * y;
+ uint8_t filterType = in[inindex];
+
+ uint8_t error = unfilterScanline(&out[outindex], &in[inindex + 1],
+ prevline, bytewidth, filterType,
+ linebytes);
+ if (error)
+ return error;
+
+ prevline = &out[outindex];
+ }
+
+ return 0;
+}
+
+static void Adam7_deinterlace(uint8_t* out,
+ const uint8_t* in,
+ uint16_t w,
+ uint16_t h,
+ uint8_t bpp)
+{
+ /* Note: this function works on image buffers WITHOUT padding bits at end
+ * of scanlines with non-multiple-of-8 bit amounts, only between reduced
+ * images is padding
+ * out must be big enough AND must be 0 everywhere if bpp < 8
+ * in the current implementation (because that's likely a little bit faster)
+ */
+ uint16_t passw[7], passh[7];
+ size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ uint8_t i;
+
+ Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart,
+ passstart, w, h, bpp);
+
+ if (bpp >= 8)
+ {
+ for (i = 0; i < 7; i++)
+ {
+ uint16_t x, y, b;
+ size_t bytewidth = bpp >> 3;
+ for (y = 0; y < passh[i]; y++)
+ for (x = 0; x < passw[i]; x++)
+ {
+ size_t pixelinstart = passstart[i] +
+ (y * passw[i] + x) * bytewidth;
+ size_t pixeloutstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w +
+ ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth;
+ for (b = 0; b < bytewidth; b++)
+ {
+ out[pixeloutstart + b] = in[pixelinstart + b];
+ }
+ }
+ }
+ }
+ else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/
+ {
+ for (i = 0; i < 7; i++)
+ {
+ uint16_t x, y, b;
+ uint32_t ilinebits = bpp * passw[i];
+ uint32_t olinebits = bpp * w;
+ size_t obp, ibp; /*bit pointers (for out and in buffer)*/
+ for (y = 0; y < passh[i]; y++)
+ for (x = 0; x < passw[i]; x++)
+ {
+ ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp);
+ obp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits +
+ (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp;
+ for (b = 0; b < bpp; b++)
+ {
+ uint8_t bit = readBitFromReversedStream(&ibp, in);
+ /* note that this function assumes the out buffer
+ * is completely 0, use setBitOfReversedStream
+ * otherwise*/
+ setBitOfReversedStream0(&obp, out, bit);
+ }
+ }
+ }
+ }
+}
+
+static void removePaddingBits(uint8_t* out,
+ const uint8_t* in,
+ size_t olinebits,
+ size_t ilinebits,
+ uint16_t h)
+{
+ /* After filtering there are still padding bits if scanlines have
+ * non multiple of 8 bit amounts. They need to be removed
+ * (except at last scanline of (Adam7-reduced) image) before working
+ * with pure image buffers for the Adam7 code, the color convert code
+ * and the output to the user.
+ *
+ * in and out are allowed to be the same buffer, in may also be higher
+ * but still overlapping; in must have >= ilinebits*h bits,
+ * out must have >= olinebits*h bits, olinebits must be <= ilinebits
+ * also used to move bits after earlier such operations happened, e.g.
+ * in a sequence of reduced images from Adam7
+ * only useful if (ilinebits - olinebits) is a value in the range 1..7
+ */
+ uint16_t y;
+ size_t diff = ilinebits - olinebits;
+ size_t obp = 0, ibp = 0; /*bit pointers*/
+ for (y = 0; y < h; y++)
+ {
+ size_t x;
+ for (x = 0; x < olinebits; x++)
+ {
+ uint8_t bit = readBitFromReversedStream(&ibp, in);
+ setBitOfReversedStream(&obp, out, bit);
+ }
+ ibp += diff;
+ }
+}
+
+/* out must be buffer big enough to contain full image,
+ * and in must contain the full decompressed data from the IDAT chunks
+ */
+static uint8_t postProcessScanlines(uint8_t* out,
+ uint8_t* in,
+ const LodePNG_Decoder* decoder)
+{
+ /*return value is error*/
+
+ /* This function converts the filtered-padded-interlaced data into pure 2D
+ * image buffer with the PNG's colortype.
+ * Steps:
+ * I) if no Adam7:
+ * 1) unfilter
+ * 2) remove padding bits (= posible extra bits per scanline if bpp < 8)
+ * II) if adam7:
+ * 1) 7x unfilter
+ * 2) 7x remove padding bits
+ * 3) Adam7_deinterlace
+ *
+ * NOTE: the in buffer will be overwritten with intermediate data!
+ */
+ uint8_t bpp = getBpp(decoder->infoPng.color.colorType,
+ decoder->infoPng.color.bitDepth);
+ uint16_t w = decoder->infoPng.width;
+ uint16_t h = decoder->infoPng.height;
+ uint8_t error = 0;
+
+ if (bpp == 0)
+ return 31; /*error: invalid colortype*/
+
+ if (decoder->infoPng.interlaceMethod == 0)
+ {
+ if (bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8)
+ {
+ error = unfilter(in, in, w, h, bpp);
+ if (error) return error;
+ removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h);
+ }
+ else
+ /* we can immediatly filter into the out buffer,
+ * no other steps needed
+ */
+ error = unfilter(out, in, w, h, bpp);
+ }
+ else /*interlaceMethod is 1 (Adam7)*/
+ {
+ uint16_t passw[7], passh[7];
+ size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ uint8_t i;
+
+ Adam7_getpassvalues(passw,
+ passh,
+ filter_passstart,
+ padded_passstart,
+ passstart,
+ w,
+ h,
+ bpp);
+
+ for (i = 0; i < 7; i++)
+ {
+ error = unfilter(&in[padded_passstart[i]],
+ &in[filter_passstart[i]],
+ passw[i],
+ passh[i],
+ bpp);
+ if (error)
+ return error;
+ if (bpp < 8)
+ /* TODO: possible efficiency improvement: if in this reduced
+ * image the bits fit nicely in 1 scanline, move bytes instead
+ * of bits or move not at all
+ */
+ {
+ /* remove padding bits in scanlines; after this there still
+ * may be padding bits between the different reduced images:
+ * each reduced image still starts nicely at a byte
+ */
+ removePaddingBits(&in[passstart[i]],
+ &in[padded_passstart[i]],
+ passw[i] * bpp,
+ ((passw[i] * bpp + 7) / 8) * 8,
+ passh[i]);
+ }
+ }
+
+ Adam7_deinterlace(out, in, w, h, bpp);
+ }
+
+ return error;
+}
+
+/* read a PNG, the result will be in the same color type as the PNG
+ * (hence "generic")
+ */
+static void decodeGeneric(LodePNG_Decoder* decoder)
+{
+ uint8_t *in = decoder->file;
+
+ uint8_t IEND = 0;
+ const uint8_t* chunk;
+ size_t i;
+
+ size_t chunkLength; /* chunk length */
+ const uint8_t* data; /*the data in the chunk*/
+
+ uint8_t *idat = decoder->buf; /* allocated buffer */
+
+ size_t idat_size = 0;
+
+ signed long free_mem = decoder->buf_size;
+
+ /* for unknown chunk order */
+ bool unknown = false;
+ uint8_t critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/
+
+ if (decoder->file_size == 0 || in == NULL)
+ {
+ /* the given data is empty */
+ decoder->error = 48;
+ return;
+ }
+
+ chunk = in + 33; /*first byte of the first chunk after the header*/
+
+ /* loop through the chunks, ignoring unknown chunks and stopping at IEND
+ * chunk. IDAT data is put at the start of the in buffer
+ */
+ while (!IEND) {
+
+ /* minimal size of chunk is 12 bytes */
+ if ((size_t)((chunk - in) + 12) > decoder->file_size || chunk < in)
+ {
+ /* error: size of the in buffer too small to contain next chunk */
+ decoder->error = 30;
+ break;
+ }
+
+ /* length of the data of the chunk, excluding the length bytes,
+ * chunk type and CRC bytes
+ *
+ * data field of the chunk is restricted to 2^31-1 bytes in size
+ */
+ chunkLength = LodePNG_chunk_length(chunk);
+
+ if (chunkLength > 2147483647)
+ {
+ decoder->error = 63;
+ break;
+ }
+
+ /* check if chunk fits in buffer */
+ if ((size_t)((chunk - in) + chunkLength + 12) > decoder->file_size ||
+ (chunk + chunkLength + 12) < in)
+ {
+ /* error: size of the in buffer too small to contain next chunk */
+ decoder->error = 35;
+ break;
+ }
+ data = LodePNG_chunk_data(chunk);
+
+ /* IDAT chunk, containing compressed image data
+ * there may be more than 1 IDAT chunk, complete
+ * compressed stream is concatenation of consecutive
+ * chunks data
+ */
+ if (LodePNG_chunk_type_equals(chunk, PNG_CHUNK_IDAT))
+ {
+ free_mem -= chunkLength;
+
+ if (free_mem < 0)
+ {
+ decoder->error = OUT_OF_MEMORY;
+ break;
+ }
+ /* copy compressed data */
+ memcpy(idat+idat_size, data, chunkLength * sizeof(uint8_t));
+ idat_size += chunkLength;
+ critical_pos = 3;
+ }
+ /*IEND chunk*/
+ else if (LodePNG_chunk_type_equals(chunk, PNG_CHUNK_IEND))
+ {
+ IEND = 1;
+ }
+ /*palette chunk (PLTE)*/
+ else if (LodePNG_chunk_type_equals(chunk, PNG_CHUNK_PLTE))
+ {
+ uint32_t pos = 0;
+ decoder->infoPng.color.palettesize = chunkLength / 3;
+ if (decoder->infoPng.color.palettesize > 256)
+ {
+ /*error: palette too big*/
+ decoder->error = 38;
+ break;
+ }
+
+ for (i = 0; i < decoder->infoPng.color.palettesize; i++)
+ {
+ decoder->infoPng.color.palette[(i<<2)] = data[pos++]; /*R*/
+ decoder->infoPng.color.palette[(i<<2) | 1] = data[pos++]; /*G*/
+ decoder->infoPng.color.palette[(i<<2) | 2] = data[pos++]; /*B*/
+ decoder->infoPng.color.palette[(i<<2) | 3] = 255; /*alpha*/
+ }
+ critical_pos = 2;
+ }
+ /*palette transparency chunk (tRNS)*/
+ else if (LodePNG_chunk_type_equals(chunk, PNG_CHUNK_tRNS))
+ {
+ if (decoder->infoPng.color.colorType == PNG_COLORTYPE_PALETTE)
+ {
+ if (chunkLength > decoder->infoPng.color.palettesize)
+ {
+ /* error: more alpha values given than there are palette
+ * entries
+ */
+ decoder->error = 39;
+ break;
+ }
+ for (i = 0; i < chunkLength; i++)
+ /* copy alpha informations for palette colors */
+ decoder->infoPng.color.palette[(i<<2) | 3] = data[i];
+ }
+ else if (decoder->infoPng.color.colorType == PNG_COLORTYPE_GREY)
+ {
+ if (chunkLength != 2)
+ {
+ /* error: this chunk must be 2 bytes for greyscale image */
+ decoder->error = 40;
+ break;
+ }
+ /* transparent color definition */
+ decoder->infoPng.color.key_defined = 1;
+ decoder->infoPng.color.key_r =
+ decoder->infoPng.color.key_g =
+ decoder->infoPng.color.key_b = data[0]<<8|data[1];
+ }
+ else if (decoder->infoPng.color.colorType == PNG_COLORTYPE_RGB)
+ {
+ if (chunkLength != 6)
+ {
+ /* error: this chunk must be 6 bytes for RGB image */
+ decoder->error = 41;
+ break;
+ }
+ /* transparent color definition */
+ decoder->infoPng.color.key_defined = 1;
+ decoder->infoPng.color.key_r = data[0]<<8|data[1];
+ decoder->infoPng.color.key_g = data[2]<<8|data[3];
+ decoder->infoPng.color.key_b = data[4]<<8|data[5];
+ }
+ else
+ {
+ /* error: tRNS chunk not allowed for other color models */
+ decoder->error = 42;
+ break;
+ }
+ }
+ /*background color chunk (bKGD)*/
+ else if (LodePNG_chunk_type_equals(chunk, PNG_CHUNK_bKGD))
+ {
+ if (decoder->infoPng.color.colorType == PNG_COLORTYPE_PALETTE)
+ {
+ if (chunkLength != 1)
+ {
+ /* error: this chunk must be 1 byte for indexed color image */
+ decoder->error = 43;
+ break;
+ }
+ decoder->infoPng.background_r =
+ decoder->infoPng.color.palette[(data[0]<<2)];
+
+ decoder->infoPng.background_g =
+ decoder->infoPng.color.palette[(data[0]<<2) | 1];
+
+ decoder->infoPng.background_b =
+ decoder->infoPng.color.palette[(data[0]<<2) | 2];
+
+ }
+ else if (decoder->infoPng.color.colorType == PNG_COLORTYPE_GREY ||
+ decoder->infoPng.color.colorType == PNG_COLORTYPE_GREYA)
+ {
+ if (chunkLength != 2)
+ {
+ /* error: this chunk must be 2 bytes for greyscale image */
+ decoder->error = 44;
+ break;
+ }
+ decoder->infoPng.background_r =
+ decoder->infoPng.background_g =
+ decoder->infoPng.background_b = data[0];
+ }
+ else if (decoder->infoPng.color.colorType == PNG_COLORTYPE_RGB ||
+ decoder->infoPng.color.colorType == PNG_COLORTYPE_RGBA)
+ {
+ if (chunkLength != 6)
+ {
+ /* error: this chunk must be 6 bytes for greyscale image */
+ decoder->error = 45;
+ break;
+ }
+ decoder->infoPng.background_r = data[0];
+ decoder->infoPng.background_g = data[2];
+ decoder->infoPng.background_b = data[4];
+ }
+ }
+ else
+ {
+ /* it's not an implemented chunk type,
+ * so ignore it (unless it is critical)
+ * skip over the data
+ */
+ if (LodePNG_chunk_critical(chunk))
+ {
+ /* error: unknown critical chunk
+ * (5th bit of first byte of chunk type is 0)
+ */
+ decoder->error = 69;
+ break;
+ }
+ unknown = true;
+ }
+
+ if (!unknown) /*check CRC if wanted, only on known chunk types*/
+ {
+ if (!LodePNG_chunk_check_crc(chunk))
+ {
+ decoder->error = 57;
+ break;
+ }
+ }
+
+ if (!IEND)
+ chunk = LodePNG_chunk_next(chunk);
+ }
+
+ if (!decoder->error)
+ {
+ /* ptr to buffer just after concatenated IDATs */
+ uint8_t *scanlines = idat + idat_size;
+ size_t scanline_size = free_mem;
+
+ /* decompress with the Zlib decompressor
+ * decompressor updates scanlines_size to actual size
+ * of decompressed data
+ */
+ decoder->error = LodePNG_decompress(scanlines,
+ &scanline_size,
+ idat,
+ idat_size);
+
+ free_mem -= scanline_size;
+ /* possible memory saving (at cost of memcpy)
+ * memcpy(decoder->buf - scanlines_size,
+ * scanlines,
+ * scanlines_size * sizeof(uint8_t));
+ * this will free compressed IDATs and
+ * will trash raw PNG file (it is trashed anyway
+ */
+ if (!decoder->error)
+ {
+ /* size of decoded image in bytes rounded up */
+ size_t decoded_img_size = (decoder->infoPng.height *
+ decoder->infoPng.width *
+ getBpp(decoder->infoPng.color.colorType,
+ decoder->infoPng.color.bitDepth) +
+ 7) / 8;
+
+ /* at this time buffer contains:
+ * compressed IDATs
+ * decompressed IDATs
+ * png raw file at the end of the buffer (not needed any more )
+ */
+ free_mem -= decoded_img_size;
+
+ if (free_mem < 0)
+ {
+ decoder->error = OUT_OF_MEMORY;
+ return;
+ }
+
+ /* ptr to decoded png image
+ * this will overwrite raw png file loaded into memory
+ * decoded image is put in the end of allocated buffer
+ */
+ decoder->decoded_img = decoder->buf +
+ decoder->buf_size -
+ decoded_img_size;
+
+ /* clear memory as filters assume 0'ed memory */
+ memset(decoder->decoded_img,0,decoded_img_size*sizeof(uint8_t));
+
+ decoder->error = postProcessScanlines(decoder->decoded_img,
+ scanlines,
+ decoder);
+ }
+ }
+}
+
+/* Public functions */
+
+/* read the information from the header and store it in the decoder
+ * context struct
+ * value is error
+ */
+void LodePNG_inspect(LodePNG_Decoder* decoder, uint8_t *in, size_t inlength)
+{
+ uint32_t header_crc, checksum;
+ if (inlength == 0 || in == NULL)
+ {
+ /* the given data is empty */
+ decoder->error = 48;
+ return;
+ }
+
+ if (inlength < 29)
+ {
+ /*error: the data length is smaller than the length of the header*/
+ decoder->error = 27;
+ return;
+ }
+
+ /* when decoding a new PNG image, make sure all parameters created after
+ * previous decoding are reset
+ */
+ LodePNG_InfoPng_cleanup(&decoder->infoPng);
+ LodePNG_InfoPng_init(&decoder->infoPng);
+ decoder->error = 0;
+
+ decoder->file = in;
+ decoder->file_size = inlength;
+
+ if (in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 ||
+ in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10)
+ {
+ /* error: the first 8 bytes are not the correct PNG signature */
+ decoder->error = 28;
+ return;
+ }
+
+ if (in[12] != 'I' || in[13] != 'H' || in[14] != 'D' || in[15] != 'R')
+ {
+ /* error: it doesn't start with a IHDR chunk! */
+ decoder->error = 29;
+ return;
+ }
+
+ /* read the values given in the header */
+ decoder->infoPng.width = in[16]<<24|in[17]<<16|in[18]<<8|in[19];
+ decoder->infoPng.height = in[20]<<24|in[21]<<16|in[22]<<8|in[23];
+ decoder->infoPng.color.bitDepth = in[24];
+ decoder->infoPng.color.colorType = in[25];
+ decoder->infoPng.compressionMethod = in[26];
+ decoder->infoPng.filterMethod = in[27];
+ decoder->infoPng.interlaceMethod = in[28];
+
+ /* get the value from the chunk's crc field */
+ header_crc = in[29]<<24|in[30]<<16|in[31]<<8|in[32];
+
+ /* calculate crc of the header chunk */
+ checksum = tinf_crc32(in + 12, 17);
+
+ if (header_crc != checksum)
+ {
+ decoder->error = 57;
+ return;
+ }
+
+ if (decoder->infoPng.compressionMethod != 0)
+ {
+ /* error: only compression method 0 is allowed in the specification */
+ decoder->error = 32;
+ return;
+ }
+
+ if (decoder->infoPng.filterMethod != 0)
+ {
+ /* error: only filter method 0 is allowed in the specification */
+ decoder->error = 33;
+ return;
+ }
+
+ if (decoder->infoPng.interlaceMethod > 1)
+ {
+ /* error: only interlace methods 0 and 1 exist in the specification */
+ decoder->error = 34;
+ return;
+ }
+
+ /* check validity of colortype and bitdepth combination */
+ decoder->error = checkColorValidity(decoder->infoPng.color.colorType,
+ decoder->infoPng.color.bitDepth);
+}
+
+void LodePNG_decode(LodePNG_Decoder* decoder,
+ uint8_t* in,
+ size_t insize,
+ void (*pf_progress)(int current, int total))
+{
+ size_t line_buf_size;
+ /* parse header */
+ LodePNG_inspect(decoder, in, insize);
+
+
+ /* Check memory available against worst case where
+ * we have to have decoded PNG image
+ * and converted to the native pixel format image
+ * in buffer at the same time (do we realy need that much?)
+ */
+
+ size_t decoded_img_size = (decoder->infoPng.height *
+ decoder->infoPng.width *
+ getBpp(decoder->infoPng.color.colorType,
+ decoder->infoPng.color.bitDepth) +
+ 7) / 8;
+
+ /* one line more as temp buffer for conversion */
+#ifdef HAVE_LCD_COLOR
+ decoder->native_img_size = decoder->infoPng.width *
+ (decoder->infoPng.height)*FB_DATA_SZ;
+ line_buf_size = decoder->infoPng.width * sizeof(struct uint8_rgb);
+#else
+ decoder->native_img_size = decoder->infoPng.width *
+ decoder->infoPng.height;
+ line_buf_size = decoder->infoPng.width;
+#endif
+
+ if (decoded_img_size + decoder->native_img_size + line_buf_size
+ > decoder->buf_size)
+ {
+ decoder->error = OUT_OF_MEMORY;
+ return;
+ }
+
+ if (pf_progress != NULL)
+ pf_progress(0, 100);
+
+ long time = *rb->current_tick;
+ /* put decoded png data (pure 2D array of pixels in format
+ * defined by PNG header at the end of the allocated buffer
+ */
+ decodeGeneric(decoder);
+ if (decoder->error) return;
+
+ if (pf_progress != NULL)
+ pf_progress(50, 100);
+
+ /* convert decoded png data into native rockbox
+ * pixel format (native LCD data for color
+ * or greylib pixel format for greyscale)
+ *
+ * converted image will be put at the begining
+ * of the allocated buffer
+ */
+ LodePNG_convert(decoder);
+
+ /* correct aspect ratio */
+#if (LCD_PIXEL_ASPECT_HEIGHT != 1 || LCD_PIXEL_ASPECT_WIDTH != 1)
+ struct bitmap img_src, img_dst; /* scaler vars */
+ struct dim dim_src, dim_dst; /* recalc_dimensions vars */
+ unsigned int c_native_img_size; /* size of the image after correction */
+
+ dim_src.width = decoder->infoPng.width;
+ dim_src.height = decoder->infoPng.height;
+
+ dim_dst.width = decoder->infoPng.width;
+ dim_dst.height = decoder->infoPng.height;
+
+ /* defined in apps/recorder/resize.c */
+ if (!recalc_dimension(&dim_dst, &dim_src))
+ {
+ /* calculate 'corrected' image size */
+#ifdef HAVE_LCD_COLOR
+ c_native_img_size = dim_dst.width *
+ (dim_dst.height)*FB_DATA_SZ;
+#else
+ c_native_img_size = dim_dst.width *
+ dim_dst.height;
+#endif
+ /* check memory constraints
+ * do the correction only if there is enough
+ * free memory
+ */
+ if ( decoder->native_img_size + c_native_img_size <=
+ decoder->buf_size )
+ {
+ img_src.width = dim_src.width;
+ img_src.height = dim_src.height;
+ img_src.data = (unsigned char *)decoder->buf;
+
+ img_dst.width = dim_dst.width;
+ img_dst.height = dim_dst.height;
+ img_dst.data = (unsigned char *)decoder->buf +
+ decoder->native_img_size;
+
+ /* scale the bitmap to correct physical
+ * pixel dimentions
+ */
+ resize_bitmap(&img_src, &img_dst);
+
+ /* update decoder struct */
+ decoder->infoPng.width = img_dst.width;
+ decoder->infoPng.height = img_dst.height;
+ decoder->native_img_size = c_native_img_size;
+
+ /* copy back corrected image to the begining of the buffer */
+ memcpy(img_src.data, img_dst.data, decoder->native_img_size);
+ }
+ }
+
+#endif /* (LCD_PIXEL_ASPECT_HEIGHT != 1 || LCD_PIXEL_ASPECT_WIDTH != 1) */
+time = *rb->current_tick - time;
+if (pf_progress) pf_progress(100, 100);
+}
+
+void LodePNG_Decoder_init(LodePNG_Decoder* decoder,
+ uint8_t *buf,
+ size_t buf_size)
+{
+ LodePNG_InfoPng_init(&decoder->infoPng);
+ decoder->error = 0;
+ decoder->buf = buf;
+ decoder->buf_size = buf_size;
+ decoder->decoded_img = NULL;
+ decoder->file = NULL;
+ decoder->file_size = 0;
+}
+
+const char* LodePNG_perror(LodePNG_Decoder *decoder)
+{
+ return png_error_messages[decoder->error-PNG_ERROR_MIN];
+}
diff --git a/apps/plugins/imageviewer/png/png_decoder.h b/apps/plugins/imageviewer/png/png_decoder.h
new file mode 100644
index 0000000000..4ca2a51277
--- /dev/null
+++ b/apps/plugins/imageviewer/png/png_decoder.h
@@ -0,0 +1,141 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$id $
+ *
+ * Copyright (C) 2009 by Christophe Gouiran <bechris13250 -at- gmail -dot- com>
+ *
+ * Based on lodepng, a lightweight png decoder/encoder
+ * (c) 2005-2008 Lode Vandevenne
+ *
+ * Copyright (c) 2010 Marcin Bukat
+ * - pixel format conversion & transparency handling
+ * - adaptation of tinf (tiny inflate library)
+ * - code refactoring & cleanups
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#define OUT_OF_MEMORY 9900
+#define FILE_TOO_LARGE 9910
+
+/* PNG chunk types signatures */
+/* critical chunks */
+#define PNG_CHUNK_IHDR 0x49484452
+#define PNG_CHUNK_PLTE 0x504c5445
+#define PNG_CHUNK_IDAT 0x49444154
+#define PNG_CHUNK_IEND 0x49454e44
+
+/* ancillary chunks */
+#define PNG_CHUNK_bKGD 0x624b4744
+#define PNG_CHUNK_cHRM 0x6348524d
+#define PNG_CHUNK_gAMA 0x67414d41
+#define PNG_CHUNK_hIST 0x68495354
+#define PNG_CHUNK_iCCP 0x69434350
+#define PNG_CHUNK_pHYs 0x70485973
+#define PNG_CHUNK_sBIT 0x73424954
+#define PNG_CHUNK_sPLT 0x73504c54
+#define PNG_CHUNK_sRGB 0x73524742
+#define PNG_CHUNK_tEXt 0x74455874
+#define PNG_CHUNK_tIME 0x74494d45
+#define PNG_CHUNK_tRNS 0x74524e53
+#define PNG_CHUNK_zTXt 0x7a545874
+
+/* PNG color types */
+#define PNG_COLORTYPE_GREY 0
+#define PNG_COLORTYPE_RGB 2
+#define PNG_COLORTYPE_PALETTE 3
+#define PNG_COLORTYPE_GREYA 4
+#define PNG_COLORTYPE_RGBA 6
+
+/* PNG filter types */
+#define PNG_FILTERTYPE_NONE 0
+#define PNG_FILTERTYPE_SUB 1
+#define PNG_FILTERTYPE_UP 2
+#define PNG_FILTERTYPE_AVERAGE 3
+#define PNG_FILTERTYPE_PAETH 4
+
+#define PNG_ERROR_MIN 27
+#define PNG_ERROR_MAX 74
+
+/* Typedefs */
+typedef struct LodePNG_InfoColor /*info about the color type of an image*/
+{
+ /*header (IHDR)*/
+ unsigned colorType; /*color type*/
+ unsigned bitDepth; /*bits per sample*/
+
+ /*palette (PLTE)*/
+ unsigned char palette[256 * 4]; /*palette in RGBARGBA... order*/
+ size_t palettesize; /* palette size in number of colors
+ * (amount of bytes is 4 * palettesize)
+ */
+
+ /*transparent color key (tRNS)*/
+ unsigned key_defined; /*is a transparent color key given?*/
+ unsigned key_r; /*red component of color key*/
+ unsigned key_g; /*green component of color key*/
+ unsigned key_b; /*blue component of color key*/
+} LodePNG_InfoColor;
+
+typedef struct LodePNG_InfoPng /*information about the PNG image, except pixels and sometimes except width and height*/
+{
+ /*header (IHDR), palette (PLTE) and transparency (tRNS)*/
+ unsigned width; /*width of the image in pixels - filled in by decoder)*/
+ unsigned height; /*height of the image in pixels - filled in by decoder)*/
+ unsigned compressionMethod; /*compression method of the original file*/
+ unsigned filterMethod; /*filter method of the original file*/
+ unsigned interlaceMethod; /*interlace method of the original file*/
+ LodePNG_InfoColor color; /*color type and bits, palette, transparency*/
+
+ /*suggested background color (bKGD)*/
+ unsigned background_r; /*red component of suggested background color*/
+ unsigned background_g; /*green component of suggested background color*/
+ unsigned background_b; /*blue component of suggested background color*/
+
+} LodePNG_InfoPng;
+
+typedef struct LodePNG_Decoder
+{
+ unsigned char *buf; /* pointer to the buffer allocated for decoder
+ * filled by LodePNG_Decoder_init()
+ */
+ size_t buf_size; /* size of the buffer decoder is free to use
+ * filled by LodePNG_Decoder_init()
+ */
+ unsigned char *file; /* ptr to raw png file loaded */
+ size_t file_size; /* size of the raw png file in mem */
+ unsigned char *decoded_img; /* ptr to decoded PNG image in PNG pixel
+ * format. set by decodeGeneric()
+ */
+ unsigned int native_img_size; /* size of the image in native pixel
+ * format
+ */
+ LodePNG_InfoPng infoPng; /*info of the PNG image obtained after decoding*/
+ long error;
+} LodePNG_Decoder;
+
+/* Public functions prototypes */
+void LodePNG_Decoder_init(LodePNG_Decoder* decoder,
+ uint8_t *buf,
+ size_t buf_size);
+
+void LodePNG_decode(LodePNG_Decoder* decoder,
+ uint8_t* in,
+ size_t insize,
+ void (*pf_progress)(int current, int total));
+
+void LodePNG_inspect(LodePNG_Decoder* decoder, uint8_t *in, size_t inlength);
+
+const char* LodePNG_perror(LodePNG_Decoder *decoder);
diff --git a/apps/plugins/imageviewer/png/tinf.h b/apps/plugins/imageviewer/png/tinf.h
new file mode 100644
index 0000000000..645bdb7d5a
--- /dev/null
+++ b/apps/plugins/imageviewer/png/tinf.h
@@ -0,0 +1,77 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Original source:
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ *
+ * Rockbox adaptation:
+ * Copyright (c) 2010 by Marcin Bukat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ * tinf - tiny inflate library (inflate, gzip, zlib)
+ *
+ * version 1.00
+ *
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ * All Rights Reserved
+ *
+ * http://www.ibsensoftware.com/
+ */
+
+/* removed from original file:
+ * tinf_gzip_uncompress() prototype
+ * tinf_init() prototype
+ */
+
+#ifndef TINF_H_INCLUDED
+#define TINF_H_INCLUDED
+
+/* calling convention */
+#ifndef TINFCC
+ #ifdef __WATCOMC__
+ #define TINFCC __cdecl
+ #else
+ #define TINFCC
+ #endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TINF_OK 0
+#define TINF_DATA_ERROR (-3)
+
+/* function prototypes */
+
+int TINFCC tinf_uncompress(void *dest, unsigned int *destLen,
+ const void *source, unsigned int sourceLen);
+
+int TINFCC tinf_zlib_uncompress(void *dest, unsigned int *destLen,
+ const void *source, unsigned int sourceLen);
+
+unsigned int TINFCC tinf_adler32(const void *data, unsigned int length);
+
+unsigned int TINFCC tinf_crc32(const void *data, unsigned int length);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* TINF_H_INCLUDED */
diff --git a/apps/plugins/imageviewer/png/tinflate.c b/apps/plugins/imageviewer/png/tinflate.c
new file mode 100644
index 0000000000..b142f7afe7
--- /dev/null
+++ b/apps/plugins/imageviewer/png/tinflate.c
@@ -0,0 +1,503 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Original source:
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ *
+ * Rockbox adaptation:
+ * Copyright (c) 2010 by Marcin Bukat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ * tinflate - tiny inflate
+ *
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ * All Rights Reserved
+ *
+ * http://www.ibsensoftware.com/
+ *
+ * This software is provided 'as-is', without any express
+ * or implied warranty. In no event will the authors be
+ * held liable for any damages arising from the use of
+ * this software.
+ *
+ * Permission is granted to anyone to use this software
+ * for any purpose, including commercial applications,
+ * and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The origin of this software must not be
+ * misrepresented; you must not claim that you
+ * wrote the original software. If you use this
+ * software in a product, an acknowledgment in
+ * the product documentation would be appreciated
+ * but is not required.
+ *
+ * 2. Altered source versions must be plainly marked
+ * as such, and must not be misrepresented as
+ * being the original software.
+ *
+ * 3. This notice may not be removed or altered from
+ * any source distribution.
+ */
+
+#include "tinf.h"
+#include <string.h> /* memcpy */
+
+/* ------------------------------ *
+ * -- internal data structures -- *
+ * ------------------------------ */
+
+typedef struct {
+ unsigned short table[16]; /* table of code length counts */
+ unsigned short trans[288]; /* code -> symbol translation table */
+} TINF_TREE;
+
+typedef struct {
+ unsigned short table[16];
+ unsigned short trans[32];
+} TINF_SDTREE;
+
+typedef struct {
+ TINF_TREE sltree;
+ TINF_TREE sdtree;
+ unsigned char length_bits[30];
+ unsigned short length_base[30];
+ unsigned char dist_bits[30];
+ unsigned short dist_base[30];
+ unsigned char clcidx[19];
+} TINF_TABLES;
+
+typedef struct {
+ const unsigned char *source;
+ unsigned int tag;
+ unsigned int bitcount;
+
+ unsigned char *dest;
+ unsigned int *destLen;
+
+ TINF_TREE ltree; /* dynamic length/symbol tree */
+ TINF_TREE dtree; /* dynamic distance tree */
+} TINF_DATA;
+
+/* static tables */
+TINF_TABLES tbl = {
+ .sltree = {
+ .table = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0018,
+ 0x0098, 0x0070, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
+
+ .trans = {0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107,
+ 0x0108, 0x0109, 0x010a, 0x010b, 0x010c, 0x010d, 0x010e, 0x010f,
+ 0x0110, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117,
+ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
+ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
+ 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
+ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
+ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
+ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
+ 0x0118, 0x0119, 0x011a, 0x011b, 0x011c, 0x011d, 0x011e, 0x011f,
+ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
+ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
+ 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
+ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
+ 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
+ 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
+ 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
+ 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
+ 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
+ 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
+ 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+ 0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
+ 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff},
+ },
+
+ .sdtree = {
+ .table = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
+
+ .trans = {0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f},
+ },
+
+ .length_bits = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+ 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04,
+ 0x05, 0x05, 0x05, 0x05, 0x00, 0x06},
+
+ .length_base = {0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a,
+ 0x000b, 0x000d, 0x000f, 0x0011, 0x0013, 0x0017, 0x001b, 0x001f,
+ 0x0023, 0x002b, 0x0033, 0x003b, 0x0043, 0x0053, 0x0063, 0x0073,
+ 0x0083, 0x00a3, 0x00c3, 0x00e3, 0x0102, 0x0143},
+
+ .dist_bits = {0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+ 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06,
+ 0x07, 0x07, 0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a,
+ 0x0b, 0x0b, 0x0c, 0x0c, 0x0d, 0x0d},
+
+ .dist_base = {0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007, 0x0009, 0x000d,
+ 0x0011, 0x0019, 0x0021, 0x0031, 0x0041, 0x0061, 0x0081, 0x00c1,
+ 0x0101, 0x0181, 0x0201, 0x0301, 0x0401, 0x0601, 0x0801, 0x0c01,
+ 0x1001, 0x1801, 0x2001, 0x3001, 0x4001, 0x6001},
+
+ .clcidx = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15},
+};
+
+
+/* ----------------------- *
+ * -- utility functions -- *
+ * ----------------------- */
+
+/* given an array of code lengths, build a tree */
+static void tinf_build_tree(TINF_TREE *t, const unsigned char *lengths, unsigned int num)
+{
+ unsigned short offs[16];
+ unsigned int i, sum;
+
+ /* clear code length count table */
+ /* for (i = 0; i < 16; ++i) t->table[i] = 0; */
+ memset(t->table, 0, sizeof(short)*16);
+
+ /* scan symbol lengths, and sum code length counts */
+ for (i = 0; i < num; ++i) t->table[lengths[i]]++;
+
+ t->table[0] = 0;
+
+ /* compute offset table for distribution sort */
+ for (sum = 0, i = 0; i < 16; ++i)
+ {
+ offs[i] = sum;
+ sum += t->table[i];
+ }
+
+ /* create code->symbol translation table (symbols sorted by code) */
+ for (i = 0; i < num; ++i)
+ {
+ if (lengths[i]) t->trans[offs[lengths[i]]++] = i;
+ }
+}
+
+/* ---------------------- *
+ * -- decode functions -- *
+ * ---------------------- */
+
+/* get one bit from source stream */
+static int tinf_getbit(TINF_DATA *d)
+{
+ unsigned int bit;
+
+ /* check if tag is empty */
+ if (!d->bitcount--)
+ {
+ /* load next tag */
+ d->tag = *d->source++;
+ d->bitcount = 7;
+ }
+
+ /* shift bit out of tag */
+ bit = d->tag & 0x01;
+ d->tag >>= 1;
+
+ return bit;
+}
+
+/* read a num bit value from a stream and add base */
+static unsigned int tinf_read_bits(TINF_DATA *d, int num, int base)
+{
+ unsigned int val = 0;
+
+ /* read num bits */
+ if (num)
+ {
+ unsigned int limit = 1 << (num);
+ unsigned int mask;
+
+ for (mask = 1; mask < limit; mask <<= 1)
+ if (tinf_getbit(d)) val += mask;
+ }
+
+ return val + base;
+}
+
+/* given a data stream and a tree, decode a symbol */
+static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
+{
+ int sum = 0, cur = 0, len = 0;
+
+ /* get more bits while code value is above sum */
+ do {
+
+ cur = (cur << 1) + tinf_getbit(d);
+
+ ++len;
+
+ sum += t->table[len];
+ cur -= t->table[len];
+
+ } while (cur >= 0);
+
+ return t->trans[sum + cur];
+}
+
+/* given a data stream, decode dynamic trees from it */
+static void tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt, TINF_TABLES *tbl)
+{
+ TINF_TREE code_tree;
+ unsigned char lengths[288+32];
+ unsigned int hlit, hdist, hclen;
+ unsigned int i, num, length;
+
+ /* get 5 bits HLIT (257-286) */
+ hlit = tinf_read_bits(d, 5, 257);
+
+ /* get 5 bits HDIST (1-32) */
+ hdist = tinf_read_bits(d, 5, 1);
+
+ /* get 4 bits HCLEN (4-19) */
+ hclen = tinf_read_bits(d, 4, 4);
+
+ /* for (i = 0; i < 19; ++i) lengths[i] = 0; */
+ memset(lengths, 0, sizeof(unsigned char)*19);
+
+ /* read code lengths for code length alphabet */
+ for (i = 0; i < hclen; ++i)
+ {
+ /* get 3 bits code length (0-7) */
+ unsigned int clen = tinf_read_bits(d, 3, 0);
+
+ lengths[tbl->clcidx[i]] = clen;
+ }
+
+ /* build code length tree */
+ tinf_build_tree(&code_tree, lengths, 19);
+
+ /* decode code lengths for the dynamic trees */
+ for (num = 0; num < hlit + hdist; )
+ {
+ int sym = tinf_decode_symbol(d, &code_tree);
+
+ switch (sym)
+ {
+ case 16:
+ /* copy previous code length 3-6 times (read 2 bits) */
+ {
+ unsigned char prev = lengths[num - 1];
+ for (length = tinf_read_bits(d, 2, 3); length; --length)
+ {
+ lengths[num++] = prev;
+ }
+ }
+ break;
+ case 17:
+ /* repeat code length 0 for 3-10 times (read 3 bits) */
+ for (length = tinf_read_bits(d, 3, 3); length; --length)
+ {
+ lengths[num++] = 0;
+ }
+ break;
+ case 18:
+ /* repeat code length 0 for 11-138 times (read 7 bits) */
+ for (length = tinf_read_bits(d, 7, 11); length; --length)
+ {
+ lengths[num++] = 0;
+ }
+ break;
+ default:
+ /* values 0-15 represent the actual code lengths */
+ lengths[num++] = sym;
+ break;
+ }
+ }
+
+ /* build dynamic trees */
+ tinf_build_tree(lt, lengths, hlit);
+ tinf_build_tree(dt, lengths + hlit, hdist);
+}
+
+/* ----------------------------- *
+ * -- block inflate functions -- *
+ * ----------------------------- */
+
+/* given a stream and two trees, inflate a block of data */
+static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt, TINF_TABLES *tbl)
+{
+ /* remember current output position */
+ unsigned char *start = d->dest;
+
+ while (1)
+ {
+ int sym = tinf_decode_symbol(d, lt);
+
+ /* check for end of block */
+ if (sym == 256)
+ {
+ *d->destLen += d->dest - start;
+ return TINF_OK;
+ }
+
+ if (sym < 256)
+ {
+ *d->dest++ = sym;
+
+ } else {
+
+ int length, dist, offs;
+ int i;
+
+ sym -= 257;
+
+ /* possibly get more bits from length code */
+ length = tinf_read_bits(d, tbl->length_bits[sym], tbl->length_base[sym]);
+
+ dist = tinf_decode_symbol(d, dt);
+
+ /* possibly get more bits from distance code */
+ offs = tinf_read_bits(d, tbl->dist_bits[dist], tbl->dist_base[dist]);
+
+ /* copy match */
+ for (i = 0; i < length; ++i)
+ {
+ d->dest[i] = d->dest[i - offs];
+ }
+
+ d->dest += length;
+ }
+ }
+}
+
+/* inflate an uncompressed block of data */
+static int tinf_inflate_uncompressed_block(TINF_DATA *d)
+{
+ unsigned int length, invlength;
+ /* unsigned int i; */
+
+ /* get length */
+ length = d->source[1];
+ length = (length << 8) + d->source[0];
+
+ /* get one's complement of length */
+ invlength = d->source[3];
+ invlength = (invlength << 8) + d->source[2];
+
+ /* check length */
+ if (length != (~invlength & 0x0000ffff)) return TINF_DATA_ERROR;
+
+ d->source += 4;
+
+ /* copy block */
+ /* for (i = length; i; --i) *d->dest++ = *d->source++; */
+ memcpy(d->dest, d->source, sizeof(unsigned char)*length);
+ d->dest += sizeof(unsigned char)*length;
+ d->source += sizeof(unsigned char)*length;
+
+ /* make sure we start next block on a byte boundary */
+ d->bitcount = 0;
+
+ *d->destLen += length;
+
+ return TINF_OK;
+}
+
+/* inflate a block of data compressed with fixed huffman trees */
+static int tinf_inflate_fixed_block(TINF_DATA *d, TINF_TABLES *tbl)
+{
+ /* decode block using fixed trees */
+ return tinf_inflate_block_data(d, &tbl->sltree, &tbl->sdtree, tbl);
+}
+
+/* inflate a block of data compressed with dynamic huffman trees */
+static int tinf_inflate_dynamic_block(TINF_DATA *d, TINF_TABLES *tbl)
+{
+ /* decode trees from stream */
+ tinf_decode_trees(d, &d->ltree, &d->dtree, tbl);
+
+ /* decode block using decoded trees */
+ return tinf_inflate_block_data(d, &d->ltree, &d->dtree, tbl);
+}
+
+/* ---------------------- *
+ * -- public functions -- *
+ * ---------------------- */
+
+/* inflate stream from source to dest */
+int tinf_uncompress(void *dest, unsigned int *destLen,
+ const void *source, unsigned int sourceLen)
+{
+ TINF_DATA d;
+ int bfinal;
+
+ d.source = (const unsigned char *)source;
+ d.bitcount = 0;
+
+ d.dest = (unsigned char *)dest;
+ d.destLen = destLen;
+
+ *destLen = 0;
+
+ do {
+
+ unsigned int btype;
+ int res;
+
+ /* read final block flag */
+ bfinal = tinf_getbit(&d);
+
+ /* read block type (2 bits) */
+ btype = tinf_read_bits(&d, 2, 0);
+
+ /* decompress block */
+ switch (btype)
+ {
+ case 0:
+ /* decompress uncompressed block */
+ res = tinf_inflate_uncompressed_block(&d);
+ break;
+ case 1:
+ /* decompress block with fixed huffman trees */
+ res = tinf_inflate_fixed_block(&d,&tbl);
+ break;
+ case 2:
+ /* decompress block with dynamic huffman trees */
+ res = tinf_inflate_dynamic_block(&d,&tbl);
+ break;
+ default:
+ return TINF_DATA_ERROR;
+ }
+
+ if (res != TINF_OK) return TINF_DATA_ERROR;
+
+ if (d.source > (unsigned char *)source + sourceLen)
+ return TINF_DATA_ERROR;
+ } while (!bfinal);
+
+ return TINF_OK;
+}
diff --git a/apps/plugins/imageviewer/png/tinfzlib.c b/apps/plugins/imageviewer/png/tinfzlib.c
new file mode 100644
index 0000000000..711b6cf2e9
--- /dev/null
+++ b/apps/plugins/imageviewer/png/tinfzlib.c
@@ -0,0 +1,100 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Original source:
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ *
+ * Rockbox adaptation:
+ * Copyright (c) 2010 by Marcin Bukat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ * tinfzlib - tiny zlib decompressor
+ *
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ * All Rights Reserved
+ *
+ * http://www.ibsensoftware.com/
+ *
+ * This software is provided 'as-is', without any express
+ * or implied warranty. In no event will the authors be
+ * held liable for any damages arising from the use of
+ * this software.
+ *
+ * Permission is granted to anyone to use this software
+ * for any purpose, including commercial applications,
+ * and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The origin of this software must not be
+ * misrepresented; you must not claim that you
+ * wrote the original software. If you use this
+ * software in a product, an acknowledgment in
+ * the product documentation would be appreciated
+ * but is not required.
+ *
+ * 2. Altered source versions must be plainly marked
+ * as such, and must not be misrepresented as
+ * being the original software.
+ *
+ * 3. This notice may not be removed or altered from
+ * any source distribution.
+ */
+
+#include "tinf.h"
+
+/* This routine do not check adler32 checksum
+ * as it is tailored to be used as PNG decompressor
+ * and PNG has crc32 check of the compressed block
+ * already
+ */
+int tinf_zlib_uncompress(void *dest, unsigned int *destLen,
+ const void *source, unsigned int sourceLen)
+{
+ unsigned char *src = (unsigned char *)source;
+ unsigned char *dst = (unsigned char *)dest;
+ int res;
+ unsigned char cmf, flg;
+
+ /* -- get header bytes -- */
+
+ cmf = src[0];
+ flg = src[1];
+
+ /* -- check format -- */
+
+ /* check checksum */
+ if (((cmf << 8) + flg) % 31) return TINF_DATA_ERROR;
+
+ /* check method is deflate */
+ if ((cmf & 0x0f) != 8) return TINF_DATA_ERROR;
+
+ /* check window size is valid */
+ if ((cmf >> 4) > 7) return TINF_DATA_ERROR;
+
+ /* check there is no preset dictionary */
+ if (flg & 0x20) return TINF_DATA_ERROR;
+
+ /* -- inflate -- */
+
+ res = tinf_uncompress(dst, destLen, src + 2, sourceLen - 6);
+
+ if (res != TINF_OK) return TINF_DATA_ERROR;
+
+ return TINF_OK;
+}
diff --git a/apps/plugins/imageviewer/png/zconf.h b/apps/plugins/imageviewer/png/zconf.h
deleted file mode 100644
index 03a9431c8b..0000000000
--- a/apps/plugins/imageviewer/png/zconf.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-# define deflateInit_ z_deflateInit_
-# define deflate z_deflate
-# define deflateEnd z_deflateEnd
-# define inflateInit_ z_inflateInit_
-# define inflate z_inflate
-# define inflateEnd z_inflateEnd
-# define deflateInit2_ z_deflateInit2_
-# define deflateSetDictionary z_deflateSetDictionary
-# define deflateCopy z_deflateCopy
-# define deflateReset z_deflateReset
-# define deflateParams z_deflateParams
-# define deflateBound z_deflateBound
-# define deflatePrime z_deflatePrime
-# define inflateInit2_ z_inflateInit2_
-# define inflateSetDictionary z_inflateSetDictionary
-# define inflateSync z_inflateSync
-# define inflateSyncPoint z_inflateSyncPoint
-# define inflateCopy z_inflateCopy
-# define inflateReset z_inflateReset
-# define inflateBack z_inflateBack
-# define inflateBackEnd z_inflateBackEnd
-# define compress z_compress
-# define compress2 z_compress2
-# define compressBound z_compressBound
-# define uncompress z_uncompress
-# define adler32 z_adler32
-# define crc32 z_crc32
-# define get_crc_table z_get_crc_table
-# define zError z_zError
-
-# define alloc_func z_alloc_func
-# define free_func z_free_func
-# define in_func z_in_func
-# define out_func z_out_func
-# define Byte z_Byte
-# define uInt z_uInt
-# define uLong z_uLong
-# define Bytef z_Bytef
-# define charf z_charf
-# define intf z_intf
-# define uIntf z_uIntf
-# define uLongf z_uLongf
-# define voidpf z_voidpf
-# define voidp z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-# define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-# define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-# define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-# ifndef WIN32
-# define WIN32
-# endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-# ifndef SYS16BIT
-# define SYS16BIT
-# endif
-# endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-# define MAXSEG_64K
-#endif
-#ifdef MSDOS
-# define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-# define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
-# define STDC
-#endif
-
-#ifndef STDC
-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-# define const /* note: need a more gentle solution here */
-# endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-# ifdef MAXSEG_64K
-# define MAX_MEM_LEVEL 8
-# else
-# define MAX_MEM_LEVEL 9
-# endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-# define MAX_WBITS 15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
- (1 << (windowBits+2)) + (1 << (memLevel+9))
- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
- The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
- /* Type declarations */
-
-#ifndef OF /* function prototypes */
-# ifdef STDC
-# define OF(args) args
-# else
-# define OF(args) ()
-# endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-# if defined(M_I86SM) || defined(M_I86MM)
- /* MSC small or medium model */
-# define SMALL_MEDIUM
-# ifdef _MSC_VER
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-# if (defined(__SMALL__) || defined(__MEDIUM__))
- /* Turbo C small or medium model */
-# define SMALL_MEDIUM
-# ifdef __BORLANDC__
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
- /* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-# ifdef ZLIB_DLL
-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-# ifdef ZLIB_INTERNAL
-# define ZEXTERN extern __declspec(dllexport)
-# else
-# define ZEXTERN extern __declspec(dllimport)
-# endif
-# endif
-# endif /* ZLIB_DLL */
- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-# ifdef ZLIB_WINAPI
-# ifdef FAR
-# undef FAR
-# endif
-# include <windows.h>
- /* No need for _export, use ZLIB.DEF instead. */
- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-# define ZEXPORT WINAPI
-# ifdef WIN32
-# define ZEXPORTVA WINAPIV
-# else
-# define ZEXPORTVA FAR CDECL
-# endif
-# endif
-#endif
-
-#if defined (__BEOS__)
-# ifdef ZLIB_DLL
-# ifdef ZLIB_INTERNAL
-# define ZEXPORT __declspec(dllexport)
-# define ZEXPORTVA __declspec(dllexport)
-# else
-# define ZEXPORT __declspec(dllimport)
-# define ZEXPORTVA __declspec(dllimport)
-# endif
-# endif
-#endif
-
-#ifndef ZEXTERN
-# define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-# define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-# define ZEXPORTVA
-#endif
-
-#ifndef FAR
-# define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char Byte; /* 8 bits */
-#endif
-typedef unsigned int uInt; /* 16 bits or more */
-typedef unsigned long uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-# define Bytef Byte FAR
-#else
- typedef Byte FAR Bytef;
-#endif
-typedef char FAR charf;
-typedef int FAR intf;
-typedef uInt FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
- typedef void const *voidpc;
- typedef void FAR *voidpf;
- typedef void *voidp;
-#else
- typedef Byte const *voidpc;
- typedef Byte FAR *voidpf;
- typedef Byte *voidp;
-#endif
-
-#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
-# include <sys/types.h> /* for off_t */
-# include <unistd.h> /* for SEEK_* and off_t */
-# ifdef VMS
-# include <unixio.h> /* for off_t */
-# endif
-# define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-# define SEEK_SET 0 /* Seek from beginning of file. */
-# define SEEK_CUR 1 /* Seek from current position. */
-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-# define z_off_t long
-#endif
-
-#if defined(__OS400__)
-# define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-# define NO_vsnprintf
-# ifdef FAR
-# undef FAR
-# endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-# pragma map(deflateInit_,"DEIN")
-# pragma map(deflateInit2_,"DEIN2")
-# pragma map(deflateEnd,"DEEND")
-# pragma map(deflateBound,"DEBND")
-# pragma map(inflateInit_,"ININ")
-# pragma map(inflateInit2_,"ININ2")
-# pragma map(inflateEnd,"INEND")
-# pragma map(inflateSync,"INSY")
-# pragma map(inflateSetDictionary,"INSEDI")
-# pragma map(compressBound,"CMBND")
-# pragma map(inflate_table,"INTABL")
-# pragma map(inflate_fast,"INFA")
-# pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/apps/plugins/imageviewer/png/zlib.h b/apps/plugins/imageviewer/png/zlib.h
deleted file mode 100644
index 23e6dcd8f5..0000000000
--- a/apps/plugins/imageviewer/png/zlib.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.3, July 18th, 2005
-
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly Mark Adler
- jloup@gzip.org madler@alumni.caltech.edu
-
-
- The data format used by the zlib library is described by RFCs (Request for
- Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
- (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
- The 'zlib' compression library provides in-memory compression and
- decompression functions, including integrity checks of the uncompressed
- data. This version of the library supports only one compression method
- (deflation) but other algorithms will be added later and will have the same
- stream interface.
-
- Compression can be done in a single step if the buffers are large
- enough (for example if an input file is mmap'ed), or can be done by
- repeated calls of the compression function. In the latter case, the
- application must provide more input and/or consume the output
- (providing more output space) before each call.
-
- The compressed data format used by default by the in-memory functions is
- the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
- around a deflate stream, which is itself documented in RFC 1951.
-
- The library also supports reading and writing files in gzip (.gz) format
- with an interface similar to that of stdio using the functions that start
- with "gz". The gzip format is different from the zlib format. gzip is a
- gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
- This library can optionally read and write gzip streams in memory as well.
-
- The zlib format was designed to be compact and fast for use in memory
- and on communications channels. The gzip format was designed for single-
- file compression on file systems, has a larger header than zlib to maintain
- directory information, and uses a different, slower check method than zlib.
-
- The library does not install any signal handler. The decoder checks
- the consistency of the compressed data, so the library should never
- crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void (*free_func) OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
- Bytef *next_in; /* next input byte */
- uInt avail_in; /* number of bytes available at next_in */
- uLong total_in; /* total nb of input bytes read so far */
-
- Bytef *next_out; /* next output byte should be put there */
- uInt avail_out; /* remaining free space at next_out */
- uLong total_out; /* total nb of bytes output so far */
-
- char *msg; /* last error message, NULL if no error */
- //struct internal_state state; /* not visible by applications */
-
- alloc_func zalloc; /* used to allocate the internal state */
- free_func zfree; /* used to free the internal state */
- voidpf opaque; /* private data object passed to zalloc and zfree */
-
- int data_type; /* best guess about the data type: binary or text */
- uLong adler; /* adler32 value of the uncompressed data */
- uLong reserved; /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
- gzip header information passed to and from zlib routines. See RFC 1952
- for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
- int text; /* true if compressed data believed to be text */
- uLong time; /* modification time */
- int xflags; /* extra flags (not used when writing a gzip file) */
- int os; /* operating system */
- Bytef *extra; /* pointer to extra field or Z_NULL if none */
- uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
- uInt extra_max; /* space at extra (only when reading header) */
- Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
- uInt name_max; /* space at name (only when reading header) */
- Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
- uInt comm_max; /* space at comment (only when reading header) */
- int hcrc; /* true if there was or will be a header crc */
- int done; /* true when done reading gzip header (not used
- when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
- The application must update next_in and avail_in when avail_in has
- dropped to zero. It must update next_out and avail_out when avail_out
- has dropped to zero. The application must initialize zalloc, zfree and
- opaque before calling the init function. All other fields are set by the
- compression library and must not be updated by the application.
-
- The opaque value provided by the application will be passed as the first
- parameter for calls of zalloc and zfree. This can be useful for custom
- memory management. The compression library attaches no meaning to the
- opaque value.
-
- zalloc must return Z_NULL if there is not enough memory for the object.
- If zlib is used in a multi-threaded application, zalloc and zfree must be
- thread safe.
-
- On 16-bit systems, the functions zalloc and zfree must be able to allocate
- exactly 65536 bytes, but will not be required to allocate more than this
- if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
- pointers returned by zalloc for objects of exactly 65536 bytes *must*
- have their offset normalized to zero. The default allocation function
- provided by this library ensures this (see zutil.c). To reduce memory
- requirements and avoid any allocation of 64K objects, at the expense of
- compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
- The fields total_in and total_out can be used for statistics or
- progress reports. After compression, total_in holds the total size of
- the uncompressed data and may be saved for use in the decompressor
- (particularly if the decompressor wants to decompress everything in
- a single step).
-*/
-
- /* constants */
-
-#define Z_NO_FLUSH 0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH 2
-#define Z_FULL_FLUSH 3
-#define Z_FINISH 4
-#define Z_BLOCK 5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK 0
-#define Z_STREAM_END 1
-#define Z_NEED_DICT 2
-#define Z_ERRNO (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR (-3)
-#define Z_MEM_ERROR (-4)
-#define Z_BUF_ERROR (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION 0
-#define Z_BEST_SPEED 1
-#define Z_BEST_COMPRESSION 9
-#define Z_DEFAULT_COMPRESSION (-1)
-/* compression levels */
-
-#define Z_FILTERED 1
-#define Z_HUFFMAN_ONLY 2
-#define Z_RLE 3
-#define Z_FIXED 4
-#define Z_DEFAULT_STRATEGY 0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY 0
-#define Z_TEXT 1
-#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN 2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED 8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
- /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
- If the first character differs, the library code actually used is
- not compatible with the zlib.h header file used by the application.
- This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
- Initializes the internal stream state for compression. The fields
- zalloc, zfree and opaque must be initialized before by the caller.
- If zalloc and zfree are set to Z_NULL, deflateInit updates them to
- use default allocation functions.
-
- The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
- 1 gives best speed, 9 gives best compression, 0 gives no compression at
- all (the input data is simply copied a block at a time).
- Z_DEFAULT_COMPRESSION requests a default compromise between speed and
- compression (currently equivalent to level 6).
-
- deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_STREAM_ERROR if level is not a valid compression level,
- Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
- with the version assumed by the caller (ZLIB_VERSION).
- msg is set to null if there is no error message. deflateInit does not
- perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
- deflate compresses as much data as possible, and stops when the input
- buffer becomes empty or the output buffer becomes full. It may introduce some
- output latency (reading input without producing any output) except when
- forced to flush.
-
- The detailed semantics are as follows. deflate performs one or both of the
- following actions:
-
- - Compress more input starting at next_in and update next_in and avail_in
- accordingly. If not all input can be processed (because there is not
- enough room in the output buffer), next_in and avail_in are updated and
- processing will resume at this point for the next call of deflate().
-
- - Provide more output starting at next_out and update next_out and avail_out
- accordingly. This action is forced if the parameter flush is non zero.
- Forcing flush frequently degrades the compression ratio, so this parameter
- should be set only when necessary (in interactive applications).
- Some output may be provided even if flush is not set.
-
- Before the call of deflate(), the application should ensure that at least
- one of the actions is possible, by providing more input and/or consuming
- more output, and updating avail_in or avail_out accordingly; avail_out
- should never be zero before the call. The application can consume the
- compressed output when it wants, for example when the output buffer is full
- (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
- and with zero avail_out, it must be called again after making room in the
- output buffer because there might be more output pending.
-
- Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
- decide how much data to accumualte before producing output, in order to
- maximize compression.
-
- If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
- flushed to the output buffer and the output is aligned on a byte boundary, so
- that the decompressor can get all input data available so far. (In particular
- avail_in is zero after the call if enough output space has been provided
- before the call.) Flushing may degrade compression for some compression
- algorithms and so it should be used only when necessary.
-
- If flush is set to Z_FULL_FLUSH, all output is flushed as with
- Z_SYNC_FLUSH, and the compression state is reset so that decompression can
- restart from this point if previous compressed data has been damaged or if
- random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
- compression.
-
- If deflate returns with avail_out == 0, this function must be called again
- with the same value of the flush parameter and more output space (updated
- avail_out), until the flush is complete (deflate returns with non-zero
- avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
- avail_out is greater than six to avoid repeated flush markers due to
- avail_out == 0 on return.
-
- If the parameter flush is set to Z_FINISH, pending input is processed,
- pending output is flushed and deflate returns with Z_STREAM_END if there
- was enough output space; if deflate returns with Z_OK, this function must be
- called again with Z_FINISH and more output space (updated avail_out) but no
- more input data, until it returns with Z_STREAM_END or an error. After
- deflate has returned Z_STREAM_END, the only possible operations on the
- stream are deflateReset or deflateEnd.
-
- Z_FINISH can be used immediately after deflateInit if all the compression
- is to be done in a single step. In this case, avail_out must be at least
- the value returned by deflateBound (see below). If deflate does not return
- Z_STREAM_END, then it must be called again as described above.
-
- deflate() sets strm->adler to the adler32 checksum of all input read
- so far (that is, total_in bytes).
-
- deflate() may update strm->data_type if it can make a good guess about
- the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
- binary. This field is only for information purposes and does not affect
- the compression algorithm in any manner.
-
- deflate() returns Z_OK if some progress has been made (more input
- processed or more output produced), Z_STREAM_END if all input has been
- consumed and all output has been produced (only when flush is set to
- Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
- if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
- (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
- fatal, and deflate() can be called again with more input and more output
- space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
- All dynamically allocated data structures for this stream are freed.
- This function discards any unprocessed input and does not flush any
- pending output.
-
- deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
- stream state was inconsistent, Z_DATA_ERROR if the stream was freed
- prematurely (some input or output was discarded). In the error case,
- msg may be set but then points to a static string (which must not be
- deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
- Initializes the internal stream state for decompression. The fields
- next_in, avail_in, zalloc, zfree and opaque must be initialized before by
- the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
- value depends on the compression method), inflateInit determines the
- compression method from the zlib header and allocates all data structures
- accordingly; otherwise the allocation will be deferred to the first call of
- inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
- use default allocation functions.
-
- inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
- version assumed by the caller. msg is set to null if there is no error
- message. inflateInit does not perform any decompression apart from reading
- the zlib header if present: this will be done by inflate(). (So next_in and
- avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
- inflate decompresses as much data as possible, and stops when the input
- buffer becomes empty or the output buffer becomes full. It may introduce
- some output latency (reading input without producing any output) except when
- forced to flush.
-
- The detailed semantics are as follows. inflate performs one or both of the
- following actions:
-
- - Decompress more input starting at next_in and update next_in and avail_in
- accordingly. If not all input can be processed (because there is not
- enough room in the output buffer), next_in is updated and processing
- will resume at this point for the next call of inflate().
-
- - Provide more output starting at next_out and update next_out and avail_out
- accordingly. inflate() provides as much output as possible, until there
- is no more input data or no more space in the output buffer (see below
- about the flush parameter).
-
- Before the call of inflate(), the application should ensure that at least
- one of the actions is possible, by providing more input and/or consuming
- more output, and updating the next_* and avail_* values accordingly.
- The application can consume the uncompressed output when it wants, for
- example when the output buffer is full (avail_out == 0), or after each
- call of inflate(). If inflate returns Z_OK and with zero avail_out, it
- must be called again after making room in the output buffer because there
- might be more output pending.
-
- The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
- Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
- output as possible to the output buffer. Z_BLOCK requests that inflate() stop
- if and when it gets to the next deflate block boundary. When decoding the
- zlib or gzip format, this will cause inflate() to return immediately after
- the header and before the first block. When doing a raw inflate, inflate()
- will go ahead and process the first block, and will return when it gets to
- the end of that block, or when it runs out of data.
-
- The Z_BLOCK option assists in appending to or combining deflate streams.
- Also to assist in this, on return inflate() will set strm->data_type to the
- number of unused bits in the last byte taken from strm->next_in, plus 64
- if inflate() is currently decoding the last block in the deflate stream,
- plus 128 if inflate() returned immediately after decoding an end-of-block
- code or decoding the complete header up to just before the first byte of the
- deflate stream. The end-of-block will not be indicated until all of the
- uncompressed data from that block has been written to strm->next_out. The
- number of unused bits may in general be greater than seven, except when
- bit 7 of data_type is set, in which case the number of unused bits will be
- less than eight.
-
- inflate() should normally be called until it returns Z_STREAM_END or an
- error. However if all decompression is to be performed in a single step
- (a single call of inflate), the parameter flush should be set to
- Z_FINISH. In this case all pending input is processed and all pending
- output is flushed; avail_out must be large enough to hold all the
- uncompressed data. (The size of the uncompressed data may have been saved
- by the compressor for this purpose.) The next operation on this stream must
- be inflateEnd to deallocate the decompression state. The use of Z_FINISH
- is never required, but can be used to inform inflate that a faster approach
- may be used for the single inflate() call.
-
- In this implementation, inflate() always flushes as much output as
- possible to the output buffer, and always uses the faster approach on the
- first call. So the only effect of the flush parameter in this implementation
- is on the return value of inflate(), as noted below, or when it returns early
- because Z_BLOCK is used.
-
- If a preset dictionary is needed after this call (see inflateSetDictionary
- below), inflate sets strm->adler to the adler32 checksum of the dictionary
- chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
- strm->adler to the adler32 checksum of all output produced so far (that is,
- total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
- below. At the end of the stream, inflate() checks that its computed adler32
- checksum is equal to that saved by the compressor and returns Z_STREAM_END
- only if the checksum is correct.
-
- inflate() will decompress and check either zlib-wrapped or gzip-wrapped
- deflate data. The header type is detected automatically. Any information
- contained in the gzip header is not retained, so applications that need that
- information should instead use raw inflate, see inflateInit2() below, or
- inflateBack() and perform their own processing of the gzip header and
- trailer.
-
- inflate() returns Z_OK if some progress has been made (more input processed
- or more output produced), Z_STREAM_END if the end of the compressed data has
- been reached and all uncompressed output has been produced, Z_NEED_DICT if a
- preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
- corrupted (input stream not conforming to the zlib format or incorrect check
- value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
- if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
- Z_BUF_ERROR if no progress is possible or if there was not enough room in the
- output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
- inflate() can be called again with more input and more output space to
- continue decompressing. If Z_DATA_ERROR is returned, the application may then
- call inflateSync() to look for a good compression block if a partial recovery
- of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
- All dynamically allocated data structures for this stream are freed.
- This function discards any unprocessed input and does not flush any
- pending output.
-
- inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
- was inconsistent. In the error case, msg may be set but then points to a
- static string (which must not be deallocated).
-*/
-
- /* Advanced functions */
-
-/*
- The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
- int level,
- int method,
- int windowBits,
- int memLevel,
- int strategy));
-
- This is another version of deflateInit with more compression options. The
- fields next_in, zalloc, zfree and opaque must be initialized before by
- the caller.
-
- The method parameter is the compression method. It must be Z_DEFLATED in
- this version of the library.
-
- The windowBits parameter is the base two logarithm of the window size
- (the size of the history buffer). It should be in the range 8..15 for this
- version of the library. Larger values of this parameter result in better
- compression at the expense of memory usage. The default value is 15 if
- deflateInit is used instead.
-
- windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
- determines the window size. deflate() will then generate raw deflate data
- with no zlib header or trailer, and will not compute an adler32 check value.
-
- windowBits can also be greater than 15 for optional gzip encoding. Add
- 16 to windowBits to write a simple gzip header and trailer around the
- compressed data instead of a zlib wrapper. The gzip header will have no
- file name, no extra data, no comment, no modification time (set to zero),
- no header crc, and the operating system will be set to 255 (unknown). If a
- gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
- The memLevel parameter specifies how much memory should be allocated
- for the internal compression state. memLevel=1 uses minimum memory but
- is slow and reduces compression ratio; memLevel=9 uses maximum memory
- for optimal speed. The default value is 8. See zconf.h for total memory
- usage as a function of windowBits and memLevel.
-
- The strategy parameter is used to tune the compression algorithm. Use the
- value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
- filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
- string match), or Z_RLE to limit match distances to one (run-length
- encoding). Filtered data consists mostly of small values with a somewhat
- random distribution. In this case, the compression algorithm is tuned to
- compress them better. The effect of Z_FILTERED is to force more Huffman
- coding and less string matching; it is somewhat intermediate between
- Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
- Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
- parameter only affects the compression ratio but not the correctness of the
- compressed output even if it is not set appropriately. Z_FIXED prevents the
- use of dynamic Huffman codes, allowing for a simpler decoder for special
- applications.
-
- deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
- method). msg is set to null if there is no error message. deflateInit2 does
- not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
- const Bytef *dictionary,
- uInt dictLength));
-/*
- Initializes the compression dictionary from the given byte sequence
- without producing any compressed output. This function must be called
- immediately after deflateInit, deflateInit2 or deflateReset, before any
- call of deflate. The compressor and decompressor must use exactly the same
- dictionary (see inflateSetDictionary).
-
- The dictionary should consist of strings (byte sequences) that are likely
- to be encountered later in the data to be compressed, with the most commonly
- used strings preferably put towards the end of the dictionary. Using a
- dictionary is most useful when the data to be compressed is short and can be
- predicted with good accuracy; the data can then be compressed better than
- with the default empty dictionary.
-
- Depending on the size of the compression data structures selected by
- deflateInit or deflateInit2, a part of the dictionary may in effect be
- discarded, for example if the dictionary is larger than the window size in
- deflate or deflate2. Thus the strings most likely to be useful should be
- put at the end of the dictionary, not at the front. In addition, the
- current implementation of deflate will use at most the window size minus
- 262 bytes of the provided dictionary.
-
- Upon return of this function, strm->adler is set to the adler32 value
- of the dictionary; the decompressor may later use this value to determine
- which dictionary has been used by the compressor. (The adler32 value
- applies to the whole dictionary even if only a subset of the dictionary is
- actually used by the compressor.) If a raw deflate was requested, then the
- adler32 value is not computed and strm->adler is not set.
-
- deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
- parameter is invalid (such as NULL dictionary) or the stream state is
- inconsistent (for example if deflate has already been called for this stream
- or if the compression method is bsort). deflateSetDictionary does not
- perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
- z_streamp source));
-/*
- Sets the destination stream as a complete copy of the source stream.
-
- This function can be useful when several compression strategies will be
- tried, for example when there are several ways of pre-processing the input
- data with a filter. The streams that will be discarded should then be freed
- by calling deflateEnd. Note that deflateCopy duplicates the internal
- compression state which can be quite large, so this strategy is slow and
- can consume lots of memory.
-
- deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
- (such as zalloc being NULL). msg is left unchanged in both source and
- destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
- This function is equivalent to deflateEnd followed by deflateInit,
- but does not free and reallocate all the internal compression state.
- The stream will keep the same compression level and any other attributes
- that may have been set by deflateInit2.
-
- deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
- int level,
- int strategy));
-/*
- Dynamically update the compression level and compression strategy. The
- interpretation of level and strategy is as in deflateInit2. This can be
- used to switch between compression and straight copy of the input data, or
- to switch to a different kind of input data requiring a different
- strategy. If the compression level is changed, the input available so far
- is compressed with the old level (and may be flushed); the new level will
- take effect only at the next call of deflate().
-
- Before the call of deflateParams, the stream state must be set as for
- a call of deflate(), since the currently available input may have to
- be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
- deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
- stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
- if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
- int good_length,
- int max_lazy,
- int nice_length,
- int max_chain));
-/*
- Fine tune deflate's internal compression parameters. This should only be
- used by someone who understands the algorithm used by zlib's deflate for
- searching for the best matching string, and even then only by the most
- fanatic optimizer trying to squeeze out the last compressed bit for their
- specific input data. Read the deflate.c source code for the meaning of the
- max_lazy, good_length, nice_length, and max_chain parameters.
-
- deflateTune() can be called after deflateInit() or deflateInit2(), and
- returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
- uLong sourceLen));
-/*
- deflateBound() returns an upper bound on the compressed size after
- deflation of sourceLen bytes. It must be called after deflateInit()
- or deflateInit2(). This would be used to allocate an output buffer
- for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
- int bits,
- int value));
-/*
- deflatePrime() inserts bits in the deflate output stream. The intent
- is that this function is used to start off the deflate output with the
- bits leftover from a previous deflate stream when appending to it. As such,
- this function can only be used for raw deflate, and must be used before the
- first deflate() call after a deflateInit2() or deflateReset(). bits must be
- less than or equal to 16, and that many of the least significant bits of
- value will be inserted in the output.
-
- deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
- gz_headerp head));
-/*
- deflateSetHeader() provides gzip header information for when a gzip
- stream is requested by deflateInit2(). deflateSetHeader() may be called
- after deflateInit2() or deflateReset() and before the first call of
- deflate(). The text, time, os, extra field, name, and comment information
- in the provided gz_header structure are written to the gzip header (xflag is
- ignored -- the extra flags are set according to the compression level). The
- caller must assure that, if not Z_NULL, name and comment are terminated with
- a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
- available there. If hcrc is true, a gzip header crc is included. Note that
- the current versions of the command-line version of gzip (up through version
- 1.3.x) do not support header crc's, and will report that it is a "multi-part
- gzip file" and give up.
-
- If deflateSetHeader is not used, the default gzip header has text false,
- the time set to zero, and os set to 255, with no extra, name, or comment
- fields. The gzip header is returned to the default state by deflateReset().
-
- deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
- int windowBits));
-
- This is another version of inflateInit with an extra parameter. The
- fields next_in, avail_in, zalloc, zfree and opaque must be initialized
- before by the caller.
-
- The windowBits parameter is the base two logarithm of the maximum window
- size (the size of the history buffer). It should be in the range 8..15 for
- this version of the library. The default value is 15 if inflateInit is used
- instead. windowBits must be greater than or equal to the windowBits value
- provided to deflateInit2() while compressing, or it must be equal to 15 if
- deflateInit2() was not used. If a compressed stream with a larger window
- size is given as input, inflate() will return with the error code
- Z_DATA_ERROR instead of trying to allocate a larger window.
-
- windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
- determines the window size. inflate() will then process raw deflate data,
- not looking for a zlib or gzip header, not generating a check value, and not
- looking for any check values for comparison at the end of the stream. This
- is for use with other formats that use the deflate compressed data format
- such as zip. Those formats provide their own check values. If a custom
- format is developed using the raw deflate format for compressed data, it is
- recommended that a check value such as an adler32 or a crc32 be applied to
- the uncompressed data as is done in the zlib, gzip, and zip formats. For
- most applications, the zlib format should be used as is. Note that comments
- above on the use in deflateInit2() applies to the magnitude of windowBits.
-
- windowBits can also be greater than 15 for optional gzip decoding. Add
- 32 to windowBits to enable zlib and gzip decoding with automatic header
- detection, or add 16 to decode only the gzip format (the zlib format will
- return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is
- a crc32 instead of an adler32.
-
- inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
- is set to null if there is no error message. inflateInit2 does not perform
- any decompression apart from reading the zlib header if present: this will
- be done by inflate(). (So next_in and avail_in may be modified, but next_out
- and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
- const Bytef *dictionary,
- uInt dictLength));
-/*
- Initializes the decompression dictionary from the given uncompressed byte
- sequence. This function must be called immediately after a call of inflate,
- if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
- can be determined from the adler32 value returned by that call of inflate.
- The compressor and decompressor must use exactly the same dictionary (see
- deflateSetDictionary). For raw inflate, this function can be called
- immediately after inflateInit2() or inflateReset() and before any call of
- inflate() to set the dictionary. The application must insure that the
- dictionary that was used for compression is provided.
-
- inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
- parameter is invalid (such as NULL dictionary) or the stream state is
- inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
- expected one (incorrect adler32 value). inflateSetDictionary does not
- perform any decompression: this will be done by subsequent calls of
- inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
- Skips invalid compressed data until a full flush point (see above the
- description of deflate with Z_FULL_FLUSH) can be found, or until all
- available input is skipped. No output is provided.
-
- inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
- if no more input was provided, Z_DATA_ERROR if no flush point has been found,
- or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
- case, the application may save the current current value of total_in which
- indicates where valid compressed data was found. In the error case, the
- application may repeatedly call inflateSync, providing more input each time,
- until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
- z_streamp source));
-/*
- Sets the destination stream as a complete copy of the source stream.
-
- This function can be useful when randomly accessing a large stream. The
- first pass through the stream can periodically record the inflate state,
- allowing restarting inflate at those points when randomly accessing the
- stream.
-
- inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
- (such as zalloc being NULL). msg is left unchanged in both source and
- destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
- This function is equivalent to inflateEnd followed by inflateInit,
- but does not free and reallocate all the internal decompression state.
- The stream will keep attributes that may have been set by inflateInit2.
-
- inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
- int bits,
- int value));
-/*
- This function inserts bits in the inflate input stream. The intent is
- that this function is used to start inflating at a bit position in the
- middle of a byte. The provided bits will be used before any bytes are used
- from next_in. This function should only be used with raw inflate, and
- should be used before the first inflate() call after inflateInit2() or
- inflateReset(). bits must be less than or equal to 16, and that many of the
- least significant bits of value will be inserted in the input.
-
- inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
- gz_headerp head));
-/*
- inflateGetHeader() requests that gzip header information be stored in the
- provided gz_header structure. inflateGetHeader() may be called after
- inflateInit2() or inflateReset(), and before the first call of inflate().
- As inflate() processes the gzip stream, head->done is zero until the header
- is completed, at which time head->done is set to one. If a zlib stream is
- being decoded, then head->done is set to -1 to indicate that there will be
- no gzip header information forthcoming. Note that Z_BLOCK can be used to
- force inflate() to return immediately after header processing is complete
- and before any actual data is decompressed.
-
- The text, time, xflags, and os fields are filled in with the gzip header
- contents. hcrc is set to true if there is a header CRC. (The header CRC
- was valid if done is set to one.) If extra is not Z_NULL, then extra_max
- contains the maximum number of bytes to write to extra. Once done is true,
- extra_len contains the actual extra field length, and extra contains the
- extra field, or that field truncated if extra_max is less than extra_len.
- If name is not Z_NULL, then up to name_max characters are written there,
- terminated with a zero unless the length is greater than name_max. If
- comment is not Z_NULL, then up to comm_max characters are written there,
- terminated with a zero unless the length is greater than comm_max. When
- any of extra, name, or comment are not Z_NULL and the respective field is
- not present in the header, then that field is set to Z_NULL to signal its
- absence. This allows the use of deflateSetHeader() with the returned
- structure to duplicate the header. However if those fields are set to
- allocated memory, then the application will need to save those pointers
- elsewhere so that they can be eventually freed.
-
- If inflateGetHeader is not used, then the header information is simply
- discarded. The header is always checked for validity, including the header
- CRC if present. inflateReset() will reset the process to discard the header
- information. The application would need to call inflateGetHeader() again to
- retrieve the header from the next gzip stream.
-
- inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
- unsigned char FAR *window));
-
- Initialize the internal stream state for decompression using inflateBack()
- calls. The fields zalloc, zfree and opaque in strm must be initialized
- before the call. If zalloc and zfree are Z_NULL, then the default library-
- derived memory allocation routines are used. windowBits is the base two
- logarithm of the window size, in the range 8..15. window is a caller
- supplied buffer of that size. Except for special applications where it is
- assured that deflate was used with small window sizes, windowBits must be 15
- and a 32K byte window must be supplied to be able to decompress general
- deflate streams.
-
- See inflateBack() for the usage of these routines.
-
- inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
- be allocated, or Z_VERSION_ERROR if the version of the library does not
- match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
- in_func in, void FAR *in_desc,
- out_func out, void FAR *out_desc));
-/*
- inflateBack() does a raw inflate with a single call using a call-back
- interface for input and output. This is more efficient than inflate() for
- file i/o applications in that it avoids copying between the output and the
- sliding window by simply making the window itself the output buffer. This
- function trusts the application to not change the output buffer passed by
- the output function, at least until inflateBack() returns.
-
- inflateBackInit() must be called first to allocate the internal state
- and to initialize the state with the user-provided window buffer.
- inflateBack() may then be used multiple times to inflate a complete, raw
- deflate stream with each call. inflateBackEnd() is then called to free
- the allocated state.
-
- A raw deflate stream is one with no zlib or gzip header or trailer.
- This routine would normally be used in a utility that reads zip or gzip
- files and writes out uncompressed files. The utility would decode the
- header and process the trailer on its own, hence this routine expects
- only the raw deflate stream to decompress. This is different from the
- normal behavior of inflate(), which expects either a zlib or gzip header and
- trailer around the deflate stream.
-
- inflateBack() uses two subroutines supplied by the caller that are then
- called by inflateBack() for input and output. inflateBack() calls those
- routines until it reads a complete deflate stream and writes out all of the
- uncompressed data, or until it encounters an error. The function's
- parameters and return types are defined above in the in_func and out_func
- typedefs. inflateBack() will call in(in_desc, &buf) which should return the
- number of bytes of provided input, and a pointer to that input in buf. If
- there is no input available, in() must return zero--buf is ignored in that
- case--and inflateBack() will return a buffer error. inflateBack() will call
- out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
- should return zero on success, or non-zero on failure. If out() returns
- non-zero, inflateBack() will return with an error. Neither in() nor out()
- are permitted to change the contents of the window provided to
- inflateBackInit(), which is also the buffer that out() uses to write from.
- The length written by out() will be at most the window size. Any non-zero
- amount of input may be provided by in().
-
- For convenience, inflateBack() can be provided input on the first call by
- setting strm->next_in and strm->avail_in. If that input is exhausted, then
- in() will be called. Therefore strm->next_in must be initialized before
- calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
- immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
- must also be initialized, and then if strm->avail_in is not zero, input will
- initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
- The in_desc and out_desc parameters of inflateBack() is passed as the
- first parameter of in() and out() respectively when they are called. These
- descriptors can be optionally used to pass any information that the caller-
- supplied in() and out() functions need to do their job.
-
- On return, inflateBack() will set strm->next_in and strm->avail_in to
- pass back any unused input that was provided by the last in() call. The
- return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
- if in() or out() returned an error, Z_DATA_ERROR if there was a format
- error in the deflate stream (in which case strm->msg is set to indicate the
- nature of the error), or Z_STREAM_ERROR if the stream was not properly
- initialized. In the case of Z_BUF_ERROR, an input or output error can be
- distinguished using strm->next_in which will be Z_NULL only if in() returned
- an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
- out() returning non-zero. (in() will always be called before out(), so
- strm->next_in is assured to be defined if out() returns non-zero.) Note
- that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
- All memory allocated by inflateBackInit() is freed.
-
- inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
- state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
- Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
- 1.0: size of uInt
- 3.2: size of uLong
- 5.4: size of voidpf (pointer)
- 7.6: size of z_off_t
-
- Compiler, assembler, and debug options:
- 8: DEBUG
- 9: ASMV or ASMINF -- use ASM code
- 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
- 11: 0 (reserved)
-
- One-time table building (smaller code, but not thread-safe if true):
- 12: BUILDFIXED -- build static block decoding tables when needed
- 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
- 14,15: 0 (reserved)
-
- Library content (indicates missing functionality):
- 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
- deflate code when not needed)
- 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
- and decode gzip streams (to avoid linking crc code)
- 18-19: 0 (reserved)
-
- Operation variations (changes in library functionality):
- 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
- 21: FASTEST -- deflate algorithm with only one, lowest compression level
- 22,23: 0 (reserved)
-
- The sprintf variant used by gzprintf (zero is best):
- 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
- 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
- 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
- Remainder:
- 27-31: 0 (reserved)
- */
-
-
- /* utility functions */
-
-/*
- The following utility functions are implemented on top of the
- basic stream-oriented functions. To simplify the interface, some
- default options are assumed (compression level and memory usage,
- standard memory allocation functions). The source code of these
- utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen));
-/*
- Compresses the source buffer into the destination buffer. sourceLen is
- the byte length of the source buffer. Upon entry, destLen is the total
- size of the destination buffer, which must be at least the value returned
- by compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
- This function can be used to compress a whole file at once if the
- input file is mmap'ed.
- compress returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_BUF_ERROR if there was not enough room in the output
- buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen,
- int level));
-/*
- Compresses the source buffer into the destination buffer. The level
- parameter has the same meaning as in deflateInit. sourceLen is the byte
- length of the source buffer. Upon entry, destLen is the total size of the
- destination buffer, which must be at least the value returned by
- compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
-
- compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_BUF_ERROR if there was not enough room in the output buffer,
- Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
- compressBound() returns an upper bound on the compressed size after
- compress() or compress2() on sourceLen bytes. It would be used before
- a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen));
-/*
- Decompresses the source buffer into the destination buffer. sourceLen is
- the byte length of the source buffer. Upon entry, destLen 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.)
- Upon exit, destLen is the actual size of the compressed buffer.
- This function can be used to decompress a whole file at once if the
- input file is mmap'ed.
-
- uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_BUF_ERROR if there was not enough room in the output
- buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-/*
- Opens a gzip (.gz) file for reading or writing. The mode parameter
- is as in fopen ("rb" or "wb") but can also include a compression level
- ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
- Huffman only compression as in "wb1h", or 'R' for run-length encoding
- as in "wb1R". (See the description of deflateInit2 for more information
- about the strategy parameter.)
-
- gzopen can be used to read a file which is not in gzip format; in this
- case gzread will directly read from the file without decompression.
-
- gzopen returns NULL if the file could not be opened or if there was
- insufficient memory to allocate the (de)compression state; errno
- can be checked to distinguish the two cases (if errno is zero, the
- zlib error is Z_MEM_ERROR). */
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
- gzdopen() associates a gzFile with the file descriptor fd. File
- descriptors are obtained from calls like open, dup, creat, pipe or
- fileno (in the file has been previously opened with fopen).
- The mode parameter is as in gzopen.
- The next call of gzclose on the returned gzFile will also close the
- file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
- descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
- gzdopen returns NULL if there was insufficient memory to allocate
- the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
- Dynamically update the compression level or strategy. See the description
- of deflateInit2 for the meaning of these parameters.
- gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
- opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
- Reads the given number of uncompressed bytes from the compressed file.
- If the input file was not in gzip format, gzread copies the given number
- of bytes into the buffer.
- gzread returns the number of uncompressed bytes actually read (0 for
- end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
- voidpc buf, unsigned len));
-/*
- Writes the given number of uncompressed bytes into the compressed file.
- gzwrite returns the number of uncompressed bytes actually written
- (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
-/*
- Converts, formats, and writes the args to the compressed file under
- control of the format string, as in fprintf. gzprintf returns the number of
- uncompressed bytes actually written (0 in case of error). The number of
- uncompressed bytes written is limited to 4095. The caller should assure that
- this limit is not exceeded. If it is exceeded, then gzprintf() will return
- return an error (0) with nothing written. In this case, there may also be a
- buffer overflow with unpredictable consequences, which is possible only if
- zlib was compiled with the insecure functions sprintf() or vsprintf()
- because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
- Writes the given null-terminated string to the compressed file, excluding
- the terminating null character.
- gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
- Reads bytes from the compressed file until len-1 characters are read, or
- a newline character is read and transferred to buf, or an end-of-file
- condition is encountered. The string is then terminated with a null
- character.
- gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
- Writes c, converted to an unsigned char, into the compressed file.
- gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
- Reads one byte from the compressed file. gzgetc returns this byte
- or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
- Push one character back onto the stream to be read again later.
- Only one character of push-back is allowed. gzungetc() returns the
- character pushed, or -1 on failure. gzungetc() will fail if a
- character has been pushed but not read yet, or if c is -1. The pushed
- character will be discarded if the stream is repositioned with gzseek()
- or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
- Flushes all pending output into the compressed file. The parameter
- flush is as in the deflate() function. The return value is the zlib
- error number (see function gzerror below). gzflush returns Z_OK if
- the flush parameter is Z_FINISH and all output could be flushed.
- gzflush should be called only when strictly necessary because it can
- degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
- z_off_t offset, int whence));
-/*
- Sets the starting position for the next gzread or gzwrite on the
- given compressed file. The offset represents a number of bytes in the
- uncompressed data stream. The whence parameter is defined as in lseek(2);
- the value SEEK_END is not supported.
- If the file is opened for reading, this function is emulated but can be
- extremely slow. If the file is opened for writing, only forward seeks are
- supported; gzseek then compresses a sequence of zeroes up to the new
- starting position.
-
- gzseek returns the resulting offset location as measured in bytes from
- the beginning of the uncompressed stream, or -1 in case of error, in
- particular if the file is opened for writing and the new starting position
- would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
-/*
- Rewinds the given file. This function is supported only for reading.
-
- gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
-/*
- Returns the starting position for the next gzread or gzwrite on the
- given compressed file. This position represents a number of bytes in the
- uncompressed data stream.
-
- gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
- Returns 1 when EOF has previously been detected reading the given
- input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
- Returns 1 if file is being read directly without decompression, otherwise
- zero.
-*/
-
-ZEXTERN int ZEXPORT gzclose OF((gzFile file));
-/*
- Flushes all pending output if necessary, closes the compressed file
- and deallocates all the (de)compression state. The return value is the zlib
- error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
- Returns the error message for the last error which occurred on the
- given compressed file. errnum is set to zlib error number. If an
- error occurred in the file system and not in the compression library,
- errnum is set to Z_ERRNO and the application may consult errno
- to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
- Clears the error and end-of-file flags for file. This is analogous to the
- clearerr() function in stdio. This is useful for continuing to read a gzip
- file that is being written concurrently.
-*/
-
- /* checksum functions */
-
-/*
- These functions are not related to compression but are exported
- anyway because they might be useful in applications using the
- compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
- Update a running Adler-32 checksum with the bytes buf[0..len-1] and
- return the updated checksum. If buf is NULL, this function returns
- the required initial value for the checksum.
- An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
- much faster. Usage example:
-
- uLong adler = adler32(0L, Z_NULL, 0);
-
- while (read_buffer(buffer, length) != EOF) {
- adler = adler32(adler, buffer, length);
- }
- if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
- z_off_t len2));
-/*
- Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
- and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
- each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
- seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
-/*
- Update a running CRC-32 with the bytes buf[0..len-1] and return the
- updated CRC-32. If buf is NULL, this function returns the required initial
- value for the for the crc. Pre- and post-conditioning (one's complement) is
- performed within this function so it shouldn't be done by the application.
- Usage example:
-
- uLong crc = crc32(0L, Z_NULL, 0);
-
- while (read_buffer(buffer, length) != EOF) {
- crc = crc32(crc, buffer, length);
- }
- if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
- Combine two CRC-32 check values into one. For two sequences of bytes,
- seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
- calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
- check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
- len2.
-*/
-
-
- /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
- int windowBits, int memLevel,
- int strategy, const char *version,
- int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
- unsigned char FAR *window,
- const char *version,
- int stream_size));
-#define deflateInit(strm, level) \
- deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
- inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
- deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
- (strategy), ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
- inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
- inflateBackInit_((strm), (windowBits), (window), \
- ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
- struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char * ZEXPORT zError OF((int));
-ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/apps/plugins/imageviewer/png/zutil.h b/apps/plugins/imageviewer/png/zutil.h
deleted file mode 100644
index b7d5eff81b..0000000000
--- a/apps/plugins/imageviewer/png/zutil.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#ifdef STDC
-# ifndef _WIN32_WCE
-# include <stddef.h>
-# endif
-# include <string.h>
-# include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-# ifdef _WIN32_WCE
- /* The Microsoft C Run-Time Library for Windows CE doesn't have
- * errno. We define it as a global variable to simplify porting.
- * Its value is always 0 and should not be used. We rename it to
- * avoid conflict with other libraries that use the same workaround.
- */
-# define errno z_errno
-# endif
- extern int errno;
-#else
-# ifndef _WIN32_WCE
-# include <errno.h>
-# endif
-#endif
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
- return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
- /* common constants */
-
-#ifndef DEF_WBITS
-# define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES 2
-/* The three kinds of block type */
-
-#define MIN_MATCH 3
-#define MAX_MATCH 258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
- /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-# define OS_CODE 0x00
-# if defined(__TURBOC__) || defined(__BORLANDC__)
-# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
- /* Allow compilation with ANSI keywords only enabled */
- void _Cdecl farfree( void *block );
- void *_Cdecl farmalloc( unsigned long nbytes );
-# else
-# include <alloc.h>
-# endif
-# else /* MSC or DJGPP */
-# include <malloc.h>
-# endif
-#endif
-
-#ifdef AMIGA
-# define OS_CODE 0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-# define OS_CODE 0x02
-# define F_OPEN(name, mode) \
- fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-# define OS_CODE 0x05
-#endif
-
-#ifdef OS2
-# define OS_CODE 0x06
-# ifdef M_I86
- #include <malloc.h>
-# endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-# define OS_CODE 0x07
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-# include <unix.h> /* for fdopen */
-# else
-# ifndef fdopen
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# endif
-# endif
-#endif
-
-#ifdef TOPS20
-# define OS_CODE 0x0a
-#endif
-
-#ifdef WIN32
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-# define OS_CODE 0x0b
-# endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-# define OS_CODE 0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-# if defined(_WIN32_WCE)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# ifndef _PTRDIFF_T_DEFINED
- typedef int ptrdiff_t;
-# define _PTRDIFF_T_DEFINED
-# endif
-# else
-# define fdopen(fd,type) _fdopen(fd,type)
-# endif
-#endif
-
- /* common defaults */
-
-#ifndef OS_CODE
-# define OS_CODE 0x03 /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-# define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
- /* functions */
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-#if defined(__CYGWIN__)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-#ifndef HAVE_VSNPRINTF
-# ifdef MSDOS
- /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
- but for now we just assume it doesn't. */
-# define NO_vsnprintf
-# endif
-# ifdef __TURBOC__
-# define NO_vsnprintf
-# endif
-# ifdef WIN32
- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-# if !defined(vsnprintf) && !defined(NO_vsnprintf)
-# define vsnprintf _vsnprintf
-# endif
-# endif
-# ifdef __SASC
-# define NO_vsnprintf
-# endif
-#endif
-#ifdef VMS
-# define NO_vsnprintf
-#endif
-
-#if defined(pyr)
-# define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
- * You may have to use the same strategy for Borland C (untested).
- * The __SC__ check is for Symantec.
- */
-# define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-# define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-# define zmemcpy _fmemcpy
-# define zmemcmp _fmemcmp
-# define zmemzero(dest, len) _fmemset(dest, 0, len)
-# else
-# define zmemcpy memcpy
-# define zmemcmp memcmp
-# define zmemzero(dest, len) memset(dest, 0, len)
-# endif
-#else
- extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
- extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
- extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-# include <stdio.h>
- extern int z_verbose;
- extern void z_error OF((char *m));
-# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-# define Trace(x) {if (z_verbose>=0) fprintf x ;}
-# define Tracev(x) {if (z_verbose>0) fprintf x ;}
-# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-# define Assert(cond,msg)
-# define Trace(x)
-# define Tracev(x)
-# define Tracevv(x)
-# define Tracec(c,x)
-# define Tracecv(c,x)
-#endif
-
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void zcfree OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
- (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */