From 3bf91543f4060602fee698b44c448fa87df8161b Mon Sep 17 00:00:00 2001 From: Sean Barrett Date: Wed, 9 Jul 2014 23:26:03 -0700 Subject: [PATCH] revert img_n=0 initialization to original location --- stb_image.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stb_image.h b/stb_image.h index 909a692..4097dbb 100644 --- a/stb_image.h +++ b/stb_image.h @@ -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) { int m; - z->s->img_n = 0; z->marker = STBI__MARKER_none; // initialize cached marker to empty m = stbi__get_marker(z); 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) { int n, decode_n; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + // validate req_comp if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");