From cd6819374ce3b338ea935aa871660a981c4ca7e7 Mon Sep 17 00:00:00 2001 From: Hayaki Saito Date: Sun, 15 Jun 2014 13:57:03 +0900 Subject: [PATCH] Make sure to rewind after BMP test, to fix broken GIF test --- stb_image.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stb_image.h b/stb_image.h index 7029f5c..7705046 100644 --- a/stb_image.h +++ b/stb_image.h @@ -2897,7 +2897,7 @@ static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) } // Microsoft/Windows BMP image -static int stbi__bmp_test(stbi__context *s) +static int stbi__bmp_test_raw(stbi__context *s) { int r; int sz; @@ -2909,6 +2909,12 @@ static int stbi__bmp_test(stbi__context *s) stbi__get32le(s); // discard data offset sz = stbi__get32le(s); r = (sz == 12 || sz == 40 || sz == 56 || sz == 108); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); stbi__rewind(s); return r; }