Index: trunk/psLib/src/image/psImageGeomManip.c =================================================================== --- trunk/psLib/src/image/psImageGeomManip.c (revision 4316) +++ trunk/psLib/src/image/psImageGeomManip.c (revision 4367) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-23 03:50:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ const psImage* restrict mask, psMaskType maskVal, - psU32 scale, + int scale, const psStats* stats) { @@ -303,10 +303,10 @@ psImage* psImageRotate(psImage* out, - const psImage* in, + const psImage* input, float angle, - psC64 unexposedValue, + _Complex exposed, psImageInterpolateMode mode) { - if (in == NULL) { + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL); @@ -319,8 +319,8 @@ if (fabsf(angle - M_PI_2) < FLT_EPSILON) { // perform 1/4 rotate counter-clockwise - psS32 numRows = in->numCols; - psS32 numCols = in->numRows; + psS32 numRows = input->numCols; + psS32 numCols = input->numRows; psS32 lastCol = numCols - 1; - psElemType type = in->type.type; + psElemType type = input->type.type; out = psImageRecycle(out, numCols, numRows, type); @@ -328,5 +328,5 @@ #define PSIMAGE_ROTATE_LEFT_90(TYPE) \ case PS_TYPE_##TYPE: { \ - ps##TYPE** inData = in->data.TYPE; \ + ps##TYPE** inData = input->data.TYPE; \ for (psS32 row=0;rowdata.TYPE[row]; \ @@ -364,9 +364,9 @@ } else if (fabsf(angle - M_PI) < FLT_EPSILON) { // perform 1/2 rotate - psS32 numRows = in->numRows; + psS32 numRows = input->numRows; psS32 lastRow = numRows - 1; - psS32 numCols = in->numCols; + psS32 numCols = input->numCols; psS32 lastCol = numCols - 1; - psElemType type = in->type.type; + psElemType type = input->type.type; out = psImageRecycle(out, numCols, numRows, type); @@ -376,5 +376,5 @@ for (psS32 row=0;rowdata.TYPE[row]; \ - ps##TYPE* inRow = in->data.TYPE[lastRow-row]; \ + ps##TYPE* inRow = input->data.TYPE[lastRow-row]; \ for (psS32 col=0;colnumCols; + psS32 numRows = input->numCols; psS32 lastRow = numRows - 1; - psS32 numCols = in->numRows; - psElemType type = in->type.type; + psS32 numCols = input->numRows; + psElemType type = input->type.type; out = psImageRecycle(out, numCols, numRows, type); @@ -419,5 +419,5 @@ #define PSIMAGE_ROTATE_RIGHT_90(TYPE) \ case PS_TYPE_##TYPE: { \ - ps##TYPE** inData = in->data.TYPE; \ + ps##TYPE** inData = input->data.TYPE; \ for (psS32 row=0;rowdata.TYPE[row]; \ @@ -454,9 +454,9 @@ } } else if (fabsf(angle) < FLT_EPSILON) { - out = psImageCopy(out, in, in->type.type); + out = psImageCopy(out, input, input->type.type); } else { - psElemType type = in->type.type; - psS32 numRows = in->numRows; - psS32 numCols = in->numCols; + psElemType type = input->type.type; + psS32 numRows = input->numRows; + psS32 numCols = input->numCols; float centerX = (float)(numCols) / 2.0f; float centerY = (float)(numRows) / 2.0f; @@ -497,12 +497,12 @@ #define PSIMAGE_ROTATE_ARBITRARY_LOOP(TYPE,MODE) { \ - if (creal(unexposedValue) < PS_MIN_##TYPE || \ - creal(unexposedValue) > PS_MAX_##TYPE || \ - cimag(unexposedValue) < PS_MIN_##TYPE || \ - cimag(unexposedValue) > PS_MAX_##TYPE) { \ + if (creal(exposed) < PS_MIN_##TYPE || \ + creal(exposed) > PS_MAX_##TYPE || \ + cimag(exposed) < PS_MIN_##TYPE || \ + cimag(exposed) > PS_MAX_##TYPE) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "unexposedValue", \ - creal(unexposedValue),cimag(unexposedValue), \ + "exposed", \ + creal(exposed),cimag(exposed), \ PS_TYPE_##TYPE##_NAME, \ (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ @@ -519,5 +519,5 @@ outRow = out->data.TYPE[y]; \ for (psS32 x = 0; x < outCols; x++) { \ - outRow[x] = p_psImagePixelInterpolate##MODE##_##TYPE(in,inX,inY,NULL,0,unexposedValue); \ + outRow[x] = p_psImagePixelInterpolate##MODE##_##TYPE(input,inX,inY,NULL,0,exposed); \ inX += cosT; \ inY -= sinT; \ @@ -594,8 +594,8 @@ psImage* psImageShift(psImage* out, - const psImage* in, + const psImage* input, float dx, float dy, - psC64 unexposedValue, + _Complex exposed, psImageInterpolateMode mode) { @@ -605,5 +605,5 @@ psElemType type; - if (in == NULL) { + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL); @@ -613,7 +613,7 @@ // create an output image of the same size // and type - outRows = in->numRows; - outCols = in->numCols; - type = in->type.type; + outRows = input->numRows; + outCols = input->numCols; + type = input->type.type; elementSize = PSELEMTYPE_SIZEOF(type); out = psImageRecycle(out, outCols, outRows, type); @@ -621,12 +621,12 @@ #define PSIMAGE_SHIFT_CASE(MODE,TYPE) \ case PS_TYPE_##TYPE: \ - if (creal(unexposedValue) < PS_MIN_##TYPE || \ - creal(unexposedValue) > PS_MAX_##TYPE || \ - cimag(unexposedValue) < PS_MIN_##TYPE || \ - cimag(unexposedValue) > PS_MAX_##TYPE) { \ + if (creal(exposed) < PS_MIN_##TYPE || \ + creal(exposed) > PS_MAX_##TYPE || \ + cimag(exposed) < PS_MIN_##TYPE || \ + cimag(exposed) > PS_MAX_##TYPE) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "unexposedValue", \ - creal(unexposedValue),cimag(unexposedValue), \ + "exposed", \ + creal(exposed),cimag(exposed), \ PS_TYPE_##TYPE##_NAME, \ (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ @@ -640,5 +640,5 @@ for (psS32 col=0;coltype.type) { \ + switch (input->type.type) { \ PSIMAGE_SHIFT_CASE(MODE,U8); \ PSIMAGE_SHIFT_CASE(MODE,U16); \ @@ -694,8 +694,8 @@ int inputMaskVal, const psPlaneTransform *outToIn, - const psRegion region, + psRegion region, const psPixels* pixels, psImageInterpolateMode mode, - int exposedValue) + double exposedValue) { if (input == NULL) {