Changeset 28043 for trunk/ippTools/src/pxcam.c

Timestamp:

May 19, 2010, 5:13:52 PM (16 years ago)

Author:

watersc1

Message:

Merging czw_branch (maskstats and software versions) back into the trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/pxcam.c (modified) (2 diffs)

trunk/ippTools/src/pxcam.c

@@ -152 +152 @@
                     char *tess_id,
                     char *end_stage,
-                    psS64 magicked,
+                    psS64 magicked,
                     char *note)
 {
@@ -184 +184 @@
                 end_stage ? end_stage : "NULL",
                 (long long) magicked,
+                         "NULL", // This shouldn't be propagated
+                         "NULL",
+                         "NULL",
+                         "NULL",
+                         "NULL",
+                         "NULL",
                 note     ? note     : "NULL",
                 (long long)chip_id