Index: trunk/psLib/src/imageops/psImagePixelExtract.c
===================================================================
--- trunk/psLib/src/imageops/psImagePixelExtract.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImagePixelExtract.c	(revision 8232)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 00:44:05 $
+ *  @version $Revision: 1.26 $ $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"
+
 
 #define VECTOR_STORE_ROW_CASE(TYPE) \
@@ -34,5 +34,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(out);
         return NULL;
@@ -124,5 +124,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(out);
         return NULL;
@@ -223,5 +223,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(out);
         return NULL;
@@ -350,5 +350,5 @@
         if (inRows != mask->numRows || inCols != mask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     mask->numCols,mask->numRows,
                     inCols, inRows);
@@ -360,5 +360,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);
@@ -369,5 +369,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;
@@ -378,5 +378,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                PS_ERRORTEXT_psImage_BAD_STAT,stats->options);
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),stats->options);
         psFree(out);
         return NULL;
@@ -466,5 +466,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);
@@ -531,5 +531,5 @@
     } else { // don't know what the direction flag is
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID,
+                _("Specified slice direction, %d, is invalid."),
                 direction);
         psFree(out);
@@ -555,5 +555,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(out);
         return NULL;
@@ -588,5 +588,5 @@
     if (nSamples < 2) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_nSamples_TOOSMALL,
+                _("Specified number of samples, %d, must be greater than 1 to make a line."),
                 nSamples);
         psFree(out);
@@ -639,5 +639,5 @@
     if (mode < PS_INTERPOLATE_FLAT ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -648,5 +648,5 @@
         if (numRows != mask->numRows || numCols != mask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     mask->numCols,mask->numRows,
                     numCols-1, numRows);
@@ -658,5 +658,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);
@@ -719,5 +719,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);
             psFree(out);
@@ -742,5 +742,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(out);
         return NULL;
@@ -752,5 +752,5 @@
         if (numRows != mask->numRows || numCols != mask->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."),
                     mask->numCols,mask->numRows,
                     numCols, numRows);
@@ -762,5 +762,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);
@@ -774,5 +774,5 @@
             y < input->row0 || y >= (input->row0 + numRows) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
+                _("Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d]."),
                 x, y,
                 numCols-1, numRows-1);
@@ -783,5 +783,5 @@
     if (radii == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_RADII_VECTOR_NULL);
+                _("Specified radii vector can not be NULL."));
         psFree(out);
         return NULL;
@@ -790,5 +790,5 @@
     if (radii->n < 2) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL,
+                _("Input radii vector size, %d, can not be less than 2."),
                 radii->n);
         psFree(out);
@@ -798,5 +798,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;
@@ -807,5 +807,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                PS_ERRORTEXT_psImage_BAD_STAT,
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),
                 stats->options);
         psFree(out);