Index: /trunk/psLib/pslib.kdevelop
===================================================================
--- /trunk/psLib/pslib.kdevelop (revision 4366)
+++ /trunk/psLib/pslib.kdevelop (revision 4367)
@@ -12,12 +12,16 @@
+ KDevClearCase
+ KDevcopyto
KDevCTags
+ CvsService
+ KDevFileGroups
+ KDevPerforce
KDevsubversion
- KDevcopyto
- KDevClearCase
- KDevFileGroups
- CvsService
- KDevPerforce
+ ./src/
+ false
+
+
@@ -156,3 +160,27 @@
+
+
+ .h
+ .cpp
+
+
+
+
+
+
+ libtool
+
+
+
+ true
+ false
+ false
+
+
+ false
+ true
+ 10
+
+
Index: /trunk/psLib/pslib.kdevses
===================================================================
--- /trunk/psLib/pslib.kdevses (revision 4366)
+++ /trunk/psLib/pslib.kdevses (revision 4367)
@@ -2,12 +2,5 @@
-
-
-
-
-
-
-
-
+
Index: /trunk/psLib/src/collections/psArray.c
===================================================================
--- /trunk/psLib/src/collections/psArray.c (revision 4366)
+++ /trunk/psLib/src/collections/psArray.c (revision 4367)
@@ -9,6 +9,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-22 02:05:41 $
+ * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -147,5 +147,5 @@
}
-psArray* psArraySort(psArray* array, psComparePtrFcn func)
+psArray* psArraySort(psArray* array, psComparePtrFunc func)
{
if (array == NULL) {
Index: /trunk/psLib/src/collections/psArray.h
===================================================================
--- /trunk/psLib/src/collections/psArray.h (revision 4366)
+++ /trunk/psLib/src/collections/psArray.h (revision 4367)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-22 02:05:41 $
+ * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -123,5 +123,5 @@
psArray* psArraySort(
psArray* array, ///< input array to sort.
- psComparePtrFcn func ///< the compare function
+ psComparePtrFunc func ///< the compare function
);
Index: /trunk/psLib/src/collections/psCompare.h
===================================================================
--- /trunk/psLib/src/collections/psCompare.h (revision 4366)
+++ /trunk/psLib/src/collections/psCompare.h (revision 4367)
@@ -6,6 +6,6 @@
* @ingroup Compare
*
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-08 23:40:45 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,5 @@
* than, equal to, or greater than the second.
*/
-typedef int (*psComparePtrFcn) (
+typedef int (*psComparePtrFunc) (
const void **a, ///< first comparison target
const void **b ///< second comparison target
Index: /trunk/psLib/src/collections/psList.c
===================================================================
--- /trunk/psLib/src/collections/psList.c (revision 4366)
+++ /trunk/psLib/src/collections/psList.c (revision 4367)
@@ -6,6 +6,6 @@
* @author Robert Daniel DeSonia, MHPCC
*
- * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 03:13:01 $
+ * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -610,5 +610,5 @@
}
-psList* psListSort(psList* list, psComparePtrFcn compare)
+psList* psListSort(psList* list, psComparePtrFunc func)
{
psArray* arr;
@@ -622,5 +622,5 @@
psFree(list);
- arr = psArraySort(arr, compare);
+ arr = psArraySort(arr, func);
// convert back to linked list
Index: /trunk/psLib/src/collections/psList.h
===================================================================
--- /trunk/psLib/src/collections/psList.h (revision 4366)
+++ /trunk/psLib/src/collections/psList.h (revision 4367)
@@ -7,6 +7,6 @@
* @ingroup LinkedList
*
- * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -99,5 +99,5 @@
psListIterator* psListIteratorAlloc(
psList* list, ///< the psList to iterate with
- long location, ///< the initial starting point.
+ long location, ///< the initial starting point.
///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL.
bool mutable ///< Is it permissible to modify list?
@@ -221,5 +221,5 @@
psList* psListSort(
psList* list, ///< the list to sort
- psComparePtrFcn compare ///< the comparison function
+ psComparePtrFunc func ///< the comparison function
);
Index: /trunk/psLib/src/image/psImageGeomManip.c
===================================================================
--- /trunk/psLib/src/image/psImageGeomManip.c (revision 4366)
+++ /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) {
Index: /trunk/psLib/src/image/psImageGeomManip.h
===================================================================
--- /trunk/psLib/src/image/psImageGeomManip.h (revision 4366)
+++ /trunk/psLib/src/image/psImageGeomManip.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 03:13:02 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,5 @@
const psImage* mask, ///< mask for input image. If NULL, no masking is done.
psMaskType maskVal, ///< the bits to check in mask.
- psU32 scale, ///< the scale to rebin for each dimension
+ int scale, ///< the scale to rebin for each dimension
const psStats* stats
///< the statistic to perform when rebinning. Only one method should be set.
@@ -75,7 +75,7 @@
psImage* psImageRotate(
psImage* out, ///< an psImage to recycle. If NULL, a new image is created
- const psImage* in, ///< input image
+ const psImage* input, ///< input image
float angle, ///< the rotation angle in radians.
- psC64 unexposedValue, ///< the output image pixel values for non-imagery areas
+ _Complex exposed, ///< the output image pixel values for non-imagery areas
psImageInterpolateMode mode ///< the interpolation mode used
);
@@ -94,8 +94,8 @@
psImage* psImageShift(
psImage* out, ///< an psImage to recycle. If NULL, a new image is created
- const psImage* in, ///< input image
+ const psImage* input, ///< input image
float dx, ///< the shift in x direction.
float dy, ///< the shift in y direction.
- psC64 unexposedValue, ///< the output image pixel values for non-imagery areas
+ _Complex exposed, ///< the output image pixel values for non-imagery areas
psImageInterpolateMode mode ///< the interpolation mode to use
);
@@ -149,9 +149,9 @@
int inputMaskVal, ///< masking value for inputMask
const psPlaneTransform *outToIn, ///< the transform to apply
- const psRegion region, ///< the size of the transformed image
+ psRegion region, ///< the size of the transformed image
const psPixels* pixels, /**< if not NULL, consists of psPixelCoords and specifies which pixels in
- * output image shall be transformed; otherwise, entire image generated*/
+ * output image shall be transformed; otherwise, entire image generated*/
psImageInterpolateMode mode, ///< the interpolation scheme to be used
- int exposedValue ///< Exposed value to which non-corresponding pixels are set
+ double exposedValue ///< Exposed value to which non-corresponding pixels are set
);
Index: /trunk/psLib/src/image/psImagePixelExtract.c
===================================================================
--- /trunk/psLib/src/image/psImagePixelExtract.c (revision 4366)
+++ /trunk/psLib/src/image/psImagePixelExtract.c (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-10 02:30:47 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24,6 +24,6 @@
psVector* psImageSlice(psVector* out,
- psVector* slicePositions,
- const psImage* restrict in,
+ psVector* coords,
+ const psImage* restrict input,
const psImage* restrict mask,
psU32 maskVal,
@@ -44,5 +44,5 @@
psS32 col1 = region.x1;
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -52,15 +52,15 @@
if (col1 < 1) {
- col1 += in->numCols;
+ col1 += input->numCols;
}
if (row1 < 1) {
- row1 += in->numRows;
+ row1 += input->numRows;
}
if ( col0 < 0 ||
row0 < 0 ||
- col1 > in->numCols ||
- row1 > in->numRows ||
+ col1 > input->numCols ||
+ row1 > input->numRows ||
col0 >= col1 ||
row0 >= row1) {
@@ -68,12 +68,12 @@
PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
col0, col1, row0, row1,
- in->numCols, in->numRows);
- psFree(out);
- return NULL;
- }
-
- type = in->type.type;
- inRows = in->numRows;
- inCols = in->numCols;
+ input->numCols, input->numRows);
+ psFree(out);
+ return NULL;
+ }
+
+ type = input->type.type;
+ inRows = input->numRows;
+ inCols = input->numCols;
if (direction == PS_CUT_X_NEG || direction == PS_CUT_Y_NEG) {
@@ -134,7 +134,7 @@
// psStats.
out = psVectorRecycle(out, numCols, PS_TYPE_F64);
- if (slicePositions != NULL) {
- slicePositions = psVectorRecycle(slicePositions, numCols, PS_TYPE_U32);
- outPosition = slicePositions->data.U32;
+ if (coords != NULL) {
+ coords = psVectorRecycle(coords, numCols, PS_TYPE_U32);
+ outPosition = coords->data.U32;
}
outData = out->data.F64;
@@ -153,5 +153,5 @@
psMaskType* maskVecData = NULL; \
for (psS32 c=col0;cdata.TYPE[row0] + c; \
+ ps##TYPE *imgData = input->data.TYPE[row0] + c; \
ps##TYPE *imgVecData = imgVec->data.TYPE; \
if (maskVec != NULL) { \
@@ -213,5 +213,5 @@
// fill in psVector to fake out the statistics functions.
imgVec = psAlloc(sizeof(psVector));
- imgVec->type = in->type;
+ imgVec->type = input->type;
imgVec->n = *(int*)&imgVec->nalloc = numCols;
if (mask != NULL) {
@@ -224,7 +224,7 @@
// psStats.
out = psVectorRecycle(out, numRows, PS_TYPE_F64);
- if (slicePositions != NULL) {
- slicePositions = psVectorRecycle(slicePositions, numRows, PS_TYPE_U32);
- outPosition = slicePositions->data.U32;
+ if (coords != NULL) {
+ coords = psVectorRecycle(coords, numRows, PS_TYPE_U32);
+ outPosition = coords->data.U32;
}
outData = out->data.F64;
@@ -239,5 +239,5 @@
// point the vector struct to the
// data to calculate the stats
- imgVec->data.U8 = (psPtr )(in->data.U8[r] + col0 * elementSize);
+ imgVec->data.U8 = (psPtr )(input->data.U8[r] + col0 * elementSize);
if (maskVec != NULL) {
maskVec->data.U8 = (psPtr )(mask->data.U8[r] + col0 * sizeof(psMaskType));
@@ -271,13 +271,13 @@
psVector* cutCols,
psVector* cutRows,
- const psImage* in,
+ const psImage* input,
const psImage* mask,
psU32 maskVal,
psRegion region,
- psU32 nSamples,
+ unsigned int nSamples,
psImageInterpolateMode mode)
{
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -285,6 +285,6 @@
return NULL;
}
- psS32 numCols = in->numCols;
- psS32 numRows = in->numRows;
+ psS32 numCols = input->numCols;
+ psS32 numRows = input->numRows;
if (nSamples < 2) {
@@ -352,5 +352,5 @@
}
- out = psVectorRecycle(out, nSamples, in->type.type);
+ out = psVectorRecycle(out, nSamples, input->type.type);
float dX = (endCol - startCol) / (float)(nSamples-1);
@@ -370,5 +370,5 @@
cutRowsData[i] = y; \
} \
- outData[i] = psImagePixelInterpolate(in,x,y,mask,maskVal,0,mode); \
+ outData[i] = psImagePixelInterpolate(input,x,y,mask,maskVal,0,mode); \
} \
} \
@@ -376,5 +376,5 @@
- switch (in->type.type) {
+ switch (input->type.type) {
LINEAR_CUT_CASE(U8);
LINEAR_CUT_CASE(U16);
@@ -392,5 +392,5 @@
default: {
char* typeStr;
- PS_TYPE_NAME(typeStr,in->type.type);
+ PS_TYPE_NAME(typeStr,input->type.type);
psError(PS_ERR_BAD_PARAMETER_TYPE, true,
PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
@@ -405,9 +405,9 @@
psVector* psImageRadialCut(psVector* out,
- const psImage* in,
+ const psImage* input,
const psImage* restrict mask,
psU32 maskVal,
- float centerCol,
- float centerRow,
+ float x,
+ float y,
const psVector* radii,
const psStats* stats)
@@ -417,5 +417,5 @@
/* check the parameters */
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -423,6 +423,6 @@
return NULL;
}
- psS32 numCols = in->numCols;
- psS32 numRows = in->numRows;
+ psS32 numCols = input->numCols;
+ psS32 numRows = input->numRows;
if (mask != NULL) {
@@ -446,9 +446,9 @@
}
- if (centerCol < 0 || centerCol >= numCols ||
- centerRow < 0 || centerRow >= numRows) {
+ if (x < 0 || x >= numCols ||
+ y < 0 || y >= numRows) {
psError(PS_ERR_BAD_PARAMETER_VALUE, true,
PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
- centerCol, centerRow,
+ x, y,
numCols-1, numRows-1);
psFree(out);
@@ -498,8 +498,8 @@
psF32* rSq = rSqVec->data.F32;
- psS32 startRow = centerRow - rSq[numOut];
- psS32 endRow = centerRow + rSq[numOut];
- psS32 startCol = centerCol - rSq[numOut];
- psS32 endCol = centerCol + rSq[numOut];
+ psS32 startRow = y - rSq[numOut];
+ psS32 endRow = y + rSq[numOut];
+ psS32 startCol = x - rSq[numOut];
+ psS32 endCol = x + rSq[numOut];
if (startRow < 0) {
@@ -531,5 +531,5 @@
// than the area of the region of interest.
buffer[lcv] = psVectorAlloc(1+4*(rSq[lcv+1]-rSq[lcv]),
- in->type.type);
+ input->type.type);
buffer[lcv]->n = 0;
@@ -546,5 +546,5 @@
float dist;
for (psS32 row=startRow; row <= endRow; row++) {
- psF32* inRow = in->data.F32[row];
+ psF32* inRow = input->data.F32[row];
psMaskType* maskRow = NULL;
if (mask != NULL) {
@@ -552,6 +552,6 @@
}
for (psS32 col=startCol; col <= endCol; col++) {
- dX = centerCol - (float)col - 0.5f;
- dY = centerRow - (float)row - 0.5f;
+ dX = x - (float)col - 0.5f;
+ dY = y - (float)row - 0.5f;
dist = dX*dX+dY*dY;
for (psS32 r = 0; r < numOut; r++) {
Index: /trunk/psLib/src/image/psImagePixelExtract.h
===================================================================
--- /trunk/psLib/src/image/psImagePixelExtract.h (revision 4366)
+++ /trunk/psLib/src/image/psImagePixelExtract.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
-* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-* @date $Date: 2005-06-10 02:30:47 $
+* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+* @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -58,5 +58,5 @@
psVector* psImageSlice(
psVector* out, ///< psVector to recycle, or NULL.
- psVector* slicePositions,
+ psVector* coords,
///< If not NULL, it is populated with the coordinate in the slice dimension
///< coorsponding to the output vector's value of the same position in the
@@ -94,5 +94,5 @@
psU32 maskVal, ///< the mask value to apply to the mask
psRegion region, ///< the start and end points to cut along
- psU32 nSamples, ///< the number of samples along the cut
+ unsigned int nSamples, ///< the number of samples along the cut
psImageInterpolateMode mode ///< the interpolation method to use
);
@@ -116,6 +116,6 @@
const psImage* mask, ///< the mask for the input image.
psU32 maskVal, ///< the mask value to apply to the mask
- float centerCol, ///< the column of the center of the cut circle
- float centerRow, ///< the row of the center of the cut circle
+ float x, ///< the column of the center of the cut circle
+ float y, ///< the row of the center of the cut circle
const psVector* radii, ///< the radii of the cut circle
const psStats* stats ///< the statistic to perform in operation
Index: /trunk/psLib/src/image/psImagePixelManip.c
===================================================================
--- /trunk/psLib/src/image/psImagePixelManip.c (revision 4366)
+++ /trunk/psLib/src/image/psImagePixelManip.c (revision 4367)
@@ -10,6 +10,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 02:30:49 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -311,8 +311,8 @@
int psImageClipComplexRegion(psImage* input,
- psC64 min,
- psC64 vmin,
- psC64 max,
- psC64 vmax)
+ _Complex min,
+ _Complex vmin,
+ _Complex max,
+ _Complex vmax)
{
psS32 numClipped = 0;
Index: /trunk/psLib/src/image/psImagePixelManip.h
===================================================================
--- /trunk/psLib/src/image/psImagePixelManip.h (revision 4366)
+++ /trunk/psLib/src/image/psImagePixelManip.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47,12 +47,12 @@
* This function is defined for psC32, and psC64 imagery only.
*
- * @return psS32 The number of clipped pixels
+ * @return int The number of clipped pixels
*/
int psImageClipComplexRegion(
psImage* input, ///< the image to clip
- psC64 min, ///< the minimum image value allowed
- psC64 vmin, ///< the value pixels < min are set to
- psC64 max, ///< the maximum image value allowed
- psC64 vmax ///< the value pixels > max are set to
+ _Complex min, ///< the minimum image value allowed
+ _Complex vmin, ///< the value pixels < min are set to
+ _Complex max, ///< the maximum image value allowed
+ _Complex vmax ///< the value pixels > max are set to
);
Index: /trunk/psLib/src/imageops/psImageGeomManip.c
===================================================================
--- /trunk/psLib/src/imageops/psImageGeomManip.c (revision 4366)
+++ /trunk/psLib/src/imageops/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) {
Index: /trunk/psLib/src/imageops/psImageGeomManip.h
===================================================================
--- /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4366)
+++ /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 03:13:02 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,5 @@
const psImage* mask, ///< mask for input image. If NULL, no masking is done.
psMaskType maskVal, ///< the bits to check in mask.
- psU32 scale, ///< the scale to rebin for each dimension
+ int scale, ///< the scale to rebin for each dimension
const psStats* stats
///< the statistic to perform when rebinning. Only one method should be set.
@@ -75,7 +75,7 @@
psImage* psImageRotate(
psImage* out, ///< an psImage to recycle. If NULL, a new image is created
- const psImage* in, ///< input image
+ const psImage* input, ///< input image
float angle, ///< the rotation angle in radians.
- psC64 unexposedValue, ///< the output image pixel values for non-imagery areas
+ _Complex exposed, ///< the output image pixel values for non-imagery areas
psImageInterpolateMode mode ///< the interpolation mode used
);
@@ -94,8 +94,8 @@
psImage* psImageShift(
psImage* out, ///< an psImage to recycle. If NULL, a new image is created
- const psImage* in, ///< input image
+ const psImage* input, ///< input image
float dx, ///< the shift in x direction.
float dy, ///< the shift in y direction.
- psC64 unexposedValue, ///< the output image pixel values for non-imagery areas
+ _Complex exposed, ///< the output image pixel values for non-imagery areas
psImageInterpolateMode mode ///< the interpolation mode to use
);
@@ -149,9 +149,9 @@
int inputMaskVal, ///< masking value for inputMask
const psPlaneTransform *outToIn, ///< the transform to apply
- const psRegion region, ///< the size of the transformed image
+ psRegion region, ///< the size of the transformed image
const psPixels* pixels, /**< if not NULL, consists of psPixelCoords and specifies which pixels in
- * output image shall be transformed; otherwise, entire image generated*/
+ * output image shall be transformed; otherwise, entire image generated*/
psImageInterpolateMode mode, ///< the interpolation scheme to be used
- int exposedValue ///< Exposed value to which non-corresponding pixels are set
+ double exposedValue ///< Exposed value to which non-corresponding pixels are set
);
Index: /trunk/psLib/src/imageops/psImagePixelExtract.c
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelExtract.c (revision 4366)
+++ /trunk/psLib/src/imageops/psImagePixelExtract.c (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-10 02:30:47 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24,6 +24,6 @@
psVector* psImageSlice(psVector* out,
- psVector* slicePositions,
- const psImage* restrict in,
+ psVector* coords,
+ const psImage* restrict input,
const psImage* restrict mask,
psU32 maskVal,
@@ -44,5 +44,5 @@
psS32 col1 = region.x1;
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -52,15 +52,15 @@
if (col1 < 1) {
- col1 += in->numCols;
+ col1 += input->numCols;
}
if (row1 < 1) {
- row1 += in->numRows;
+ row1 += input->numRows;
}
if ( col0 < 0 ||
row0 < 0 ||
- col1 > in->numCols ||
- row1 > in->numRows ||
+ col1 > input->numCols ||
+ row1 > input->numRows ||
col0 >= col1 ||
row0 >= row1) {
@@ -68,12 +68,12 @@
PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
col0, col1, row0, row1,
- in->numCols, in->numRows);
- psFree(out);
- return NULL;
- }
-
- type = in->type.type;
- inRows = in->numRows;
- inCols = in->numCols;
+ input->numCols, input->numRows);
+ psFree(out);
+ return NULL;
+ }
+
+ type = input->type.type;
+ inRows = input->numRows;
+ inCols = input->numCols;
if (direction == PS_CUT_X_NEG || direction == PS_CUT_Y_NEG) {
@@ -134,7 +134,7 @@
// psStats.
out = psVectorRecycle(out, numCols, PS_TYPE_F64);
- if (slicePositions != NULL) {
- slicePositions = psVectorRecycle(slicePositions, numCols, PS_TYPE_U32);
- outPosition = slicePositions->data.U32;
+ if (coords != NULL) {
+ coords = psVectorRecycle(coords, numCols, PS_TYPE_U32);
+ outPosition = coords->data.U32;
}
outData = out->data.F64;
@@ -153,5 +153,5 @@
psMaskType* maskVecData = NULL; \
for (psS32 c=col0;cdata.TYPE[row0] + c; \
+ ps##TYPE *imgData = input->data.TYPE[row0] + c; \
ps##TYPE *imgVecData = imgVec->data.TYPE; \
if (maskVec != NULL) { \
@@ -213,5 +213,5 @@
// fill in psVector to fake out the statistics functions.
imgVec = psAlloc(sizeof(psVector));
- imgVec->type = in->type;
+ imgVec->type = input->type;
imgVec->n = *(int*)&imgVec->nalloc = numCols;
if (mask != NULL) {
@@ -224,7 +224,7 @@
// psStats.
out = psVectorRecycle(out, numRows, PS_TYPE_F64);
- if (slicePositions != NULL) {
- slicePositions = psVectorRecycle(slicePositions, numRows, PS_TYPE_U32);
- outPosition = slicePositions->data.U32;
+ if (coords != NULL) {
+ coords = psVectorRecycle(coords, numRows, PS_TYPE_U32);
+ outPosition = coords->data.U32;
}
outData = out->data.F64;
@@ -239,5 +239,5 @@
// point the vector struct to the
// data to calculate the stats
- imgVec->data.U8 = (psPtr )(in->data.U8[r] + col0 * elementSize);
+ imgVec->data.U8 = (psPtr )(input->data.U8[r] + col0 * elementSize);
if (maskVec != NULL) {
maskVec->data.U8 = (psPtr )(mask->data.U8[r] + col0 * sizeof(psMaskType));
@@ -271,13 +271,13 @@
psVector* cutCols,
psVector* cutRows,
- const psImage* in,
+ const psImage* input,
const psImage* mask,
psU32 maskVal,
psRegion region,
- psU32 nSamples,
+ unsigned int nSamples,
psImageInterpolateMode mode)
{
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -285,6 +285,6 @@
return NULL;
}
- psS32 numCols = in->numCols;
- psS32 numRows = in->numRows;
+ psS32 numCols = input->numCols;
+ psS32 numRows = input->numRows;
if (nSamples < 2) {
@@ -352,5 +352,5 @@
}
- out = psVectorRecycle(out, nSamples, in->type.type);
+ out = psVectorRecycle(out, nSamples, input->type.type);
float dX = (endCol - startCol) / (float)(nSamples-1);
@@ -370,5 +370,5 @@
cutRowsData[i] = y; \
} \
- outData[i] = psImagePixelInterpolate(in,x,y,mask,maskVal,0,mode); \
+ outData[i] = psImagePixelInterpolate(input,x,y,mask,maskVal,0,mode); \
} \
} \
@@ -376,5 +376,5 @@
- switch (in->type.type) {
+ switch (input->type.type) {
LINEAR_CUT_CASE(U8);
LINEAR_CUT_CASE(U16);
@@ -392,5 +392,5 @@
default: {
char* typeStr;
- PS_TYPE_NAME(typeStr,in->type.type);
+ PS_TYPE_NAME(typeStr,input->type.type);
psError(PS_ERR_BAD_PARAMETER_TYPE, true,
PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
@@ -405,9 +405,9 @@
psVector* psImageRadialCut(psVector* out,
- const psImage* in,
+ const psImage* input,
const psImage* restrict mask,
psU32 maskVal,
- float centerCol,
- float centerRow,
+ float x,
+ float y,
const psVector* radii,
const psStats* stats)
@@ -417,5 +417,5 @@
/* check the parameters */
- if (in == NULL || in->data.V == NULL) {
+ if (input == NULL || input->data.V == NULL) {
psError(PS_ERR_BAD_PARAMETER_NULL, true,
PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -423,6 +423,6 @@
return NULL;
}
- psS32 numCols = in->numCols;
- psS32 numRows = in->numRows;
+ psS32 numCols = input->numCols;
+ psS32 numRows = input->numRows;
if (mask != NULL) {
@@ -446,9 +446,9 @@
}
- if (centerCol < 0 || centerCol >= numCols ||
- centerRow < 0 || centerRow >= numRows) {
+ if (x < 0 || x >= numCols ||
+ y < 0 || y >= numRows) {
psError(PS_ERR_BAD_PARAMETER_VALUE, true,
PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
- centerCol, centerRow,
+ x, y,
numCols-1, numRows-1);
psFree(out);
@@ -498,8 +498,8 @@
psF32* rSq = rSqVec->data.F32;
- psS32 startRow = centerRow - rSq[numOut];
- psS32 endRow = centerRow + rSq[numOut];
- psS32 startCol = centerCol - rSq[numOut];
- psS32 endCol = centerCol + rSq[numOut];
+ psS32 startRow = y - rSq[numOut];
+ psS32 endRow = y + rSq[numOut];
+ psS32 startCol = x - rSq[numOut];
+ psS32 endCol = x + rSq[numOut];
if (startRow < 0) {
@@ -531,5 +531,5 @@
// than the area of the region of interest.
buffer[lcv] = psVectorAlloc(1+4*(rSq[lcv+1]-rSq[lcv]),
- in->type.type);
+ input->type.type);
buffer[lcv]->n = 0;
@@ -546,5 +546,5 @@
float dist;
for (psS32 row=startRow; row <= endRow; row++) {
- psF32* inRow = in->data.F32[row];
+ psF32* inRow = input->data.F32[row];
psMaskType* maskRow = NULL;
if (mask != NULL) {
@@ -552,6 +552,6 @@
}
for (psS32 col=startCol; col <= endCol; col++) {
- dX = centerCol - (float)col - 0.5f;
- dY = centerRow - (float)row - 0.5f;
+ dX = x - (float)col - 0.5f;
+ dY = y - (float)row - 0.5f;
dist = dX*dX+dY*dY;
for (psS32 r = 0; r < numOut; r++) {
Index: /trunk/psLib/src/imageops/psImagePixelExtract.h
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4366)
+++ /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
-* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-* @date $Date: 2005-06-10 02:30:47 $
+* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+* @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -58,5 +58,5 @@
psVector* psImageSlice(
psVector* out, ///< psVector to recycle, or NULL.
- psVector* slicePositions,
+ psVector* coords,
///< If not NULL, it is populated with the coordinate in the slice dimension
///< coorsponding to the output vector's value of the same position in the
@@ -94,5 +94,5 @@
psU32 maskVal, ///< the mask value to apply to the mask
psRegion region, ///< the start and end points to cut along
- psU32 nSamples, ///< the number of samples along the cut
+ unsigned int nSamples, ///< the number of samples along the cut
psImageInterpolateMode mode ///< the interpolation method to use
);
@@ -116,6 +116,6 @@
const psImage* mask, ///< the mask for the input image.
psU32 maskVal, ///< the mask value to apply to the mask
- float centerCol, ///< the column of the center of the cut circle
- float centerRow, ///< the row of the center of the cut circle
+ float x, ///< the column of the center of the cut circle
+ float y, ///< the row of the center of the cut circle
const psVector* radii, ///< the radii of the cut circle
const psStats* stats ///< the statistic to perform in operation
Index: /trunk/psLib/src/imageops/psImagePixelManip.c
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4366)
+++ /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4367)
@@ -10,6 +10,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 02:30:49 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -311,8 +311,8 @@
int psImageClipComplexRegion(psImage* input,
- psC64 min,
- psC64 vmin,
- psC64 max,
- psC64 vmax)
+ _Complex min,
+ _Complex vmin,
+ _Complex max,
+ _Complex vmax)
{
psS32 numClipped = 0;
Index: /trunk/psLib/src/imageops/psImagePixelManip.h
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4366)
+++ /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4367)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47,12 +47,12 @@
* This function is defined for psC32, and psC64 imagery only.
*
- * @return psS32 The number of clipped pixels
+ * @return int The number of clipped pixels
*/
int psImageClipComplexRegion(
psImage* input, ///< the image to clip
- psC64 min, ///< the minimum image value allowed
- psC64 vmin, ///< the value pixels < min are set to
- psC64 max, ///< the maximum image value allowed
- psC64 vmax ///< the value pixels > max are set to
+ _Complex min, ///< the minimum image value allowed
+ _Complex vmin, ///< the value pixels < min are set to
+ _Complex max, ///< the maximum image value allowed
+ _Complex vmax ///< the value pixels > max are set to
);
Index: /trunk/psLib/src/math/psCompare.h
===================================================================
--- /trunk/psLib/src/math/psCompare.h (revision 4366)
+++ /trunk/psLib/src/math/psCompare.h (revision 4367)
@@ -6,6 +6,6 @@
* @ingroup Compare
*
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-08 23:40:45 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,5 @@
* than, equal to, or greater than the second.
*/
-typedef int (*psComparePtrFcn) (
+typedef int (*psComparePtrFunc) (
const void **a, ///< first comparison target
const void **b ///< second comparison target
Index: /trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.c (revision 4366)
+++ /trunk/psLib/src/sys/psLogMsg.c (revision 4367)
@@ -12,6 +12,6 @@
* @author GLG, MHPCC
*
- * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-20 22:42:30 $
+ * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -87,5 +87,5 @@
An psBool: TRUE if successful.
*****************************************************************************/
-psBool psLogSetDestination(const char *dest)
+bool psLogSetDestination(const char *dest)
{
char protocol[5];
@@ -163,5 +163,5 @@
NULL.
*****************************************************************************/
-void psLogSetFormat(const char *fmt)
+void psLogSetFormat(const char *format)
{
// assume none.
@@ -173,16 +173,16 @@
// if fmt is NULL, no logging is desired.
- if (fmt == NULL) {
+ if (format == NULL) {
return;
}
// XXX: What is the purpose of this conditional.
- if (strlen(fmt) == 0) {
- fmt = "THLNM";
+ if (strlen(format) == 0) {
+ format = "THLNM";
}
// Step through each character in the format string. For each letter
// in that string, set the appropriate logging.
- for (const char *ptr = fmt; *ptr != '\0'; ptr++) {
+ for (const char *ptr = format; *ptr != '\0'; ptr++) {
switch (*ptr) {
case 'H':
@@ -215,5 +215,5 @@
// XXX: If one must at least log error messages, why don't we set logMsg = true here?
if (!logMsg) {
- psTrace("utils.logMsg", 1, "You must at least log error messages (You chose \"%s\")", fmt);
+ psTrace("utils.logMsg", 1, "You must at least log error messages (You chose \"%s\")", format);
}
}
Index: /trunk/psLib/src/sys/psLogMsg.h
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.h (revision 4366)
+++ /trunk/psLib/src/sys/psLogMsg.h (revision 4367)
@@ -11,6 +11,6 @@
* @author GLG, MHPCC
*
- * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,7 +30,7 @@
* argument which can specify general log destinations.
*
- * @return psS32 true if set successfully, otherwise false.
+ * @return bool true if set successfully, otherwise false.
*/
-psBool psLogSetDestination(
+bool psLogSetDestination(
const char *dest ///< Specifies where to send messages.
);
@@ -56,5 +56,5 @@
*/
void psLogSetFormat(
- const char *fmt ///< Specifies the system log format
+ const char *format ///< Specifies the system log format
);
Index: /trunk/psLib/src/sysUtils/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 4366)
+++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 4367)
@@ -12,6 +12,6 @@
* @author GLG, MHPCC
*
- * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-20 22:42:30 $
+ * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -87,5 +87,5 @@
An psBool: TRUE if successful.
*****************************************************************************/
-psBool psLogSetDestination(const char *dest)
+bool psLogSetDestination(const char *dest)
{
char protocol[5];
@@ -163,5 +163,5 @@
NULL.
*****************************************************************************/
-void psLogSetFormat(const char *fmt)
+void psLogSetFormat(const char *format)
{
// assume none.
@@ -173,16 +173,16 @@
// if fmt is NULL, no logging is desired.
- if (fmt == NULL) {
+ if (format == NULL) {
return;
}
// XXX: What is the purpose of this conditional.
- if (strlen(fmt) == 0) {
- fmt = "THLNM";
+ if (strlen(format) == 0) {
+ format = "THLNM";
}
// Step through each character in the format string. For each letter
// in that string, set the appropriate logging.
- for (const char *ptr = fmt; *ptr != '\0'; ptr++) {
+ for (const char *ptr = format; *ptr != '\0'; ptr++) {
switch (*ptr) {
case 'H':
@@ -215,5 +215,5 @@
// XXX: If one must at least log error messages, why don't we set logMsg = true here?
if (!logMsg) {
- psTrace("utils.logMsg", 1, "You must at least log error messages (You chose \"%s\")", fmt);
+ psTrace("utils.logMsg", 1, "You must at least log error messages (You chose \"%s\")", format);
}
}
Index: /trunk/psLib/src/sysUtils/psLogMsg.h
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4366)
+++ /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4367)
@@ -11,6 +11,6 @@
* @author GLG, MHPCC
*
- * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,7 +30,7 @@
* argument which can specify general log destinations.
*
- * @return psS32 true if set successfully, otherwise false.
+ * @return bool true if set successfully, otherwise false.
*/
-psBool psLogSetDestination(
+bool psLogSetDestination(
const char *dest ///< Specifies where to send messages.
);
@@ -56,5 +56,5 @@
*/
void psLogSetFormat(
- const char *fmt ///< Specifies the system log format
+ const char *format ///< Specifies the system log format
);
Index: /trunk/psLib/src/types/psArray.c
===================================================================
--- /trunk/psLib/src/types/psArray.c (revision 4366)
+++ /trunk/psLib/src/types/psArray.c (revision 4367)
@@ -9,6 +9,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-22 02:05:41 $
+ * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -147,5 +147,5 @@
}
-psArray* psArraySort(psArray* array, psComparePtrFcn func)
+psArray* psArraySort(psArray* array, psComparePtrFunc func)
{
if (array == NULL) {
Index: /trunk/psLib/src/types/psArray.h
===================================================================
--- /trunk/psLib/src/types/psArray.h (revision 4366)
+++ /trunk/psLib/src/types/psArray.h (revision 4367)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-22 02:05:41 $
+ * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -123,5 +123,5 @@
psArray* psArraySort(
psArray* array, ///< input array to sort.
- psComparePtrFcn func ///< the compare function
+ psComparePtrFunc func ///< the compare function
);
Index: /trunk/psLib/src/types/psList.c
===================================================================
--- /trunk/psLib/src/types/psList.c (revision 4366)
+++ /trunk/psLib/src/types/psList.c (revision 4367)
@@ -6,6 +6,6 @@
* @author Robert Daniel DeSonia, MHPCC
*
- * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-18 03:13:01 $
+ * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -610,5 +610,5 @@
}
-psList* psListSort(psList* list, psComparePtrFcn compare)
+psList* psListSort(psList* list, psComparePtrFunc func)
{
psArray* arr;
@@ -622,5 +622,5 @@
psFree(list);
- arr = psArraySort(arr, compare);
+ arr = psArraySort(arr, func);
// convert back to linked list
Index: /trunk/psLib/src/types/psList.h
===================================================================
--- /trunk/psLib/src/types/psList.h (revision 4366)
+++ /trunk/psLib/src/types/psList.h (revision 4367)
@@ -7,6 +7,6 @@
* @ingroup LinkedList
*
- * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-06-21 03:01:37 $
+ * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-06-23 03:50:29 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -99,5 +99,5 @@
psListIterator* psListIteratorAlloc(
psList* list, ///< the psList to iterate with
- long location, ///< the initial starting point.
+ long location, ///< the initial starting point.
///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL.
bool mutable ///< Is it permissible to modify list?
@@ -221,5 +221,5 @@
psList* psListSort(
psList* list, ///< the list to sort
- psComparePtrFcn compare ///< the comparison function
+ psComparePtrFunc func ///< the comparison function
);