TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-12-04 03:27:19 +00:00
parent 0124053db8
commit b5d6b4506e
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
panda/src/pnmimagetypes/pnmFileTypeSGIReader.cxx
View File

@ -105,14 +105,14 @@ Reader(PNMFileType *type, FILE *file, bool owns_file, string magic_number) :
} }
_maxval = (xelval)pixmax; _maxval = (xelval)pixmax;
table_start = ftell(file); table_start = ftell(file);
if( head.storage != STORAGE_VERBATIM ) if( head.storage != STORAGE_VERBATIM )
table = read_table(file, head.ysize * head.zsize); table = read_table(file, head.ysize * head.zsize);
_x_size = head.xsize; _x_size = head.xsize;
_y_size = head.ysize; _y_size = head.ysize;
_num_channels = head.zsize; _num_channels = min((int)head.zsize, 4);
bpc = head.bpc; bpc = head.bpc;
current_row = _y_size - 1; current_row = _y_size - 1;
@ -260,6 +260,13 @@ read_header(FILE *ifp, Header *head, const string &magic_number) {
} }
/* adjust ysize/zsize to dimension, just to be sure */ /* adjust ysize/zsize to dimension, just to be sure */
// On reflection, this is a bad idea. Ignore the number of
// dimensions, and take the xsize/ysize/zsize at face value. The
// table was written based on these numbers, after all; you can't
// just change them arbitrarily.
/*
switch( head->dimension ) { switch( head->dimension ) {
case 1: case 1:
head->ysize = 1; head->ysize = 1;
@ -291,6 +298,8 @@ read_header(FILE *ifp, Header *head, const string &magic_number) {
<< " (only 1-3 allowed)\n"; << " (only 1-3 allowed)\n";
return false; return false;
} }
*/
return true; return true;
} }
@ -302,10 +311,12 @@ read_table(FILE *ifp, int tablen) {
table = MALLOC(tablen, TabEntry); table = MALLOC(tablen, TabEntry);
for( i = 0; i < tablen; i++ ) for( i = 0; i < tablen; i++ ) {
table[i].start = get_big_long(ifp); table[i].start = get_big_long(ifp);
for( i = 0; i < tablen; i++ ) }
for( i = 0; i < tablen; i++ ) {
table[i].length = get_big_long(ifp); table[i].length = get_big_long(ifp);
}
return table; return table;
} }
@ -325,8 +336,9 @@ read_channel(FILE *ifp,
short (*func)(FILE *); short (*func)(FILE *);
func = (bpc==1) ? get_byte_as_short : get_big_short; func = (bpc==1) ? get_byte_as_short : get_big_short;
if ( table ) if ( table ) {
temp = (ScanElem *)alloca(WORSTCOMPR(xsize) * sizeof(ScanElem)); temp = (ScanElem *)alloca(WORSTCOMPR(xsize) * sizeof(ScanElem));
}
sgi_index = channel * ysize + row; sgi_index = channel * ysize + row;
if( table ) { if( table ) {
@ -336,7 +348,8 @@ read_channel(FILE *ifp,
length /= 2; /* doc says length is in bytes, we are reading words */ length /= 2; /* doc says length is in bytes, we are reading words */
if( fseek(ifp, offset, SEEK_SET) != 0 ) if( fseek(ifp, offset, SEEK_SET) != 0 )
pm_error("seek error for offset %ld", offset); pm_error("seek error for offset %ld", offset);
nassertv(length <= WORSTCOMPR(xsize));
for( i = 0; i < length; i++ ) for( i = 0; i < length; i++ )
temp[i] = (*func)(ifp); temp[i] = (*func)(ifp);

3
panda/src/pnmimagetypes/pnmFileTypeSGIWriter.cxx
View File

@ -125,13 +125,12 @@ write_header() {
switch (_num_channels) { switch (_num_channels) {
case 1: case 1:
case 2:
dimensions = 2; dimensions = 2;
break; break;
case 2:
case 3: case 3:
case 4: case 4:
dimensions = 3;
dimensions = 3; dimensions = 3;
break; break;