TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert accidental commit

Browse Source
This commit is contained in:
David Rose 2012-03-28 00:13:58 +00:00
parent 29e5d74613
commit 772e96881b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
View File

@ -899,7 +899,6 @@ write_data(xel *array, xelval *alpha) {
switch ( get_color_type() ) { switch ( get_color_type() ) {
case CT_color: case CT_color:
case CT_grayscale:
// This call is a bit of fakery to convert our proper 2-d array of // This call is a bit of fakery to convert our proper 2-d array of
// xels to an indirect 2-d array of pixels. We make it look like a // xels to an indirect 2-d array of pixels. We make it look like a
// single row of _x_size * _y_size pixels. // single row of _x_size * _y_size pixels.
@ -908,7 +907,7 @@ write_data(xel *array, xelval *alpha) {
// regardless of the number of colors we can read. // regardless of the number of colors we can read.
chv = ppm_computecolorhist( (pixel **)&array, _x_size * _y_size, 1, chv = ppm_computecolorhist( (pixel **)&array, _x_size * _y_size, 1,
256, &colors ); 256, &colors );
if ( chv == (colorhist_vector) 0 || true) { if ( chv == (colorhist_vector) 0 ) {
pnmimage_tiff_cat.debug() pnmimage_tiff_cat.debug()
<< colors << " colors found; too many for a palette.\n" << colors << " colors found; too many for a palette.\n"
<< "Writing a 24-bit RGB file.\n"; << "Writing a 24-bit RGB file.\n";
@ -937,12 +936,10 @@ write_data(xel *array, xelval *alpha) {
grayscale = false; grayscale = false;
break; break;
/*
case CT_grayscale: case CT_grayscale:
chv = (colorhist_vector) 0; chv = (colorhist_vector) 0;
grayscale = true; grayscale = true;
break; break;
*/
default: default:
break; break;