Fix handling of iphone-procesed image to not accidentally appear corrupt (instead they just load wrong).
Add a proper testing path to image test
This commit is contained in:
Sean Barrett
parent
687985dbf9
commit
334cec8d8c
15
stb_image.h
15
stb_image.h
@ -26,7 +26,7 @@
|
||||
- overridable dequantizing-IDCT, YCbCr-to-RGB conversion (define STBI_SIMD)
|
||||
|
||||
Latest revisions:
|
||||
1.36 (2014-05-30) converted to header file
|
||||
1.36 (2014-06-03) converted to header file, allow reading incorrect iphoned-images without iphone flag
|
||||
1.35 (2014-05-27) warnings, bugfixes, TGA optimization, etc
|
||||
1.34 (unknown ) warning fix
|
||||
1.33 (2011-07-14) minor fixes suggested by Dave Moore
|
||||
@ -2698,7 +2698,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
|
||||
stbi_uc palette[1024], pal_img_n=0;
|
||||
stbi_uc has_trans=0, tc[3];
|
||||
stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
|
||||
int first=1,k,interlace=0, iphone=0;
|
||||
int first=1,k,interlace=0, is_iphone=0;
|
||||
stbi__context *s = z->s;
|
||||
|
||||
z->expanded = NULL;
|
||||
@ -2713,7 +2713,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
|
||||
stbi__pngchunk c = stbi__get_chunk_header(s);
|
||||
switch (c.type) {
|
||||
case PNG_TYPE('C','g','B','I'):
|
||||
iphone = stbi__de_iphone_flag;
|
||||
is_iphone = 1;
|
||||
stbi__skip(s, c.length);
|
||||
break;
|
||||
case PNG_TYPE('I','H','D','R'): {
|
||||
@ -2800,7 +2800,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
|
||||
if (first) return stbi__err("first not IHDR", "Corrupt PNG");
|
||||
if (scan != SCAN_load) return 1;
|
||||
if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
|
||||
z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, 16384, (int *) &raw_len, !iphone);
|
||||
z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, 16384, (int *) &raw_len, !is_iphone);
|
||||
if (z->expanded == NULL) return 0; // zlib should set error
|
||||
free(z->idata); z->idata = NULL;
|
||||
if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
|
||||
@ -2810,7 +2810,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
|
||||
if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, interlace)) return 0;
|
||||
if (has_trans)
|
||||
if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
|
||||
if (iphone && s->img_out_n > 2)
|
||||
if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
|
||||
stbi__de_iphone(z);
|
||||
if (pal_img_n) {
|
||||
// pal_img_n == 3 or 4
|
||||
@ -4250,7 +4250,7 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
|
||||
*x = width;
|
||||
*y = height;
|
||||
|
||||
*comp = 3;
|
||||
if (comp) *comp = 3;
|
||||
if (req_comp == 0) req_comp = 3;
|
||||
|
||||
// Read data
|
||||
@ -4535,6 +4535,9 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
|
||||
|
||||
/*
|
||||
revision history:
|
||||
1.36 (2014-06-03)
|
||||
convert to header file single-file library
|
||||
if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
|
||||
1.35 (2014-05-27)
|
||||
various warnings
|
||||
fix broken STBI_SIMD path
|
||||
|
||||
@ -4,12 +4,42 @@
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include "stb_image.h"
|
||||
|
||||
#define STB_DEFINE
|
||||
#include "stb.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int w,h;
|
||||
unsigned char *data = stbi_load(argv[1], &w, &h, 0, 4);
|
||||
if (data)
|
||||
stbi_write_png("c:/x/result.png", w, h, 4, data, w*4);
|
||||
if (argc > 1) {
|
||||
int i;
|
||||
for (i=1; i < argc; ++i) {
|
||||
unsigned char *data;
|
||||
printf("%s\n", argv[i]);
|
||||
data = stbi_load(argv[i], &w, &h, 0, 4);
|
||||
assert(data);
|
||||
if (data) {
|
||||
char fname[512];
|
||||
stb_splitpath(fname, argv[i], STB_FILE);
|
||||
stbi_write_png(stb_sprintf("output/%s.png", fname), w, h, 4, data, w*4);
|
||||
free(data);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int i;
|
||||
char **files = stb_readdir_files("images");
|
||||
for (i=0; i < stb_arr_len(files); ++i) {
|
||||
unsigned char *data;
|
||||
printf("%s\n", files[i]);
|
||||
data = stbi_load(files[i], &w, &h, 0, 4);
|
||||
//assert(data);
|
||||
if (data) {
|
||||
char fname[512];
|
||||
stb_splitpath(fname, files[i], STB_FILE);
|
||||
stbi_write_png(stb_sprintf("output/%s.png", fname), w, h, 4, data, w*4);
|
||||
free(data);
|
||||
} else
|
||||
printf("FAILED\n");
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -84,9 +84,5 @@ LINK32=link.exe
|
||||
|
||||
SOURCE=..\image_test.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\stb_image_write.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
||||
Loading…
Reference in New Issue
Block a user