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

From Gordon Tomlinson:

Browse Source 
"
This fixes some crashing issues I was having with certain FLT files that only had partial colour palettes

Which are typically found in older 14.x files and file converted through Polytrans or Deep exploration etc.

The code that grabs the color entries in ConvertFromFLT::visitColorPalette was assuming that there were full
palettes always coming in and stepping was out of bounds in certain cases (not all) and thus crashing with
access  violations etc,

Although the normal from Creator is to have 1024 or 512 entries , this is not a  really requirement of the format,  just the way Creator creates its default palettes etc.

Code changed to look at the number of entries and use just those and fills in any missing entries with a default white colour"
This commit is contained in:
Robert Osfield
2005-08-24 11:53:13 +00:00
parent e7c6a03bb2
commit f4dd930376
1 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/osgPlugins/flt/flt2osg.cpp
View File

@@ -631,18 +631,51 @@ void ConvertFromFLT::visitColorPalette(osg::Group& , ColorPaletteRecord* rec)
ColorPool* pColorPool = rec->getFltFile()->getColorPool();
int flightVersion = rec->getFlightVersion();
if (flightVersion > 13)
{
if ( flightVersion > 13 ) {
SColorPalette* pCol = (SColorPalette*)rec->getData();
int colors = (flightVersion >= 1500) ? 1024 : 512;
// *******************************************************************
// GTHACK (Gordon Tomlinson)
//
// Some older files or converted file come through with less than
// the normal color palettes entries, which was cause an array over
// over run at times and thus a crash , chnaged the copy code to now
// figure out how many color entries there are and just grab those
// and fill any extras empty entries with a default white
//
// *******************************************************************
unsigned int datalen = pCol->RecHeader.length();
for (int i=0; i < colors; i++)
{
osg::Vec4 color(pCol->Colors[i].get());
color[3] = 1.0f; // Force alpha to one
pColorPool->addColor(i, color);
}
}
int colorLen = ( datalen -( sizeof(char)*128)) /sizeof(pCol->Colors[0])-1;
//
// Quick sanity check on the size
//
if( colorLen > colors )
colorLen = colors;
for (int i = 0; i < colorLen ; i++){
osg::Vec4 color( pCol->Colors[i].get());
//
// Force alpha to one
//
color[3] = 1.0f;
pColorPool->addColor(i, color);
}
//
// Fill any remainder of the palette with white
//
for (int i = colorLen; i < colors ; i++){
osg::Vec4 color( 1.0f, 1.0f, 1.0f, 1.0f );
pColorPool->addColor( i, color );
}
} // ( flightVersion > 13 )
else // version 11, 12 & 13
{
SOldColorPalette* pCol = (SOldColorPalette*)rec->getData();