IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 8, 2006, 1:32:23 PM (20 years ago)
Author:
jhoblitt
Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src

    • Property svn:ignore

      •  

        old new  
        1010libpslib.la.temp
        1111config.h.in
        12 psErrorText.h
        1312*.bb
        1413*.bbg

  • trunk/psLib/src/imageops/psImageStructManip.c

    r7524 r8232  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2006-06-12 20:44:04 $
     10 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2006-08-08 23:32:23 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121#include "psError.h"
    2222
    23 #include "psErrorText.h"
     23
    2424
    2525static psImage* imageSubset(psImage* out,
    … …  
    3535    if (image == NULL || image->data.V == NULL) {
    3636        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    37                 PS_ERRORTEXT_psImage_IMAGE_NULL);
     37                _("Can not operate on a NULL psImage."));
    3838        return NULL;
    3939    }
    … …  
    4141    if ( col0 < image->col0 || row0 < image->row0 ) {
    4242        //        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    43         //                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID);
     43        //                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."));
    4444        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    45                 PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
     45                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
    4646                col0, col1-1, row0, row1-1,
    4747                image->numCols-1, image->numRows-1);
    … …  
    5151    if (image->type.dimen != PS_DIMEN_IMAGE) {
    5252        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    53                 PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
     53                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
    5454        return NULL;
    5555    }
    … …  
    6969            row1 > image->row0 + image->numRows ) {
    7070        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    71                 PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
     71                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
    7272                col0, col1-1, row0, row1-1,
    7373                image->numCols-1, image->numRows-1);
    … …  
    153153    if (input == NULL || input->data.V == NULL) {
    154154        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    155                 PS_ERRORTEXT_psImage_IMAGE_NULL);
     155                _("Can not operate on a NULL psImage."));
    156156        psFree(output);
    157157        return NULL;
    … …  
    160160    if (input == output) {
    161161        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    162                 PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED);
     162                _("Specified input and output psImage can not reference the same psImage."));
    163163        psFree(output);
    164164        return NULL;
    … …  
    167167    if (input->type.dimen != PS_DIMEN_IMAGE) {
    168168        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    169                 PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
     169                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
    170170        psFree(output);
    171171        return NULL;
    … …  
    287287            PS_TYPE_NAME(typeStr,type);
    288288            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    289                     PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     289                    _("Specified psImage type, %s, is not supported."),
    290290                    typeStr);
    291291            psFree(output);
    … …  
    302302    if (image == NULL || image->data.V == NULL) {
    303303        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    304                 PS_ERRORTEXT_psImage_IMAGE_NULL);
     304                _("Can not operate on a NULL psImage."));
    305305        return NULL;
    306306    }
    … …  
    335335            row0 >= row1 ) {
    336336        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    337                 PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
     337                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
    338338                col0, col1-1, row0, row1-1,
    339339                image->numCols-1, image->numRows-1);
Note: See TracChangeset for help on using the changeset viewer.