Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 6250) +++ /trunk/psLib/src/astro/psCoord.c (revision 6251) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.102 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-28 01:31:44 $ +* @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-30 20:28:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1085,6 +1085,4 @@ PS_ASSERT_PTR_NON_NULL(input, NULL); PS_ASSERT_PTR_NON_NULL(inToOut, NULL); - PS_ASSERT_PTR_NON_NULL(inToOut->x, NULL); - PS_ASSERT_PTR_NON_NULL(inToOut->y, NULL); if (out == NULL) { //XXX: Should the length (nalloc) be 1 and append be used everytime a pixel is added? @@ -1104,8 +1102,8 @@ deriv = psPlaneTransformDeriv(deriv, inToOut, coord); fxnVal = psPlaneTransformApply(fxnVal, inToOut, coord); - if (fabs(fxnVal->x - coord->x) < fabs(deriv->x) && - fabs(fxnVal->y - coord->y) < fabs(deriv->y)) { - int x = (int)(round(fabs(deriv->x))); - int y = (int)(round(fabs(deriv->y))); + if (fabs(fxnVal->x - coord->x) <= fabs(deriv->x) && + fabs(fxnVal->y - coord->y) <= fabs(deriv->y)) { + int x = (int)(ceil(fabs(deriv->x))); + int y = (int)(ceil(fabs(deriv->y))); for (int j = -x; j <= x; j++) { for (int k = -y; k <= y; k++) { Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 6250) +++ /trunk/psLib/src/sys/psType.h (revision 6251) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-28 01:12:15 $ +* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-30 20:28:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -98,5 +98,10 @@ */ typedef enum { + PS_DATA_S8 = PS_TYPE_S8, ///< psS8 + PS_DATA_S16 = PS_TYPE_S16, ///< psS16 PS_DATA_S32 = PS_TYPE_S32, ///< psS32 + PS_DATA_U8 = PS_TYPE_U8, ///< psU8 + PS_DATA_U16 = PS_TYPE_U16, ///< psU16 + PS_DATA_U32 = PS_TYPE_U32, ///< psU32 PS_DATA_F32 = PS_TYPE_F32, ///< psF32 PS_DATA_F64 = PS_TYPE_F64, ///< psF64 Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 6250) +++ /trunk/psLib/src/types/psMetadata.c (revision 6251) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-26 00:46:54 $ + * @version $Revision: 1.97 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-30 20:28:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -181,5 +181,10 @@ METADATAITEM_ALLOC_TYPE(F32,psF32,PS_DATA_F32) METADATAITEM_ALLOC_TYPE(F64,psF64,PS_DATA_F64) +METADATAITEM_ALLOC_TYPE(S8,psS8,PS_DATA_S8) +METADATAITEM_ALLOC_TYPE(S16,psS16,PS_DATA_S16) METADATAITEM_ALLOC_TYPE(S32,psS32,PS_DATA_S32) +METADATAITEM_ALLOC_TYPE(U8,psU8,PS_DATA_U8) +METADATAITEM_ALLOC_TYPE(U16,psU16,PS_DATA_U16) +METADATAITEM_ALLOC_TYPE(U32,psU32,PS_DATA_U32) METADATAITEM_ALLOC_TYPE(Bool,psBool,PS_DATA_BOOL) @@ -233,6 +238,21 @@ metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; + case PS_DATA_S8: + metadataItem->data.S8 = (psS8)va_arg(argPtr, psS32); + break; + case PS_DATA_S16: + metadataItem->data.S16 = (psS16)va_arg(argPtr, psS32); + break; case PS_DATA_S32: metadataItem->data.S32 = (psS32)va_arg(argPtr, psS32); + break; + case PS_DATA_U8: + metadataItem->data.U8 = (psU8)va_arg(argPtr, psU32); + break; + case PS_DATA_U16: + metadataItem->data.U16 = (psU16)va_arg(argPtr, psU32); + break; + case PS_DATA_U32: + metadataItem->data.U32 = (psU32)va_arg(argPtr, psU32); break; case PS_DATA_F32: @@ -363,10 +383,10 @@ // Numerical types PS_METADATA_COPY_CASE(BOOL,B); - // PS_METADATA_COPY_CASE(S8,S8); - // PS_METADATA_COPY_CASE(S16,S16); + PS_METADATA_COPY_CASE(S8,S8); + PS_METADATA_COPY_CASE(S16,S16); PS_METADATA_COPY_CASE(S32,S32); - // PS_METADATA_COPY_CASE(U8,U8); - // PS_METADATA_COPY_CASE(U16,U16); - // PS_METADATA_COPY_CASE(U32,U32); + PS_METADATA_COPY_CASE(U8,U8); + PS_METADATA_COPY_CASE(U16,U16); + PS_METADATA_COPY_CASE(U32,U32); PS_METADATA_COPY_CASE(F32,F32); PS_METADATA_COPY_CASE(F64,F64); @@ -574,5 +594,10 @@ METADATA_ADD_TYPE(Bool,psBool,PS_DATA_BOOL) +METADATA_ADD_TYPE(S8,psS8,PS_DATA_S8) +METADATA_ADD_TYPE(S16,psS16,PS_DATA_S16) METADATA_ADD_TYPE(S32,psS32,PS_DATA_S32) +METADATA_ADD_TYPE(U8,psU8,PS_DATA_U8) +METADATA_ADD_TYPE(U16,psU16,PS_DATA_U16) +METADATA_ADD_TYPE(U32,psU32,PS_DATA_U32) METADATA_ADD_TYPE(F32,psF32,PS_DATA_F32) METADATA_ADD_TYPE(F64,psF64,PS_DATA_F64) @@ -775,6 +800,21 @@ \ switch (metadataItem->type) { \ + case PS_DATA_S8: \ + value = (ps##TYPE)metadataItem->data.S8; \ + break; \ + case PS_DATA_S16: \ + value = (ps##TYPE)metadataItem->data.S16; \ + break; \ case PS_DATA_S32: \ value = (ps##TYPE)metadataItem->data.S32; \ + break; \ + case PS_DATA_U8: \ + value = (ps##TYPE)metadataItem->data.U8; \ + break; \ + case PS_DATA_U16: \ + value = (ps##TYPE)metadataItem->data.U16; \ + break; \ + case PS_DATA_U32: \ + value = (ps##TYPE)metadataItem->data.U32; \ break; \ case PS_DATA_F32: \ @@ -803,5 +843,10 @@ psMetadataLookupNumTYPE(F32) psMetadataLookupNumTYPE(F64) +psMetadataLookupNumTYPE(S8) +psMetadataLookupNumTYPE(S16) psMetadataLookupNumTYPE(S32) +psMetadataLookupNumTYPE(U8) +psMetadataLookupNumTYPE(U16) +psMetadataLookupNumTYPE(U32) psMetadataLookupNumTYPE(Bool) @@ -1062,6 +1107,21 @@ } break; + case PS_DATA_S8: + printf("%d", item->data.S8); + break; + case PS_DATA_S16: + printf("%d", item->data.S16); + break; case PS_DATA_S32: printf("%d", item->data.S32); + break; + case PS_DATA_U8: + printf("%u", item->data.U8); + break; + case PS_DATA_U16: + printf("%u", item->data.U16); + break; + case PS_DATA_U32: + printf("%u", item->data.U32); break; case PS_DATA_F32: Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 6250) +++ /trunk/psLib/src/types/psMetadata.h (revision 6251) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-23 23:52:15 $ +* @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-30 20:28:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,10 @@ #define PS_DATA_IS_PRIMITIVE(TYPE) \ -(TYPE == PS_DATA_S32 || \ +(TYPE == PS_DATA_S8 || \ + TYPE == PS_DATA_S16 || \ + TYPE == PS_DATA_S32 || \ + TYPE == PS_DATA_U8 || \ + TYPE == PS_DATA_U16 || \ + TYPE == PS_DATA_U32 || \ TYPE == PS_DATA_F32 || \ TYPE == PS_DATA_F64 || \ @@ -39,5 +44,7 @@ #define PS_DATA_PRIMITIVE_TYPE(DATATYPE) ( \ - (DATATYPE==PS_DATA_S32 || DATATYPE==PS_DATA_F32 || \ + (DATATYPE==PS_DATA_S8 || DATATYPE==PS_DATA_S16 || \ + DATATYPE==PS_DATA_S32 || DATATYPE==PS_DATA_U8 || \ + DATATYPE==PS_DATA_U16 || DATATYPE==PS_DATA_U32 || DATATYPE==PS_DATA_F32 || \ DATATYPE==PS_DATA_F64 || DATATYPE==PS_DATA_BOOL) ? DATATYPE : 0) @@ -186,4 +193,30 @@ ); +/** Create a metadata item with specified psS8 data. + * + * Returns a fill psMetadataItem ready for insertion into the psMetadata + * struct. + * + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocS8( + const char* name, ///< Name of metadata item. + const char* comment, ///< Comment for metadata item. + psS8 value ///< the value of the metadata item. +); + +/** Create a metadata item with specified psS16 data. + * + * Returns a fill psMetadataItem ready for insertion into the psMetadata + * struct. + * + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocS16( + const char* name, ///< Name of metadata item. + const char* comment, ///< Comment for metadata item. + psS16 value ///< the value of the metadata item. +); + /** Create a metadata item with specified psS32 data. * @@ -197,4 +230,43 @@ const char* comment, ///< Comment for metadata item. psS32 value ///< the value of the metadata item. +); + +/** Create a metadata item with specified psU8 data. + * + * Returns a fill psMetadataItem ready for insertion into the psMetadata + * struct. + * + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocU8( + const char* name, ///< Name of metadata item. + const char* comment, ///< Comment for metadata item. + psU8 value ///< the value of the metadata item. +); + +/** Create a metadata item with specified psU16 data. + * + * Returns a fill psMetadataItem ready for insertion into the psMetadata + * struct. + * + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocU16( + const char* name, ///< Name of metadata item. + const char* comment, ///< Comment for metadata item. + psU16 value ///< the value of the metadata item. +); + +/** Create a metadata item with specified psU32 data. + * + * Returns a fill psMetadataItem ready for insertion into the psMetadata + * struct. + * + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocU32( + const char* name, ///< Name of metadata item. + const char* comment, ///< Comment for metadata item. + psU32 value ///< the value of the metadata item. ); @@ -339,4 +411,30 @@ ); +/** Add a psS8 value to metadata collection. + * + * @return bool: True for success, False for failure. + */ +bool psMetadataAddS8( + psMetadata* md, ///< Metadata collection to insert metadata item + long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags + const char* comment, ///< Comment for metadata item + psS8 value ///< Value for metadata item data +); + +/** Add a psS16 value to metadata collection. + * + * @return bool: True for success, False for failure. + */ +bool psMetadataAddS16( + psMetadata* md, ///< Metadata collection to insert metadata item + long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags + const char* comment, ///< Comment for metadata item + psS16 value ///< Value for metadata item data +); + /** Add a psS32 value to metadata collection. * @@ -350,4 +448,43 @@ const char* comment, ///< Comment for metadata item psS32 value ///< Value for metadata item data +); + +/** Add a psU8 value to metadata collection. + * + * @return bool: True for success, False for failure. + */ +bool psMetadataAddU8( + psMetadata* md, ///< Metadata collection to insert metadata item + long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags + const char* comment, ///< Comment for metadata item + psU8 value ///< Value for metadata item data +); + +/** Add a psU16 value to metadata collection. + * + * @return bool: True for success, False for failure. + */ +bool psMetadataAddU16( + psMetadata* md, ///< Metadata collection to insert metadata item + long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags + const char* comment, ///< Comment for metadata item + psU16 value ///< Value for metadata item data +); + +/** Add a psU32 value to metadata collection. + * + * @return bool: True for success, False for failure. + */ +bool psMetadataAddU32( + psMetadata* md, ///< Metadata collection to insert metadata item + long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags + const char* comment, ///< Comment for metadata item + psU32 value ///< Value for metadata item data ); @@ -555,5 +692,4 @@ ); - /** Find an item in the metadata collection based on key name. * @@ -603,7 +739,77 @@ * returned. * + * @return psS8 : Value of metadata item. + */ +psS8 psMetadataLookupS8( + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. +); + +/** Find an item in the metadata collection based on key name and return its integer value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psS16 : Value of metadata item. + */ +psS16 psMetadataLookupS16( + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. +); + +/** Find an item in the metadata collection based on key name and return its integer value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * * @return psS32 : Value of metadata item. */ psS32 psMetadataLookupS32( + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. +); + +/** Find an item in the metadata collection based on key name and return its integer value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psU8 : Value of metadata item. + */ +psU8 psMetadataLookupU8( + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. +); + +/** Find an item in the metadata collection based on key name and return its integer value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psU16 : Value of metadata item. + */ +psU16 psMetadataLookupU16( + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. +); + +/** Find an item in the metadata collection based on key name and return its integer value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psU32 : Value of metadata item. + */ +psU32 psMetadataLookupU32( bool *status, ///< Status of lookup. const psMetadata *md, ///< Metadata collection to lookup metadata item. Index: /trunk/psLib/test/astro/tst_psCoord.c =================================================================== --- /trunk/psLib/test/astro/tst_psCoord.c (revision 6250) +++ /trunk/psLib/test/astro/tst_psCoord.c (revision 6251) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-18 21:23:21 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-30 20:28:34 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,4 +18,5 @@ static psS32 testPlaneTransformApply(void); static psS32 testPlaneDistortApply(void); +static psS32 testPixelsTransform(void); testDescription tests[] = { @@ -24,4 +25,5 @@ {testPlaneTransformApply, 831, "psPlaneTransformApply()", 0, false}, {testPlaneDistortApply, 832, "psPlaneDistortApply()", 0, false}, + {testPixelsTransform, 833, "psPixelsTransform()", 0, false}, {NULL} }; @@ -371,2 +373,61 @@ } +psS32 testPixelsTransform(void) +{ + psPixels *input = NULL; + psPixels *output = NULL; + psPlaneTransform *trans = psPlaneTransformAlloc(2, 0); + + //Return NULL for NULL input pixels + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + output = psPixelsTransform(output, input, trans); + if (output != NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psPixelsTransform failed to return NULL for NULL input pixels.\n"); + return 1; + } + //Return NULL for NULL input PlaneTransform + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + output = psPixelsTransform(output, input, NULL); + if (output != NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psPixelsTransform failed to return NULL for NULL psPlaneTransform.\n"); + return 2; + } + + input = psPixelsAlloc(5); + /* for (int i = 0; i < 2; i++) { + input->data[i].x = i*1.0; + input->data[i].y = i*1.0; + } + */ + input->data[0].x = 1.0; + input->data[0].y = 2.0; + input->data[1].x = 1.0; + input->data[1].y = 3.0; + trans->x->nX = 1; + trans->x->nY = 0; + trans->y->nX = 1; + trans->y->nY = 0; + trans->x->coeff[0][0] = 0; + trans->x->coeff[1][0] = 1; + trans->y->coeff[0][0] = 0; + trans->y->coeff[1][0] = 2; + + //Verify that the output pixels are what we expected + output = psPixelsTransform(output, input, trans); + printf("\n output return %ld pixels\n\n", output->n); + int nExpected = 1; + if (output->n != nExpected) { + psError(PS_ERR_BAD_PARAMETER_SIZE, false, + "psPixelsTransform failed to return the expected number of pixels.\n"); + return 3; + } + + psFree(input); + psFree(output); + psFree(trans); + + return 0; +} + Index: /trunk/psLib/test/astro/verified/tst_psCoord.stderr =================================================================== --- /trunk/psLib/test/astro/verified/tst_psCoord.stderr (revision 6250) +++ /trunk/psLib/test/astro/verified/tst_psCoord.stderr (revision 6251) @@ -91,2 +91,19 @@ ---> TESTPOINT PASSED (psCoord{psPlaneDistortApply()} | tst_psCoord.c) +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psCoord.c * +* TestPoint: psCoord{psPixelsTransform()} * +* TestType: Positive * +\**********************************************************************************/ + +|I|testPixelsTransform + Following should generate error message +|E|psPixelsTransform (FILE:LINENO) + Unallowable operation: input is NULL. +|I|testPixelsTransform + Following should generate error message +|E|psPixelsTransform (FILE:LINENO) + Unallowable operation: input is NULL. + +---> TESTPOINT PASSED (psCoord{psPixelsTransform()} | tst_psCoord.c) + Index: /trunk/psLib/test/imageops/Makefile.am =================================================================== --- /trunk/psLib/test/imageops/Makefile.am (revision 6250) +++ /trunk/psLib/test/imageops/Makefile.am (revision 6251) @@ -13,5 +13,5 @@ tst_psImageStructManip \ tst_psImageSmooth \ - tst_psImageMaskOps + tst_psImageMaskOps tst_psImageConvolve_SOURCES = tst_psImageConvolve.c @@ -20,7 +20,7 @@ tst_psImagePixelExtract_SOURCES = tst_psImagePixelExtract.c tst_psImagePixelManip_SOURCES = tst_psImagePixelManip.c +tst_psImageSmooth_SOURCES = tst_psImageSmooth.c tst_psImageStats_SOURCES = tst_psImageStats.c tst_psImageStructManip_SOURCES = tst_psImageStructManip.c -tst_psImageSmooth_SOURCES = tst_psImageSmooth.c tst_psImageMaskOps_SOURCES = tst_psImageMaskOps.c