FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Eric Hammil, fix for bmp image size.

Browse Source
This commit is contained in:
Robert Osfield
2003-10-17 10:24:22 +00:00
parent 98ed1a8d7d
commit 8b0a5035b2
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/bmp/ReaderWriterBMP.cpp
View File

@@ -143,11 +143,16 @@ int *numComponents_ret)
// BMP - sponsored by Seagate.
// unsigned char palette[256][3];
unsigned char *buffer=NULL; // returned to sender & as read from the disk
long filelen;
bmperror = ERROR_NO_FILE;
FILE *fp = fopen(filename, "rb");
if (!fp) return NULL;
fseek(fp, 0, SEEK_END);
filelen = ftell(fp); // determine file size so we can fill it in later if FileSize == 0
fseek(fp, 0, SEEK_SET);
int ncolours;
int ncomp=0;
bool swap=false; // dont need to swap bytes
@@ -206,6 +211,10 @@ int *numComponents_ret)
long size = hd.siz[1]*65536+hd.siz[0];
osg::notify(osg::INFO) << "new size calc = "<<size<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<std::endl;
// handle size==0 in uncompressed 24-bit BMPs -Eric Hammil
if (size==0) size = filelen;
osg::notify(osg::INFO) << "size after zero correction = "<<size<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<std::endl;
int ncpal=4; // default number of colours per palette entry
size -= sizeof(bmpheader)+infsize;