Index: trunk/psLib/src/imageops/psImageGeomManip.c
===================================================================
--- trunk/psLib/src/imageops/psImageGeomManip.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageGeomManip.c	(revision 8232)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 00:44:05 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 #include "psMemory.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psCoord.h"
 
@@ -51,5 +51,5 @@
     if (in == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -58,5 +58,5 @@
     if (scale < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                _("Specified scale value, %d, must be a positive value."),
                 scale);
         psFree(out);
@@ -66,5 +66,5 @@
     if (stats == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_STAT_NULL);
+                _("Specified statistic can not be NULL."));
         psFree(out);
         return NULL;
@@ -74,5 +74,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_BAD_STAT,
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),
                 stats->options);
         psFree(out);
@@ -87,5 +87,5 @@
             PS_TYPE_NAME(typeStr,mask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
@@ -159,5 +159,5 @@
             PS_TYPE_NAME(typeStr,in->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(out);
@@ -184,5 +184,5 @@
     if (in == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -191,5 +191,5 @@
     if (scale < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                _("Specified scale value, %d, must be a positive value."),
                 scale);
         psFree(out);
@@ -199,5 +199,5 @@
     if (mode > PS_INTERPOLATE_LANCZOS4_VARIANCE ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -241,5 +241,5 @@
             PS_TYPE_NAME(typeStr,in->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(out);
@@ -262,5 +262,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -311,5 +311,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -357,5 +357,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);
                 psFree(out);
@@ -403,5 +403,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);
                 psFree(out);
@@ -448,5 +448,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);
                 psFree(out);
@@ -503,5 +503,5 @@
                     cimag(exposed) > 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]."), \
                         "exposed", \
                         creal(exposed),cimag(exposed), \
@@ -570,5 +570,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); \
                 psFree(out); \
@@ -584,5 +584,5 @@
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                    _("Specified interpolation mode, %d, is unsupported."),
                     mode);
             psFree(out);
@@ -608,5 +608,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -627,5 +627,5 @@
             cimag(exposed) > 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]."), \
                 "exposed", \
                 creal(exposed),cimag(exposed), \
@@ -666,5 +666,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); \
             psFree(out); \
@@ -680,5 +680,5 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -702,5 +702,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(output);
         return NULL;
@@ -715,5 +715,5 @@
         if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     input->numCols, input->numRows,
                     inputMask->numCols, inputMask->numRows );
@@ -725,5 +725,5 @@
             PS_TYPE_NAME(typeStr,inputMask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(output);
@@ -734,5 +734,5 @@
     if (outToIn == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageManip_TRANSFORM_NULL);
+                _("Specified input transform can not be NULL."));
         return NULL;
     }
@@ -853,5 +853,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); \
             psFree(output); \
@@ -867,5 +867,5 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(output);