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

Changed destinationRowDelta and destination_pixelSpace to int's, solving a

Browse Source 
memory corruption crash under 64 bit build.
This commit is contained in:
Robert Osfield
2005-09-15 20:55:35 +00:00
parent d2f98ef56e
commit 34986dedf0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgTerrain/DataSet.cpp
View File

@@ -710,10 +710,10 @@ void DataSet::SourceData::readImage(DestinationData& destination)
// now copy into destination image
unsigned char* sourceRowPtr = tempImage;
unsigned int sourceRowDelta = pixelSpace*destWidth;
int sourceRowDelta = pixelSpace*destWidth;
unsigned char* destinationRowPtr = destination._image->data(destX,destY+destHeight-1);
unsigned int destinationRowDelta = -(int)(destination._image->getRowSizeInBytes());
unsigned int destination_pixelSpace = destination._image->getPixelSizeInBits()/8;
int destinationRowDelta = -(int)(destination._image->getRowSizeInBytes());
int destination_pixelSpace = destination._image->getPixelSizeInBits()/8;
bool destination_hasAlpha = osg::Image::computeNumComponents(destination._image->getPixelFormat())==4;
// copy image to destination image