python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-05-29 10:13:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix C99 errors inside libimagequant quantizer

Browse Source
This commit is contained in:
rr- 2016-05-06 20:07:55 +02:00
parent 0904eb3e27
commit 0b4a089321
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libImaging/QuantPngQuant.c
View File

@ -47,8 +47,9 @@ quantize_pngquant(
liq_image *image = NULL; liq_image *image = NULL;
liq_attr *attr = NULL; liq_attr *attr = NULL;
liq_result *remap = NULL; liq_result *remap = NULL;
char *charMatrix = NULL; unsigned char *charMatrix = NULL;
char **charMatrixRows = NULL; unsigned char **charMatrixRows = NULL;
unsigned int i, y;
*palette = NULL; *palette = NULL;
*paletteLength = 0; *paletteLength = 0;
*quantizedPixels = NULL; *quantizedPixels = NULL;
@ -80,7 +81,7 @@ quantize_pngquant(
*paletteLength = l_palette->count; *paletteLength = l_palette->count;
*palette = malloc(sizeof(Pixel) * l_palette->count); *palette = malloc(sizeof(Pixel) * l_palette->count);
if (!*palette) { goto err; } if (!*palette) { goto err; }
for (unsigned int i = 0; i < l_palette->count; i++) { for (i = 0; i < l_palette->count; i++) {
(*palette)[i].c.b = l_palette->entries[i].b; (*palette)[i].c.b = l_palette->entries[i].b;
(*palette)[i].c.g = l_palette->entries[i].g; (*palette)[i].c.g = l_palette->entries[i].g;
(*palette)[i].c.r = l_palette->entries[i].r; (*palette)[i].c.r = l_palette->entries[i].r;
@ -90,9 +91,9 @@ quantize_pngquant(
/* write output pixels (pngquant uses char array) */ /* write output pixels (pngquant uses char array) */
charMatrix = malloc(width * height); charMatrix = malloc(width * height);
if (!charMatrix) { goto err; } if (!charMatrix) { goto err; }
charMatrixRows = malloc(height * sizeof(char*)); charMatrixRows = malloc(height * sizeof(unsigned char*));
if (!charMatrixRows) { goto err; } if (!charMatrixRows) { goto err; }
for (unsigned int y = 0; y < height; y++) { for (y = 0; y < height; y++) {
charMatrixRows[y] = &charMatrix[y * width]; charMatrixRows[y] = &charMatrix[y * width];
} }
if (LIQ_OK != liq_write_remapped_image_rows(remap, image, charMatrixRows)) { if (LIQ_OK != liq_write_remapped_image_rows(remap, image, charMatrixRows)) {
@ -102,7 +103,7 @@ quantize_pngquant(
/* transcribe output pixels (pillow uses uint32_t array) */ /* transcribe output pixels (pillow uses uint32_t array) */
*quantizedPixels = malloc(sizeof(uint32_t) * width * height); *quantizedPixels = malloc(sizeof(uint32_t) * width * height);
if (!*quantizedPixels) { goto err; } if (!*quantizedPixels) { goto err; }
for (int i = 0; i < width * height; i++) { for (i = 0; i < width * height; i++) {
(*quantizedPixels)[i] = charMatrix[i]; (*quantizedPixels)[i] = charMatrix[i];
} }