[libcvd-members] libcvd/cvd image.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        07/01/16 23:51:18

Modified files:
        cvd            : image.h 

Log message:
         A const SubImage can resurn a const sub_image

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/image.h?cvsroot=libcvd&r1=1.31&r2=1.32

Patches:
Index: image.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/image.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- image.h     28 Nov 2006 15:32:55 -0000      1.31
+++ image.h     16 Jan 2007 23:51:18 -0000      1.32
@@ -273,6 +273,7 @@
                {
                }
 
+
                /// Is this pixel co-ordinate inside the image?
                /// @param ir The co-ordinate to test
                bool in_image(const ImageRef& ir) const
@@ -444,11 +445,13 @@
                /// Return const a sub image
                /// @param start Top left pixel of the sub image
                /// @param size width and  height of the sub image
-               const SubImage<const T> sub_image(const ImageRef& start, const 
ImageRef& size) const
+               const SubImage sub_image(const ImageRef& start, const ImageRef& 
size) const
                {       
                        CVD_IMAGE_ASSERT(in_image(start), 
ImageError::AccessOutsideImage);
                        CVD_IMAGE_ASSERT(in_image(start + size - 
ImageRef(1,1)), ImageError::AccessOutsideImage);
-                       return SubImage<const T>( &operator[](start), size, 
my_stride);
+
+                       T*ptr = my_data + start.y * my_stride + start.x;
+                       return SubImage(ptr, size, my_stride);
                }
 
        protected: