[libcvd-members] libcvd/cvd image.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        11/02/28 10:57:50

Modified files:
        cvd            : image.h 

Log message:
        Fix broken assert in debug mode.

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

Patches:
Index: image.h
===================================================================
RCS file: /cvsroot/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     28 Feb 2011 10:57:49 -0000      1.52
@@ -81,8 +81,10 @@
 
 #ifdef CVD_IMAGE_DEBUG
        #define CVD_IMAGE_ASSERT(X,Y)  if(!(X)) throw Y()
+       #define CVD_IMAGE_ASSERT2(X,Y,Z)  if(!(X)) throw Y(Z)
 #else
        #define CVD_IMAGE_ASSERT(X,Y)
+       #define CVD_IMAGE_ASSERT2(X,Y)
 #endif
 
 /// Fatal image errors (used for debugging). These are not included in the
@@ -369,7 +371,7 @@
                }
 
                inline void copy_from( const SubImage<T> & other ){
-                       CVD_IMAGE_ASSERT(other.size() == this->size(), 
Exceptions::Image::IncompatibleImageSizes);
+                       CVD_IMAGE_ASSERT2(other.size() == this->size(), 
Exceptions::Image::IncompatibleImageSizes, "copy_from");
                        std::copy(other.begin(), other.end(), this->begin());
                }