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

From Colin McDonald, "There is a problem reading bmp files containing a colour palette,

Browse Source 
due to an incorrect scan line length calculation.  Attached is a fix,
and a little bmp file which demonstrates the problem."
This commit is contained in:
Robert Osfield 2008-07-01 19:04:29 +00:00
parent dba344feba
commit aa593fcd2d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ int *numComponents_ret)
int npixperbyte=8/inf.Colorbits; // no of pixels per byte int npixperbyte=8/inf.Colorbits; // no of pixels per byte
for (int ii=0; ii<inf.width/npixperbyte; ii++) { for (int ii=0; ii<inf.width/npixperbyte; ii++) {
unsigned char mask=0x00; // masked with index to extract colorbits bits unsigned char mask=0x00; // masked with index to extract colorbits bits
unsigned char byte=imptr[(j*inf.width/npixperbyte)+ii]; unsigned char byte=imptr[(j*doff/npixperbyte)+ii];
int jj; int jj;
for (jj=0; jj<inf.Colorbits; jj++) mask |= (0x80>>jj); // fill N High end bits for (jj=0; jj<inf.Colorbits; jj++) mask |= (0x80>>jj); // fill N High end bits
for (jj=0; jj<npixperbyte; jj++) { for (jj=0; jj<npixperbyte; jj++) {