Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMerge.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMerge.c

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