Diff of /panTools.h [ed05d7] .. [51520e] Maximize Restore

  Switch to side-by-side view

--- a/panTools.h
+++ b/panTools.h
@@ -27,7 +27,7 @@
 
 #ifdef __cplusplus
 extern "C" {  
-#endif	
+#endif
 
 #include "../libpano/sys_win.h"
 #include "../libpano/Filter.h"
@@ -48,6 +48,7 @@
   int imageDepth;         //< the Image Depth
   int imageChannelSize;   //< the Image ChannelSize
   int imageSize;          //< the Image Size
+  int imagePlanes;        //< the Image number of planes 
 } PhoData;
 
 /**
@@ -64,17 +65,6 @@
 } PanData;
 
 
-#if 0   // unused functions
-typedef void (*ConvFileName_proc)(fullPath *fname,char *string);
-typedef void (*PrintError_proc)(char* fmt, ...); 
-typedef void (*SetAdjustDefaults_proc)(aPrefs *p);
-typedef int (*addLayerToFile_proc)(Image *im, fullPath* sfile, fullPath* dfile, stBuf *sB);
-typedef void** (*mymalloc_proc)(long numBytes);
-typedef int (*readPrefs_proc)(char* p, int selector ); 
-typedef int (*writePSDwithLayer_proc)(Image *im, fullPath *fname);
-typedef int (*writeTIFF_proc)(Image *im, fullPath* fname);
-#endif
-
 typedef void (*CopyImageData_proc)(Image *dest, Image *src);
 typedef void (*FourToThreeBPP_proc)(Image *im);
 typedef void (*SetImageDefaults_proc)(Image *im);
@@ -89,29 +79,19 @@
 typedef struct
 {
   // handle to pano13.dll
-  HINSTANCE hpano13;
+  HINSTANCE             hpano13;
 
   // entry points to pano13.dll
-  FourToThreeBPP_proc FourToThreeBPP;
-  filter_main_proc filter_main;
-  myfree_proc myfree;
-  SetWindowOwner_proc SetWindowOwner;
+  FourToThreeBPP_proc   FourToThreeBPP;
+  filter_main_proc      filter_main;
+  myfree_proc           myfree;
+  SetWindowOwner_proc   SetWindowOwner;
   SetImageDefaults_proc SetImageDefaults;
-  CopyImageData_proc CopyImageData;
-  writePSD_proc writePSD;
+  CopyImageData_proc    CopyImageData;
+  writePSD_proc         writePSD;
+  writePSD_proc         writePSDwithLayer;
 
-#if 0   // unused calls
-  ConvFileName_proc ConvFileName;
-  PrintError_proc PrintError;
-  SetAdjustDefaults_proc SetAdjustDefaults;
-  addLayerToFile_proc addLayerToFile;
-  mymalloc_proc mymalloc;
-  readPrefs_proc readPrefs;
-  writePSDwithLayer_proc writePSDwithLayer;
-  writeTIFF_proc writeTIFF;
-#endif
-
-  bool initDLL;       //< true of pano13.dll is loaded & initialized
+  bool                  initDLL;       //< true of pano13.dll is loaded & initialized
 } DllData;
 
 int panTools();