Changeset 4316
- Timestamp:
- Jun 17, 2005, 5:13:02 PM (21 years ago)
- Location:
- trunk/psLib
- Files:
-
- 26 edited
-
pslib.kdevelop.pcs (modified) ( previous)
-
pslib.kdevses (modified) (1 diff)
-
src/collections/psList.c (modified) (8 diffs)
-
src/collections/psList.h (modified) (10 diffs)
-
src/fft/psImageFFT.c (modified) (6 diffs)
-
src/fft/psImageFFT.h (modified) (2 diffs)
-
src/image/psImage.c (modified) (2 diffs)
-
src/image/psImage.h (modified) (2 diffs)
-
src/image/psImageConvolve.c (modified) (3 diffs)
-
src/image/psImageConvolve.h (modified) (3 diffs)
-
src/image/psImageFFT.c (modified) (6 diffs)
-
src/image/psImageFFT.h (modified) (2 diffs)
-
src/image/psImageGeomManip.c (modified) (6 diffs)
-
src/image/psImageGeomManip.h (modified) (4 diffs)
-
src/imageops/psImageConvolve.c (modified) (3 diffs)
-
src/imageops/psImageConvolve.h (modified) (3 diffs)
-
src/imageops/psImageGeomManip.c (modified) (6 diffs)
-
src/imageops/psImageGeomManip.h (modified) (4 diffs)
-
src/mathtypes/psImage.c (modified) (2 diffs)
-
src/mathtypes/psImage.h (modified) (2 diffs)
-
src/sys/psLogMsg.c (modified) (2 diffs)
-
src/sys/psLogMsg.h (modified) (2 diffs)
-
src/sysUtils/psLogMsg.c (modified) (2 diffs)
-
src/sysUtils/psLogMsg.h (modified) (2 diffs)
-
src/types/psList.c (modified) (8 diffs)
-
src/types/psList.h (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/pslib.kdevses
r4298 r4316 2 2 <!DOCTYPE KDevPrjSession> 3 3 <KDevPrjSession> 4 <DocsAndViews NumberOfDocuments=" 1" >5 <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/ dataIO/psDB.c" >6 <View0 line=" 0" Type="Source" />4 <DocsAndViews NumberOfDocuments="4" > 5 <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.h" > 6 <View0 line="197" Type="Source" /> 7 7 </Doc0> 8 <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.c" > 9 <View0 line="565" Type="Source" /> 10 </Doc1> 11 <Doc2 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.h" > 12 <View0 line="69" Type="Source" /> 13 </Doc2> 14 <Doc3 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.c" > 15 <View0 line="369" Type="Source" /> 16 </Doc3> 8 17 </DocsAndViews> 9 18 <pluginList> -
trunk/psLib/src/collections/psList.c
r4312 r4316 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.3 6$ $Name: not supported by cvs2svn $9 * @date $Date: 2005-06-18 0 0:53:32$8 * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-06-18 03:13:01 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 149 149 } 150 150 151 psListIterator* psListIteratorAlloc(psList* list, intlocation, bool mutable)151 psListIterator* psListIteratorAlloc(psList* list, long location, bool mutable) 152 152 { 153 153 psListIterator* iter = psAlloc(sizeof(psListIterator)); … … 181 181 } 182 182 183 psBool psListIteratorSet(psListIterator* iterator,184 183 bool psListIteratorSet(psListIterator* iterator, 184 int location) 185 185 { 186 186 if (iterator == NULL) { … … 247 247 } 248 248 249 psBool psListAdd(psList* list, psS32location, psPtr data)249 bool psListAdd(psList* list, long location, psPtr data) 250 250 { 251 251 … … 433 433 } 434 434 435 psBool psListRemove(psList* list,436 psS32location)435 bool psListRemove(psList* list, 436 long location) 437 437 { 438 438 if (list == NULL) { … … 451 451 } 452 452 453 psBool psListRemoveData(psList* list,454 453 bool psListRemoveData(psList* list, 454 psPtr data) 455 455 { 456 456 if (list == NULL) { … … 485 485 } 486 486 487 psPtr psListGet(psList* list, psS32location)487 psPtr psListGet(psList* list, long location) 488 488 { 489 489 if (list == NULL) { … … 564 564 * Convert a psList to/from a psVoidPtrArray 565 565 */ 566 psArray* psListToArray( psList* restrict list)566 psArray* psListToArray(const psList* restrict list) 567 567 { 568 568 psListElem* ptr; -
trunk/psLib/src/collections/psList.h
r4312 r4316 7 7 * @ingroup LinkedList 8 8 * 9 * @version $Revision: 1.2 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-18 0 0:53:32 $9 * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 99 99 psListIterator* psListIteratorAlloc( 100 100 psList* list, ///< the psList to iterate with 101 intlocation, ///< the initial starting point.101 long location, ///< the initial starting point. 102 102 ///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL. 103 103 bool mutable ///< Is it permissible to modify list? … … 109 109 * @return psBool TRUE if iterator successfully set, otherwise FALSE. 110 110 */ 111 psBool psListIteratorSet(111 bool psListIteratorSet( 112 112 psListIterator* iterator, ///< list iterator 113 113 int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 118 118 * @return psBool TRUE if item was successfully added, otherwise FALSE. 119 119 */ 120 psBool psListAdd(120 bool psListAdd( 121 121 psList* list, ///< list to add item to 122 psS32location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location.122 long location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. 123 123 psPtr data ///< data item to add. If NULL, list is not modified. 124 124 ); … … 128 128 * @return psBool TRUE if item was successfully added, otherwise FALSE. 129 129 */ 130 psBool psListAddAfter(131 psListIterator* list,///< list position to add item to130 bool psListAddAfter( 131 psListIterator* iterator, ///< list position to add item to 132 132 psPtr data ///< data item to add. If NULL, list is not modified. 133 133 ); … … 137 137 * @return psBool TRUE if item was successfully added, otherwise FALSE. 138 138 */ 139 psBool psListAddBefore(140 psListIterator* list, ///< list position to add item to139 bool psListAddBefore( 140 psListIterator* iterator, ///< list position to add item to 141 141 psPtr data ///< data item to add. If NULL, list is not modified. 142 142 ); … … 146 146 * @return psBool TRUE if element is successfully removed, otherwise FALSE. 147 147 */ 148 psBool psListRemove(148 bool psListRemove( 149 149 psList* list, ///< list to remove element from 150 psS32location ///< index of item150 long location ///< index of item 151 151 ); 152 152 … … 155 155 * @return psBool TRUE if element is successfully removed, otherwise FALSE. 156 156 */ 157 psBool psListRemoveData(157 bool psListRemoveData( 158 158 psList* list, ///< list to remove element from 159 159 psPtr data ///< data item to find and remove … … 169 169 psPtr psListGet( 170 170 psList* list, ///< list to retrieve element from 171 psS32location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL171 long location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL 172 172 ); 173 173 … … 196 196 */ 197 197 psArray* psListToArray( 198 psList* dlist ///< List to convert198 const psList* list ///< List to convert 199 199 ); 200 200 -
trunk/psLib/src/fft/psImageFFT.c
r4193 r4316 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-06- 09 21:17:45$7 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-18 03:13:02 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 27 27 static psBool p_fftwWisdomImported = false; 28 28 29 psImage* psImageFFT(psImage* out, const psImage* i n, psFFTFlags direction)29 psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction) 30 30 { 31 31 psU32 numCols; … … 35 35 36 36 /* got good image data? */ 37 if (i n== NULL) {37 if (image == NULL) { 38 38 psFree(out); 39 39 return NULL; … … 60 60 } 61 61 62 type = i n->type.type;62 type = image->type.type; 63 63 64 64 /* make sure the system-level wisdom information is imported. */ … … 68 68 } 69 69 70 numRows = i n->numRows;71 numCols = i n->numCols;70 numRows = image->numRows; 71 numCols = image->numCols; 72 72 73 73 // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. … … 75 75 76 76 fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex)); 77 p_psImageCopyToRawBuffer(outBuffer, i n, PS_TYPE_C32);77 p_psImageCopyToRawBuffer(outBuffer, image, PS_TYPE_C32); 78 78 79 79 plan = fftwf_plan_dft_2d(numRows, numCols, -
trunk/psLib/src/fft/psImageFFT.h
r4162 r4316 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 08 23:40:45$9 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 33 33 psImage* psImageFFT( 34 34 psImage* out, ///< a psImage to recycle. If NULL, a new psImage is made. 35 const psImage* i n, ///< the psImage to apply transform to35 const psImage* image, ///< the psImage to apply transform to 36 36 psFFTFlags direction ///< the direction of the transform 37 37 ); -
trunk/psLib/src/image/psImage.c
r4315 r4316 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 8$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-06-18 0 2:30:49$11 * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-18 03:13:02 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 329 329 330 330 331 psS32psImageFreeChildren(psImage* image)331 int psImageFreeChildren(psImage* image) 332 332 { 333 333 psS32 numFreed = 0; -
trunk/psLib/src/image/psImage.h
r4315 r4316 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 6$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-06-18 0 2:30:49$13 * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-18 03:13:02 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 166 166 * 167 167 */ 168 psS32psImageFreeChildren(168 int psImageFreeChildren( 169 169 psImage* image ///< psImage in which all children shall be deallocated 170 170 ); -
trunk/psLib/src/image/psImageConvolve.c
r4315 r4316 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 8$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-06-18 0 2:30:49$7 * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-18 03:13:02 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 27 27 static void freeKernel(psKernel* ptr); 28 28 29 psKernel* psKernelAlloc( psS32 xMin, psS32 xMax, psS32 yMin, psS32yMax)29 psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax) 30 30 { 31 31 psKernel* result; … … 90 90 const psVector* xShifts, 91 91 const psVector* yShifts, 92 psBool relative)92 bool relative) 93 93 { 94 94 psS32 lastX; -
trunk/psLib/src/image/psImageConvolve.h
r4315 r4316 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-18 0 2:30:49$9 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 71 71 */ 72 72 psKernel* psKernelAlloc( 73 psS32xMin, ///< Most negative x index74 psS32xMax, ///< Most positive x index75 psS32yMin, ///< Most negative y index76 psS32yMax ///< Most positive y index73 int xMin, ///< Most negative x index 74 int xMax, ///< Most positive x index 75 int yMin, ///< Most negative y index 76 int yMax ///< Most positive y index 77 77 ); 78 78 … … 97 97 const psVector* xShifts, ///< list of x-axis shifts 98 98 const psVector* yShifts, ///< list of y-axis shifts 99 psBool relative99 bool relative 100 100 /**< specifies the starting point for the shifts; true=relative to previous shift 101 101 * false = relative to some other starting point. */ -
trunk/psLib/src/image/psImageFFT.c
r4193 r4316 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-06- 09 21:17:45$7 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-18 03:13:02 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 27 27 static psBool p_fftwWisdomImported = false; 28 28 29 psImage* psImageFFT(psImage* out, const psImage* i n, psFFTFlags direction)29 psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction) 30 30 { 31 31 psU32 numCols; … … 35 35 36 36 /* got good image data? */ 37 if (i n== NULL) {37 if (image == NULL) { 38 38 psFree(out); 39 39 return NULL; … … 60 60 } 61 61 62 type = i n->type.type;62 type = image->type.type; 63 63 64 64 /* make sure the system-level wisdom information is imported. */ … … 68 68 } 69 69 70 numRows = i n->numRows;71 numCols = i n->numCols;70 numRows = image->numRows; 71 numCols = image->numCols; 72 72 73 73 // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. … … 75 75 76 76 fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex)); 77 p_psImageCopyToRawBuffer(outBuffer, i n, PS_TYPE_C32);77 p_psImageCopyToRawBuffer(outBuffer, image, PS_TYPE_C32); 78 78 79 79 plan = fftwf_plan_dft_2d(numRows, numCols, -
trunk/psLib/src/image/psImageFFT.h
r4162 r4316 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 08 23:40:45$9 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 33 33 psImage* psImageFFT( 34 34 psImage* out, ///< a psImage to recycle. If NULL, a new psImage is made. 35 const psImage* i n, ///< the psImage to apply transform to35 const psImage* image, ///< the psImage to apply transform to 36 36 psFFTFlags direction ///< the direction of the transform 37 37 ); -
trunk/psLib/src/image/psImageGeomManip.c
r4308 r4316 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-06-1 7 23:44:21$12 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-18 03:13:02 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 174 174 psImage* psImageResample(psImage* out, 175 175 const psImage* in, 176 psS32scale,176 int scale, 177 177 psImageInterpolateMode mode) 178 178 { … … 251 251 252 252 psImage* psImageRoll(psImage* out, 253 const psImage* in ,254 psS32dx,255 psS32dy)253 const psImage* input, 254 int dx, 255 int dy) 256 256 { 257 257 psS32 outRows; … … 259 259 psS32 elementSize; 260 260 261 if (in == NULL) {261 if (input == NULL) { 262 262 psError(PS_ERR_BAD_PARAMETER_NULL, true, 263 263 PS_ERRORTEXT_psImage_IMAGE_NULL); … … 267 267 // create an output image of the same size 268 268 // and type 269 outRows = in ->numRows;270 outCols = in ->numCols;271 elementSize = PSELEMTYPE_SIZEOF(in ->type.type);272 out = psImageRecycle(out, outCols, outRows, in ->type.type);269 outRows = input->numRows; 270 outCols = input->numCols; 271 elementSize = PSELEMTYPE_SIZEOF(input->type.type); 272 out = psImageRecycle(out, outCols, outRows, input->type.type); 273 273 274 274 // make dx and dy between 0 and outCols or … … 292 292 inRowNumber -= outRows; 293 293 } 294 psU8* inRow = in ->data.U8[inRowNumber]; // use byte arithmetic for all types294 psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types 295 295 psU8* outRow = out->data.U8[row]; 296 296 -
trunk/psLib/src/image/psImageGeomManip.h
r4287 r4316 8 8 * @author Robert DeSonia, MHPCC 9 9 * 10 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-06-1 6 22:07:41$10 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-06-18 03:13:02 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 57 57 psImage* out, ///< an psImage to recycle. If NULL, a new image is created 58 58 const psImage* in, ///< input image 59 psS32scale, ///< resample scaling factor59 int scale, ///< resample scaling factor 60 60 psImageInterpolateMode mode ///< the interpolation mode used in resampling 61 61 ); … … 111 111 psImage* psImageRoll( 112 112 psImage* out, ///< an psImage to recycle. If NULL, a new image is created 113 const psImage* in ,///< input image114 psS32 dx,///< number of pixels to roll in the x-dimension115 psS32 dy///< number of pixels to roll in the y-dimension113 const psImage* input, ///< input image 114 int dx, ///< number of pixels to roll in the x-dimension 115 int dy ///< number of pixels to roll in the y-dimension 116 116 ); 117 117 … … 151 151 const psRegion region, ///< the size of the transformed image 152 152 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*/ 154 154 psImageInterpolateMode mode, ///< the interpolation scheme to be used 155 155 int exposedValue ///< Exposed value to which non-corresponding pixels are set -
trunk/psLib/src/imageops/psImageConvolve.c
r4315 r4316 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 8$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-06-18 0 2:30:49$7 * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-18 03:13:02 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 27 27 static void freeKernel(psKernel* ptr); 28 28 29 psKernel* psKernelAlloc( psS32 xMin, psS32 xMax, psS32 yMin, psS32yMax)29 psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax) 30 30 { 31 31 psKernel* result; … … 90 90 const psVector* xShifts, 91 91 const psVector* yShifts, 92 psBool relative)92 bool relative) 93 93 { 94 94 psS32 lastX; -
trunk/psLib/src/imageops/psImageConvolve.h
r4315 r4316 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-18 0 2:30:49$9 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 71 71 */ 72 72 psKernel* psKernelAlloc( 73 psS32xMin, ///< Most negative x index74 psS32xMax, ///< Most positive x index75 psS32yMin, ///< Most negative y index76 psS32yMax ///< Most positive y index73 int xMin, ///< Most negative x index 74 int xMax, ///< Most positive x index 75 int yMin, ///< Most negative y index 76 int yMax ///< Most positive y index 77 77 ); 78 78 … … 97 97 const psVector* xShifts, ///< list of x-axis shifts 98 98 const psVector* yShifts, ///< list of y-axis shifts 99 psBool relative99 bool relative 100 100 /**< specifies the starting point for the shifts; true=relative to previous shift 101 101 * false = relative to some other starting point. */ -
trunk/psLib/src/imageops/psImageGeomManip.c
r4308 r4316 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-06-1 7 23:44:21$12 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-18 03:13:02 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 174 174 psImage* psImageResample(psImage* out, 175 175 const psImage* in, 176 psS32scale,176 int scale, 177 177 psImageInterpolateMode mode) 178 178 { … … 251 251 252 252 psImage* psImageRoll(psImage* out, 253 const psImage* in ,254 psS32dx,255 psS32dy)253 const psImage* input, 254 int dx, 255 int dy) 256 256 { 257 257 psS32 outRows; … … 259 259 psS32 elementSize; 260 260 261 if (in == NULL) {261 if (input == NULL) { 262 262 psError(PS_ERR_BAD_PARAMETER_NULL, true, 263 263 PS_ERRORTEXT_psImage_IMAGE_NULL); … … 267 267 // create an output image of the same size 268 268 // and type 269 outRows = in ->numRows;270 outCols = in ->numCols;271 elementSize = PSELEMTYPE_SIZEOF(in ->type.type);272 out = psImageRecycle(out, outCols, outRows, in ->type.type);269 outRows = input->numRows; 270 outCols = input->numCols; 271 elementSize = PSELEMTYPE_SIZEOF(input->type.type); 272 out = psImageRecycle(out, outCols, outRows, input->type.type); 273 273 274 274 // make dx and dy between 0 and outCols or … … 292 292 inRowNumber -= outRows; 293 293 } 294 psU8* inRow = in ->data.U8[inRowNumber]; // use byte arithmetic for all types294 psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types 295 295 psU8* outRow = out->data.U8[row]; 296 296 -
trunk/psLib/src/imageops/psImageGeomManip.h
r4287 r4316 8 8 * @author Robert DeSonia, MHPCC 9 9 * 10 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-06-1 6 22:07:41$10 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-06-18 03:13:02 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 57 57 psImage* out, ///< an psImage to recycle. If NULL, a new image is created 58 58 const psImage* in, ///< input image 59 psS32scale, ///< resample scaling factor59 int scale, ///< resample scaling factor 60 60 psImageInterpolateMode mode ///< the interpolation mode used in resampling 61 61 ); … … 111 111 psImage* psImageRoll( 112 112 psImage* out, ///< an psImage to recycle. If NULL, a new image is created 113 const psImage* in ,///< input image114 psS32 dx,///< number of pixels to roll in the x-dimension115 psS32 dy///< number of pixels to roll in the y-dimension113 const psImage* input, ///< input image 114 int dx, ///< number of pixels to roll in the x-dimension 115 int dy ///< number of pixels to roll in the y-dimension 116 116 ); 117 117 … … 151 151 const psRegion region, ///< the size of the transformed image 152 152 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*/ 154 154 psImageInterpolateMode mode, ///< the interpolation scheme to be used 155 155 int exposedValue ///< Exposed value to which non-corresponding pixels are set -
trunk/psLib/src/mathtypes/psImage.c
r4315 r4316 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 8$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-06-18 0 2:30:49$11 * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-18 03:13:02 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 329 329 330 330 331 psS32psImageFreeChildren(psImage* image)331 int psImageFreeChildren(psImage* image) 332 332 { 333 333 psS32 numFreed = 0; -
trunk/psLib/src/mathtypes/psImage.h
r4315 r4316 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 6$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-06-18 0 2:30:49$13 * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-18 03:13:02 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 166 166 * 167 167 */ 168 psS32psImageFreeChildren(168 int psImageFreeChildren( 169 169 psImage* image ///< psImage in which all children shall be deallocated 170 170 ); -
trunk/psLib/src/sys/psLogMsg.c
r4183 r4316 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.4 4$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06- 09 06:13:14$14 * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-18 03:13:02 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 363 363 NULL 364 364 *****************************************************************************/ 365 void psLogMsg(const char *name, psS32 level, const char *fmt, ...)365 void psLogMsg(const char *name, int level, const char *format, ...) 366 366 { 367 367 va_list ap; 368 368 369 va_start(ap, f mt);370 psLogMsgV(name, level, f mt, ap);369 va_start(ap, format); 370 psLogMsgV(name, level, format, ap); 371 371 va_end(ap); 372 372 } -
trunk/psLib/src/sys/psLogMsg.h
r4180 r4316 11 11 * @author GLG, MHPCC 12 12 * 13 * @version $Revision: 1.2 4$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-06- 09 06:12:31$13 * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-18 03:13:02 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 void psLogMsg( 68 68 const char *name, ///< name of the log source 69 psS32 myLevel, ///< severity level of this log message70 const char *f mt, ///< printf-style format command69 int level, ///< severity level of this log message 70 const char *format, ///< printf-style format command 71 71 ... 72 72 ); -
trunk/psLib/src/sysUtils/psLogMsg.c
r4184 r4316 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.4 4$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06- 09 06:13:14$14 * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-18 03:13:02 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 363 363 NULL 364 364 *****************************************************************************/ 365 void psLogMsg(const char *name, psS32 level, const char *fmt, ...)365 void psLogMsg(const char *name, int level, const char *format, ...) 366 366 { 367 367 va_list ap; 368 368 369 va_start(ap, f mt);370 psLogMsgV(name, level, f mt, ap);369 va_start(ap, format); 370 psLogMsgV(name, level, format, ap); 371 371 va_end(ap); 372 372 } -
trunk/psLib/src/sysUtils/psLogMsg.h
r4181 r4316 11 11 * @author GLG, MHPCC 12 12 * 13 * @version $Revision: 1.2 4$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-06- 09 06:12:31$13 * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-18 03:13:02 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 void psLogMsg( 68 68 const char *name, ///< name of the log source 69 psS32 myLevel, ///< severity level of this log message70 const char *f mt, ///< printf-style format command69 int level, ///< severity level of this log message 70 const char *format, ///< printf-style format command 71 71 ... 72 72 ); -
trunk/psLib/src/types/psList.c
r4312 r4316 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.3 6$ $Name: not supported by cvs2svn $9 * @date $Date: 2005-06-18 0 0:53:32$8 * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-06-18 03:13:01 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 149 149 } 150 150 151 psListIterator* psListIteratorAlloc(psList* list, intlocation, bool mutable)151 psListIterator* psListIteratorAlloc(psList* list, long location, bool mutable) 152 152 { 153 153 psListIterator* iter = psAlloc(sizeof(psListIterator)); … … 181 181 } 182 182 183 psBool psListIteratorSet(psListIterator* iterator,184 183 bool psListIteratorSet(psListIterator* iterator, 184 int location) 185 185 { 186 186 if (iterator == NULL) { … … 247 247 } 248 248 249 psBool psListAdd(psList* list, psS32location, psPtr data)249 bool psListAdd(psList* list, long location, psPtr data) 250 250 { 251 251 … … 433 433 } 434 434 435 psBool psListRemove(psList* list,436 psS32location)435 bool psListRemove(psList* list, 436 long location) 437 437 { 438 438 if (list == NULL) { … … 451 451 } 452 452 453 psBool psListRemoveData(psList* list,454 453 bool psListRemoveData(psList* list, 454 psPtr data) 455 455 { 456 456 if (list == NULL) { … … 485 485 } 486 486 487 psPtr psListGet(psList* list, psS32location)487 psPtr psListGet(psList* list, long location) 488 488 { 489 489 if (list == NULL) { … … 564 564 * Convert a psList to/from a psVoidPtrArray 565 565 */ 566 psArray* psListToArray( psList* restrict list)566 psArray* psListToArray(const psList* restrict list) 567 567 { 568 568 psListElem* ptr; -
trunk/psLib/src/types/psList.h
r4312 r4316 7 7 * @ingroup LinkedList 8 8 * 9 * @version $Revision: 1.2 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-18 0 0:53:32 $9 * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-18 03:13:02 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 99 99 psListIterator* psListIteratorAlloc( 100 100 psList* list, ///< the psList to iterate with 101 intlocation, ///< the initial starting point.101 long location, ///< the initial starting point. 102 102 ///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL. 103 103 bool mutable ///< Is it permissible to modify list? … … 109 109 * @return psBool TRUE if iterator successfully set, otherwise FALSE. 110 110 */ 111 psBool psListIteratorSet(111 bool psListIteratorSet( 112 112 psListIterator* iterator, ///< list iterator 113 113 int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 118 118 * @return psBool TRUE if item was successfully added, otherwise FALSE. 119 119 */ 120 psBool psListAdd(120 bool psListAdd( 121 121 psList* list, ///< list to add item to 122 psS32location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location.122 long location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. 123 123 psPtr data ///< data item to add. If NULL, list is not modified. 124 124 ); … … 128 128 * @return psBool TRUE if item was successfully added, otherwise FALSE. 129 129 */ 130 psBool psListAddAfter(131 psListIterator* list,///< list position to add item to130 bool psListAddAfter( 131 psListIterator* iterator, ///< list position to add item to 132 132 psPtr data ///< data item to add. If NULL, list is not modified. 133 133 ); … … 137 137 * @return psBool TRUE if item was successfully added, otherwise FALSE. 138 138 */ 139 psBool psListAddBefore(140 psListIterator* list, ///< list position to add item to139 bool psListAddBefore( 140 psListIterator* iterator, ///< list position to add item to 141 141 psPtr data ///< data item to add. If NULL, list is not modified. 142 142 ); … … 146 146 * @return psBool TRUE if element is successfully removed, otherwise FALSE. 147 147 */ 148 psBool psListRemove(148 bool psListRemove( 149 149 psList* list, ///< list to remove element from 150 psS32location ///< index of item150 long location ///< index of item 151 151 ); 152 152 … … 155 155 * @return psBool TRUE if element is successfully removed, otherwise FALSE. 156 156 */ 157 psBool psListRemoveData(157 bool psListRemoveData( 158 158 psList* list, ///< list to remove element from 159 159 psPtr data ///< data item to find and remove … … 169 169 psPtr psListGet( 170 170 psList* list, ///< list to retrieve element from 171 psS32location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL171 long location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL 172 172 ); 173 173 … … 196 196 */ 197 197 psArray* psListToArray( 198 psList* dlist ///< List to convert198 const psList* list ///< List to convert 199 199 ); 200 200
Note:
See TracChangeset
for help on using the changeset viewer.
