Index: /trunk/psLib/pslib.kdevelop
===================================================================
--- /trunk/psLib/pslib.kdevelop (revision 4886)
+++ /trunk/psLib/pslib.kdevelop (revision 4887)
@@ -49,9 +49,4 @@
- false
- 2
- false
-
- 0
Index: /trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.c (revision 4886)
+++ /trunk/psLib/src/mathtypes/psImage.c (revision 4887)
@@ -9,6 +9,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-08-26 03:35:02 $
+ * @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-08-26 23:01:17 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -219,8 +219,10 @@
case PS_TYPE_U8:
temp = va_arg (argp, psU32);
- if ( temp >= 0 || temp <= 255 )
+ if ( temp >= PS_MIN_U8 && temp <= PS_MAX_U8 )
vU8 = temp;
- else
+ else {
psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: U8 Value out of Range.\n");
+ return false;
+ }
for (int iy = 0; iy < image->numRows; iy++) {
for (int ix = 0; ix < image->numCols; ix++) {
Index: /trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.c (revision 4886)
+++ /trunk/psLib/src/mathtypes/psVector.c (revision 4887)
@@ -9,6 +9,6 @@
* @author Robert DeSonia, MHPCC
*
-* @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
-* @date $Date: 2005-08-19 21:27:43 $
+* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+* @date $Date: 2005-08-26 23:01:17 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -612,5 +612,4 @@
...)
{
-
va_list argp;
psU8 vU8;
@@ -627,4 +626,7 @@
psC64 vC64;
+ unsigned int temp;
+ int temp2;
+
if (image == NULL)
return (false);
@@ -634,35 +636,35 @@
switch (image->type.type) {
case PS_TYPE_U8:
- vU8 = va_arg (argp, psU32);
-
- for (long iy = 0; iy < image->n; iy++) {
- // for (int ix = 0; ix < image->numCols; ix++) {
+ temp = va_arg (argp, psU32);
+ if ( temp >= PS_MIN_U8 && temp <= PS_MAX_U8 )
+ vU8 = temp;
+ else {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: U8 Value out of Range.\n");
+ return false;
+ }
+ for (long iy = 0; iy < image->n; iy++) {
image->data.U8[iy] = vU8;
- // }
- }
- break;
-
+ }
+ return (true);
case PS_TYPE_F32:
- vF32 = va_arg (argp, psF64);
-
- for (long iy = 0; iy < image->n; iy++) {
- // for (int ix = 0; ix < image->numCols; ix++) {
+ vF32 = (psF32)va_arg (argp, psF64);
+ for (long iy = 0; iy < image->n; iy++) {
image->data.F32[iy] = vF32;
- // }
- }
- return (true);
-
+ }
+ return (true);
case PS_TYPE_F64:
vF64 = va_arg (argp, psF64);
-
- for (long iy = 0; iy < image->n; iy++) {
- // for (int ix = 0; ix < image->numCols; ix++) {
+ for (long iy = 0; iy < image->n; iy++) {
image->data.F64[iy] = vF64;
- // }
}
return (true);
case PS_TYPE_U16:
- vU16 = va_arg (argp, psU32);
-
+ temp = va_arg (argp, psU32);
+ if ( temp >= PS_MIN_U16 && temp <= PS_MAX_U16 )
+ vU16 = temp;
+ else {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: U16 Value out of Range.\n");
+ return false;
+ }
for (long iy = 0; iy < image->n; iy++) {
image->data.U16[iy] = vU16;
@@ -671,5 +673,4 @@
case PS_TYPE_U32:
vU32 = va_arg (argp, psU32);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.U32[iy] = vU32;
@@ -678,5 +679,4 @@
case PS_TYPE_U64:
vU64 = va_arg (argp, psU64);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.U64[iy] = vU64;
@@ -684,6 +684,11 @@
return (true);
case PS_TYPE_S8:
- vS8 = va_arg (argp, psS32);
-
+ temp2 = va_arg (argp, psS32);
+ if ( temp2 >= PS_MIN_S8 && temp2 <= PS_MAX_S8 )
+ vS8 = temp2;
+ else {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: S8 Value out of Range.\n");
+ return false;
+ }
for (long iy = 0; iy < image->n; iy++) {
image->data.S8[iy] = vS8;
@@ -691,6 +696,11 @@
return (true);
case PS_TYPE_S16:
- vS16 = va_arg (argp, psS32);
-
+ temp2 = va_arg (argp, psS32);
+ if ( temp2 >= PS_MIN_S16 && temp2 <= PS_MAX_S16 )
+ vS16 = temp2;
+ else {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: S16 Value out of Range.\n");
+ return false;
+ }
for (long iy = 0; iy < image->n; iy++) {
image->data.S16[iy] = vS16;
@@ -699,5 +709,4 @@
case PS_TYPE_S32:
vS32 = va_arg (argp, psS32);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.S32[iy] = vS32;
@@ -706,5 +715,4 @@
case PS_TYPE_S64:
vS64 = va_arg (argp, psS64);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.S64[iy] = vS64;
@@ -713,5 +721,4 @@
case PS_TYPE_C32:
vC32 = va_arg (argp, psC32);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.C32[iy] = vC32;
@@ -720,10 +727,8 @@
case PS_TYPE_C64:
vC64 = va_arg (argp, psC64);
-
for (long iy = 0; iy < image->n; iy++) {
image->data.C64[iy] = vC64;
}
return (true);
-
default:
psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", image->type);
Index: /trunk/psLib/src/mathtypes/psVector.h
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.h (revision 4886)
+++ /trunk/psLib/src/mathtypes/psVector.h (revision 4887)
@@ -11,6 +11,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-08-19 21:27:43 $
+ * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-08-26 23:01:17 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27,22 +27,4 @@
/// @{
-///< Union of psVector data types.
-/*
-typedef union {
- psU8* U8; ///< Unsigned 8-bit integer data.
- psU16* U16; ///< Unsigned 16-bit integer data.
- psU32* U32; ///< Unsigned 32-bit integer data.
- psU64* U64; ///< Unsigned 64-bit integer data.
- psS8* S8; ///< Signed 8-bit integer data.
- psS16* S16; ///< Signed 16-bit integer data.
- psS32* S32; ///< Signed 32-bit integer data.
- psS64* S64; ///< Signed 64-bit integer data.
- psF32* F32; ///< Single-precision float data.
- psF64* F64; ///< Double-precision float data.
- psC32* C32; ///< Single-precision complex data.
- psC64* C64; ///< Double-precision complex data.
-}
-p_psVectorData;
-*/
/** An vector to support primitive types.
*
Index: /trunk/psLib/test/mathtypes/tst_psImage.c
===================================================================
--- /trunk/psLib/test/mathtypes/tst_psImage.c (revision 4886)
+++ /trunk/psLib/test/mathtypes/tst_psImage.c (revision 4887)
@@ -6,6 +6,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-08-26 03:35:03 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-08-26 23:01:17 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -328,5 +328,5 @@
int nCol = 1;
in1 = psImageAlloc(nRow, nCol, PS_TYPE_U8);
- if ( !psImageInit(in1, 1 ) ) {
+ if ( !psImageInit(in1, -1 ) ) {
psError(PS_ERR_BAD_PARAMETER_VALUE, true, "ImageInit failed. U8 Case - 1x1\n");
}
Index: /trunk/psLib/test/mathtypes/tst_psVector.c
===================================================================
--- /trunk/psLib/test/mathtypes/tst_psVector.c (revision 4886)
+++ /trunk/psLib/test/mathtypes/tst_psVector.c (revision 4887)
@@ -14,6 +14,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-07-13 02:47:00 $
+ * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-08-26 23:01:17 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27,4 +27,5 @@
static psS32 testVectorRealloc(void);
static psS32 testVectorExtend(void);
+static psS32 testVectorInit(void);
testDescription tests[] = {
@@ -32,4 +33,5 @@
{testVectorRealloc,-2,"psVectorRealloc",0,false},
{testVectorExtend,-3,"psVectorExtend",0,false},
+ {testVectorInit,-4,"psVectorInit",0,false},
{NULL}
};
@@ -270,2 +272,87 @@
return 0;
}
+
+psS32 testVectorInit(void)
+{
+ psVector *in1 = NULL;
+ psVector *in2 = NULL;
+ psVector *in3 = NULL;
+ psVector *in4 = NULL;
+ psVector *in5 = NULL;
+ psVector *in6 = NULL;
+ psVector *in7 = NULL;
+ psVector *in8 = NULL;
+ psVector *in9 = NULL;
+ psVector *in10 = NULL;
+ psVector *in11 = NULL;
+ psVector *in12 = NULL;
+ int nalloc = 1;
+ in1 = psVectorAlloc(nalloc, PS_TYPE_U8);
+ in2 = psVectorAlloc(nalloc, PS_TYPE_U16);
+ in3 = psVectorAlloc(nalloc, PS_TYPE_U32);
+ in4 = psVectorAlloc(nalloc, PS_TYPE_U64);
+ in5 = psVectorAlloc(nalloc, PS_TYPE_S8);
+ in6 = psVectorAlloc(nalloc, PS_TYPE_S16);
+ in7 = psVectorAlloc(nalloc, PS_TYPE_S32);
+ in8 = psVectorAlloc(nalloc, PS_TYPE_S64);
+ in9 = psVectorAlloc(nalloc, PS_TYPE_F32);
+ in10 = psVectorAlloc(nalloc, PS_TYPE_F64);
+ in11 = psVectorAlloc(nalloc, PS_TYPE_C32);
+ in12 = psVectorAlloc(nalloc, PS_TYPE_C64);
+ psC32 vC32;
+ psC64 vC64;
+
+ if ( !psVectorInit(in1, 1 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. U8 Case \n");
+ }
+ if ( !psVectorInit(in2, PS_MAX_U64) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. U16 Case \n");
+ }
+ if ( !psVectorInit(in3, 10) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. U32 Case \n");
+ }
+ if ( !psVectorInit(in4, -1) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. U64 Case \n");
+ }
+ if ( !psVectorInit(in5, PS_MAX_S16 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. S8 Case \n");
+ }
+ if ( !psVectorInit(in6, -100 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. S16 Case \n");
+ }
+ if ( !psVectorInit(in7, 1 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. S32 Case \n");
+ }
+ if ( !psVectorInit(in8, PS_MAX_U64 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. S64 Case \n");
+ }
+ if ( !psVectorInit(in9, 1.1 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. F32 Case \n");
+ }
+ if ( !psVectorInit(in10, 1.4 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. F64 Case \n");
+ }
+
+ vC32 = 1.23 + 1.19I;
+ vC64 = 2.13 + 2.31I;
+ if ( !psVectorInit(in11, vC32 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. C32 Case \n");
+ }
+ if ( !psVectorInit(in12, vC64 ) ) {
+ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed. C64 Case \n");
+ }
+
+ psFree(in1);
+ psFree(in2);
+ psFree(in3);
+ psFree(in4);
+ psFree(in5);
+ psFree(in6);
+ psFree(in7);
+ psFree(in8);
+ psFree(in9);
+ psFree(in10);
+ psFree(in11);
+ psFree(in12);
+ return 0;
+}
Index: /trunk/psLib/test/mathtypes/verified/tst_psImage.stderr
===================================================================
--- /trunk/psLib/test/mathtypes/verified/tst_psImage.stderr (revision 4886)
+++ /trunk/psLib/test/mathtypes/verified/tst_psImage.stderr (revision 4887)
@@ -122,4 +122,8 @@