From 2ab78cfe381bf3f4571c075c1547cfd172dadde4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Mar 2005 21:00:28 +0000 Subject: [PATCH] From Marco Jez, fixed constness of data return type --- include/osg/Image | 2 +- src/osg/Image.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osg/Image b/include/osg/Image index 6c94ae71b..5aeea2814 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -179,7 +179,7 @@ class SG_EXPORT Image : public Object return _data+(column*getPixelSizeInBits())/8+row*getRowSizeInBytes()+image*getImageSizeInBytes(); } - inline unsigned char* data(int column, int row=0,int image=0) const + inline const unsigned char* data(int column, int row=0,int image=0) const { if (!_data) return NULL; return _data+(column*getPixelSizeInBits())/8+row*getRowSizeInBytes()+image*getImageSizeInBytes(); diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp index 65ee5edb8..38c017b78 100644 --- a/src/osg/Image.cpp +++ b/src/osg/Image.cpp @@ -885,7 +885,7 @@ bool Image::isImageTranslucent() const { for(int it=0;it