Changeset 8232 for trunk/psLib/src/math
- Timestamp:
- Aug 8, 2006, 1:32:23 PM (20 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 10 edited
-
. (modified) (1 prop)
-
math/psBinaryOp.c (modified) (23 diffs)
-
math/psMathUtils.c (modified) (2 diffs)
-
math/psMatrix.c (modified) (3 diffs)
-
math/psPolynomial.c (modified) (6 diffs)
-
math/psRandom.c (modified) (8 diffs)
-
math/psRegion.c (modified) (4 diffs)
-
math/psSpline.c (modified) (2 diffs)
-
math/psStats.c (modified) (7 diffs)
-
math/psUnaryOp.c (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src
- Property svn:ignore
-
old new 10 10 libpslib.la.temp 11 11 config.h.in 12 psErrorText.h13 12 *.bb 14 13 *.bbg
-
- Property svn:ignore
-
trunk/psLib/src/math/psBinaryOp.c
r7766 r8232 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $33 * @date $Date: 2006-0 6-30 02:20:06$32 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2006-08-08 23:32:23 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 50 50 #include "psLogMsg.h" 51 51 #include "psAssert.h" 52 #include "psErrorText.h" 52 53 53 54 54 /***************************************************************************** … … 107 107 long n2 = ((psVector*)IN2)->n; \ 108 108 if (n1 != n2) { \ 109 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, n2); \109 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, n2); \ 110 110 if (OUT != IN1 && OUT != IN2) { \ 111 111 psFree(OUT); \ … … 129 129 if (((psVector*)IN1)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \ 130 130 if (n1 != numRows2) { \ 131 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numRows2); \131 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, numRows2); \ 132 132 if (OUT != IN1 && OUT != IN2) { \ 133 133 psFree(OUT); \ … … 146 146 } else { /* Transposed vectors */ \ 147 147 if (n1 != numCols2) { \ 148 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numCols2); \148 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, numCols2); \ 149 149 if (OUT != IN1 && OUT != IN2) { \ 150 150 psFree(OUT); \ … … 187 187 if (((psVector*)IN2)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \ 188 188 if (n2 != numRows1) { \ 189 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numRows1); \189 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n2, numRows1); \ 190 190 if (OUT != IN1 && OUT != IN2) { \ 191 191 psFree(OUT); \ … … 204 204 } else { /* Transposed vectors */ \ 205 205 if (n2 != numCols1) { \ 206 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numCols1); \206 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n2, numCols1); \ 207 207 if (OUT != IN1) { \ 208 208 psFree(OUT); \ … … 229 229 long numCols2 = ((psImage*)IN2)->numCols; \ 230 230 if (numRows1 != numRows2 || numCols1 != numCols2) { \ 231 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_SIZE_DIFFERS, \231 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \ 232 232 numCols1, numRows1, numCols2, numRows2); \ 233 233 if (OUT != IN1 && OUT != IN2) { \ … … 278 278 PS_TYPE_NAME(strType,IN1->type); \ 279 279 psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ 280 PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, \280 _("Specified data type, %s, is not supported."), \ 281 281 strType); */ \ 282 282 if (OUT != IN1 && OUT != IN2) { \ … … 329 329 PS_TYPE_NAME(strType,IN1->type); \ 330 330 psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ 331 PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, \331 _("Specified data type, %s, is not supported."), \ 332 332 strType); */ \ 333 333 if (OUT != IN1 && OUT != IN2) { \ … … 372 372 if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) { \ 373 373 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ 374 PS_ERRORTEXT_psMatrix_MIN_COMPLEX_SUPPORT); \374 _("The minimum operation is not supported with complex data.")); \ 375 375 if (OUT != IN1 && OUT != IN2) { \ 376 376 psFree(OUT); \ … … 383 383 if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) { \ 384 384 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ 385 PS_ERRORTEXT_psMatrix_MAX_COMPLEX_SUPPORT); \385 _("The maximum operation is not supported with complex data.")); \ 386 386 if (OUT != IN1 && OUT != IN2) { \ 387 387 psFree(OUT); \ … … 393 393 } else { \ 394 394 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ 395 PS_ERRORTEXT_psMatrix_OPERATION_UNSUPPORTED, \395 _("Specified operation, %s, is not supported."), \ 396 396 OP); \ 397 397 if (OUT != IN1 && OUT != IN2) { \ … … 469 469 if (out == NULL) { 470 470 psError(PS_ERR_UNKNOWN, false, 471 PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);471 _("Couldn't create a proper output psVector.")); 472 472 return NULL; 473 473 } … … 478 478 if (out == NULL) { 479 479 psError(PS_ERR_UNKNOWN, false, 480 PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);480 _("Couldn't create a proper output psImage.")); 481 481 return NULL; 482 482 } … … 484 484 } else { 485 485 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 486 PS_ERRORTEXT_psMatrix_DIMEN_INVALID,486 _("Specified parameter, %s, has invalid dimensionality, %d."), 487 487 "in2",dim2); 488 488 psBinaryOp_EXIT; … … 493 493 if (out == NULL) { 494 494 psError(PS_ERR_UNKNOWN, false, 495 PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);495 _("Couldn't create a proper output psVector.")); 496 496 return NULL; 497 497 } … … 502 502 if (out == NULL) { 503 503 psError(PS_ERR_UNKNOWN, false, 504 PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);504 _("Couldn't create a proper output psVector.")); 505 505 return NULL; 506 506 } … … 511 511 if (out == NULL) { 512 512 psError(PS_ERR_UNKNOWN, false, 513 PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);513 _("Couldn't create a proper output psImage.")); 514 514 return NULL; 515 515 } … … 517 517 } else { 518 518 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 519 PS_ERRORTEXT_psMatrix_DIMEN_INVALID,519 _("Specified parameter, %s, has invalid dimensionality, %d."), 520 520 "in2",dim2); 521 521 psBinaryOp_EXIT; … … 525 525 if (out == NULL) { 526 526 psError(PS_ERR_UNKNOWN, false, 527 PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);527 _("Couldn't create a proper output psImage.")); 528 528 return NULL; 529 529 } … … 536 536 } else { 537 537 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 538 PS_ERRORTEXT_psMatrix_DIMEN_INVALID,538 _("Specified parameter, %s, has invalid dimensionality, %d."), 539 539 "in2",dim2); 540 540 psBinaryOp_EXIT; … … 542 542 } else { 543 543 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 544 PS_ERRORTEXT_psMatrix_DIMEN_INVALID,544 _("Specified parameter, %s, has invalid dimensionality, %d."), 545 545 "in1",dim1); 546 546 psBinaryOp_EXIT; -
trunk/psLib/src/math/psMathUtils.c
r7766 r8232 3 3 * This file contains standard math routines. 4 4 * 5 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $6 * @date $Date: 2006-0 6-30 02:20:06$5 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 6 * @date $Date: 2006-08-08 23:32:23 $ 7 7 * 8 8 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 26 26 #include "psAssert.h" 27 27 #include "psConstants.h" 28 #include "psErrorText.h" 28 29 29 30 30 /*****************************************************************************/ -
trunk/psLib/src/math/psMatrix.c
r7766 r8232 21 21 * @author Robert DeSonia, MHPCC 22 22 * 23 * @version $Revision: 1.4 0$ $Name: not supported by cvs2svn $24 * @date $Date: 2006-0 6-30 02:20:06$23 * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ 24 * @date $Date: 2006-08-08 23:32:23 $ 25 25 * 26 26 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 43 43 #include "psMatrix.h" 44 44 #include "psAssert.h" 45 #include "psErrorText.h" 45 46 46 #include "psTrace.h" 47 47 … … 568 568 569 569 if(numRowsIn!=numColsOut && numRowsOut!=numColsIn) { 570 psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMatrix_TRANSPOSE_MISMATCH);570 psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Number of rows do not match number of columns.")); 571 571 TRANSPOSE_CLEANUP; 572 572 } -
trunk/psLib/src/math/psPolynomial.c
r7914 r8232 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.14 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2006-0 7-15 02:57:12$9 * @version $Revision: 1.148 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2006-08-08 23:32:23 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 32 32 #include "psPolynomial.h" 33 33 #include "psAssert.h" 34 #include "psErrorText.h" 34 35 35 36 36 /*****************************************************************************/ … … 795 795 } else { 796 796 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 797 PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,797 _("Unknown polynomial type 0x%x found. Evaluation failed."), 798 798 poly->type); 799 799 } … … 845 845 } else { 846 846 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 847 PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,847 _("Unknown polynomial type 0x%x found. Evaluation failed."), 848 848 poly->type); 849 849 } … … 924 924 } else { 925 925 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 926 PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,926 _("Unknown polynomial type 0x%x found. Evaluation failed."), 927 927 poly->type); 928 928 } … … 1040 1040 } else { 1041 1041 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 1042 PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,1042 _("Unknown polynomial type 0x%x found. Evaluation failed."), 1043 1043 poly->type); 1044 1044 } -
trunk/psLib/src/math/psRandom.c
r7766 r8232 10 10 * @author GLG, MHPCC 11 11 * 12 * @version $Revision: 1.1 2$ $Name: not supported by cvs2svn $13 * @date $Date: 2006-0 6-30 02:20:06$12 * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2006-08-08 23:32:23 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 31 31 #include "psLogMsg.h" 32 32 #include "psAssert.h" 33 #include "psErrorText.h" 33 34 34 35 35 psU64 p_psRandomGetSystemSeed() … … 78 78 psError(PS_ERR_UNEXPECTED_NULL, 79 79 true, 80 PS_ERRORTEXT_psRandom_UNKNOWN_RANDFOM_NUMBER_GENERATOR_TYPE);80 _("Unknown Random Number Generator Type")); 81 81 break; 82 82 } … … 92 92 psError(PS_ERR_UNEXPECTED_NULL, 93 93 true, 94 PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR);94 _("Random variable is NULL.")); 95 95 } else { 96 96 // Check seed value to see if system seed should be used … … 109 109 psError(PS_ERR_UNEXPECTED_NULL, 110 110 true, 111 PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR);111 _("Random variable is NULL.")); 112 112 return(0); 113 113 } else { … … 122 122 psError(PS_ERR_UNEXPECTED_NULL, 123 123 true, 124 PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR);124 _("Random variable is NULL.")); 125 125 return(0); 126 126 } else { … … 136 136 psError(PS_ERR_UNEXPECTED_NULL, 137 137 true, 138 PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR);138 _("Random variable is NULL.")); 139 139 return(0); 140 140 } else { … … 149 149 psError(PS_ERR_UNEXPECTED_NULL, 150 150 true, 151 PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR);151 _("Random variable is NULL.")); 152 152 return(0); 153 153 } else { -
trunk/psLib/src/math/psRegion.c
r7901 r8232 3 3 #include "psMemory.h" 4 4 #include "psError.h" 5 #include "psErrorText.h" 5 6 6 #include "psRegion.h" 7 7 … … 52 52 if (sscanf(region,"[%d:%d,%d:%d]",&col0,&col1,&row0,&row1) < 4) { 53 53 psError(PS_ERR_BAD_PARAMETER_NULL, true, 54 PS_ERRORTEXT_psImage_SUBSECTION_INVALID,54 _("Specified subsection string, '%s', can not be parsed. Must be in the form '[x1:x2,y1:y2]'."), 55 55 region); 56 56 return psRegionSet(NAN,NAN,NAN,NAN); … … 64 64 if ((col1 > 0) && (col0 > col1)) { 65 65 psError(PS_ERR_BAD_PARAMETER_VALUE, true, 66 PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,66 _("Specified subset range, [%d:%d,%d:%d], is invalid. Ranges must be incremental."), 67 67 col0,col1,row0,row1); 68 68 return psRegionSet(NAN,NAN,NAN,NAN); … … 71 71 if ((row1 > 0) && (row0 > row1)) { 72 72 psError(PS_ERR_BAD_PARAMETER_VALUE, true, 73 PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,73 _("Specified subset range, [%d:%d,%d:%d], is invalid. Ranges must be incremental."), 74 74 col0,col1,row0,row1); 75 75 return psRegionSet(NAN,NAN,NAN,NAN); -
trunk/psLib/src/math/psSpline.c
r7914 r8232 6 6 * This file contains the routines that allocate, free, and evaluate splines. 7 7 * 8 * @version $Revision: 1.15 0$ $Name: not supported by cvs2svn $9 * @date $Date: 2006-0 7-15 02:57:12$8 * @version $Revision: 1.151 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2006-08-08 23:32:23 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 28 28 #include "psSpline.h" 29 29 #include "psAssert.h" 30 #include "psErrorText.h" 30 31 31 #include "psMathUtils.h" 32 32 -
trunk/psLib/src/math/psStats.c
r7999 r8232 16 16 * use ->min and ->max (PS_STAT_USE_RANGE) 17 17 * 18 * @version $Revision: 1.18 2$ $Name: not supported by cvs2svn $19 * @date $Date: 2006-0 7-28 00:44:05$18 * @version $Revision: 1.183 $ $Name: not supported by cvs2svn $ 19 * @date $Date: 2006-08-08 23:32:23 $ 20 20 * 21 21 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 49 49 #include "psString.h" 50 50 51 #include "psErrorText.h" 51 52 52 53 53 /*****************************************************************************/ … … 440 440 psError(PS_ERR_UNEXPECTED_NULL, 441 441 false, 442 PS_ERRORTEXT_psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM);442 _("Failed to sort input data.")); 443 443 psTrace(__func__, 4, "---- %s(false) end ----\n", __func__); 444 444 psFree(vector); … … 924 924 ((y->data.F64[2] <= yVal) && (yVal <= y->data.F64[0]))) ) { 925 925 psError(PS_ERR_BAD_PARAMETER_VALUE, true, 926 PS_ERRORTEXT_psStats_YVAL_OUT_OF_RANGE,926 _("Specified yVal, %g, is not within y-range, %g to %g."), 927 927 (psF64)yVal, y->data.F64[0], y->data.F64[2]); 928 928 } … … 946 946 if (myPoly == NULL) { 947 947 psError(PS_ERR_UNEXPECTED_NULL, false, 948 PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT);948 _("Failed to fit a 1-dimensional polynomial to the three specified data points. Returning NAN.")); 949 949 psFree(x); 950 950 psFree(y); … … 967 967 if (isnan(tmpFloat)) { 968 968 psError(PS_ERR_UNEXPECTED_NULL, 969 false, PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLY_MEDIAN);969 false, _("Failed to determine the median of the fitted polynomial. Returning NAN.")); 970 970 psFree(x); 971 971 psFree(y); … … 2035 2035 PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV)) { 2036 2036 if (!vectorRobustStats(inF32, errorsF32, maskU8, maskVal, stats)) { 2037 psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psStats_STATS_FAILED);2037 psError(PS_ERR_UNKNOWN, false, _("Failed to calculate the specified statistic.")); 2038 2038 psFree(stats); 2039 2039 psFree(inF32); -
trunk/psLib/src/math/psUnaryOp.c
r7766 r8232 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $33 * @date $Date: 2006-0 6-30 02:20:06$32 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2006-08-08 23:32:23 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 51 51 #include "psLogMsg.h" 52 52 #include "psAssert.h" 53 #include "psErrorText.h" 53 54 54 55 55 /***************************************************************************** … … 78 78 long nOut = ((psVector*)OUT)->n; \ 79 79 if (nIn != nOut) { \ 80 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, nIn, nOut); \80 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), nIn, nOut); \ 81 81 if (OUT != IN) { \ 82 82 psFree(OUT); \ … … 99 99 long numColsOut = ((psImage*)OUT)->numCols; \ 100 100 if(numRowsIn!=numRowsOut || numColsIn!=numColsOut) { \ 101 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_SIZE_DIFFERS, \101 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \ 102 102 numColsIn, numRowsIn, numColsOut, numRowsOut); \ 103 103 if (OUT != IN) { \ … … 157 157 char* strType; \ 158 158 PS_TYPE_NAME(strType, IN->type); \ 159 psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, strType); \159 psError(PS_ERR_BAD_PARAMETER_TYPE, true, _("Specified data type, %s, is not supported."), strType); \ 160 160 if (OUT != IN) { \ 161 161 psFree(OUT); \ … … 275 275 } \ 276 276 } else { \ 277 psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMatrix_OPERATION_UNSUPPORTED, OP); \277 psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified operation, %s, is not supported."), OP); \ 278 278 if (OUT != IN) { \ 279 279 psFree(OUT); \ … … 309 309 case PS_DIMEN_TRANSV: 310 310 if (((psVector*)in)->n == 0) { 311 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_VECTOR_EMPTY);311 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Input psVector contains no elements. No data to perform operation with.")); 312 312 psUnaryOp_EXIT; 313 313 } … … 315 315 out = psVectorRecycle(out, ((psVector*)in)->n, psTypeIn->type); 316 316 if (out == NULL) { 317 psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED);317 psError(PS_ERR_UNKNOWN, false, _("Couldn't create a proper output psVector.")); 318 318 psUnaryOp_EXIT; 319 319 } … … 324 324 case PS_DIMEN_IMAGE: 325 325 if (((psImage* ) in)->numCols == 0 || ((psImage* ) in)->numRows == 0) { 326 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_EMPTY);326 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Input psImage contains no pixels. No data to perform operation with.")); 327 327 psUnaryOp_EXIT; 328 328 } … … 330 330 out = psImageRecycle(out, ((psImage*)in)->numCols, ((psImage*)in)->numRows, psTypeIn->type); 331 331 if (out == NULL) { 332 psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED);332 psError(PS_ERR_UNKNOWN, false, _("Couldn't create a proper output psImage.")); 333 333 psUnaryOp_EXIT; 334 334 } … … 340 340 psFree(out); 341 341 } 342 psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_DIMEN_INVALID, "in", psTypeIn->dimen);342 psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified parameter, %s, has invalid dimensionality, %d."), "in", psTypeIn->dimen); 343 343 psUnaryOp_EXIT; 344 344 }
Note:
See TracChangeset
for help on using the changeset viewer.
