[libcvd-members] libcvd/cvd image.h vector_image_ref.h

[Damian Eads]

CVSROOT:        /sources/libcvd
Module name:    libcvd
Changes by:     Damian Eads <eads>      10/11/25 15:45:07

Modified files:
        cvd            : image.h vector_image_ref.h 

Log message:
        ConstSubImageIterator now inherits from std::iterator, which just 
defines iterator trait typedefs. Minor compiler error in vec_image_ref 
involving anonymous const Vectors that was fixed with .ref() on Vector object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/image.h?cvsroot=libcvd&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/vector_image_ref.h?cvsroot=libcvd&r1=1.11&r2=1.12

Patches:
Index: image.h
===================================================================
RCS file: /sources/libcvd/libcvd/cvd/image.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- image.h     17 Nov 2010 02:35:24 -0000      1.51
+++ image.h     25 Nov 2010 15:45:06 -0000      1.52
@@ -128,7 +128,7 @@
 template<class T> class SubImage;
 
 
-template<class T> class ConstSubImageIterator
+template<class T> class ConstSubImageIterator : public 
std::iterator<std::forward_iterator_tag, T, ptrdiff_t>
 {
        public:
                const ConstSubImageIterator& operator++()
@@ -184,16 +184,6 @@
                                return ptr != s.ptr; 
                }
 
-
-               //Make it look like a standard iterator
-               typedef std::forward_iterator_tag iterator_category;
-               typedef T value_type;
-               typedef ptrdiff_t difference_type;
-               typedef const T* pointer;
-               typedef const T& reference;
-
-
-
                ConstSubImageIterator()
                {}
 
@@ -232,9 +222,6 @@
                SubImageIterator()
                {}
 
-               typedef T* pointer;
-               typedef T& reference;
-
                T* operator->() { return ConstSubImageIterator<T>::ptr; }
                T& operator*() { return *ConstSubImageIterator<T>::ptr;}
 };

Index: vector_image_ref.h
===================================================================
RCS file: /sources/libcvd/libcvd/cvd/vector_image_ref.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- vector_image_ref.h  17 Nov 2010 09:22:42 -0000      1.11
+++ vector_image_ref.h  25 Nov 2010 15:45:06 -0000      1.12
@@ -60,10 +60,7 @@
        /// @ingroup gImage
        inline ImageRef ir_rescale_rounded(const ImageRef &v, double 
rescaling_factor)
        {
-         return ir_rounded(vec(v) * rescaling_factor);
+         return ir_rounded(vec(v).ref() * rescaling_factor);
        }
-
 }
-
-
 #endif