|
|
@ -1,4 +1,4 @@ |
|
|
|
/* stb_image - v2.00 - public domain image loader - http://nothings.org/stb_image.h
|
|
|
|
/* stb_image - v2.00b - public domain image loader - http://nothings.org/stb_image.h
|
|
|
|
no warranty implied; use at your own risk |
|
|
|
no warranty implied; use at your own risk |
|
|
|
|
|
|
|
|
|
|
|
Do this: |
|
|
|
Do this: |
|
|
@ -143,6 +143,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Latest revision history: |
|
|
|
Latest revision history: |
|
|
|
|
|
|
|
2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG |
|
|
|
2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD |
|
|
|
2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD |
|
|
|
progressive JPEG |
|
|
|
progressive JPEG |
|
|
|
PGM/PPM support |
|
|
|
PGM/PPM support |
|
|
@ -2639,7 +2640,7 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan) |
|
|
|
if (z->progressive) { |
|
|
|
if (z->progressive) { |
|
|
|
z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; |
|
|
|
z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; |
|
|
|
z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; |
|
|
|
z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; |
|
|
|
z->img_comp[i].raw_coeff = malloc(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); |
|
|
|
z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); |
|
|
|
z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); |
|
|
|
z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
z->img_comp[i].coeff = 0; |
|
|
|
z->img_comp[i].coeff = 0; |
|
|
@ -6176,6 +6177,7 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int |
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
revision history: |
|
|
|
revision history: |
|
|
|
|
|
|
|
2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG |
|
|
|
2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) |
|
|
|
2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) |
|
|
|
progressive JPEG (stb) |
|
|
|
progressive JPEG (stb) |
|
|
|
PGM/PPM support (Ken Miller) |
|
|
|
PGM/PPM support (Ken Miller) |
|
|
|