Changeset 3115 for trunk/psLib/src/mathtypes
- Timestamp:
- Feb 2, 2005, 2:54:13 PM (21 years ago)
- Location:
- trunk/psLib/src/mathtypes
- Files:
-
- 4 edited
-
psImage.c (modified) (7 diffs)
-
psImage.h (modified) (4 diffs)
-
psVector.c (modified) (6 diffs)
-
psVector.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/mathtypes/psImage.c
r2970 r3115 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 1-13 03:26:23$11 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-02-03 00:54:11 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 568 568 psS32 lastX = input->numCols - 1; \ 569 569 psS32 lastY = input->numRows - 1; \ 570 ps##TYPE V00 ; \571 ps##TYPE V01 ; \572 ps##TYPE V10 ; \573 ps##TYPE V11 ; \570 ps##TYPE V00 = 0; \ 571 ps##TYPE V01 = 0; \ 572 ps##TYPE V10 = 0; \ 573 ps##TYPE V11 = 0; \ 574 574 psBool valid00 = false; \ 575 575 psBool valid01 = false; \ … … 611 611 /* OK, at least one pixel is not valid - need to do it piecemeal */ \ 612 612 \ 613 psF64 V0 ; \613 psF64 V0 = 0.0; \ 614 614 psBool valid0 = true; \ 615 615 if (valid00 && valid10) { \ … … 623 623 } \ 624 624 \ 625 psF64 V1 ; \625 psF64 V1 = 0.0; \ 626 626 psBool valid1 = true; \ 627 627 if (valid01 && valid11) { \ … … 662 662 psS32 lastX = input->numCols - 1; \ 663 663 psS32 lastY = input->numRows - 1; \ 664 ps##TYPE V00 ; \665 ps##TYPE V01 ; \666 ps##TYPE V10 ; \667 ps##TYPE V11 ; \664 ps##TYPE V00 = 0; \ 665 ps##TYPE V01 = 0; \ 666 ps##TYPE V10 = 0; \ 667 ps##TYPE V11 = 0; \ 668 668 psBool valid00 = false; \ 669 669 psBool valid01 = false; \ … … 705 705 /* OK, at least one pixel is not valid - need to do it piecemeal */ \ 706 706 \ 707 psC64 V0 ; \707 psC64 V0 = 0; \ 708 708 psBool valid0 = true; \ 709 709 if (valid00 && valid10) { \ … … 717 717 } \ 718 718 \ 719 psC64 V1 ; \719 psC64 V1 = 0; \ 720 720 psBool valid1 = true; \ 721 721 if (valid01 && valid11) { \ -
trunk/psLib/src/mathtypes/psImage.h
r2970 r3115 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.4 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 1-13 03:26:23$13 * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-02-03 00:54:11 $ 15 15 * 16 16 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 157 157 */ 158 158 psImage* psImageCopy( 159 psImage* restrict output,///< if not NULL, a psImage that could be recycled.159 psImage* output, ///< if not NULL, a psImage that could be recycled. 160 160 const psImage* input, ///< the psImage to copy 161 161 psElemType type ///< the desired datatype of the returned copy … … 221 221 psC64 unexposedValue /**< return value if x,y location is not in image. */ \ 222 222 ); 223 223 #ifndef SWIG 224 224 p_psImagePixelInterpolateFcns(U8) 225 225 p_psImagePixelInterpolateFcns(U16) … … 234 234 p_psImagePixelInterpolateComplexFcns(C32) 235 235 p_psImagePixelInterpolateComplexFcns(C64) 236 #endif 236 237 237 238 /// @} -
trunk/psLib/src/mathtypes/psVector.c
r2676 r3115 10 10 * @author Robert DeSonia, MHPCC 11 11 * 12 * @version $Revision: 1.3 2$ $Name: not supported by cvs2svn $13 * @date $Date: 200 4-12-09 21:30:43$12 * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-02-03 00:54:10 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 28 28 #include "psCollectionsErrors.h" 29 29 30 static void vectorFree(psVector* restrictpsVec);31 32 33 static void vectorFree(psVector* restrictpsVec)30 static void vectorFree(psVector* psVec); 31 32 33 static void vectorFree(psVector* psVec) 34 34 { 35 35 if (psVec == NULL) { … … 64 64 } 65 65 66 psVector* psVectorRealloc(psVector* restrictin, psU32 nalloc)66 psVector* psVectorRealloc(psVector* in, psU32 nalloc) 67 67 { 68 68 psS32 elementSize = 0; … … 87 87 } 88 88 89 psVector* psVectorRecycle(psVector* restrictin, psU32 n, psElemType type)89 psVector* psVectorRecycle(psVector* in, psU32 n, psElemType type) 90 90 { 91 91 psS32 byteSize; … … 218 218 } 219 219 220 psVector* psVectorSort(psVector* restrict outVector, const psVector* restrictinVector)220 psVector* psVectorSort(psVector* outVector, const psVector* inVector) 221 221 { 222 222 psS32 N = 0; … … 302 302 } 303 303 304 psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrictinVector)304 psVector* psVectorSortIndex(psVector* outVector, const psVector* inVector) 305 305 { 306 306 psS32 N = 0; -
trunk/psLib/src/mathtypes/psVector.h
r3025 r3115 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 1-17 20:58:21$13 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-02-03 00:54:10 $ 15 15 * 16 16 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 84 84 */ 85 85 psVector* psVectorRealloc( 86 psVector* restrict psVec,///< Vector to reallocate.87 psU32 nalloc ///< Total number of elements to make available.86 psVector* psVec, ///< Vector to reallocate. 87 psU32 nalloc ///< Total number of elements to make available. 88 88 ); 89 89 … … 98 98 */ 99 99 psVector* psVectorRecycle( 100 psVector* restrictpsVec,100 psVector* psVec, 101 101 ///< Vector to recycle. If NULL, a new vector is created. No effort 102 102 ///< taken to preserve the values. 103 103 104 psU32 nalloc, ///< Total number of elements to make available.104 psU32 nalloc, ///< Total number of elements to make available. 105 105 psElemType type ///< the datatype of the returned vector 106 106 ); … … 128 128 */ 129 129 psVector* psVectorSort( 130 psVector* restrict outVector,///< the output vector to recycle, or NULL if new vector desired.131 const psVector* restrict inVector///< the vector to sort.130 psVector* outVector, ///< the output vector to recycle, or NULL if new vector desired. 131 const psVector* inVector ///< the vector to sort. 132 132 ); 133 133 … … 140 140 */ 141 141 psVector* psVectorSortIndex( 142 psVector* restrict outVector,///< vector to recycle143 const psVector* restrict inVector///< vector to sort142 psVector* outVector, ///< vector to recycle 143 const psVector* inVector ///< vector to sort 144 144 ); 145 145
Note:
See TracChangeset
for help on using the changeset viewer.
