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/psImageConvolve.c

    r7914 r8232  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-07-15 02:57:12 $
     7 *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-08-08 23:32:23 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121#include "psError.h"
    2222
    23 #include "psErrorText.h"
     23
    2424
    2525#define FOURIER_PADDING 32 /* padding amount in every side of the image for fourier convolution */
    … …  
    120120    if (tShifts == NULL || xShifts == NULL || yShifts == NULL) {
    121121        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    122                 PS_ERRORTEXT_psImageConvolve_SHIFT_NULL);
     122                _("Specified shift vectors can not be NULL."));
    123123        return NULL;
    124124    }
    … …  
    134134        PS_TYPE_NAME(typeTStr,tShifts->type.type);
    135135        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    136                 PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH,
     136                _("Input t-, x-, and y-shift vector types (%s/%s/%s) must match."),
    137137                typeTStr, typeXStr, typeYStr);
    138138        return NULL;
    … …  
    257257                PS_TYPE_NAME(typeStr,xShifts->type.type);
    258258                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    259                         PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     259                        _("Specified psImage type, %s, is not supported."),
    260260                        typeStr);
    261261            }
    … …  
    280280                PS_TYPE_NAME(typeStr,xShifts->type.type);
    281281                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    282                         PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     282                        _("Specified psImage type, %s, is not supported."),
    283283                        typeStr);
    284284            }
    … …  
    301301    if (kernel == NULL) {
    302302        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    303                 PS_ERRORTEXT_psImageConvolve_KERNEL_NULL);
     303                _("Specified psKernel can not be NULL."));
    304304        psFree(out);
    305305        return NULL;
    … …  
    361361                PS_TYPE_NAME(typeStr,in->type.type);
    362362                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    363                         PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     363                        _("Specified psImage type, %s, is not supported."),
    364364                        typeStr);
    365365                psFree(out);
    … …  
    380380        if (kRows >= numRows || kCols >= numCols) {
    381381            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
    382                     PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE,
     382                    _("Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d."),
    383383                    kCols,kRows,
    384384                    numCols, numRows);
    … …  
    434434        if (kernelFourier == NULL) {
    435435            psError(PS_ERR_UNKNOWN, false,
    436                     PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED);
     436                    _("Failed to perform a fourier transform of kernel."));
    437437            psFree(out);
    438438            return NULL;
    … …  
    442442        if (inFourier == NULL) {
    443443            psError(PS_ERR_UNKNOWN, false,
    444                     PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
     444                    _("Failed to perform a fourier transform of input image."));
    445445            psFree(out);
    446446            return NULL;
    … …  
    460460        if (complexOut == NULL) {
    461461            psError(PS_ERR_UNKNOWN, false,
    462                     PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
     462                    _("Failed to perform a fourier transform of input image."));
    463463            psFree(out);
    464464            return NULL;
    … …  
    665665            PS_TYPE_NAME(typeStr,image->type.type);
    666666            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    667                     PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     667                    _("Specified psImage type, %s, is not supported."),
    668668                    typeStr);
    669669            return false;
Note: See TracChangeset for help on using the changeset viewer.