Changeset 28536 for trunk/psModules

Timestamp:

Jun 28, 2010, 8:13:53 PM (16 years ago)

Author:

Paul Price

Message:

Merging background restoration branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/extras/ippStages.c (modified) (1 diff)
• psModules/src/extras/ippStages.h (modified) (1 diff)

trunk/psModules/src/extras/ippStages.c

@@ -15 +15 @@
     } else if (!strcmp(stageString, "chip")) {
         return IPP_STAGE_CHIP;
+    } else if (!strcmp(stageString, "chip_bg")) {
+        return IPP_STAGE_CHIP_BG;
     } else if (!strcmp(stageString, "camera")) {
         return IPP_STAGE_CAMERA;
     } else if (!strcmp(stageString, "warp")) {
         return IPP_STAGE_WARP;
+    } else if (!strcmp(stageString, "warp_bg")) {
+        return IPP_STAGE_WARP_BG;
     } else if (!strcmp(stageString, "fake")) {
         return IPP_STAGE_FAKE;

trunk/psModules/src/extras/ippStages.h

@@ -13 +13 @@
     IPP_STAGE_RAW = 0,
     IPP_STAGE_CHIP,
+    IPP_STAGE_CHIP_BG,
     IPP_STAGE_CAMERA,
     IPP_STAGE_FAKE,
     IPP_STAGE_WARP,
+    IPP_STAGE_WARP_BG,
     IPP_STAGE_DIFF,
     IPP_STAGE_STACK,