Merge branch 'master' of https://github.com/bigmonachus/stb

2015-01-17 08:19:22 -08:00 · 2015-01-17 08:19:22 -08:00 · 974ca12fb8
commit 974ca12fb8
parent 4c9e8dd359 a2df517a1a
1 changed files with 3 additions and 3 deletions
--- a/stb_image.h
+++ b/stb_image.h
@ -1768,7 +1768,7 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__
               } else {
                  if (r == 0) {
                     if (s)
-                        data[stbi__jpeg_dezigzag[k++]] = s;
+                        data[stbi__jpeg_dezigzag[k++]] = (short) s;
                     break;
                  }
                  --r;