Index: trunk/ippTools/src/warptool.h
===================================================================
--- trunk/ippTools/src/warptool.h	(revision 11731)
+++ trunk/ippTools/src/warptool.h	(revision 11763)
@@ -28,13 +28,12 @@
     P4TOOL_MODE_UPDATERUN,
     P4TOOL_MODE_ADDINPUTEXP,
-    P4TOOL_MODE_TOSCFILE,
-    P4TOOL_MODE_ADDSCFILE,
-    P4TOOL_MODE_SCFILE,
-    P4TOOL_MODE_TOSTACKEDIMFILE,
-    P4TOOL_MODE_ADDSTACKEDIMFILE,
-    P4TOOL_MODE_STACKEDIMFILE,
-    P4TOOL_MODE_TODIFFIMFILE,
-    P4TOOL_MODE_ADDDIFFIMFILE,
-    P4TOOL_MODE_DIFFIMFILE
+    P4TOOL_MODE_EXP,
+    P4TOOL_MODE_IMFILE,
+    P4TOOL_MODE_TOOVERLAP,
+    P4TOOL_MODE_ADDOVERLAP,
+    P4TOOL_MODE_SCMAP,
+    P4TOOL_MODE_TOWARPED,
+    P4TOOL_MODE_ADDWARPED,
+    P4TOOL_MODE_WARPED,
 } p4toolMode;