From 3c6b26c9702285ab92513e74f9adba3f6943ffe6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 4 Feb 2009 11:35:24 +0000 Subject: [PATCH] Fixed the constness of osg::Image* pointer --- include/osg/Image | 2 +- src/osg/Image.cpp | 2 +- src/osgWrappers/osg/Image.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osg/Image b/include/osg/Image index 55593a9d7..a96ef028f 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -145,7 +145,7 @@ class OSG_EXPORT Image : public Object * accomodate the source image in its offset position. * 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 diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp index 02e238387..3d67e55f2 100644 --- a/src/osg/Image.cpp +++ b/src/osg/Image.cpp @@ -939,7 +939,7 @@ void Image::scaleImage(int s,int t,int r, GLenum newDataType) 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 (s_offset<0 || t_offset<0 || r_offset<0) diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index b59f275bb..04c776703 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -150,9 +150,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __void__scaleImage__int__int__int__GLenum, "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, - __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. ", "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,