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

From Marcel Pursche, fixed checking of destination dimensions in osg::copyImage.

Browse Source
This commit is contained in:
Robert Osfield 2013-06-28 14:38:45 +00:00
parent d4e1a8d6a3
commit 88a8423802
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/ImageUtils.cpp
View File

@ -200,7 +200,7 @@ struct WriteRowOperator
bool copyImage(const osg::Image* srcImage, int src_s, int src_t, int src_r, int width, int height, int depth,
osg::Image* destImage, int dest_s, int dest_t, int dest_r, bool doRescale)
{
if ((src_s+width) > (dest_s + destImage->s()))
if ((dest_s+width) > (destImage->s()))
{
OSG_NOTICE<<"copyImage("<<srcImage<<", "<<src_s<<", "<< src_t<<", "<<src_r<<", "<<width<<", "<<height<<", "<<depth<<std::endl;
OSG_NOTICE<<" "<<destImage<<", "<<dest_s<<", "<< dest_t<<", "<<dest_r<<", "<<doRescale<<")"<<std::endl;
@ -208,7 +208,7 @@ bool copyImage(const osg::Image* srcImage, int src_s, int src_t, int src_r, int
return false;
}
if ((src_t+height) > (dest_t + destImage->t()))
if ((dest_t+height) > (destImage->t()))
{
OSG_NOTICE<<"copyImage("<<srcImage<<", "<<src_s<<", "<< src_t<<", "<<src_r<<", "<<width<<", "<<height<<", "<<depth<<std::endl;
OSG_NOTICE<<" "<<destImage<<", "<<dest_s<<", "<< dest_t<<", "<<dest_r<<", "<<doRescale<<")"<<std::endl;
@ -216,7 +216,7 @@ bool copyImage(const osg::Image* srcImage, int src_s, int src_t, int src_r, int
return false;
}
if ((src_r+depth) > (dest_r + destImage->r()))
if ((dest_r+depth) > (destImage->r()))
{
OSG_NOTICE<<"copyImage("<<srcImage<<", "<<src_s<<", "<< src_t<<", "<<src_r<<", "<<width<<", "<<height<<", "<<depth<<std::endl;
OSG_NOTICE<<" "<<destImage<<", "<<dest_s<<", "<< dest_t<<", "<<dest_r<<", "<<doRescale<<")"<<std::endl;
@ -316,7 +316,7 @@ bool copyImage(const osg::Image* srcImage, int src_s, int src_t, int src_r, int
}
}
return false;
return true;
}
}