IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 8232 for trunk/psLib/src/fft


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:
3 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/fft/psImageFFT.c

    r4543 r8232  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-07-12 19:30:18 $
     7 *  @version $Revision: 1.18 $ $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 "psImageStructManip.h"
    2222
    23 #include "psErrorText.h"
     23
    2424
    2525#define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE
    … …  
    4343        if ((direction & PS_FFT_REVERSE) != 0) {
    4444            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    45                     PS_ERRORTEXT_psImageFFT_FORWARD_REVERSE);
     45                    _("Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options."));
    4646            psFree(out);
    4747            return NULL;
    … …  
    4949        if ((direction & PS_FFT_REAL_RESULT) != 0) {
    5050            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    51                     PS_ERRORTEXT_psImageFFT_REAL_FORWARD_NOTSUPPORTED);
     51                    _("The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported."));
    5252            psFree(out);
    5353            return NULL;
    … …  
    5555    } else if ((direction & PS_FFT_REVERSE) == 0) {
    5656        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    57                 PS_ERRORTEXT_psImageFFT_NO_DIRECTION_OPTION);
     57                _("Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option."));
    5858        psFree(out);
    5959        return NULL;
    … …  
    8686    if (plan == NULL) {
    8787        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    88                 PS_ERRORTEXT_psImageFFT_FFTW_PLAN_NULL);
     88                _("Could not create a valid FFT plan to perform the transform."));
    8989        psFree(out);
    9090        return NULL;
    … …  
    179179        PS_TYPE_NAME(typeStr,type);
    180180        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    181                 PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     181                _("Specified psImage type, %s, is not supported."),
    182182                typeStr);
    183183
    … …  
    241241        PS_TYPE_NAME(typeStr,type);
    242242        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    243                 PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
     243                _("Specified psImage type, %s, is not supported."),
    244244                typeStr);
    245245        psFree(out);
    … …  
    271271        PS_TYPE_NAME(typeStrImag,imag->type.type);
    272272        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    273                 PS_ERRORTEXT_psImageFFT_REAL_IMAG_TYPE_MISMATCH,
     273                _("Real psImage type (%s) and imaginary psImage type (%s) must be the same."),
    274274                typeStrReal,typeStrImag);
    275275        psFree(out);
    … …  
    279279    if (imag->numCols != numCols || imag->numRows != numRows) {
    280280        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    281                 PS_ERRORTEXT_psImageFFT_REAL_IMAG_SIZE_MISMATCH,
     281                _("Real psImage size (%dx%d) and imaginary psImage size (%dx%d) must be the same."),
    282282                numCols, numRows, imag->numCols, imag->numRows);
    283283        psFree(out);
    … …  
    320320        PS_TYPE_NAME(typeStr,type);
    321321        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    322                 PS_ERRORTEXT_psImageFFT_NONREAL_NOTSUPPORTED,
     322                _("Input psImage type, %s, is required to be either psF32 or psF64."),
    323323                typeStr);
    324324        psFree(out);
    … …  
    380380        PS_TYPE_NAME(typeStr,type);
    381381        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    382                 PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED,
     382                _("Input psImage type, %s, is required to be either psC32 or psC64."),
    383383                typeStr);
    384384        psFree(out);
    … …  
    446446        PS_TYPE_NAME(typeStr,type);
    447447        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    448                 PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED,
     448                _("Input psImage type, %s, is required to be either psC32 or psC64."),
    449449                typeStr);
    450450        psFree(out);

  • trunk/psLib/src/fft/psVectorFFT.c

    r4540 r8232  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-07-12 19:12:01 $
     7 *  @version $Revision: 1.34 $ $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
    … …  
    2222#include "psLogMsg.h"
    2323
    24 #include "psErrorText.h"
     24
    2525
    2626#define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
    … …  
    6363    } else {
    6464        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    65                 PS_ERRORTEXT_psVectorFFT_DIRECTION_NOTSET);
     65                _("Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE."));
    6666        psFree(out);
    6767        return NULL;
    … …  
    7171    if (plan == NULL) {
    7272        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    73                 PS_ERRORTEXT_psVectorFFT_FFTW_PLAN_NULL);
     73                _("Could not create a valid FFT plan to perform the transform."));
    7474        psFree(out);
    7575        return NULL;
    … …  
    142142        PS_TYPE_NAME(typeStr,type);
    143143        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    144                 PS_ERRORTEXT_psVectorFFT_TYPE_UNSUPPORTED,
     144                _("Specified psVector type, %s, is not supported."),
    145145                typeStr);
    146146        psFree(out);
    … …  
    201201        PS_TYPE_NAME(typeStr,type);
    202202        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    203                 PS_ERRORTEXT_psVectorFFT_TYPE_UNSUPPORTED,
     203                _("Specified psVector type, %s, is not supported."),
    204204                typeStr);
    205205        psFree(out);
    … …  
    233233        PS_TYPE_NAME(typeStrImag,imag->type.type);
    234234        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    235                 PS_ERRORTEXT_psVectorFFT_REAL_IMAG_TYPE_MISMATCH,
     235                _("Real psVector type, %s, and imaginary psVector type, %s, must be the same."),
    236236                typeStrReal,typeStrImag);
    237237        psFree(out);
    … …  
    267267        PS_TYPE_NAME(typeStr,type);
    268268        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    269                 PS_ERRORTEXT_psVectorFFT_NONREAL_NOTSUPPORTED,
     269                _("Input psVector type, %s, is required to be either psF32 or psF64."),
    270270                typeStr);
    271271        psFree(out);
    … …  
    327327        PS_TYPE_NAME(typeStr,type);
    328328        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    329                 PS_ERRORTEXT_psVectorFFT_NONCOMPLEX_NOTSUPPORTED,
     329                _("Input psVector type, %s, is required to be either psC32 or psC64."),
    330330                typeStr);
    331331        psFree(out);
    … …  
    407407        PS_TYPE_NAME(typeStr,type);
    408408        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    409                 PS_ERRORTEXT_psVectorFFT_NONCOMPLEX_NOTSUPPORTED,
     409                _("Input psVector type, %s, is required to be either psC32 or psC64."),
    410410                typeStr);
    411411        psFree(out);
Note: See TracChangeset for help on using the changeset viewer.