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

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Branch:         subimage2
Changes by:     Edward Rosten <edrosten>        06/06/29 18:49:31

Modified files:
        cvd            : image.h 

Log message:
        Added some typedefs to the iterators, so make them look like STL 
iterators.
        You can now use std::copy on images.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/image.h?cvsroot=libcvd&only_with_tag=subimage2&r1=1.20.2.4&r2=1.20.2.5

Patches:
Index: image.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/image.h,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -u -b -r1.20.2.4 -r1.20.2.5
--- image.h     29 Jun 2006 17:26:37 -0000      1.20.2.4
+++ image.h     29 Jun 2006 18:49:31 -0000      1.20.2.5
@@ -128,6 +128,7 @@
 #include <cvd/image_ref.h>
 #include <cvd/exceptions.h>
 #include <string>
+#include <iterator>
 #include <cvd/internal/aligned_mem.h>
 
 namespace CVD {
@@ -249,6 +250,14 @@
                bool operator<(const SubImageIteratorEnd<T>&) const { return 
end != NULL; }
 
 
+               //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()
                {}
@@ -282,6 +291,9 @@
                :ConstSubImageIteratorEnd<T>::ptr(end)
                { }
 
+               typedef T* pointer;
+               typedef T& reference;
+
                T* operator->() { return ConstSubImageIteratorEnd<T>::ptr; }
                T& operator*() { return *ConstSubImageIteratorEnd<T>::ptr;}
 };