Index: trunk/psLib/test/imageops/Makefile.am =================================================================== --- trunk/psLib/test/imageops/Makefile.am (revision 36375) +++ trunk/psLib/test/imageops/Makefile.am (revision 42822) @@ -18,5 +18,4 @@ tap_psImageSmooth \ tap_psImageSmoothMask_Threaded \ - tap_psImageSmooth_PreAlloc \ tap_psImageStructManip \ tap_psImageConvolve \ @@ -32,4 +31,5 @@ tap_psImageCovariance +# tap_psImageSmooth_PreAlloc # tap_psImageShiftKernel # tap_psImageInterpolate Index: trunk/psLib/test/imageops/convolutionBench.c =================================================================== --- trunk/psLib/test/imageops/convolutionBench.c (revision 36375) +++ trunk/psLib/test/imageops/convolutionBench.c (revision 42822) @@ -56,5 +56,5 @@ } - char size[16]; + char size[32]; sprintf(size, "%dx%d", imageCols, imageRows); printf("%15s", size); Index: trunk/psLib/test/imageops/tap_psImageGeomManip.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageGeomManip.c (revision 36375) +++ trunk/psLib/test/imageops/tap_psImageGeomManip.c (revision 42822) @@ -528,6 +528,4 @@ psImage *in; - psImage *out; - psImage *out2; psS32 rows = 64; psS32 cols = 64; @@ -544,5 +542,5 @@ // Verify the returned psImage structure pointer is NULL and program // execution doesn't stop, if input parameter input is NULL. - out2 = psImageRoll(NULL,NULL,0,0); + psImage *out2 = psImageRoll(NULL,NULL,0,0); if (out2 != NULL) { psError(PS_ERR_UNKNOWN, true,"psImageRoll did not return NULL though input image was NULL!?"); @@ -551,7 +549,7 @@ psFree(in); - psFree(out); - - #define testRollType(DATATYPE) \ + psFree(out2); + +#define testRollType(DATATYPE) { \ in = psImageAlloc(rows1,cols1,PS_TYPE_##DATATYPE); \ \ @@ -564,5 +562,5 @@ \ errorFlag = false; \ - out = psImageRoll(NULL,in,rows1/4,cols1/4); \ + psImage *out = psImageRoll(NULL,in,rows1/4,cols1/4); \ for (psS32 row=0;rowdata.DATATYPE[(row+rows1/4)%rows1]; \ @@ -579,5 +577,5 @@ psFree(in); \ psFree(out); \ - ok(!errorFlag, "psImageRoll() produced the correct data values"); + ok(!errorFlag, "psImageRoll() produced the correct data values"); } testRollType(U8); @@ -636,5 +634,4 @@ system("mkdir temp"); psS32 index = 0; - psBool fail = false; psF32 radianRot; @@ -711,5 +708,4 @@ diag("verified psF32 image failed to be read (%d deg. rotation)", rot); errorFlag = true; - fail = true; } else { if(fTruth->numRows != fOut->numRows || fTruth->numCols != fOut->numCols) { @@ -788,5 +784,4 @@ "(%d deg. rotation) BILINEAR",rot); errorFlag = true; - fail = true; } else { if (sBiTruth->numRows != sBiOut->numRows || Index: trunk/psLib/test/imageops/tap_psImageInterpolate3.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageInterpolate3.c (revision 36375) +++ trunk/psLib/test/imageops/tap_psImageInterpolate3.c (revision 42822) @@ -74,12 +74,15 @@ // point (1) : center of center pixel interpOK = psImageInterpolate(&imageVal, NULL, NULL, xCenter + 0.5, yCenter + 0.5, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); pt1->data.F32[i] = imageVal; // point (2) : edge of center pixel interpOK = psImageInterpolate(&imageVal, NULL, NULL, xCenter + 0.5, yCenter, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); pt2->data.F32[i] = imageVal; // point (3) : corner of center pixel interpOK = psImageInterpolate(&imageVal, NULL, NULL, xCenter, yCenter, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); pt3->data.F32[i] = imageVal; @@ -102,4 +105,5 @@ interpOK = psImageInterpolate(&imageVal, &varianceVal, NULL, xCenter + 0.5, yCenter + 0.5, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); psStatsInit(stats); psVectorStats(stats, pt1, NULL, NULL, 0); @@ -107,4 +111,5 @@ interpOK = psImageInterpolate(&imageVal, &varianceVal, NULL, xCenter + 0.5, yCenter, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); psStatsInit(stats); psVectorStats(stats, pt2, NULL, NULL, 0); @@ -112,4 +117,5 @@ interpOK = psImageInterpolate(&imageVal, &varianceVal, NULL, xCenter, yCenter, interp); + ok (interpOK == PS_INTERPOLATE_STATUS_GOOD, "ok pixel"); psStatsInit(stats); psVectorStats(stats, pt3, NULL, NULL, 0); Index: trunk/psLib/test/imageops/tap_psImageMapFit.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageMapFit.c (revision 36375) +++ trunk/psLib/test/imageops/tap_psImageMapFit.c (revision 42822) @@ -79,5 +79,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -153,5 +155,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -235,5 +239,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -318,5 +324,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -384,5 +392,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -445,5 +455,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -526,5 +538,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -595,5 +609,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -686,5 +702,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -753,5 +771,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); @@ -814,5 +834,7 @@ // fit the data to the map - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); psImage *model = psImageAlloc(field->numCols, field->numRows, PS_TYPE_F32); Index: trunk/psLib/test/imageops/tap_psImageMapFit2.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageMapFit2.c (revision 36375) +++ trunk/psLib/test/imageops/tap_psImageMapFit2.c (revision 42822) @@ -61,5 +61,8 @@ // fit the data to the map - psImageMapFit (map, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); + // psImageMapFit (map, x, y, f, NULL); psImage *field = psImageAlloc(1000, 1000, PS_TYPE_F32); @@ -124,5 +127,5 @@ for (int ix = 0; ix < 1000; ix += 20) { for (int iy = 0; iy < 1000; iy += 20) { - x->data.F32[x->n] = ix + 0,5; + x->data.F32[x->n] = ix + 0.5; y->data.F32[y->n] = iy + 0.5; f->data.F32[f->n] = PS_SQR(x->data.F32[x->n]) + PS_SQR(y->data.F32[x->n]); @@ -141,5 +144,8 @@ // XXX this function needs to correct for the mean superpixel position // which is sampled... - psImageMapFit (map, NULL, 0, x, y, f, NULL); + bool status; + psImageMapFit (&status, map, NULL, 0, x, y, f, NULL); + ok (status, "ok fit"); + // psImageMapFit (map, NULL, 0, x, y, f, NULL); psFree (binning); Index: trunk/psLib/test/imageops/tap_psImageMaskOps.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageMaskOps.c (revision 36375) +++ trunk/psLib/test/imageops/tap_psImageMaskOps.c (revision 42822) @@ -121,5 +121,5 @@ } psImageMaskRegion(img, reg, "=", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -149,5 +149,5 @@ maskVal = 0xf; psImageMaskRegion(img, reg, "&", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -177,5 +177,5 @@ maskVal = 0xf; psImageMaskRegion(img, reg, "^", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -250,5 +250,5 @@ } psImageKeepRegion(img, reg, "=", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -278,5 +278,5 @@ maskVal = 0xf; psImageKeepRegion(img, reg, "&", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -306,5 +306,5 @@ maskVal = 0xf; psImageKeepRegion(img, reg, "^", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -381,5 +381,5 @@ } psImageMaskCircle(img, (psF64) x, (psF64) y, (psF64) radius, "=", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -409,5 +409,5 @@ maskVal = 0xf; psImageMaskCircle(img, (psF64) x, (psF64) y, (psF64) radius, "&", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -437,5 +437,5 @@ maskVal = 0xf; psImageMaskCircle(img, (psF64) x, (psF64) y, (psF64) radius, "^", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -504,5 +504,5 @@ } psImageKeepCircle(img, (psF64) x, (psF64) y, (psF64) radius, "=", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -532,5 +532,5 @@ maskVal = 0xf; psImageKeepCircle(img, (psF64) x, (psF64) y, (psF64) radius, "&", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) { @@ -560,5 +560,5 @@ maskVal = 0xf; psImageKeepCircle(img, (psF64) x, (psF64) y, (psF64) radius, "^", maskVal); - psBool errorFlag = false; + errorFlag = false; for (int i = 0 ; i < numRows ; i++) { for (int j = 0 ; j < numCols ; j++) {