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

Fixed the constness of osg::Image* pointer

Browse Source
This commit is contained in:
Robert Osfield 2009-02-04 11:35:24 +00:00
parent 316a7a4dbd
commit 3c6b26c970
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Image
View File

@ -145,7 +145,7 @@ class OSG_EXPORT Image : public Object
* accomodate the source image in its offset position. * accomodate the source image in its offset position.
* If source is NULL then no operation happens, this Image is left unchanged. * If source is NULL then no operation happens, this Image is left unchanged.
*/ */
void copySubImage(int s_offset,int t_offset,int r_offset,osg::Image* source); void copySubImage(int s_offset, int t_offset, int r_offset, const osg::Image* source);
enum Origin enum Origin

2
src/osg/Image.cpp
View File

@ -939,7 +939,7 @@ void Image::scaleImage(int s,int t,int r, GLenum newDataType)
dirty(); dirty();
} }
void Image::copySubImage(int s_offset,int t_offset,int r_offset,osg::Image* source) void Image::copySubImage(int s_offset, int t_offset, int r_offset, const osg::Image* source)
{ {
if (!source) return; if (!source) return;
if (s_offset<0 || t_offset<0 || r_offset<0) if (s_offset<0 || t_offset<0 || r_offset<0)

4
src/osgWrappers/osg/Image.cpp
View File

@ -150,9 +150,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Image)
__void__scaleImage__int__int__int__GLenum, __void__scaleImage__int__int__int__GLenum,
"Scale image to specified size and with specified data type. ", "Scale image to specified size and with specified data type. ",
""); "");
I_Method4(void, copySubImage, IN, int, s_offset, IN, int, t_offset, IN, int, r_offset, IN, osg::Image *, source, I_Method4(void, copySubImage, IN, int, s_offset, IN, int, t_offset, IN, int, r_offset, IN, const osg::Image *, source,
Properties::NON_VIRTUAL, Properties::NON_VIRTUAL,
__void__copySubImage__int__int__int__osg_Image_P1, __void__copySubImage__int__int__int__C5_osg_Image_P1,
"Copy a source Image into a subpart of this Image at specified position. ", "Copy a source Image into a subpart of this Image at specified position. ",
"Typically used to copy to an already allocated image, such as creating a 3D image from a stack 2D images. If this Image is empty then image data is created to accomodate the source image in its offset position. If source is NULL then no operation happens, this Image is left unchanged. "); "Typically used to copy to an already allocated image, such as creating a 3D image from a stack 2D images. If this Image is empty then image data is created to accomodate the source image in its offset position. If source is NULL then no operation happens, this Image is left unchanged. ");
I_Method1(void, setOrigin, IN, osg::Image::Origin, origin, I_Method1(void, setOrigin, IN, osg::Image::Origin, origin,