Changeset 34041 for branches/meh_branches/ppstack_test/ppMerge/src/ppMerge.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMerge.c (modified) (1 diff)

branches/meh_branches/ppstack_test/ppMerge/src/ppMerge.c

@@ -56 +56 @@
       case PPMERGE_TYPE_FRINGE:
       case PPMERGE_TYPE_CTEMASK:
+      case PPMERGE_TYPE_NOISEMAP:
         if (!ppMergeScaleZero(config)) {
             psErrorStackPrint(stderr, "Error getting scale and zero-points.");