IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4287


Ignore:
Timestamp:
Jun 16, 2005, 12:07:41 PM (21 years ago)
Author:
gusciora
Message:

...

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/image/psImageGeomManip.c

    r4286 r4287  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-16 22:00:04 $
     12 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-16 22:07:41 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    697697                          const psPixels* pixels,
    698698                          psImageInterpolateMode mode,
    699                           int exposedValue,
    700                           psPlaneTransform *junk)
     699                          int exposedValue)
    701700{
    702     printf("junk(A): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    703 
    704 
    705701    if (input == NULL) {
    706702        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    … …  
    711707    psElemType type = input->type.type;
    712708
    713     printf("junk(B): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    714709    if (inputMask != NULL) {
    715710        if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
    … …  
    738733    }
    739734
    740     printf("junk(C): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    741735    int row0;
    742736    int row1;
    … …  
    780774    }
    781775
    782     printf("junk(D): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    783776    // loop through the output image using the domain above and transform
    784777    // each output pixel to input coordinates and use psImagePixelInterpolate
    … …  
    793786    #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    794787    /* apply the transform to get the position in the input image */ \
    795     printf("junk(Ea): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    796788    inPosition = psPlaneTransformApply(inPosition, outToIn, &outPosition); \
    797789    \
    798     printf("junk(Eaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    799790    if (inPosition == NULL) { \
    800791        psError(PS_ERR_UNKNOWN, false, \
    … …  
    804795    } \
    805796    /* interpolate the cooresponding input pixel to get the output pixel value. */ \
    806     printf("junk(Eaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    807797    ps##TYPE value = p_psImagePixelInterpolate##MODE##_##TYPE(input, \
    808798                     inPosition->x, inPosition->y, \
    809799                     inputMask, inputMaskVal, NAN); \
    810800    /*    psFree(inPosition); */\
    811     printf("junk(Eaaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    812801    if (isnan(value)) { \
    813802        if (blankPixels != NULL) { \
    … …  
    816805        value = exposedValue; \
    817806    } \
    818     printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    819 
    820 
    821807
    822808    #define PSIMAGE_TRANSFORM_LOOP(TYPE, MODE) { \
    … …  
    825811            ps##TYPE* outputData=output->data.TYPE[row]; \
    826812            for (int col = 0; col < numCols; col++) { \
    827                 printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    828813                outPosition.x = col+col0; \
    829                 printf("junk(Ebb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    830814                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    831                 printf("junk(Ebbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    832815                outputData[col] = value; \
    833                 printf("junk(Ebbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    834                 printf("HERE B: Writing (%d, %d) Image size is (%d, %d)\n", \
    835                        row, col, output->numRows, output->numCols); \
    836                 printf("junk(Ebbbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    837             } \
    838         } \
    839     }
    840 
    841     printf("junk(F): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     816            } \
     817        } \
     818    }
    842819
    843820    #define PSIMAGE_TRANSFORM_FROMLIST(TYPE, MODE) { \
    … …  
    851828                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    852829                output->data.TYPE[y][x] = value; \
    853                 printf("HERE C: Writing (%d, %d) Image size is (%d, %d)\n", y, x, output->numRows, output->numCols); \
    854             } \
    855         } \
    856     }
    857 
    858     printf("junk(G): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     830            } \
     831        } \
     832    }
    859833
    860834    #define PSIMAGE_TRANSFORM_CASE(MODE) \
    … …  
    874848                    typeStr); \
    875849            psFree(output); \
    876             printf("junk(H): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    877850            return NULL; \
    878851        } \
    … …  
    880853    break;
    881854
    882     printf("junk(J): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    883855    switch (mode) {
    884856        PSIMAGE_TRANSFORM_CASE(FLAT);
    … …  
    890862                mode);
    891863        psFree(output);
    892         printf("junk(K): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    893         return NULL;
    894     }
    895     printf("junk(L): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     864        return NULL;
     865    }
    896866
    897867    return output;

  • trunk/psLib/src/image/psImageGeomManip.h

    r4286 r4287  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-16 22:00:04 $
     10 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-16 22:07:41 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    151151    const psRegion region,             ///< the size of the transformed image
    152152    const psPixels* pixels,            /**< if not NULL, consists of psPixelCoords and specifies which pixels in
    153                                              *  output image shall be transformed; otherwise, entire image generated*/
     153                                                 *  output image shall be transformed; otherwise, entire image generated*/
    154154    psImageInterpolateMode mode,       ///< the interpolation scheme to be used
    155     int exposedValue,                   ///< Exposed value to which non-corresponding pixels are set
    156     psPlaneTransform *junk
     155    int exposedValue                   ///< Exposed value to which non-corresponding pixels are set
    157156);
    158157

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

    r4286 r4287  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-16 22:00:04 $
     12 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-16 22:07:41 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    697697                          const psPixels* pixels,
    698698                          psImageInterpolateMode mode,
    699                           int exposedValue,
    700                           psPlaneTransform *junk)
     699                          int exposedValue)
    701700{
    702     printf("junk(A): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    703 
    704 
    705701    if (input == NULL) {
    706702        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    … …  
    711707    psElemType type = input->type.type;
    712708
    713     printf("junk(B): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    714709    if (inputMask != NULL) {
    715710        if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
    … …  
    738733    }
    739734
    740     printf("junk(C): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    741735    int row0;
    742736    int row1;
    … …  
    780774    }
    781775
    782     printf("junk(D): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    783776    // loop through the output image using the domain above and transform
    784777    // each output pixel to input coordinates and use psImagePixelInterpolate
    … …  
    793786    #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    794787    /* apply the transform to get the position in the input image */ \
    795     printf("junk(Ea): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    796788    inPosition = psPlaneTransformApply(inPosition, outToIn, &outPosition); \
    797789    \
    798     printf("junk(Eaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    799790    if (inPosition == NULL) { \
    800791        psError(PS_ERR_UNKNOWN, false, \
    … …  
    804795    } \
    805796    /* interpolate the cooresponding input pixel to get the output pixel value. */ \
    806     printf("junk(Eaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    807797    ps##TYPE value = p_psImagePixelInterpolate##MODE##_##TYPE(input, \
    808798                     inPosition->x, inPosition->y, \
    809799                     inputMask, inputMaskVal, NAN); \
    810800    /*    psFree(inPosition); */\
    811     printf("junk(Eaaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    812801    if (isnan(value)) { \
    813802        if (blankPixels != NULL) { \
    … …  
    816805        value = exposedValue; \
    817806    } \
    818     printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    819 
    820 
    821807
    822808    #define PSIMAGE_TRANSFORM_LOOP(TYPE, MODE) { \
    … …  
    825811            ps##TYPE* outputData=output->data.TYPE[row]; \
    826812            for (int col = 0; col < numCols; col++) { \
    827                 printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    828813                outPosition.x = col+col0; \
    829                 printf("junk(Ebb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    830814                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    831                 printf("junk(Ebbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    832815                outputData[col] = value; \
    833                 printf("junk(Ebbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    834                 printf("HERE B: Writing (%d, %d) Image size is (%d, %d)\n", \
    835                        row, col, output->numRows, output->numCols); \
    836                 printf("junk(Ebbbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    837             } \
    838         } \
    839     }
    840 
    841     printf("junk(F): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     816            } \
     817        } \
     818    }
    842819
    843820    #define PSIMAGE_TRANSFORM_FROMLIST(TYPE, MODE) { \
    … …  
    851828                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    852829                output->data.TYPE[y][x] = value; \
    853                 printf("HERE C: Writing (%d, %d) Image size is (%d, %d)\n", y, x, output->numRows, output->numCols); \
    854             } \
    855         } \
    856     }
    857 
    858     printf("junk(G): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     830            } \
     831        } \
     832    }
    859833
    860834    #define PSIMAGE_TRANSFORM_CASE(MODE) \
    … …  
    874848                    typeStr); \
    875849            psFree(output); \
    876             printf("junk(H): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    877850            return NULL; \
    878851        } \
    … …  
    880853    break;
    881854
    882     printf("junk(J): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    883855    switch (mode) {
    884856        PSIMAGE_TRANSFORM_CASE(FLAT);
    … …  
    890862                mode);
    891863        psFree(output);
    892         printf("junk(K): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    893         return NULL;
    894     }
    895     printf("junk(L): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     864        return NULL;
     865    }
    896866
    897867    return output;

  • trunk/psLib/src/imageops/psImageGeomManip.h

    r4286 r4287  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-16 22:00:04 $
     10 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-16 22:07:41 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    151151    const psRegion region,             ///< the size of the transformed image
    152152    const psPixels* pixels,            /**< if not NULL, consists of psPixelCoords and specifies which pixels in
    153                                              *  output image shall be transformed; otherwise, entire image generated*/
     153                                                 *  output image shall be transformed; otherwise, entire image generated*/
    154154    psImageInterpolateMode mode,       ///< the interpolation scheme to be used
    155     int exposedValue,                   ///< Exposed value to which non-corresponding pixels are set
    156     psPlaneTransform *junk
     155    int exposedValue                   ///< Exposed value to which non-corresponding pixels are set
    157156);
    158157
Note: See TracChangeset for help on using the changeset viewer.