fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-09-20 12:45:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BUG] Problem with GRAYSCALE JPEG image. (Solved by DrTwox)

Browse source
This commit is contained in:
Crayon2000 2010-02-08 16:25:50 +00:00
parent 8af33a1eba
commit f04aced37f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
GRRLIB/GRRLIB/GRRLIB_texEdit.c
View file

@ -317,14 +317,17 @@ GRRLIB_texImg* GRRLIB_LoadTextureJPGEx (const u8 *my_jpg, const int my_size) {
cinfo.progress = NULL; cinfo.progress = NULL;
jpeg_mem_src(&cinfo, (unsigned char *)my_jpg, my_size); jpeg_mem_src(&cinfo, (unsigned char *)my_jpg, my_size);
jpeg_read_header(&cinfo, TRUE); jpeg_read_header(&cinfo, TRUE);
if(cinfo.jpeg_color_space == JCS_GRAYSCALE) {
cinfo.out_color_space = JCS_RGB;
}
jpeg_start_decompress(&cinfo); jpeg_start_decompress(&cinfo);
unsigned char *tempBuffer = malloc(cinfo.output_width * cinfo.output_height * cinfo.num_components); unsigned char *tempBuffer = malloc(cinfo.output_width * cinfo.output_height * cinfo.output_components);
JSAMPROW row_pointer[1]; JSAMPROW row_pointer[1];
row_pointer[0] = malloc(cinfo.output_width * cinfo.num_components); row_pointer[0] = malloc(cinfo.output_width * cinfo.output_components);
size_t location = 0; size_t location = 0;
while (cinfo.output_scanline < cinfo.output_height) { while (cinfo.output_scanline < cinfo.output_height) {
jpeg_read_scanlines(&cinfo, row_pointer, 1); jpeg_read_scanlines(&cinfo, row_pointer, 1);
for (i = 0; i < cinfo.image_width * cinfo.num_components; i++) { for (i = 0; i < cinfo.image_width * cinfo.output_components; i++) {
/* Put the decoded scanline into the tempBuffer */ /* Put the decoded scanline into the tempBuffer */
tempBuffer[ location++ ] = row_pointer[0][i]; tempBuffer[ location++ ] = row_pointer[0][i];
} }