dmlib: src/dmzlib.c annotate

annotate src/dmzlib.c @ 960:1832ac20edb2

Clean up dmzlib and use it in stb_image.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 27 Feb 2015 04:46:13 +0200
parents	985225a93aeb
children	76ac0d5c89b3

rev	line source
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * DMLib
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * -- ZLib implementation
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * Public domain zlib decode v0.2 by Sean Barrett 2006-11-18
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 * Modified and reformatted for DMLib by Matti 'ccr' Hamalainen
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 */
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "dmzlib.h"
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #define DM_ZLIB_TMPBUF_SIZE (16 * 1024)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	11 #define DMSTBI_ASSERT(x) // dummy
951 1723ebe6771c Add kludge stbi__err() implementation temporarily until the error handling Matti Hamalainen <ccr@tnsp.org> parents: 949 diff changeset	12
1723ebe6771c Add kludge stbi__err() implementation temporarily until the error handling Matti Hamalainen <ccr@tnsp.org> parents: 949 diff changeset	13
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 // @TODO: should statically initialize these for optimal thread safety
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	15 static Uint8 dm_zdefault_length[288], dm_zdefault_distance[32];
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 void dmZLibInit()
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 int i;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 // use <= to match clearly with spec
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 for (i = 0; i <= 143; i++)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	24 dm_zdefault_length[i] = 8;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 for (; i <= 255; i++)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	27 dm_zdefault_length[i] = 9;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 for (; i <= 279; i++)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	30 dm_zdefault_length[i] = 7;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 for (; i <= 287; i++)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	33 dm_zdefault_length[i] = 8;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 for (i = 0; i <= 31; i++)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	36 dm_zdefault_distance[i] = 5;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 static inline int stbi__bit_reverse_16(int n)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 n = ((n & 0xAAAA) >> 1) \| ((n & 0x5555) << 1);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 n = ((n & 0xCCCC) >> 2) \| ((n & 0x3333) << 2);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 n = ((n & 0xF0F0) >> 4) \| ((n & 0x0F0F) << 4);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 n = ((n & 0xFF00) >> 8) \| ((n & 0x00FF) << 8);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 return n;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 static inline int stbi__bit_reverse_n(int v, int bits)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	52 DMSTBI_ASSERT(bits <= 16);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 // to bit reverse n bits, reverse 16 and shift
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 // e.g. 11 bits, bit reverse and shift away 5
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 return stbi__bit_reverse_16(v) >> (16 - bits);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	59 static int dmZLibBuildHuffmanTables(DMZHuffmanContext * ctx, const Uint8 * sizelist, const int num)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 int i, k = 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 int code, next_code[16], sizes[17];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 // DEFLATE spec for generating codes
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 memset(sizes, 0, sizeof(sizes));
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	66 memset(ctx->fast, 0, sizeof(ctx->fast));
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 for (i = 0; i < num; i++)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 sizes[sizelist[i]]++;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 sizes[0] = 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 for (i = 1; i < 16; i++)
954 88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	73 {
88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	74 if (sizes[i] > (1 << i))
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	75 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	76 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	77 "Sizes assert failed while building Huffman codes.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	78 }
954 88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	79 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 code = 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 for (i = 1; i < 16; i++)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 next_code[i] = code;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	85 ctx->firstCode[i] = (Uint16) code;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	86 ctx->firstSymbol[i] = (Uint16) k;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 code = (code + sizes[i]);
954 88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	88
88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	89 if (sizes[i] && code - 1 >= (1 << i))
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	90 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	91 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	92 "Bad Huffman code lengths.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	93 }
954 88cbea0ee9b5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 951 diff changeset	94
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	95 ctx->maxCode[i] = code << (16 - i); // preshift for inner loop
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 code <<= 1;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 k += sizes[i];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	100 ctx->maxCode[16] = 0x10000; // sentinel
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 for (i = 0; i < num; i++)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 int s = sizelist[i];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 if (s)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	106 int c = next_code[s] - ctx->firstCode[s] + ctx->firstSymbol[s];
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 Uint16 fastv = (Uint16) ((s << 9) \| i);
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	108 ctx->size[c] = (Uint8) s;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	109 ctx->value[c] = (Uint16) i;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 if (s <= STBI__ZFAST_BITS)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 int k = stbi__bit_reverse_n(next_code[s], s);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 while (k < STBI__ZFAST_SIZE)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	115 ctx->fast[k] = fastv;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 k += (1 << s);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 ++next_code[s];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 return 1;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	126 static inline Uint8 dmZGet8(DMZLibContext * ctx)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	128 if (ctx->zbuffer >= ctx->zbufferEnd)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 return 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	131 return *ctx->zbuffer++;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	135 static void stbi__fill_bits(DMZLibContext * ctx)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 do
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	139 DMSTBI_ASSERT(ctx->codeBuffer < (1U << ctx->numBits));
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	140 ctx->codeBuffer \|= dmZGet8(ctx) << ctx->numBits;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	141 ctx->numBits += 8;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	143 while (ctx->numBits <= 24);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	147 static inline unsigned int dmZReceive(DMZLibContext * ctx, int n)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	149 unsigned int val;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	150
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	151 if (ctx->numBits < n)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	152 stbi__fill_bits(ctx);
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	153
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	154 val = ctx->codeBuffer & ((1 << n) - 1);
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	155 ctx->codeBuffer >>= n;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	156 ctx->numBits -= n;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	157
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	158 return val;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	162 static int stbi__zhuffman_decode_slowpath(DMZLibContext * ctx, DMZHuffmanContext * huff, int *val)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 int b, s, k;
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	165 *val = 0;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 // not resolved by fast table, so compute it the slow way
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 // use jpeg approach, which requires MSbits at top
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	169 k = stbi__bit_reverse_16(ctx->codeBuffer);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 for (s = STBI__ZFAST_BITS + 1; ; s++)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	172 if (k < huff->maxCode[s])
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	173 break;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 if (s == 16)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	177 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	178 return dmError(DMERR_DATA_ERROR,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	179 "Bad Huffman code.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	180 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 // code size is s, so:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	183 b = (k >> (16 - s)) - huff->firstCode[s] + huff->firstSymbol[s];
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	184 DMSTBI_ASSERT(huff->size[b] == s);
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	185
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	186 ctx->codeBuffer >>= s;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	187 ctx->numBits -= s;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	188 *val = huff->value[b];
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	189
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	190 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	194 static inline int stbi__zhuffman_decode(DMZLibContext * ctx, DMZHuffmanContext * huff, int *val)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 int b;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	197 if (ctx->numBits < 16)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	198 stbi__fill_bits(ctx);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	200 b = huff->fast[ctx->codeBuffer & STBI__ZFAST_MASK];
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 if (b)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 int s = b >> 9;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	204 ctx->codeBuffer >>= s;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	205 ctx->numBits -= s;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	206 *val = b & 511;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	207 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	209
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	210 return stbi__zhuffman_decode_slowpath(ctx, huff, val);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	214 static int stbi__zexpand(DMZLibContext * ctx, Uint8 *zout, size_t n)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	216 Uint8 *newBuf;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	217 size_t cur, limit;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	218
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	219 ctx->zout = zout;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	221 if (!ctx->expandable)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	222 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	223 return dmError(DMERR_BOUNDS,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	224 "Output buffer limit hit, and is not expandable.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	225 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	227 cur = ctx->zout - ctx->zoutStart;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	228 limit = ctx->zoutEnd - ctx->zoutStart;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 while (cur + n > limit)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 limit *= 2;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	233 if ((newBuf = (Uint8 *) dmRealloc(ctx->zoutStart, limit)) == NULL)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	234 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	235 return dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	236 "Could not reallocate buffer.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	237 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	239 ctx->zoutStart = newBuf;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	240 ctx->zout = newBuf + cur;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	241 ctx->zoutEnd = newBuf + limit;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	242
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	243 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 static const int stbi__zlength_base[31] =
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 3, 4, 5, 6, 7, 8, 9, 10, 11, 13,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 15, 17, 19, 23, 27, 31, 35, 43, 51, 59,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 };
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 static const int stbi__zlength_extra[31] =
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 5, 5, 5, 5, 0, 0, 0
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 };
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 static const int stbi__zdist_base[32] =
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 16385, 24577, 0, 0
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 };
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 static const int stbi__zdist_extra[32] =
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 10, 11, 11, 12, 12, 13, 13
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 };
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	274 static int dmZLibParseHuffmanBlock(DMZLibContext * a)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	276 Uint8 *zout = a->zout;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 for (;;)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	279 int z, ret;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	280 if ((ret = stbi__zhuffman_decode(a, &a->zlength, &z)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	281 return ret;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	282
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 if (z < 256)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	285 if (zout >= a->zoutEnd)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	286 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	287 if ((ret = stbi__zexpand(a, zout, 1)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	288 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 zout = a->zout;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	292 *zout++ = (Uint8) z;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 Uint8 *p;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 int len, dist;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 if (z == 256)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 a->zout = zout;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	301 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 z -= 257;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 len = stbi__zlength_base[z];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 if (stbi__zlength_extra[z])
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	307 len += dmZReceive(a, stbi__zlength_extra[z]);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	309 if ((ret = stbi__zhuffman_decode(a, &a->zdistance, &z)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	310 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312 dist = stbi__zdist_base[z];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 if (stbi__zdist_extra[z])
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	314 dist += dmZReceive(a, stbi__zdist_extra[z]);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	316 if (zout - a->zoutStart < dist)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	317 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	318 return dmError(DMERR_DATA_ERROR,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	319 "Bad Huffman block distance.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	320 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	322 if (zout + len > a->zoutEnd)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 if (!stbi__zexpand(a, zout, len))
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 return 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 zout = a->zout;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 p = (Uint8 *) (zout - dist);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 if (dist == 1)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 { // run of one byte; common in images.
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 Uint8 v = *p;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 do { *zout++ = v; } while (--len);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 do { zout++ = p++; } while (--len);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 static const Uint8 length_dezigzag[19] =
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 16, 17, 18, 0, 8, 7, 9,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 6 , 10, 5 , 11, 4, 12, 3,
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 13, 2 , 14, 1 , 15
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 };
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	351 static int dmZLibComputeHuffmanCodes(DMZLibContext * a)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 DMZHuffmanContext z_codelength;
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	354 Uint8 codeLengths[286 + 32 + 137]; //padding for maximum single op
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	355 Uint8 codeLengthSizes[19];
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	356 int i, n, ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	358 int hlit = dmZReceive(a, 5) + 257;
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	359 int hdist = dmZReceive(a, 5) + 1;
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	360 int hclen = dmZReceive(a, 4) + 4;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	362 memset(codeLengthSizes, 0, sizeof(codeLengthSizes));
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364 for (i = 0; i < hclen; i++)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	366 int s = dmZReceive(a, 3);
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	367 codeLengthSizes[length_dezigzag[i]] = (Uint8) s;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	370 if ((ret = dmZLibBuildHuffmanTables(&z_codelength, codeLengthSizes, 19)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	371 return ret;
955 6b2f41844580 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 954 diff changeset	372
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373 n = 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 while (n < hlit + hdist)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	376 int c;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	377 if ((ret = stbi__zhuffman_decode(a, &z_codelength, &c)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	378 return ret;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	379
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	380 DMSTBI_ASSERT(c >= 0 && c < 19);
955 6b2f41844580 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 954 diff changeset	381
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 if (c < 16)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	383 codeLengths[n++] = (Uint8) c;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 if (c == 16)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	387 c = dmZReceive(a, 2) + 3;
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	388 memset(codeLengths + n, codeLengths[n - 1], c);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 n += c;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 if (c == 17)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	394 c = dmZReceive(a, 3) + 3;
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	395 memset(codeLengths + n, 0, c);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 n += c;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	400 c = dmZReceive(a, 7) + 11;
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	401 memset(codeLengths + n, 0, c);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 n += c;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 if (n != hlit + hdist)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	407 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	408 return dmError(DMERR_DATA_ERROR,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	409 "Bad huffman codelengths.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	410 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	412 if ((ret = dmZLibBuildHuffmanTables(&a->zlength, codeLengths, hlit)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	413 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	415 if ((ret = dmZLibBuildHuffmanTables(&a->zdistance, codeLengths + hlit, hdist)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	416 return ret;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	417
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	418 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	422 static int dmZLibParseUncompresedBlock(DMZLibContext * a)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 Uint8 header[4];
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 int len, nlen, k;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	427 if (a->numBits & 7)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	428 dmZReceive(a, a->numBits & 7); // discard
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 // drain the bit-packed data into header
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 k = 0;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	432 while (a->numBits > 0)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	434 header[k++] = (Uint8) (a->codeBuffer & 255); // suppress MSVC run-time check
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	435 a->codeBuffer >>= 8;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	436 a->numBits -= 8;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	438 DMSTBI_ASSERT(a->numBits == 0);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 // now fill header the normal way
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 while (k < 4)
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	442 header[k++] = dmZGet8(a);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	444 len = (header[1] << 8) \| header[0];
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	445 nlen = (header[3] << 8) \| header[2];
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 if (nlen != (len ^ 0xffff))
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	448 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	449 return dmError(DMERR_DATA_ERROR,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	450 "Compressed data corrupt.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	451 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	453 if (a->zbuffer + len > a->zbufferEnd)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	454 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	455 return dmError(DMERR_BOUNDS,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	456 "Read past buffer, probably corrupt compressed data.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	457 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	459 if (a->zout + len > a->zoutEnd && !stbi__zexpand(a, a->zout, len))
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	460 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	461 return dmError(DMERR_DATA_ERROR,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	462 "XXXX TODO");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	463 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465 memcpy(a->zout, a->zbuffer, len);
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 a->zbuffer += len;
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	467 a->zout += len;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	468
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	469 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	473 int dmZLibParseHeader(DMZLibContext * ctx, BOOL checkPNG)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	475 int cmf = dmZGet8(ctx);
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	476 int flags = dmZGet8(ctx);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 int cm = cmf & 15;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 // int cinfo = cmf >> 4;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	480 if ((cmf * 256 + flags) % 31 != 0)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	481 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	482 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	483 "Bad zlib header.");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	484 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	486 if (checkPNG && (flags & 32))
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	487 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	488 // preset dictionary not allowed in png
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	489 return dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	490 "Preset dictionary not allowed in PNG.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	491 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	493 if (checkPNG && cm != 8)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	494 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	495 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	496 "Bad or unsupported compression type.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	497 }
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	500 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	504 int dmZLibDecode(DMZLibContext * ctx)
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	506 int final, type, ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	508 ctx->numBits = 0;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	509 ctx->codeBuffer = 0;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 do
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	512 final = dmZReceive(ctx, 1);
1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	513 type = dmZReceive(ctx, 2);
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 if (type == 0)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 {
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	516 if ((ret = dmZLibParseUncompresedBlock(ctx)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	517 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 if (type == 3)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 return 0;
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 else
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 if (type == 1)
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 {
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 // use fixed code lengths
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	527 if ((ret = dmZLibBuildHuffmanTables(&ctx->zlength, dm_zdefault_length, 288)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	528 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	530 if ((ret = dmZLibBuildHuffmanTables(&ctx->zdistance, dm_zdefault_distance, 32)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	531 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 else
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	534 if ((ret = dmZLibComputeHuffmanCodes(ctx)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	535 return ret;
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	536
960 1832ac20edb2 Clean up dmzlib and use it in stb_image. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	537 if ((ret = dmZLibParseHuffmanBlock(ctx)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	538 return ret;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 }
6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 while (!final);
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	542
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 955 diff changeset	543 return DMERR_OK;
949 6ed9465f3913 Initial import of separated zlib decoding routines lifted from Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 }

Mercurial > hg > dmlib

annotate src/dmzlib.c @ 960:1832ac20edb2