2015-02-20 23:46:13 +01:00
|
|
|
/* Copyright (C) 2010-2015 The RetroArch team
|
|
|
|
*
|
|
|
|
* ---------------------------------------------------------------------------------------
|
|
|
|
* The following license statement only applies to this file (rpng.c).
|
|
|
|
* ---------------------------------------------------------------------------------------
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge,
|
|
|
|
* to any person obtaining a copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation the rights to
|
|
|
|
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
|
|
|
|
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
|
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
|
|
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _RPNG_DECODE_COMMON_H
|
|
|
|
#define _RPNG_DECODE_COMMON_H
|
|
|
|
|
2015-02-26 20:09:43 +01:00
|
|
|
static enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
const char *id;
|
|
|
|
enum png_chunk_type type;
|
|
|
|
} static const chunk_map[] = {
|
|
|
|
{ "IHDR", PNG_CHUNK_IHDR },
|
|
|
|
{ "IDAT", PNG_CHUNK_IDAT },
|
|
|
|
{ "IEND", PNG_CHUNK_IEND },
|
|
|
|
{ "PLTE", PNG_CHUNK_PLTE },
|
|
|
|
};
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(chunk_map); i++)
|
|
|
|
{
|
|
|
|
if (memcmp(chunk->type, chunk_map[i].id, 4) == 0)
|
|
|
|
return chunk_map[i].type;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PNG_CHUNK_NOOP;
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:07:57 +01:00
|
|
|
static void copy_line_rgb(uint32_t *data,
|
2015-02-26 19:52:44 +01:00
|
|
|
const uint8_t *decoded, unsigned width, unsigned bpp)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
bpp /= 8;
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++)
|
|
|
|
{
|
|
|
|
uint32_t r, g, b;
|
|
|
|
|
|
|
|
r = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
g = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
b = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
data[i] = (0xffu << 24) | (r << 16) | (g << 8) | (b << 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:07:57 +01:00
|
|
|
static void copy_line_rgba(uint32_t *data,
|
2015-02-26 19:52:44 +01:00
|
|
|
const uint8_t *decoded, unsigned width, unsigned bpp)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
bpp /= 8;
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++)
|
|
|
|
{
|
|
|
|
uint32_t r, g, b, a;
|
|
|
|
r = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
g = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
b = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
a = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
data[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:07:57 +01:00
|
|
|
static void copy_line_bw(uint32_t *data,
|
2015-02-26 19:52:44 +01:00
|
|
|
const uint8_t *decoded, unsigned width, unsigned depth)
|
|
|
|
{
|
|
|
|
unsigned i, bit;
|
|
|
|
static const unsigned mul_table[] = { 0, 0xff, 0x55, 0, 0x11, 0, 0, 0, 0x01 };
|
|
|
|
unsigned mul, mask;
|
|
|
|
|
|
|
|
if (depth == 16)
|
|
|
|
{
|
|
|
|
for (i = 0; i < width; i++)
|
|
|
|
{
|
|
|
|
uint32_t val = decoded[i << 1];
|
|
|
|
data[i] = (val * 0x010101) | (0xffu << 24);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mul = mul_table[depth];
|
|
|
|
mask = (1 << depth) - 1;
|
|
|
|
bit = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++, bit += depth)
|
|
|
|
{
|
|
|
|
unsigned byte = bit >> 3;
|
|
|
|
unsigned val = decoded[byte] >> (8 - depth - (bit & 7));
|
|
|
|
|
|
|
|
val &= mask;
|
|
|
|
val *= mul;
|
|
|
|
data[i] = (val * 0x010101) | (0xffu << 24);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:07:57 +01:00
|
|
|
static void copy_line_gray_alpha(uint32_t *data,
|
2015-02-26 19:52:44 +01:00
|
|
|
const uint8_t *decoded, unsigned width,
|
|
|
|
unsigned bpp)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
bpp /= 8;
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++)
|
|
|
|
{
|
|
|
|
uint32_t gray, alpha;
|
|
|
|
|
|
|
|
gray = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
alpha = *decoded;
|
|
|
|
decoded += bpp;
|
|
|
|
|
|
|
|
data[i] = (gray * 0x010101) | (alpha << 24);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:07:57 +01:00
|
|
|
static void copy_line_plt(uint32_t *data,
|
2015-02-26 19:52:44 +01:00
|
|
|
const uint8_t *decoded, unsigned width,
|
|
|
|
unsigned depth, const uint32_t *palette)
|
|
|
|
{
|
|
|
|
unsigned i, bit;
|
|
|
|
unsigned mask = (1 << depth) - 1;
|
|
|
|
|
|
|
|
bit = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++, bit += depth)
|
|
|
|
{
|
|
|
|
unsigned byte = bit >> 3;
|
|
|
|
unsigned val = decoded[byte] >> (8 - depth - (bit & 7));
|
|
|
|
|
|
|
|
val &= mask;
|
|
|
|
data[i] = palette[val];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-20 23:46:13 +01:00
|
|
|
static void png_pass_geom(const struct png_ihdr *ihdr,
|
|
|
|
unsigned width, unsigned height,
|
|
|
|
unsigned *bpp_out, unsigned *pitch_out, size_t *pass_size)
|
|
|
|
{
|
|
|
|
unsigned bpp;
|
|
|
|
unsigned pitch;
|
|
|
|
|
|
|
|
switch (ihdr->color_type)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
bpp = (ihdr->depth + 7) / 8;
|
|
|
|
pitch = (ihdr->width * ihdr->depth + 7) / 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
bpp = (ihdr->depth * 3 + 7) / 8;
|
|
|
|
pitch = (ihdr->width * ihdr->depth * 3 + 7) / 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
bpp = (ihdr->depth + 7) / 8;
|
|
|
|
pitch = (ihdr->width * ihdr->depth + 7) / 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
bpp = (ihdr->depth * 2 + 7) / 8;
|
|
|
|
pitch = (ihdr->width * ihdr->depth * 2 + 7) / 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 6:
|
|
|
|
bpp = (ihdr->depth * 4 + 7) / 8;
|
|
|
|
pitch = (ihdr->width * ihdr->depth * 4 + 7) / 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
bpp = 0;
|
|
|
|
pitch = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pass_size)
|
|
|
|
*pass_size = (pitch + 1) * ihdr->height;
|
|
|
|
if (bpp_out)
|
|
|
|
*bpp_out = bpp;
|
|
|
|
if (pitch_out)
|
|
|
|
*pitch_out = pitch;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void deinterlace_pass(uint32_t *data, const struct png_ihdr *ihdr,
|
|
|
|
const uint32_t *input, unsigned pass_width, unsigned pass_height,
|
|
|
|
const struct adam7_pass *pass)
|
|
|
|
{
|
|
|
|
unsigned x, y;
|
|
|
|
|
|
|
|
data += pass->y * ihdr->width + pass->x;
|
|
|
|
|
|
|
|
for (y = 0; y < pass_height;
|
|
|
|
y++, data += ihdr->width * pass->stride_y, input += pass_width)
|
|
|
|
{
|
|
|
|
uint32_t *out = data;
|
|
|
|
|
|
|
|
for (x = 0; x < pass_width; x++, out += pass->stride_x)
|
|
|
|
*out = input[x];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-26 07:30:13 +01:00
|
|
|
static void png_reverse_filter_deinit(struct rpng_process_t *pngp)
|
|
|
|
{
|
|
|
|
if (pngp->decoded_scanline)
|
|
|
|
free(pngp->decoded_scanline);
|
|
|
|
pngp->decoded_scanline = NULL;
|
|
|
|
if (pngp->prev_scanline)
|
|
|
|
free(pngp->prev_scanline);
|
|
|
|
pngp->prev_scanline = NULL;
|
|
|
|
|
|
|
|
pngp->pass_initialized = false;
|
2015-02-26 07:44:45 +01:00
|
|
|
pngp->h = 0;
|
2015-02-26 07:30:13 +01:00
|
|
|
}
|
|
|
|
|
2015-02-26 21:05:09 +01:00
|
|
|
static const struct adam7_pass passes[] = {
|
|
|
|
{ 0, 0, 8, 8 },
|
|
|
|
{ 4, 0, 8, 8 },
|
|
|
|
{ 0, 4, 4, 8 },
|
|
|
|
{ 2, 0, 4, 4 },
|
|
|
|
{ 0, 2, 2, 4 },
|
|
|
|
{ 1, 0, 2, 2 },
|
|
|
|
{ 0, 1, 1, 2 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static int png_reverse_filter_init(const struct png_ihdr *ihdr,
|
2015-02-25 21:55:17 +01:00
|
|
|
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
|
2015-02-25 21:55:06 +01:00
|
|
|
const uint32_t *palette)
|
2015-02-20 23:46:13 +01:00
|
|
|
{
|
2015-02-25 21:54:50 +01:00
|
|
|
size_t pass_size;
|
2015-02-26 20:59:42 +01:00
|
|
|
|
|
|
|
if (!pngp->adam7_pass_initialized && ihdr->interlace)
|
|
|
|
{
|
2015-02-26 21:05:09 +01:00
|
|
|
if (ihdr->width <= passes[pngp->pass.pos].x ||
|
|
|
|
ihdr->height <= passes[pngp->pass.pos].y) /* Empty pass */
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
pngp->pass.width = (ihdr->width -
|
|
|
|
passes[pngp->pass.pos].x + passes[pngp->pass.pos].stride_x - 1) / passes[pngp->pass.pos].stride_x;
|
|
|
|
pngp->pass.height = (ihdr->height - passes[pngp->pass.pos].y +
|
|
|
|
passes[pngp->pass.pos].stride_y - 1) / passes[pngp->pass.pos].stride_y;
|
|
|
|
|
|
|
|
pngp->data = (uint32_t*)malloc(
|
|
|
|
pngp->pass.width * pngp->pass.height * sizeof(uint32_t));
|
|
|
|
|
|
|
|
if (!pngp->data)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pngp->ihdr = *ihdr;
|
|
|
|
pngp->ihdr.width = pngp->pass.width;
|
|
|
|
pngp->ihdr.height = pngp->pass.height;
|
|
|
|
|
|
|
|
png_pass_geom(&pngp->ihdr, pngp->pass.width,
|
|
|
|
pngp->pass.height, NULL, NULL, &pngp->pass.size);
|
|
|
|
|
|
|
|
if (pngp->pass.size > pngp->stream.total_out)
|
|
|
|
{
|
|
|
|
free(pngp->data);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-02-26 20:59:42 +01:00
|
|
|
pngp->adam7_pass_initialized = true;
|
2015-02-26 21:05:09 +01:00
|
|
|
|
|
|
|
return 0;
|
2015-02-26 20:59:42 +01:00
|
|
|
}
|
2015-02-26 20:25:51 +01:00
|
|
|
|
|
|
|
if (pngp->pass_initialized)
|
2015-02-26 21:05:09 +01:00
|
|
|
return 0;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 07:14:43 +01:00
|
|
|
png_pass_geom(ihdr, ihdr->width, ihdr->height, &pngp->bpp, &pngp->pitch, &pass_size);
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 03:28:55 +01:00
|
|
|
if (pngp->stream.total_out < pass_size)
|
2015-02-26 21:05:09 +01:00
|
|
|
return -1;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 07:14:43 +01:00
|
|
|
pngp->prev_scanline = (uint8_t*)calloc(1, pngp->pitch);
|
|
|
|
pngp->decoded_scanline = (uint8_t*)calloc(1, pngp->pitch);
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 03:54:17 +01:00
|
|
|
if (!pngp->prev_scanline || !pngp->decoded_scanline)
|
2015-02-26 07:30:13 +01:00
|
|
|
goto error;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 07:26:02 +01:00
|
|
|
pngp->h = 0;
|
2015-02-26 07:30:13 +01:00
|
|
|
pngp->pass_initialized = true;
|
|
|
|
|
2015-02-26 21:05:09 +01:00
|
|
|
return 0;
|
2015-02-26 07:30:13 +01:00
|
|
|
|
|
|
|
error:
|
|
|
|
png_reverse_filter_deinit(pngp);
|
2015-02-26 21:05:09 +01:00
|
|
|
return -1;
|
2015-02-26 07:30:13 +01:00
|
|
|
}
|
|
|
|
|
2015-02-26 07:40:11 +01:00
|
|
|
static int png_reverse_filter_wrapper(uint32_t *data, const struct png_ihdr *ihdr,
|
2015-02-26 07:30:13 +01:00
|
|
|
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
|
2015-02-26 20:39:10 +01:00
|
|
|
const uint32_t *palette, unsigned filter)
|
2015-02-26 07:30:13 +01:00
|
|
|
{
|
2015-02-26 20:39:10 +01:00
|
|
|
unsigned i;
|
2015-02-26 19:45:25 +01:00
|
|
|
|
2015-02-26 20:39:10 +01:00
|
|
|
switch (filter)
|
2015-02-20 23:46:13 +01:00
|
|
|
{
|
2015-02-26 19:45:25 +01:00
|
|
|
case 0: /* None */
|
|
|
|
memcpy(pngp->decoded_scanline, inflate_buf, pngp->pitch);
|
2015-02-26 07:44:45 +01:00
|
|
|
break;
|
|
|
|
|
2015-02-26 19:45:25 +01:00
|
|
|
case 1: /* Sub */
|
|
|
|
for (i = 0; i < pngp->bpp; i++)
|
|
|
|
pngp->decoded_scanline[i] = inflate_buf[i];
|
|
|
|
for (i = pngp->bpp; i < pngp->pitch; i++)
|
|
|
|
pngp->decoded_scanline[i] = pngp->decoded_scanline[i - pngp->bpp] + inflate_buf[i];
|
|
|
|
break;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 19:45:25 +01:00
|
|
|
case 2: /* Up */
|
|
|
|
for (i = 0; i < pngp->pitch; i++)
|
|
|
|
pngp->decoded_scanline[i] = pngp->prev_scanline[i] + inflate_buf[i];
|
|
|
|
break;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 19:45:25 +01:00
|
|
|
case 3: /* Average */
|
|
|
|
for (i = 0; i < pngp->bpp; i++)
|
|
|
|
{
|
|
|
|
uint8_t avg = pngp->prev_scanline[i] >> 1;
|
|
|
|
pngp->decoded_scanline[i] = avg + inflate_buf[i];
|
|
|
|
}
|
|
|
|
for (i = pngp->bpp; i < pngp->pitch; i++)
|
|
|
|
{
|
|
|
|
uint8_t avg = (pngp->decoded_scanline[i - pngp->bpp] + pngp->prev_scanline[i]) >> 1;
|
|
|
|
pngp->decoded_scanline[i] = avg + inflate_buf[i];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4: /* Paeth */
|
|
|
|
for (i = 0; i < pngp->bpp; i++)
|
|
|
|
pngp->decoded_scanline[i] = paeth(0, pngp->prev_scanline[i], 0) + inflate_buf[i];
|
|
|
|
for (i = pngp->bpp; i < pngp->pitch; i++)
|
|
|
|
pngp->decoded_scanline[i] = paeth(pngp->decoded_scanline[i - pngp->bpp],
|
|
|
|
pngp->prev_scanline[i], pngp->prev_scanline[i - pngp->bpp]) + inflate_buf[i];
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2015-02-26 20:25:51 +01:00
|
|
|
return -1;
|
2015-02-26 19:45:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (ihdr->color_type)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
copy_line_bw(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
copy_line_rgb(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
copy_line_plt(data, pngp->decoded_scanline, ihdr->width,
|
|
|
|
ihdr->depth, palette);
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
copy_line_gray_alpha(data, pngp->decoded_scanline, ihdr->width,
|
|
|
|
ihdr->depth);
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
copy_line_rgba(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch);
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 07:40:11 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
|
|
|
|
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
|
|
|
|
const uint32_t *palette)
|
|
|
|
{
|
|
|
|
int ret;
|
2015-02-26 07:58:40 +01:00
|
|
|
|
2015-02-26 21:05:09 +01:00
|
|
|
if (png_reverse_filter_init(ihdr, inflate_buf, pngp, palette) == -1)
|
2015-02-26 20:25:51 +01:00
|
|
|
return -1;
|
2015-02-26 07:58:40 +01:00
|
|
|
|
2015-02-26 19:47:21 +01:00
|
|
|
do{
|
2015-02-26 20:25:51 +01:00
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
if (pngp->h < ihdr->height)
|
2015-02-26 20:39:10 +01:00
|
|
|
{
|
|
|
|
unsigned filter = *inflate_buf++;
|
2015-02-26 20:25:51 +01:00
|
|
|
ret = png_reverse_filter_wrapper(data,
|
2015-02-26 20:39:10 +01:00
|
|
|
ihdr, inflate_buf, pngp, palette, filter);
|
|
|
|
}
|
2015-02-26 20:25:51 +01:00
|
|
|
|
2015-02-26 19:47:21 +01:00
|
|
|
if (ret == 1 || ret == -1)
|
2015-02-26 20:25:51 +01:00
|
|
|
{
|
|
|
|
png_reverse_filter_deinit(pngp);
|
2015-02-26 19:47:21 +01:00
|
|
|
break;
|
2015-02-26 20:25:51 +01:00
|
|
|
}
|
2015-02-26 20:39:10 +01:00
|
|
|
|
|
|
|
pngp->h++;
|
|
|
|
inflate_buf += pngp->pitch;
|
|
|
|
data += ihdr->width;
|
2015-02-26 19:47:21 +01:00
|
|
|
}while(1);
|
2015-02-26 07:40:11 +01:00
|
|
|
|
|
|
|
if (ret == 1)
|
|
|
|
return true;
|
|
|
|
return false;
|
2015-02-20 23:46:13 +01:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:53:40 +01:00
|
|
|
static void png_reverse_filter_adam7_process(uint32_t *data,
|
|
|
|
const struct png_ihdr *ihdr,
|
|
|
|
const uint8_t *inflate_buf, struct rpng_process_t *pngp)
|
|
|
|
{
|
|
|
|
if (!pngp)
|
|
|
|
return;
|
|
|
|
|
|
|
|
inflate_buf += pngp->pass.size;
|
|
|
|
pngp->stream.total_out -= pngp->pass.size;
|
|
|
|
|
|
|
|
deinterlace_pass(data,
|
|
|
|
ihdr, pngp->data, pngp->pass.width, pngp->pass.height, &passes[pngp->pass.pos]);
|
|
|
|
|
|
|
|
free(pngp->data);
|
|
|
|
|
|
|
|
pngp->pass.width = 0;
|
|
|
|
pngp->pass.height = 0;
|
|
|
|
pngp->pass.size = 0;
|
|
|
|
pngp->adam7_pass_initialized = false;
|
|
|
|
}
|
|
|
|
|
2015-03-13 17:11:11 +01:00
|
|
|
static int png_reverse_filter_adam7(uint32_t *data,
|
2015-02-20 23:46:13 +01:00
|
|
|
const struct png_ihdr *ihdr,
|
2015-02-25 21:55:17 +01:00
|
|
|
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
|
2015-02-25 21:55:06 +01:00
|
|
|
const uint32_t *palette)
|
2015-02-20 23:46:13 +01:00
|
|
|
{
|
|
|
|
|
2015-02-26 20:59:42 +01:00
|
|
|
for (; pngp->pass.pos < ARRAY_SIZE(passes); pngp->pass.pos++)
|
2015-02-20 23:46:13 +01:00
|
|
|
{
|
2015-02-26 21:05:09 +01:00
|
|
|
int ret = png_reverse_filter_init(ihdr, inflate_buf, pngp, palette);
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 21:05:09 +01:00
|
|
|
if (ret == 1)
|
|
|
|
continue;
|
|
|
|
if (ret == -1)
|
2015-03-13 17:11:11 +01:00
|
|
|
return -1;
|
2015-02-20 23:46:13 +01:00
|
|
|
|
2015-02-26 20:59:42 +01:00
|
|
|
if (!png_reverse_filter(pngp->data,
|
|
|
|
&pngp->ihdr, inflate_buf, pngp, palette))
|
2015-02-20 23:46:13 +01:00
|
|
|
{
|
2015-02-26 20:59:42 +01:00
|
|
|
free(pngp->data);
|
2015-03-13 17:11:11 +01:00
|
|
|
return -1;
|
2015-02-20 23:46:13 +01:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:53:40 +01:00
|
|
|
png_reverse_filter_adam7_process(data, ihdr, inflate_buf, pngp);
|
2015-02-20 23:46:13 +01:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:11:11 +01:00
|
|
|
return 0;
|
2015-02-20 23:46:13 +01:00
|
|
|
}
|
|
|
|
|
2015-02-26 21:36:23 +01:00
|
|
|
static bool png_reverse_filter_loop(struct rpng_t *rpng,
|
|
|
|
uint32_t **data)
|
|
|
|
{
|
|
|
|
if (rpng->ihdr.interlace == 1)
|
|
|
|
{
|
2015-03-13 17:11:11 +01:00
|
|
|
int ret = png_reverse_filter_adam7(*data,
|
|
|
|
&rpng->ihdr, rpng->process.inflate_buf, &rpng->process, rpng->palette);
|
|
|
|
if (ret == -1)
|
2015-02-26 21:36:23 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else if (!png_reverse_filter(*data,
|
|
|
|
&rpng->ihdr, rpng->process.inflate_buf, &rpng->process, rpng->palette))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-02-20 23:46:13 +01:00
|
|
|
#endif
|