Changeset 26764 for branches/eam_branches/20091201/ppImage/src/ppImageBurntoolMask.c

Timestamp:

Feb 2, 2010, 7:06:18 PM (16 years ago)

Author:

watersc1

Message:

new burntool code

File:

• branches/eam_branches/20091201/ppImage/src/ppImageBurntoolMask.c (modified) (4 diffs)

branches/eam_branches/20091201/ppImage/src/ppImageBurntoolMask.c

@@ -3 +3 @@
 #endif
 
-/* #define PPIMAGE_BURNTOOL_DEBUG 1 */
+#define PPIMAGE_BURNTOOL_DEBUG 1
 
 #include "ppImage.h"
@@ -47 +47 @@
 
     if (psMetadataLookupS32(&status,rowMD,"cell") == burntool_cell) {
-      if (((options->burntoolTrails & 0x01)&&(psMetadataLookupS32(&status,rowMD,"nfit") == 0))||
-          ((options->burntoolTrails & 0x02)&&(psMetadataLookupS32(&status,rowMD,"up") == 1))||
-          ((options->burntoolTrails & 0x04)&&(psMetadataLookupS32(&status,rowMD,"up") == 0))) {
+      if ((psMetadataLookupS32(&status,rowMD,"nfit") != 0)&&
+          (((options->burntoolTrails & 0x02)&&(psMetadataLookupS32(&status,rowMD,"up") == 1))||
+           ((options->burntoolTrails & 0x04)&&(psMetadataLookupS32(&status,rowMD,"up") == 0)))) {
         /*       If the fit fails, burntool reports zero here.  This
                  signifies that it expected to see a trail (else why
@@ -70 +70 @@
           if (psMetadataLookupS32(&status,rowMD,"up") == 0) {
             for (int j = 0; j <= psMetadataLookupS32(&status,rowMD,"y1p"); j++) {
-/* #ifdef PPIMAGE_BURNTOOL_DEBUG */
-/*            psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n", */
-/*                     i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue); */
-/* #endif */
+#ifdef PPIMAGE_BURNTOOL_DEBUG
+              psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n",
+                       i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue);
+#endif
               image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue;
             }
@@ -79 +79 @@
           else {
             for (int j = psMetadataLookupS32(&status,rowMD,"y1m"); j < image->numRows ; j++) {
-/* #ifdef PPIMAGE_BURNTOOL_DEBUG */
-/*            psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n", */
-/*                     i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue); */
-/* #endif */
+#ifdef PPIMAGE_BURNTOOL_DEBUG
+              psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n",
+                       i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue);
+#endif
               image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue;
             }