yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert img_n=0 initialization to original location

Browse Source
This commit is contained in:
Sean Barrett 2014-07-09 23:26:03 -07:00
parent a2b9aa8d06
commit 3bf91543f4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stb_image.h
View File

@ -1631,7 +1631,6 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
static int decode_jpeg_header(stbi__jpeg *z, int scan) static int decode_jpeg_header(stbi__jpeg *z, int scan)
{ {
int m; int m;
z->s->img_n = 0;
z->marker = STBI__MARKER_none; // initialize cached marker to empty z->marker = STBI__MARKER_none; // initialize cached marker to empty
m = stbi__get_marker(z); m = stbi__get_marker(z);
if (!stbi__SOI(m)) return stbi__err("no stbi__SOI","Corrupt JPEG"); if (!stbi__SOI(m)) return stbi__err("no stbi__SOI","Corrupt JPEG");
@ -1841,6 +1840,8 @@ typedef struct
static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
{ {
int n, decode_n; int n, decode_n;
z->s->img_n = 0; // make stbi__cleanup_jpeg safe
// validate req_comp // validate req_comp
if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");