[panotools-cvs] SF.net SVN: panotools: [650] trunk/libpano

[<dm...@us...>]

Revision: 650
          http://svn.sourceforge.net/panotools/?rev=650&view=rev
Author:   dmg
Date:     2007-01-10 23:50:28 -0800 (Wed, 10 Jan 2007)

Log Message:
-----------
2007-01-10  dmg  <dm...@uv...>

* version.h (VERSION), configure.ac Upgraded to version 2.9.11

* parser.c (ParseScript): V-type variables from Hugin .pto files
need to be ignored also.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/configure.ac
    trunk/libpano/parser.c
    trunk/libpano/version.h

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2007-01-11 07:32:26 UTC (rev 649)
+++ trunk/libpano/ChangeLog	2007-01-11 07:50:28 UTC (rev 650)
@@ -1,9 +1,13 @@
 2007-01-10  dmg  <dm...@uv...>
 
+	* version.h (VERSION), configure.ac Upgraded to version 2.9.11
+
+	* parser.c (ParseScript): V-type variables from Hugin .pto files
+	need to be ignored also.
+	
 	* parser.c (readAdjust): Images with 'i' were all done with the
 	first spec. This change fixes that problem (the parser should be
 	rewritten)
-
 	* version.h (VERSION), configure.ac Upgraded to version 2.9.10
 
 	* doc/stitch.txt: Updated the file to match latest version.

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2007-01-11 07:32:26 UTC (rev 649)
+++ trunk/libpano/configure.ac	2007-01-11 07:50:28 UTC (rev 650)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.5)
-AC_INIT([pano13], [2.9.10], BUG-REPORT-ADDRESS)
+AC_INIT([pano13], [2.9.11], BUG-REPORT-ADDRESS)
 AC_CONFIG_SRCDIR([PTDialogs.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config.h])

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2007-01-11 07:32:26 UTC (rev 649)
+++ trunk/libpano/parser.c	2007-01-11 07:50:28 UTC (rev 650)
@@ -41,11 +41,13 @@
 
 
 
+#include <assert.h>
 #include "filter.h"
 #include <locale.h>
 
 #include "ZComb.h"
 
+
 /* defined in adjust.c */
 int AddEdgePoints( AlignInfo *gl );
 
@@ -73,6 +75,7 @@
 
 #define READ_OPT_VAR(var)       nextWord( buf, &li );           \
                                 MY_SSCANF( buf, "%d", &k);      \
+	printf("REading optimization var %s forimage %d\n", #var,k);\
                                 if( k<0 || k>= numIm )          \
                                 {                               \
                                     PrintError("Syntax error in script: Line %d\n\nIllegal image number: %ld", lineNum, k);\
@@ -144,6 +147,8 @@
     // end mask-from-focus Rik's hacking
     SetImageDefaults(&(gl->pano));  
     SetStitchDefaults(&(gl->st)); strcpy( gl->st.srcName, "buf" ); // Default: Use buffer 'buf' for stitching
+	printf("Number of images %d\n",gl-> numIm);
+
     for(i=0; i<gl->numIm; i++)
     {
         SetImageDefaults( &(gl->im[i]) );
@@ -170,7 +175,6 @@
 
         // parse line; use only if first character is i,p,v,c,m
     
-
         switch( line[0] )
         {
         case 'i':       // Image description
@@ -339,6 +343,10 @@
                                     sscanf( buf, FMT_INT32","FMT_INT32","FMT_INT32","FMT_INT32, &im->selection.left, &im->selection.right, &im->selection.top, &im->selection.bottom );
                                     im->cP.cutFrame = TRUE;
                                     break;
+						    case 'V':
+								// Ignore V variables in i
+								nextWord( buf, &li );       
+								break;
                             default: 
                                         li++;
                                         break;
@@ -346,6 +354,7 @@
                     }
 
                     numIm++;
+
                     break;  
         case 't':       // Triangle
                     li = &(line[1]);

Modified: trunk/libpano/version.h
===================================================================
--- trunk/libpano/version.h	2007-01-11 07:32:26 UTC (rev 649)
+++ trunk/libpano/version.h	2007-01-11 07:50:28 UTC (rev 650)
@@ -27,7 +27,7 @@
 
 //version of preferences file, used to verify data
 #ifndef VERSION
-#define VERSION "2.9.10 "
+#define VERSION "2.9.11 "
 #endif
 
 #ifndef PTVERSION_NAME_LONG


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.