Index: trunk/ippTools/src/magictool.h
===================================================================
--- trunk/ippTools/src/magictool.h	(revision 14481)
+++ trunk/ippTools/src/magictool.h	(revision 14537)
@@ -1,6 +1,6 @@
 /*
- * warptool.h
+ * magictool.h
  *
- * Copyright (C) 2006  Joshua Hoblitt
+ * Copyright (C) 2007  Joshua Hoblitt
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -18,27 +18,24 @@
  */
 
-#ifndef WARPTOOL_H
-#define WARPTOOL_H 1
+#ifndef MAGICTOOL_H
+#define MAGICTOOL_H 1
 
 #include "pxtools.h"
 
 typedef enum {
-    WARPTOOL_MODE_NONE           = 0x0,
-    WARPTOOL_MODE_DEFINERUN,
-    WARPTOOL_MODE_RUNONE,
-    WARPTOOL_MODE_UPDATERUN,
-    WARPTOOL_MODE_ADDINPUTEXP,
-    WARPTOOL_MODE_EXP,
-    WARPTOOL_MODE_IMFILE,
-    WARPTOOL_MODE_TOOVERLAP,
-    WARPTOOL_MODE_ADDOVERLAP,
-    WARPTOOL_MODE_SCMAP,
-    WARPTOOL_MODE_TOWARPED,
-    WARPTOOL_MODE_ADDWARPED,
-    WARPTOOL_MODE_WARPED,
-    WARPTOOL_MODE_REVERTWARPED,
-} warptoolMode;
+    MAGICTOOL_MODE_NONE           = 0x0,
+    MAGICTOOL_MODE_DEFINERUN,
+    MAGICTOOL_MODE_UPDATERUN,
+    MAGICTOOL_MODE_ADDINPUTSKYFILE,
+    MAGICTOOL_MODE_INPUTTREE,
+    MAGICTOOL_MODE_TOPROCESS,
+    MAGICTOOL_MODE_ADDRESULT,
+    MAGICTOOL_MODE_TOMASK,
+    MAGICTOOL_MODE_ADDMASK,
+    MAGICTOOL_MODE_TOSKYFILEMASK,
+    MAGICTOOL_MODE_ADDSKYFILEMASK,
+} MAGICtoolMode;
 
-pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv);
+pxConfig *magictoolConfig(pxConfig *config, int argc, char **argv);
 
-#endif // WARPTOOL_H
+#endif // MAGICTOOL_H