Changeset 5583 for trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c

Timestamp:

Nov 23, 2005, 9:13:06 AM (21 years ago)

Author:

Paul Price

Message:

Worked out some memory leaks and bugs for GPC1 test data

File:

• trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c (modified) (2 diffs)

trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c

@@ -621 +621 @@
                     while (biassec = psListGetAndIncrement(biassecsIter)) {
                         psListIteratorSet(checkListIter, PS_LIST_HEAD);
-                        psRegion *checkRegion = NULL; // Region from iteration
+                        psString checkRegionString = NULL; // Region string from iteration
                         int i = 0;              // Counter
-                        while (checkRegion = psListGetAndIncrement(checkListIter)) {
-                            if (COMPARE_REGIONS(biassec, checkRegion)) {
+                        while (checkRegionString = psListGetAndIncrement(checkListIter)) {
+                            psRegion checkRegion = psRegionFromString(checkRegionString);
+                            psTrace(__func__, 7, "Checking [%.0f:%.0f,%.0f:%.0f] against "
+                                    "[%.0f:%.0f,%.0f:%.0f]\n", biassec->x0, biassec->x1, biassec->y0,
+                                    biassec->y1, checkRegion.x0, checkRegion.x1, checkRegion.y0,
+                                    checkRegion.y1);
+                            if (COMPARE_REGIONS(biassec, &checkRegion)) {
                                 check->data.U8[i] = 1;
                                 i++;
@@ -707 +712 @@
             psMetadataItem *binItem = psMetadataItemAllocStr(xKeyword, "Binning factor in x and y",
                                                              binString);
+            psFree(binString);
             psMetadata *header = NULL; // The FITS header
             if (cell->hdu) {