Changeset 5057 for trunk/psLib/src/mathtypes
- Timestamp:
- Sep 15, 2005, 11:22:22 AM (21 years ago)
- Location:
- trunk/psLib/src/mathtypes
- Files:
-
- 4 edited
-
psImage.c (modified) (4 diffs)
-
psImage.h (modified) (2 diffs)
-
psScalar.h (modified) (2 diffs)
-
psVector.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/mathtypes/psImage.c
r4980 r5057 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.8 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-09- 09 02:02:54$11 * @version $Revision: 1.82 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-09-15 21:22:22 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 44 44 psImageFreeChildren(image); 45 45 46 psFree(image-> rawDataBuffer);46 psFree(image->p_rawDataBuffer); 47 47 psFree(image->data.V); 48 48 } … … 71 71 image->data.V = psAlloc(sizeof(psPtr ) * numRows); 72 72 73 image-> rawDataBuffer = psAlloc(area * elementSize);73 image->p_rawDataBuffer = psAlloc(area * elementSize); 74 74 75 75 // set the row pointers. 76 image->data.V[0] = image-> rawDataBuffer;76 image->data.V[0] = image->p_rawDataBuffer; 77 77 for (psS32 i = 1; i < numRows; i++) { 78 78 image->data.V[i] = (psPtr )((int8_t *) image->data.V[i - 1] + rowSize); … … 293 293 } 294 294 // Resize the image buffer 295 old-> rawDataBuffer = psRealloc(old->data.V[0],296 numCols * numRows * elementSize);295 old->p_rawDataBuffer = psRealloc(old->data.V[0], 296 numCols * numRows * elementSize); 297 297 old->data.V = (psPtr *)psRealloc(old->data.V, numRows * sizeof(psPtr )); 298 298 299 299 // recreate the row pointers 300 old->data.V[0] = old-> rawDataBuffer;300 old->data.V[0] = old->p_rawDataBuffer; 301 301 for (psS32 i = 1; i < numRows; i++) { 302 302 old->data.V[i] = (psPtr )((int8_t *) old->data.V[i - 1] + rowSize); -
trunk/psLib/src/mathtypes/psImage.h
r4985 r5057 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.6 7$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-09-1 0 00:16:58$13 * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-09-15 21:22:22 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 59 59 60 60 union { 61 psS8** S8; ///< Signed 8-bit integer data. 62 psS16** S16; ///< Signed 16-bit integer data. 63 psS32** S32; ///< Signed 32-bit integer data. 64 psS64** S64; ///< Signed 64-bit integer data. 61 65 psU8** U8; ///< Unsigned 8-bit integer data. 62 66 psU16** U16; ///< Unsigned 16-bit integer data. 63 67 psU32** U32; ///< Unsigned 32-bit integer data. 64 68 psU64** U64; ///< Unsigned 64-bit integer data. 65 psS8** S8; ///< Signed 8-bit integer data.66 psS16** S16; ///< Signed 16-bit integer data.67 psS32** S32; ///< Signed 32-bit integer data.68 psS64** S64; ///< Signed 64-bit integer data.69 69 psF32** F32; ///< Single-precision float data. 70 70 psF64** F64; ///< Double-precision float data. 71 71 psC32** C32; ///< Single-precision complex data. 72 72 psC64** C64; ///< Double-precision complex data. 73 // psPtr** PTR; ///< Void pointers.74 73 psPtr* V; ///< Pointer to data. 75 74 } data; ///< Union for data types. 76 75 const struct psImage* parent; ///< Parent, if a subimage. 76 psPtr p_rawDataBuffer; ///< Raw data buffer for Allocating/Freeing Images; private 77 77 psArray* children; ///< Children of this region. 78 79 psPtr rawDataBuffer; ///< Raw data buffer for Allocating/Freeing Images80 78 void *lock; ///< Optional lock for thread safety 81 79 } -
trunk/psLib/src/mathtypes/psScalar.h
r4935 r5057 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.1 8$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 8-31 22:00:10$13 * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-09-15 21:22:22 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 35 35 36 36 union { 37 psS8 S8; ///< Signed 8-bit integer data. 38 psS16 S16; ///< Signed 16-bit integer data. 39 psS32 S32; ///< Signed 32-bit integer data. 40 psS64 S64; ///< Signed 64-bit integer data. 37 41 psU8 U8; ///< Unsigned 8-bit integer data. 38 42 psU16 U16; ///< Unsigned 16-bit integer data. 39 43 psU32 U32; ///< Unsigned 32-bit integer data. 40 44 psU64 U64; ///< Unsigned 64-bit integer data. 41 psS8 S8; ///< Signed 8-bit integer data.42 psS16 S16; ///< Signed 16-bit integer data.43 psS32 S32; ///< Signed 32-bit integer data.44 psS64 S64; ///< Signed 64-bit integer data.45 45 psF32 F32; ///< Single-precision float data. 46 46 psF64 F64; ///< Double-precision float data. -
trunk/psLib/src/mathtypes/psVector.h
r4944 r5057 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.4 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-09- 02 21:32:06$13 * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-09-15 21:22:22 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 38 38 const long nalloc; ///< Total number of elements available. 39 39 union { 40 psS8* S8; ///< Signed 8-bit integer data. 41 psS16* S16; ///< Signed 16-bit integer data. 42 psS32* S32; ///< Signed 32-bit integer data. 43 psS64* S64; ///< Signed 64-bit integer data. 40 44 psU8* U8; ///< Unsigned 8-bit integer data. 41 45 psU16* U16; ///< Unsigned 16-bit integer data. 42 46 psU32* U32; ///< Unsigned 32-bit integer data. 43 47 psU64* U64; ///< Unsigned 64-bit integer data. 44 psS8* S8; ///< Signed 8-bit integer data.45 psS16* S16; ///< Signed 16-bit integer data.46 psS32* S32; ///< Signed 32-bit integer data.47 psS64* S64; ///< Signed 64-bit integer data.48 48 psF32* F32; ///< Single-precision float data. 49 49 psF64* F64; ///< Double-precision float data.
Note:
See TracChangeset
for help on using the changeset viewer.
