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

Fixes to new flipVertical/flipHorizontal.

Browse Source
This commit is contained in:
Robert Osfield
2002-05-14 10:20:55 +00:00
parent 7301d1505a
commit 10c3b4e7bf
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/Image.cpp
View File

@@ -208,7 +208,7 @@ void Image::createImage(int s,int t,int r,
if (_data) ::free(_data);
if (newTotalSize)
_data = (unsigned char *)osgMalloc (newTotalSize);
_data = (unsigned char *)malloc (newTotalSize);
else
_data = 0L;
}
@@ -293,7 +293,7 @@ void Image::scaleImage(const int s,const int t,const int r)
unsigned int newTotalSize = computeRowWidthInBytes(s,_pixelFormat,_dataType,_packing)*t;
// need to sort out what size to really use...
unsigned char* newData = (unsigned char *)osgMalloc(newTotalSize);
unsigned char* newData = (unsigned char *)malloc(newTotalSize);
if (!newData)
{
// should we throw an exception??? Just return for time being.
@@ -338,7 +338,7 @@ void Image::flipHorizontal(int image)
{
if (_data==NULL)
{
notify(WARN) << "Error Image::flipVertical() do not succeed : cannot flip NULL image."<<std::endl;
notify(WARN) << "Error Image::flipHorizontal() do not succeed : cannot flip NULL image."<<std::endl;
return;
}
@@ -390,7 +390,7 @@ void Image::flipVertical(int image)
// insert fliped image
memcpy(imageData, tmpData, imageSizeInBytes);
::free(tmpData);
osgFree(tmpData);
++_modifiedTag;
}