Index: trunk/psLib/src/imageops/psImageMap.h
===================================================================
--- trunk/psLib/src/imageops/psImageMap.h	(revision 15841)
+++ trunk/psLib/src/imageops/psImageMap.h	(revision 19960)
@@ -7,6 +7,6 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-12-15 01:20:03 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-07 22:23:06 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -41,4 +41,24 @@
 } psImageMap;
 
+// Assertion for psImageMap
+#define PS_ASSERT_IMAGE_MAP_NON_NULL(MAP, RVAL) \
+if (!(MAP) || !(MAP)->binning || !(MAP)->map || !(MAP)->error) { \
+    psError(PS_ERR_UNEXPECTED_NULL, true, "Image map %s or its contents is NULL.", #MAP); \
+    return RVAL; \
+} \
+PS_ASSERT_IMAGE_NON_NULL((MAP)->map, RVAL); \
+PS_ASSERT_IMAGE_NON_NULL((MAP)->error, RVAL); \
+PS_ASSERT_IMAGE_TYPE((MAP)->map, PS_TYPE_F32, RVAL); \
+PS_ASSERT_IMAGE_TYPE((MAP)->error, PS_TYPE_F32, RVAL); \
+PS_ASSERT_IMAGES_SIZE_EQUAL((MAP)->map, (MAP)->error, RVAL);
+
+// Assertion for statistics in psImageMap
+#define PS_ASSERT_IMAGE_MAP_STATS(MAP, RVAL) \
+if (!(MAP)->stats) { \
+    psError(PS_ERR_UNEXPECTED_NULL, true, "Image map %s statistics is unset.", #MAP); \
+    return RVAL; \
+}
+
+
 psImageMap *psImageMapAlloc(const psImage *field, psImageBinning *binning, psStats *stats) PS_ATTR_MALLOC;
 bool psMemCheckImageMap(psPtr ptr);