Diff of /src/parser/tparser.h [495361] .. [7dd4fb] Maximize Restore

  Switch to side-by-side view

--- a/src/parser/tparser.h
+++ b/src/parser/tparser.h
@@ -48,6 +48,25 @@
 #define PANO_PARSER_COEF_COUNT 7
 
 typedef struct {
+    double x;
+    double y;
+} pt_point;
+
+typedef struct {
+    int iImage;
+    pt_point p1;
+    pt_point p2;
+} pt_script_morph_point;
+
+typedef struct {
+    int iImage1;
+    int iImage2;
+    pt_point p1;
+    pt_point p2;
+    int type;
+} pt_script_ctrl_point;
+
+typedef struct {
     int width;
     int height;
     int projection;
@@ -67,7 +86,7 @@
     float yaw;
     float pitch;
     float roll;
-    float coef[7]; // a, b, c, d, e       , g, t
+    float coef[7]; // a, b, c, d, e, g, t
     char *name;
     char cropType ; // it can be 'S' or  'C'
     int cropArea[PANO_PARSER_COEF_COUNT]; // the rectangle to crop to
@@ -79,18 +98,16 @@
     int pitchIndex;
     int rollIndex;
     int coefIndex[PANO_PARSER_COEF_COUNT]; // a, b, c, d, e       , g, t
+    int morphPointsCount;
+    pt_script_morph_point *morphPoints;    
 }  pt_script_image;
 
-typedef struct {
-    int iImage;
-    float x1, y1, x2, y2;
-} pt_script_morphing_points;
 
 typedef struct {
     float fGamma;
     int interpolator;
     int fastFT;
-    int humberEstimator;
+    int huberEstimator;
 } pt_script_optimize;
 
 typedef struct {
@@ -99,14 +116,19 @@
     pt_script_image *inputImageSpec;
     int iOutputImagesCount;
     pt_script_image *outputImageSpec;
-    pt_script_morphing_points *morphingPointsSpec;
+    int iMorphPointsCount;
     pt_script_optimize optimize;
+    int iCtrlPointsCount;
+    pt_script_ctrl_point *ctrlPointsSpec;
 }  pt_script;
 
+
+static pt_script_morph_point *morphPointsSpec = NULL;
 
 pt_script *panoScriptParse(char *filename, int deferenceVariables);
 void panoScriptDispose(pt_script **scriptVar);
 void panoScriptDump(pt_script *script);
+
 
 // Accessors to the data structures above...
 // they  are the preferred way to access the data in them
@@ -138,5 +160,8 @@
 float panoScriptGetImageRoll(pt_script_image *pImage);
 
 
+
+
+
 #endif