Index: trunk/psLib/src/math/psBinaryOp.c
===================================================================
--- trunk/psLib/src/math/psBinaryOp.c	(revision 7766)
+++ trunk/psLib/src/math/psBinaryOp.c	(revision 8232)
@@ -30,6 +30,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50,5 +50,5 @@
 #include "psLogMsg.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 
 /*****************************************************************************
@@ -107,5 +107,5 @@
     long n2 = ((psVector*)IN2)->n; \
     if (n1 != n2) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, n2); \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, n2); \
         if (OUT != IN1 && OUT != IN2) { \
             psFree(OUT); \
@@ -129,5 +129,5 @@
     if (((psVector*)IN1)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \
         if (n1 != numRows2) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numRows2); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, numRows2); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -146,5 +146,5 @@
     } else {  /* Transposed vectors */ \
         if (n1 != numCols2) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numCols2); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, numCols2); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -187,5 +187,5 @@
     if (((psVector*)IN2)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \
         if (n2 != numRows1) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numRows1); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n2, numRows1); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -204,5 +204,5 @@
     } else {  /* Transposed vectors */ \
         if (n2 != numCols1) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numCols1); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n2, numCols1); \
             if (OUT != IN1) { \
                 psFree(OUT); \
@@ -229,5 +229,5 @@
     long numCols2 = ((psImage*)IN2)->numCols; \
     if (numRows1 != numRows2 || numCols1 != numCols2) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_SIZE_DIFFERS, \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \
                 numCols1, numRows1, numCols2, numRows2); \
         if (OUT != IN1 && OUT != IN2) { \
@@ -278,5 +278,5 @@
     PS_TYPE_NAME(strType,IN1->type);                                                                         \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true,                                                                 \
-            PS_ERRORTEXT_psMatrix_TYPE_MISMATCH,                                                             \
+            _("Specified data type, %s, is not supported."),                                                             \
             strType);  */                                                                                    \
     if (OUT != IN1 && OUT != IN2) {                                                                          \
@@ -329,5 +329,5 @@
     PS_TYPE_NAME(strType,IN1->type);                                                                         \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true,                                                                 \
-            PS_ERRORTEXT_psMatrix_TYPE_MISMATCH,                                                             \
+            _("Specified data type, %s, is not supported."),                                                             \
             strType);  */                                                                                    \
     if (OUT != IN1 && OUT != IN2) {                                                                          \
@@ -372,5 +372,5 @@
     if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) {                                                               \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                PS_ERRORTEXT_psMatrix_MIN_COMPLEX_SUPPORT);                                                  \
+                _("The minimum operation is not supported with complex data."));                                                  \
         if (OUT != IN1 && OUT != IN2) {                                                                      \
             psFree(OUT);                                                                                     \
@@ -383,5 +383,5 @@
     if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) {                                                               \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                PS_ERRORTEXT_psMatrix_MAX_COMPLEX_SUPPORT);                                                  \
+                _("The maximum operation is not supported with complex data."));                                                  \
         if (OUT != IN1 && OUT != IN2) {                                                                      \
             psFree(OUT);                                                                                     \
@@ -393,5 +393,5 @@
 } else {                                                                                                     \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                                \
-            PS_ERRORTEXT_psMatrix_OPERATION_UNSUPPORTED,                                                     \
+            _("Specified operation, %s, is not supported."),                                                     \
             OP);                                                                                             \
     if (OUT != IN1 && OUT != IN2) {                                                                          \
@@ -469,5 +469,5 @@
             if (out == NULL) {
                 psError(PS_ERR_UNKNOWN, false,
-                        PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);
+                        _("Couldn't create a proper output psVector."));
                 return NULL;
             }
@@ -478,5 +478,5 @@
             if (out == NULL) {
                 psError(PS_ERR_UNKNOWN, false,
-                        PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);
+                        _("Couldn't create a proper output psImage."));
                 return NULL;
             }
@@ -484,5 +484,5 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psMatrix_DIMEN_INVALID,
+                    _("Specified parameter, %s, has invalid dimensionality, %d."),
                     "in2",dim2);
             psBinaryOp_EXIT;
@@ -493,5 +493,5 @@
             if (out == NULL) {
                 psError(PS_ERR_UNKNOWN, false,
-                        PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);
+                        _("Couldn't create a proper output psVector."));
                 return NULL;
             }
@@ -502,5 +502,5 @@
             if (out == NULL) {
                 psError(PS_ERR_UNKNOWN, false,
-                        PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);
+                        _("Couldn't create a proper output psVector."));
                 return NULL;
             }
@@ -511,5 +511,5 @@
             if (out == NULL) {
                 psError(PS_ERR_UNKNOWN, false,
-                        PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);
+                        _("Couldn't create a proper output psImage."));
                 return NULL;
             }
@@ -517,5 +517,5 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psMatrix_DIMEN_INVALID,
+                    _("Specified parameter, %s, has invalid dimensionality, %d."),
                     "in2",dim2);
             psBinaryOp_EXIT;
@@ -525,5 +525,5 @@
         if (out == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);
+                    _("Couldn't create a proper output psImage."));
             return NULL;
         }
@@ -536,5 +536,5 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psMatrix_DIMEN_INVALID,
+                    _("Specified parameter, %s, has invalid dimensionality, %d."),
                     "in2",dim2);
             psBinaryOp_EXIT;
@@ -542,5 +542,5 @@
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psMatrix_DIMEN_INVALID,
+                _("Specified parameter, %s, has invalid dimensionality, %d."),
                 "in1",dim1);
         psBinaryOp_EXIT;