Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvorepairFixCPT.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge/src/dvorepairFixCPT.c (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvorepairFixCPT.c

@@ -120 +120 @@
   }
 
-  measure = FtableToMeasure (&cpmFtable, &Nmeasure, &catformat);
+  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
   myAssert(measure, "failed to convert ftable to measure data");
 
@@ -127 +127 @@
 
   // convert internal to external format 
-  if (!MeasureToFtable (&cpmFtable, measure, Nmeasure, catformat)) {
+  if (!MeasureToFtable (&cpmFtable, NULL, measure, Nmeasure, catformat)) {
     myAbort("trouble converting format");
   }