AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Support 16bit pnms

Browse Source
This commit is contained in:
Matthias Clasen 2006-03-03 17:19:27 +00:00
parent 87ff791dcb
commit 9907ebb2ce
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
2006-03-03 Matthias Clasen <mclasen@redhat.com>
* io-pnm.c: Support pnm files with maxval > 255.
(#327560, Matthijs Douze)
2006-03-03 Matthias Clasen <mclasen@redhat.com>
* io-pcx.c (pcx_load_palette_8): Fix incremental loading

24
gdk-pixbuf/io-pnm.c
View File

@ -392,13 +392,6 @@ pnm_read_header (PnmLoaderContext *context)
return PNM_FATAL_ERR;
}
if (context->maxval > 255) {
g_set_error (context->error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Cannot handle PNM files with maximum color values greater than 255"));
return PNM_FATAL_ERR;
}
}
break;
default:
@ -438,6 +431,8 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
_("Raw PNM image type is invalid"));
return PNM_FATAL_ERR;
}
if(context->maxval>255)
numpix/=2;
numpix = MIN (numpix, context->width - context->output_col);
@ -466,6 +461,8 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
_("Raw PNM image type is invalid"));
return PNM_FATAL_ERR;
}
if(context->maxval>255)
numbytes*=2;
switch (context->type) {
case PNM_FORMAT_PBM_RAW:
@ -479,6 +476,17 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
if (context->maxval == 255) {
/* special-case optimization */
memcpy (dest, inbuf->byte, numbytes);
} else if(context->maxval == 65535) {
/* optimized version of the next case */
for(i=0; i < numbytes ; i+=2) {
*dest++=inbuf->byte[i];
}
} else if(context->maxval > 255) {
/* scale down to 256 colors */
for(i=0; i < numbytes ; i+=2) {
guint v=inbuf->byte[i]*256+inbuf->byte[i+1];
*dest++=v*255/context->maxval;
}
} else {
for (i = 0; i < numbytes; i++) {
guchar *byte = inbuf->byte + i;
@ -591,7 +599,7 @@ pnm_read_ascii_scanline (PnmLoaderContext *context)
break;
case PNM_FORMAT_PGM:
case PNM_FORMAT_PPM:
/* scale the color to an 8-bit color depth */
/* scale the color up or down to an 8-bit color depth */
if (value > context->maxval)
*dptr++ = 255;
else