Index: trunk/psLib/src/imageops/psImageStructManip.c
===================================================================
--- trunk/psLib/src/imageops/psImageStructManip.c	(revision 7524)
+++ trunk/psLib/src/imageops/psImageStructManip.c	(revision 8232)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-12 20:44:04 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #include "psError.h"
 
-#include "psErrorText.h"
+
 
 static psImage* imageSubset(psImage* out,
@@ -35,5 +35,5 @@
     if (image == NULL || image->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return NULL;
     }
@@ -41,7 +41,7 @@
     if ( col0 < image->col0 || row0 < image->row0 ) {
         //        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]."));
         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]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);
@@ -51,5 +51,5 @@
     if (image->type.dimen != PS_DIMEN_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
         return NULL;
     }
@@ -69,5 +69,5 @@
             row1 > image->row0 + image->numRows ) {
         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]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);
@@ -153,5 +153,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(output);
         return NULL;
@@ -160,5 +160,5 @@
     if (input == output) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED);
+                _("Specified input and output psImage can not reference the same psImage."));
         psFree(output);
         return NULL;
@@ -167,5 +167,5 @@
     if (input->type.dimen != PS_DIMEN_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
         psFree(output);
         return NULL;
@@ -287,5 +287,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);
@@ -302,5 +302,5 @@
     if (image == NULL || image->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return NULL;
     }
@@ -335,5 +335,5 @@
             row0 >= row1 ) {
         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]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);