mirrors/stb
1
0
Fork 0
mirror of https://github.com/nothings/stb synced 2024-12-15 12:22:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Reedbeta-fix-vs2015-warnings' into dev

Browse Source
This commit is contained in:
Fabian Giesen 2017-07-22 15:51:28 -07:00
commit 463dd85f1f
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
stb_image.h
View File

@ -2822,7 +2822,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m)
if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
for (i=0; i < 64; ++i) for (i=0; i < 64; ++i)
z->dequant[t][stbi__jpeg_dezigzag[i]] = sixteen ? stbi__get16be(z->s) : stbi__get8(z->s); z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
L -= (sixteen ? 129 : 65); L -= (sixteen ? 129 : 65);
} }
return L==0; return L==0;
@ -3627,20 +3627,20 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
} else if (z->s->img_n == 4) { } else if (z->s->img_n == 4) {
if (z->app14_color_transform == 0) { // CMYK if (z->app14_color_transform == 0) { // CMYK
for (i=0; i < z->s->img_x; ++i) { for (i=0; i < z->s->img_x; ++i) {
stbi_uc k = coutput[3][i]; stbi_uc m = coutput[3][i];
out[0] = stbi__blinn_8x8(coutput[0][i], k); out[0] = stbi__blinn_8x8(coutput[0][i], m);
out[1] = stbi__blinn_8x8(coutput[1][i], k); out[1] = stbi__blinn_8x8(coutput[1][i], m);
out[2] = stbi__blinn_8x8(coutput[2][i], k); out[2] = stbi__blinn_8x8(coutput[2][i], m);
out[3] = 255; out[3] = 255;
out += n; out += n;
} }
} else if (z->app14_color_transform == 2) { // YCCK } else if (z->app14_color_transform == 2) { // YCCK
z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
for (i=0; i < z->s->img_x; ++i) { for (i=0; i < z->s->img_x; ++i) {
stbi_uc k = coutput[3][i]; stbi_uc m = coutput[3][i];
out[0] = stbi__blinn_8x8(255 - out[0], k); out[0] = stbi__blinn_8x8(255 - out[0], m);
out[1] = stbi__blinn_8x8(255 - out[1], k); out[1] = stbi__blinn_8x8(255 - out[1], m);
out[2] = stbi__blinn_8x8(255 - out[2], k); out[2] = stbi__blinn_8x8(255 - out[2], m);
out += n; out += n;
} }
} else { // YCbCr + alpha? Ignore the fourth channel for now } else { // YCbCr + alpha? Ignore the fourth channel for now
@ -3665,10 +3665,10 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
} }
} else if (z->s->img_n == 4 && z->app14_color_transform == 0) { } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
for (i=0; i < z->s->img_x; ++i) { for (i=0; i < z->s->img_x; ++i) {
stbi_uc k = coutput[3][i]; stbi_uc m = coutput[3][i];
stbi_uc r = stbi__blinn_8x8(coutput[0][i], k); stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
stbi_uc g = stbi__blinn_8x8(coutput[1][i], k); stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
stbi_uc b = stbi__blinn_8x8(coutput[2][i], k); stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
out[0] = stbi__compute_y(r, g, b); out[0] = stbi__compute_y(r, g, b);
out[1] = 255; out[1] = 255;
out += n; out += n;

10
stb_image_resize.h
View File

@ -156,7 +156,8 @@
Jorge L Rodriguez: Implementation Jorge L Rodriguez: Implementation
Sean Barrett: API design, optimizations Sean Barrett: API design, optimizations
Aras Pranckevicius: bugfix Aras Pranckevicius: bugfix
Nathan Reed: warning fixes
REVISIONS REVISIONS
0.94 (2017-03-18) fixed warnings 0.94 (2017-03-18) fixed warnings
0.93 (2017-03-03) fixed bug with certain combinations of heights 0.93 (2017-03-03) fixed bug with certain combinations of heights
@ -393,8 +394,9 @@ STBIRDEF int stbir_resize_region( const void *input_pixels , int input_w , int
#ifndef STBIR_MALLOC #ifndef STBIR_MALLOC
#include <stdlib.h> #include <stdlib.h>
#define STBIR_MALLOC(size,c) malloc(size) // use comma operator to evaluate c, to avoid "unused parameter" warnings
#define STBIR_FREE(ptr,c) free(ptr) #define STBIR_MALLOC(size,c) ((void)(c), malloc(size))
#define STBIR_FREE(ptr,c) ((void)(c), free(ptr))
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER
@ -983,7 +985,7 @@ static int stbir__edge_wrap_slow(stbir_edge edge, int n, int max)
return (m); return (m);
} }
return n; // NOTREACHED // NOTREACHED
default: default:
STBIR_ASSERT(!"Unimplemented edge type"); STBIR_ASSERT(!"Unimplemented edge type");