Index: trunk/psLib/src/imageops/psImagePixelManip.c
===================================================================
--- trunk/psLib/src/imageops/psImagePixelManip.c	(revision 7766)
+++ trunk/psLib/src/imageops/psImagePixelManip.c	(revision 8232)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,5 @@
 #include "psMemory.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psCoord.h"
 
@@ -47,5 +47,5 @@
     if (max < min) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN,
+                _("Specified min value, %g, can not be greater than the specified max value, %g."),
                 (double)min,(double)max);
         return 0;
@@ -61,5 +61,5 @@
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmin",vmin, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -67,5 +67,5 @@
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmax",vmax, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -90,5 +90,5 @@
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmin",vmin, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -96,5 +96,5 @@
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmax",vmax, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -132,5 +132,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }
@@ -177,5 +177,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }
@@ -202,5 +202,5 @@
     if (image == NULL || overlay == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return pixelsOverlaid;
     }
@@ -208,5 +208,5 @@
     if (op == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageManip_OPERATION_NULL);
+                _("Operation can not be NULL."));
         return pixelsOverlaid;
     }
@@ -220,5 +220,5 @@
         PS_TYPE_NAME(typeStrOverlay,overlay->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH,
+                _("Input overlay psImage type, %s, must match input psImage type, %s."),
                 typeStrOverlay, typeStr);
         return pixelsOverlaid;
@@ -239,5 +239,5 @@
 
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
                 x0, imageColLimit, y0, imageRowLimit,
                 imageNumCols, imageNumRows);
@@ -295,5 +295,5 @@
     default: \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \
+                _("Specified operation, '%s', is not supported."), \
                 op); \
         return pixelsOverlaid; \
@@ -319,5 +319,5 @@
             PS_TYPE_NAME(typeStr,type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             return pixelsOverlaid;
@@ -344,5 +344,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return 0;
     }
@@ -350,5 +350,5 @@
     if (realMax < realMin) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN_REAL,
+                _("Specified real-portion of min value, %g, can not be greater than the real-portion of max value, %g."),
                 (double)realMin, (double)realMax);
         return 0;
@@ -356,5 +356,5 @@
     if (imagMax < imagMin) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN_IMAG,
+                _("Specified imaginary-portion of min value, %g, can not be greater than the imaginary-portion of max value, %g."),
                 (double)imagMin, (double)imagMax);
         return 0;
@@ -369,5 +369,5 @@
                 realfcn(vmin) > PS_MAX_##type || imagfcn(vmin) > PS_MAX_##type ) { \
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                     "vmin", creal(vmin), cimag(vmin), \
                     PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
@@ -377,5 +377,5 @@
                 realfcn(vmax) < PS_MIN_##type || imagfcn(vmax) < PS_MIN_##type ) { \
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                     "vmax", creal(vmax), cimag(vmax), \
                     PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
@@ -406,5 +406,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }